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;h=6d1603c024992b8361d9d100c3cdb3193df78f8a;hb=2753ad5396f2a037887503c550648902e66e86a3;hp=cbe380028fad0ae43ecf2ebcc59c683ff0584588;hpb=cda38f944b12cd0ea8865a6f427a800f28991982;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 cbe38002..6d1603c0 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
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-
 package org.oransc.policyagent.dmaap;
 
 import com.google.gson.Gson;
@@ -30,18 +29,24 @@ 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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
 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
+ */
 public class DmaapMessageHandler {
-
     private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
-
     private static Gson gson = new GsonBuilder() //
         .create(); //
-
     private final MRBatchingPublisher dmaapClient;
     private final AsyncRestClient agentClient;
 
@@ -60,39 +65,58 @@ public class DmaapMessageHandler {
     Mono<String> createTask(String msg) {
         try {
             DmaapRequestMessage dmaapRequestMessage = gson.fromJson(msg, ImmutableDmaapRequestMessage.class);
-
             return this.invokePolicyAgent(dmaapRequestMessage) //
-                .onErrorResume(t -> handleAgentCallError(t, dmaapRequestMessage)) //
-                .flatMap(response -> sendDmaapResponse(response, dmaapRequestMessage, HttpStatus.OK));
-
+                .onErrorResume(t -> handleAgentCallError(t, msg, dmaapRequestMessage)) //
+                .flatMap(
+                    response -> sendDmaapResponse(response.getBody(), dmaapRequestMessage, response.getStatusCode()));
         } catch (Exception e) {
             logger.warn("Received unparsable message from DMAAP: {}", msg);
-            return Mono.error(e);
+            return Mono.error(e); // Cannot make any response
         }
     }
 
-    private Mono<String> handleAgentCallError(Throwable t, DmaapRequestMessage dmaapRequestMessage) {
+    private Mono<ResponseEntity<String>> handleAgentCallError(Throwable t, String originalMessage,
+        DmaapRequestMessage dmaapRequestMessage) {
         logger.debug("Agent call failed: {}", t.getMessage());
-        return sendDmaapResponse(t.toString(), dmaapRequestMessage, HttpStatus.NOT_FOUND) //
+        HttpStatus status = HttpStatus.NOT_FOUND;
+        String errorMessage = t.getMessage();
+        if (t instanceof WebClientResponseException) {
+            WebClientResponseException exception = (WebClientResponseException) t;
+            status = exception.getStatusCode();
+            errorMessage = exception.getResponseBodyAsString();
+        } else if (t instanceof ServiceException) {
+            status = HttpStatus.BAD_REQUEST;
+            errorMessage = prepareBadOperationErrorMessage(t, originalMessage);
+
+        }
+        return sendDmaapResponse(errorMessage, dmaapRequestMessage, status) //
             .flatMap(notUsed -> Mono.empty());
     }
 
-    private Mono<String> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
+    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);
+    }
+
+    private Mono<ResponseEntity<String>> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
         DmaapRequestMessage.Operation operation = dmaapRequestMessage.operation();
-        Mono<String> result = null;
         String uri = dmaapRequestMessage.url();
+
         if (operation == Operation.DELETE) {
-            result = agentClient.delete(uri);
+            return agentClient.deleteForEntity(uri);
         } else if (operation == Operation.GET) {
-            result = agentClient.get(uri);
+            return agentClient.getForEntity(uri);
         } else if (operation == Operation.PUT) {
-            result = agentClient.put(uri, payload(dmaapRequestMessage));
+            return agentClient.putForEntity(uri, payload(dmaapRequestMessage));
         } else if (operation == Operation.POST) {
-            result = agentClient.post(uri, payload(dmaapRequestMessage));
+            return agentClient.postForEntity(uri, payload(dmaapRequestMessage));
         } else {
-            return Mono.error(new Exception("Not implemented operation: " + operation));
+            return Mono.error(new ServiceException("Not implemented operation: " + operation));
         }
-        return result;
+
     }
 
     private String payload(DmaapRequestMessage message) {
@@ -107,7 +131,7 @@ public class DmaapMessageHandler {
 
     private Mono<String> sendDmaapResponse(String response, DmaapRequestMessage dmaapRequestMessage,
         HttpStatus status) {
-        return getDmaapResponseMessage(dmaapRequestMessage, response, status) //
+        return createDmaapResponseMessage(dmaapRequestMessage, response, status) //
             .flatMap(this::sendToDmaap) //
             .onErrorResume(this::handleResponseCallError);
     }
@@ -124,11 +148,11 @@ public class DmaapMessageHandler {
     }
 
     private Mono<String> handleResponseCallError(Throwable t) {
-        logger.debug("Failed to respond: {}", t.getMessage());
+        logger.debug("Failed to send response to DMaaP: {}", t.getMessage());
         return Mono.empty();
     }
 
-    private Mono<String> getDmaapResponseMessage(DmaapRequestMessage dmaapRequestMessage, String response,
+    private Mono<String> createDmaapResponseMessage(DmaapRequestMessage dmaapRequestMessage, String response,
         HttpStatus status) {
         DmaapResponseMessage dmaapResponseMessage = ImmutableDmaapResponseMessage.builder() //
             .status(status.toString()) //
@@ -140,7 +164,6 @@ public class DmaapMessageHandler {
             .timestamp(dmaapRequestMessage.timestamp()) //
             .build();
         String str = gson.toJson(dmaapResponseMessage);
-
         return Mono.just(str);
 
     }