Remove Sonar issues

[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 19d1564..9d7c0a6 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
@@ -24,10 +24,8 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 
-import java.io.IOException;
 import java.util.Optional;
 
-import org.onap.dmaap.mr.client.MRBatchingPublisher;
 import org.oransc.policyagent.clients.AsyncRestClient;
 import org.oransc.policyagent.dmaap.DmaapRequestMessage.Operation;
 import org.oransc.policyagent.exceptions.ServiceException;
@@ -42,17 +40,16 @@ 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(); //
-    private final MRBatchingPublisher dmaapClient;
+            .create(); //
+    private final AsyncRestClient dmaapClient;
     private final AsyncRestClient agentClient;
 
-    public DmaapMessageHandler(MRBatchingPublisher dmaapClient, AsyncRestClient agentClient) {
+    public DmaapMessageHandler(AsyncRestClient dmaapClient, AsyncRestClient agentClient) {
         this.agentClient = agentClient;
         this.dmaapClient = dmaapClient;
     }
@@ -70,40 +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) {
-        String operationParameterStart = "operation\":\"";
-        int indexOfOperationStart = originalMessage.indexOf(operationParameterStart) + operationParameterStart.length();
-        int indexOfOperationEnd = originalMessage.indexOf("\",\"", indexOfOperationStart);
-        String badOperation = originalMessage.substring(indexOfOperationStart, indexOfOperationEnd);
-        return t.getMessage().replace("null", badOperation);
+                .flatMap(notUsed -> Mono.empty());
     }
 
     private Mono<ResponseEntity<String>> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
@@ -134,21 +123,15 @@ 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) {
-        try {
-            logger.debug("sendToDmaap: {} ", body);
-            dmaapClient.send(body);
-            dmaapClient.sendBatchWithResponse();
-            return Mono.just("OK");
-        } catch (IOException e) {
-            return Mono.error(e);
-        }
+        logger.debug("sendToDmaap: {} ", body);
+        return dmaapClient.post("", "[" + body + "]");
     }
 
     private Mono<String> handleResponseCallError(Throwable t) {
@@ -157,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);