From c46f4ebf076cfd8a892062a61feb2393639be085 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 11 May 2023 18:30:24 +0300 Subject: [PATCH] =?UTF-8?q?backend-api=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backendapi/controller/queue/AbstractQueueController.java | 2 +- .../controller/queue/securities/SecurityController.java | 4 +++- .../backendapi/controller/test/DefaultController.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java index a1c437ad4..7c4452737 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java @@ -7,7 +7,7 @@ import ru.spcex.clearing.backendapi.service.IOperator; import java.util.Objects; import java.util.concurrent.ExecutionException; -public class AbstractQueueController { +public abstract class AbstractQueueController { private final IOperator operator; public AbstractQueueController(IOperator operator) { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java index 18856e186..cc00f19eb 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java @@ -16,7 +16,9 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import java.util.Collection; import java.util.Map; -@Deprecated //todo не лишний ли этот контроллер? См. CudMoneyMarketSecurityController @Deprecated +/** + * SecurityController и MoneyMarketSecurityController разные контроллеры, не путать. + */ @Controller @RequestMapping("/securities") public class SecurityController { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/test/DefaultController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/test/DefaultController.java index 6eba641dd..f99b2eb03 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/test/DefaultController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/test/DefaultController.java @@ -22,7 +22,7 @@ public class DefaultController implements InitializingBean { @ApiOperation(value = "Test backend-api availability.") @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = String.class)}) - @RequestMapping(method = RequestMethod.GET, path = "/anonymous/method1", produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(method = RequestMethod.GET, path = "/api/system/ping", produces = MediaType.TEXT_PLAIN_VALUE) @ResponseBody public String processGet() { log.info("Call test method for backend-api controller"); @@ -31,7 +31,7 @@ public class DefaultController implements InitializingBean { @ApiOperation(value = "Test backend-api availability (for authorized access). Available for anonymous, if authorization-disabled=true.") @ApiResponses(value = {@ApiResponse(code = 200, message = "OK")}) - @RequestMapping(method = RequestMethod.GET, path = "/users/method2", produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(method = RequestMethod.GET, path = "/api/system/ping/authorized", produces = MediaType.TEXT_PLAIN_VALUE) @ResponseBody public String processProtectedGet() { log.info("controller method2");