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=dc979de080836dc66a6c3cc0310bdfb042af5f6b;hb=039eef34aefbd76c2c73baeccdaa5cbe3c745fc2;hp=cce4a92008e17892c4ec87249a6911e01be5028c;hpb=b66dcce5210e25b2571036becb6f0e7b0c23e1b2;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 cce4a920..dc979de0 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
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 Nordix Foundation
+ * Copyright (C) 2020 Nordix Foundation
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,14 @@ package org.oransc.policyagent.dmaap;
 
 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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -36,7 +40,6 @@ public class DmaapMessageHandler {
     private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
 
     private static Gson gson = new GsonBuilder() //
-        .serializeNulls() //
         .create(); //
 
     private final MRBatchingPublisher dmaapClient;
@@ -59,7 +62,7 @@ public class DmaapMessageHandler {
             DmaapRequestMessage dmaapRequestMessage = gson.fromJson(msg, ImmutableDmaapRequestMessage.class);
 
             return this.invokePolicyAgent(dmaapRequestMessage) //
-                .onErrorResume(t -> handleAgentCallError(t, dmaapRequestMessage)) //
+                .onErrorResume(t -> handleAgentCallError(t, msg, dmaapRequestMessage)) //
                 .flatMap(response -> sendDmaapResponse(response, dmaapRequestMessage, HttpStatus.OK));
 
         } catch (Exception e) {
@@ -68,30 +71,62 @@ public class DmaapMessageHandler {
         }
     }
 
-    private Mono<String> handleAgentCallError(Throwable t, DmaapRequestMessage dmaapRequestMessage) {
+    private Mono<String> handleAgentCallError(Throwable t, String origianalMessage,
+        DmaapRequestMessage dmaapRequestMessage) {
         logger.debug("Agent call failed: {}", t.getMessage());
-        return sendDmaapResponse(t.toString(), dmaapRequestMessage, HttpStatus.NOT_FOUND) //
-            .flatMap(notUsed -> Mono.empty());
+        if (t instanceof ServiceException) {
+            String errorMessage = prepareBadOperationErrorMessage(t, origianalMessage);
+            return sendDmaapResponse(errorMessage, dmaapRequestMessage, HttpStatus.NOT_FOUND) //
+                .flatMap(notUsed -> Mono.empty());
+        } else {
+            return sendDmaapResponse(t.toString(), dmaapRequestMessage, HttpStatus.NOT_FOUND) //
+                .flatMap(notUsed -> Mono.empty());
+        }
+    }
+
+    private String prepareBadOperationErrorMessage(Throwable t, String origianalMessage) {
+        String badOperation = origianalMessage.substring(origianalMessage.indexOf("operation\":\"") + 12,
+            origianalMessage.indexOf(",\"url\":"));
+        String errorMessage = t.getMessage().replace("null", badOperation);
+        return errorMessage;
     }
 
     private Mono<String> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
         DmaapRequestMessage.Operation operation = dmaapRequestMessage.operation();
+        if (operation == null) {
+            return Mono.error(new ServiceException("Not implemented operation: " + operation));
+        }
         Mono<String> result = null;
         String uri = dmaapRequestMessage.url();
-        if (operation == Operation.DELETE) {
-            result = agentClient.delete(uri);
-        } else if (operation == Operation.GET) {
-            result = agentClient.get(uri);
-        } else if (operation == Operation.PUT) {
-            result = agentClient.put(uri, dmaapRequestMessage.payload());
-        } else if (operation == Operation.POST) {
-            result = agentClient.post(uri, dmaapRequestMessage.payload());
-        } else {
-            return Mono.error(new Exception("Not implemented operation: " + operation));
+        switch (operation) {
+            case DELETE:
+                result = agentClient.delete(uri);
+                break;
+            case GET:
+                result = agentClient.get(uri);
+                break;
+            case PUT:
+                result = agentClient.put(uri, payload(dmaapRequestMessage));
+                break;
+            case POST:
+                result = agentClient.post(uri, payload(dmaapRequestMessage));
+                break;
+            default:
+                // Nothing, can never get here.
         }
         return result;
     }
 
+    private String payload(DmaapRequestMessage message) {
+        Optional<JsonObject> payload = message.payload();
+        if (payload.isPresent()) {
+            return gson.toJson(payload.get());
+        } else {
+            logger.warn("Expected payload in message from DMAAP: {}", message);
+            return "";
+        }
+    }
+
     private Mono<String> sendDmaapResponse(String response, DmaapRequestMessage dmaapRequestMessage,
         HttpStatus status) {
         return getDmaapResponseMessage(dmaapRequestMessage, response, status) //
@@ -111,7 +146,7 @@ public class DmaapMessageHandler {
     }
 
     private Mono<String> handleResponseCallError(Throwable t) {
-        logger.debug("Failed to respond: {}", t.getMessage());
+        logger.debug("Failed to send respons to DMaaP: {}", t.getMessage());
         return Mono.empty();
     }