Merge "Added STD sim 2.0.0 tests"

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / dmaap / DmaapMessageHandler.java

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 efdccd8..226b54e 100644 (file)
--- 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,8 +40,7 @@ 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);
@@ -68,7 +67,7 @@ public class DmaapMessageHandler {
         try {
             DmaapRequestMessage dmaapRequestMessage = gson.fromJson(msg, ImmutableDmaapRequestMessage.class);
             return this.invokePolicyAgent(dmaapRequestMessage) //
-                .onErrorResume(t -> handleAgentCallError(t, msg, dmaapRequestMessage)) //
+                .onErrorResume(t -> handleAgentCallError(t, dmaapRequestMessage)) //
                 .flatMap(
                     response -> sendDmaapResponse(response.getBody(), dmaapRequestMessage, response.getStatusCode()));
         } catch (Exception e) {
@@ -77,29 +76,25 @@ public class DmaapMessageHandler {
         }
     }
 
-    private Mono<ResponseEntity<String>> handleAgentCallError(Throwable t, String originalMessage,
+    private Mono<ResponseEntity<String>> handleAgentCallError(Throwable error,
         DmaapRequestMessage dmaapRequestMessage) {
-        logger.debug("Agent call failed: {}", t.getMessage());
+        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();
-    }
-
     private Mono<ResponseEntity<String>> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
         DmaapRequestMessage.Operation operation = dmaapRequestMessage.operation();
         String uri = dmaapRequestMessage.url();