X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageHandler.java;fp=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageHandler.java;h=9d7c0a696c3549be0931fdb9b637c30b93426e28;hb=3483a78c55f1830dd0aa28f789ddf817ea1358c0;hp=efdccd87697bdc78a44bf3435560136d2818d71e;hpb=955e56b891ce62e832cbb93afd29b65c891bd71a;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java
index efdccd87..9d7c0a69 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java
@@ -40,13 +40,12 @@ import reactor.core.publisher.Mono;
 /**
  * The class handles incoming requests from DMAAP.
  * <p>
- * That means: invoke a REST call towards this services and to send back a
- * response though DMAAP
+ * That means: invoke a REST call towards this services and to send back a response though DMAAP
  */
 public class DmaapMessageHandler {
     private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
     private static Gson gson = new GsonBuilder() //
-        .create(); //
+            .create(); //
     private final AsyncRestClient dmaapClient;
     private final AsyncRestClient agentClient;
 
@@ -68,36 +67,32 @@ public class DmaapMessageHandler {
         try {
             DmaapRequestMessage dmaapRequestMessage = gson.fromJson(msg, ImmutableDmaapRequestMessage.class);
             return this.invokePolicyAgent(dmaapRequestMessage) //
-                .onErrorResume(t -> handleAgentCallError(t, msg, dmaapRequestMessage)) //
-                .flatMap(
-                    response -> sendDmaapResponse(response.getBody(), dmaapRequestMessage, response.getStatusCode()));
+                    .onErrorResume(t -> handleAgentCallError(t, dmaapRequestMessage)) //
+                    .flatMap(response -> sendDmaapResponse(response.getBody(), dmaapRequestMessage,
+                            response.getStatusCode()));
         } catch (Exception e) {
             String errorMsg = "Received unparsable message from DMAAP: \"" + msg + "\", reason: " + e.getMessage();
             return Mono.error(new ServiceException(errorMsg)); // Cannot make any response
         }
     }
 
-    private Mono<ResponseEntity<String>> handleAgentCallError(Throwable t, String originalMessage,
-        DmaapRequestMessage dmaapRequestMessage) {
-        logger.debug("Agent call failed: {}", t.getMessage());
+    private Mono<ResponseEntity<String>> handleAgentCallError(Throwable error,
+            DmaapRequestMessage dmaapRequestMessage) {
+        logger.debug("Agent call failed: {}", error.getMessage());
         HttpStatus status = HttpStatus.INTERNAL_SERVER_ERROR;
-        String errorMessage = t.getMessage();
-        if (t instanceof WebClientResponseException) {
-            WebClientResponseException exception = (WebClientResponseException) t;
+        String errorMessage = error.getMessage();
+        if (error instanceof WebClientResponseException) {
+            WebClientResponseException exception = (WebClientResponseException) error;
             status = exception.getStatusCode();
             errorMessage = exception.getResponseBodyAsString();
-        } else if (t instanceof ServiceException) {
+        } else if (error instanceof ServiceException) {
             status = HttpStatus.BAD_REQUEST;
-            errorMessage = prepareBadOperationErrorMessage(t, originalMessage);
-        } else if (!(t instanceof WebClientException)) {
-            logger.warn("Unexpected exception ", t);
+            errorMessage = error.getMessage();
+        } else if (!(error instanceof WebClientException)) {
+            logger.warn("Unexpected exception ", error);
         }
         return sendDmaapResponse(errorMessage, dmaapRequestMessage, status) //
-            .flatMap(notUsed -> Mono.empty());
-    }
-
-    private String prepareBadOperationErrorMessage(Throwable t, String originalMessage) {
-        return t.getMessage();
+                .flatMap(notUsed -> Mono.empty());
     }
 
     private Mono<ResponseEntity<String>> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
@@ -128,10 +123,10 @@ public class DmaapMessageHandler {
     }
 
     private Mono<String> sendDmaapResponse(String response, DmaapRequestMessage dmaapRequestMessage,
-        HttpStatus status) {
+            HttpStatus status) {
         return createDmaapResponseMessage(dmaapRequestMessage, response, status) //
-            .flatMap(this::sendToDmaap) //
-            .onErrorResume(this::handleResponseCallError);
+                .flatMap(this::sendToDmaap) //
+                .onErrorResume(this::handleResponseCallError);
     }
 
     private Mono<String> sendToDmaap(String body) {
@@ -145,16 +140,16 @@ public class DmaapMessageHandler {
     }
 
     private Mono<String> createDmaapResponseMessage(DmaapRequestMessage dmaapRequestMessage, String response,
-        HttpStatus status) {
+            HttpStatus status) {
         DmaapResponseMessage dmaapResponseMessage = ImmutableDmaapResponseMessage.builder() //
-            .status(status.toString()) //
-            .message(response == null ? "" : response) //
-            .type("response") //
-            .correlationId(dmaapRequestMessage.correlationId() == null ? "" : dmaapRequestMessage.correlationId()) //
-            .originatorId(dmaapRequestMessage.originatorId() == null ? "" : dmaapRequestMessage.originatorId()) //
-            .requestId(dmaapRequestMessage.requestId() == null ? "" : dmaapRequestMessage.requestId()) //
-            .timestamp(dmaapRequestMessage.timestamp() == null ? "" : dmaapRequestMessage.timestamp()) //
-            .build();
+                .status(status.toString()) //
+                .message(response == null ? "" : response) //
+                .type("response") //
+                .correlationId(dmaapRequestMessage.correlationId() == null ? "" : dmaapRequestMessage.correlationId()) //
+                .originatorId(dmaapRequestMessage.originatorId() == null ? "" : dmaapRequestMessage.originatorId()) //
+                .requestId(dmaapRequestMessage.requestId() == null ? "" : dmaapRequestMessage.requestId()) //
+                .timestamp(dmaapRequestMessage.timestamp() == null ? "" : dmaapRequestMessage.timestamp()) //
+                .build();
         String str = gson.toJson(dmaapResponseMessage);
         return Mono.just(str);