From 0c1a02ba7f45f053949ce076fd05f7dc2590b940 Mon Sep 17 00:00:00 2001
From: etreschenkov <etreschenkov@mfd.ru>
Date: Wed, 28 Jun 2023 18:52:36 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-373

---
 .../gatewayapi/service/GatewayService.java    | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
index c9f6deb84..1d6c33550 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
@@ -25,7 +25,6 @@ import ru.spcex.clearing.platform.messaging.domain.cud.gateway.GatewayTaskReques
 import ru.spcex.clearing.platform.messaging.domain.cud.utilities.LimExportedRequest;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
-import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.platform.enumeration.Section;
 import ru.spcex.platform.enumeration.Task;
@@ -47,7 +46,6 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
                           RestTemplate restTemplate,
                           UserRoleVerification userRoleVerification,
                           GatewayApiSettings gatewayApiSettings,
-                          KafkaSender kafkaSender,
                           @Qualifier("sentAssets") Map<Long, List<SentAsset>> sentAssets) {
         super(kafkaQueue, kafkaProducer);
         this.restTemplate = restTemplate;
@@ -90,7 +88,9 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
 
         ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, request, SuccessResponse.class);
         SuccessResponse bodyResponse = response.getBody();
-        log.debug("LOCM task complete, success response : {}", bodyResponse);
+        if (bodyResponse != null) {
+            log.debug("LOCM task complete, success response : {}", bodyResponse);
+        }
     }
 
     public void requestOnLimit(BaseRequest<LimExportedRequest> userRequest) {
@@ -108,7 +108,9 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
         HttpEntity<OutboundRequest> request = makeDefaultRequest(outboundFondRequest);
         ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, request, SuccessResponse.class);
         SuccessResponse bodyResponse = response.getBody();
-        log.debug("Limit request complete, success response: {}", bodyResponse);
+        if (bodyResponse != null) {
+            log.debug("Limit request complete, success response: {}", bodyResponse);
+        }
     }
 
     public void requestOnDemandSecurity(BaseRequest<GatewayTaskRequest> userRequest) {
@@ -136,10 +138,14 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
 
         ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, requestFond, SuccessResponse.class);
         SuccessResponse bodyResponse = response.getBody();
-        log.debug("LOSC task 1/2 complete (FOND section), success response: {}", bodyResponse);
+        if (bodyResponse != null) {
+            log.debug("LOSC task 1/2 complete (FOND section), success response: {}", bodyResponse);
+        }
         response = restTemplate.exchange(url, HttpMethod.POST, requestMKR, SuccessResponse.class);
         bodyResponse = response.getBody();
-        log.debug("LOSC task 2/2 complete (MKR section), success response: {}", bodyResponse);
+        if (bodyResponse != null) {
+            log.debug("LOSC task 2/2 complete (MKR section), success response: {}", bodyResponse);
+        }
     }
 
     public void requestOnAsset(BaseRequest<AssetOperationListRequest> request) {
@@ -167,9 +173,11 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
             String url = formingInboundUrl(inboundServerSettings.getPathLOCM());
             HttpEntity<OutboundRequest> r = makeDefaultRequest(outboundRequest);
             try {
-                ResponseEntity<Map> response = restTemplate.exchange(url, HttpMethod.POST, r, Map.class);
-                Map bodyResponse = response.getBody();
-                log.debug("Response from service: {}", bodyResponse != null ? bodyResponse : "empty");
+                ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, r, SuccessResponse.class);
+                SuccessResponse bodyResponse = response.getBody();
+                if (bodyResponse != null) {
+                    log.debug("Response from service: {}", bodyResponse);
+                }
             } catch (Throwable err) {
                 log.error("Exchange error: {}", ExceptionUtils.getStackTrace(err));
             } finally {