X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageConsumerImpl.java;h=db4956ab39170563abc4eda7c56fe92dbf3b4105;hb=71a1a31134fe505ad69b559e28eb912aa5a4c58b;hp=c7dab584b9fb13ae1724e9e6127319e2d95e7a26;hpb=7ff95e760df22a5b6e6a77b8f7b906ab0e2a55b6;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerImpl.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerImpl.java
index c7dab584..db4956ab 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerImpl.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerImpl.java
@@ -20,15 +20,19 @@
 
 package org.oransc.policyagent.dmaap;
 
+import com.google.common.collect.Iterables;
 import java.io.IOException;
 import java.util.Properties;
+import org.onap.dmaap.mr.client.MRBatchingPublisher;
 import org.onap.dmaap.mr.client.MRClientFactory;
 import org.onap.dmaap.mr.client.MRConsumer;
 import org.onap.dmaap.mr.client.response.MRConsumerResponse;
+import org.oransc.policyagent.clients.AsyncRestClient;
 import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -42,16 +46,17 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer {
     private boolean alive = false;
     private final ApplicationConfig applicationConfig;
     protected MRConsumer consumer;
-    private MRConsumerResponse response = null;
-    @Autowired
-    private DmaapMessageHandler dmaapMessageHandler;
+    private MRBatchingPublisher producer;
+
+    @Value("${server.port}")
+    private int localServerPort;
 
     @Autowired
     public DmaapMessageConsumerImpl(ApplicationConfig applicationConfig) {
         this.applicationConfig = applicationConfig;
     }
 
-    @Scheduled(fixedRate = 1000 * 10) // , initialDelay=60000)
+    @Scheduled(fixedRate = 1000 * 40)
     @Override
     public void run() {
         if (!alive) {
@@ -60,9 +65,11 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer {
         if (this.alive) {
             try {
                 Iterable<String> dmaapMsgs = fetchAllMessages();
-                logger.debug("Fetched all the messages from DMAAP and will start to process the messages");
-                for (String msg : dmaapMsgs) {
-                    processMsg(msg);
+                if (dmaapMsgs != null && Iterables.size(dmaapMsgs) > 0) {
+                    logger.debug("Fetched all the messages from DMAAP and will start to process the messages");
+                    for (String msg : dmaapMsgs) {
+                        processMsg(msg);
+                    }
                 }
             } catch (Exception e) {
                 logger.error("{}: cannot fetch because of ", this, e.getMessage(), e);
@@ -71,15 +78,16 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer {
     }
 
     private Iterable<String> fetchAllMessages() {
-        response = consumer.fetchWithReturnConsumerResponse();
-        if (response == null) {
+        MRConsumerResponse response = null;
+        try {
+            response = consumer.fetchWithReturnConsumerResponse();
+        } catch (Exception e) {
+            logger.error("Failed to get message from DMAAP", e);
+        }
+        if (response == null || !"200".equals(response.getResponseCode())) {
             logger.warn("{}: DMaaP NULL response received", this);
         } else {
             logger.debug("DMaaP consumer received {} : {}", response.getResponseCode(), response.getResponseMessage());
-            if (!"200".equals(response.getResponseCode())) {
-                logger.error("DMaaP consumer received: {} : {}", response.getResponseCode(),
-                        response.getResponseMessage());
-            }
         }
         return response.getActualMessages();
     }
@@ -99,6 +107,7 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer {
             logger.debug("dmaapConsumerProperties---> {}", dmaapConsumerProperties.getProperty("topic"));
             logger.debug("dmaapPublisherProperties---> {}", dmaapPublisherProperties.getProperty("topic"));
             consumer = MRClientFactory.createConsumer(dmaapConsumerProperties);
+            producer = MRClientFactory.createBatchingPublisher(dmaapPublisherProperties);
             this.alive = true;
         } catch (IOException e) {
             logger.error("Exception occurred while creating Dmaap Consumer", e);
@@ -108,17 +117,17 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer {
     @Override
     public void processMsg(String msg) throws Exception {
         logger.debug("Message Reveived from DMAAP : {}", msg);
-        // Call the concurrent Task executor to handle the incoming request
-        dmaapMessageHandler.handleDmaapMsg(msg);
+        createDmaapMessageHandler().handleDmaapMsg(msg);
     }
 
-    @Override
-    public boolean isAlive() {
-        return alive;
+    protected DmaapMessageHandler createDmaapMessageHandler() {
+        String agentBaseUrl = "http://localhost:" + this.localServerPort;
+        AsyncRestClient agentClient = new AsyncRestClient(agentBaseUrl);
+        return new DmaapMessageHandler(this.producer, this.applicationConfig, agentClient);
     }
 
     @Override
-    public void stopConsumer() {
-        alive = false;
+    public boolean isAlive() {
+        return alive;
     }
 }