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=b23595a987b8e4a46cd7f55ba35871a40b40d355;hb=refs%2Fchanges%2F26%2F2626%2F3;hp=a158b400bf694bfc250008fb16671b651c41941e;hpb=0b2f51f6215dad3fc93d74572ad23f950ad8ae98;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 a158b400..b23595a9 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.
@@ -27,7 +27,6 @@ import java.io.IOException;
 
 import org.onap.dmaap.mr.client.MRBatchingPublisher;
 import org.oransc.policyagent.clients.AsyncRestClient;
-import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.oransc.policyagent.dmaap.DmaapRequestMessage.Operation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,27 +38,21 @@ public class DmaapMessageHandler {
     private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
 
     private static Gson gson = new GsonBuilder() //
-        .serializeNulls() //
         .create(); //
 
     private final MRBatchingPublisher dmaapClient;
     private final AsyncRestClient agentClient;
 
-    public DmaapMessageHandler(MRBatchingPublisher dmaapClient, ApplicationConfig applicationConfig,
-        AsyncRestClient agentClient) {
+    public DmaapMessageHandler(MRBatchingPublisher dmaapClient, AsyncRestClient agentClient) {
         this.agentClient = agentClient;
         this.dmaapClient = dmaapClient;
     }
 
     public void handleDmaapMsg(String msg) {
-        try {
-            this.createTask(msg) //
-                .subscribe(x -> logger.debug("handleDmaapMsg: " + x), //
-                    throwable -> logger.warn("handleDmaapMsg failure ", throwable), //
-                    () -> logger.debug("handleDmaapMsg complete"));
-        } catch (Exception e) {
-            logger.warn("Received unparsable message from DMAAP: {}", msg);
-        }
+        this.createTask(msg) //
+            .subscribe(message -> logger.debug("handleDmaapMsg: {}", message), //
+                throwable -> logger.warn("handleDmaapMsg failure ", throwable), //
+                () -> logger.debug("handleDmaapMsg complete"));
     }
 
     Mono<String> createTask(String msg) {
@@ -77,9 +70,9 @@ public class DmaapMessageHandler {
     }
 
     private Mono<String> handleAgentCallError(Throwable t, DmaapRequestMessage dmaapRequestMessage) {
-        logger.debug("Agent call failed: " + t.getMessage());
+        logger.debug("Agent call failed: {}", t.getMessage());
         return sendDmaapResponse(t.toString(), dmaapRequestMessage, HttpStatus.NOT_FOUND) //
-            .flatMap(s -> Mono.empty());
+            .flatMap(notUsed -> Mono.empty());
     }
 
     private Mono<String> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
@@ -91,33 +84,44 @@ public class DmaapMessageHandler {
         } else if (operation == Operation.GET) {
             result = agentClient.get(uri);
         } else if (operation == Operation.PUT) {
-            result = agentClient.put(uri, dmaapRequestMessage.payload());
+            result = agentClient.put(uri, payload(dmaapRequestMessage));
         } else if (operation == Operation.POST) {
-            result = agentClient.post(uri, dmaapRequestMessage.payload());
+            result = agentClient.post(uri, payload(dmaapRequestMessage));
         } else {
             return Mono.error(new Exception("Not implemented operation: " + operation));
         }
         return result;
     }
 
+    private String payload(DmaapRequestMessage message) {
+        if (message.payload().isPresent()) {
+            return gson.toJson(message.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) //
-            .flatMap(body -> sendToDmaap(body)) //
-            .onErrorResume(t -> handleResponseCallError(t, dmaapRequestMessage));
+            .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);
         }
     }
 
-    private Mono<String> handleResponseCallError(Throwable t, DmaapRequestMessage dmaapRequestMessage) {
-        logger.debug("Failed to respond: " + t.getMessage());
+    private Mono<String> handleResponseCallError(Throwable t) {
+        logger.debug("Failed to respond: {}", t.getMessage());
         return Mono.empty();
     }
 
@@ -137,5 +141,4 @@ public class DmaapMessageHandler {
         return Mono.just(str);
 
     }
-
 }