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=a6a912d5e91f3a4a3ecdbc2591dc1bb823fd68f3;hb=0b2f51f6215dad3fc93d74572ad23f950ad8ae98;hp=503ddabe78e0907b1bb1c68e763d418a3962e0e7;hpb=eeaabb5364f23818dda5d10e0a7f30396bb981f4;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 503ddabe..a6a912d5 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,23 @@
 
 package org.oransc.policyagent.dmaap;
 
+import com.google.common.collect.Iterables;
+
 import java.io.IOException;
 import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+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 +50,20 @@ 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;
+    private final long FETCHTIMEOUT = 30000;
+
+    private CountDownLatch sleep = new CountDownLatch(1);
+
+    @Value("${server.port}")
+    private int localServerPort;
 
     @Autowired
     public DmaapMessageConsumerImpl(ApplicationConfig applicationConfig) {
         this.applicationConfig = applicationConfig;
     }
 
-    @Scheduled(fixedRate = 1000 * 10) // , initialDelay=60000)
+    @Scheduled(fixedRate = 1000 * 10)
     @Override
     public void run() {
         if (!alive) {
@@ -60,9 +72,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,36 +85,37 @@ 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);
+            sleepAfterFailure();
         } 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();
     }
 
-    // Properties are not loaded in first atempt. Need to fix this and then uncomment the post construct annotation
-    // @PostConstruct
     @Override
     public void init() {
         Properties dmaapConsumerProperties = applicationConfig.getDmaapConsumerConfig();
         Properties dmaapPublisherProperties = applicationConfig.getDmaapPublisherConfig();
         // No need to start if there is no configuration.
         if (dmaapConsumerProperties == null || dmaapPublisherProperties == null || dmaapConsumerProperties.size() == 0
-                || dmaapPublisherProperties.size() == 0) {
+            || dmaapPublisherProperties.size() == 0) {
             logger.error("DMaaP properties Failed to Load");
             return;
         }
         try {
             logger.debug("Creating DMAAP Client");
-            System.out.println("dmaapConsumerProperties--->"+dmaapConsumerProperties.getProperty("topic"));
-            System.out.println("dmaapPublisherProperties--->"+dmaapPublisherProperties.getProperty("topic"));
+            logger.debug("dmaapConsumerProperties---> {}", dmaapConsumerProperties.getProperty("topic"));
+            logger.debug("dmaapPublisherProperties---> {}", dmaapPublisherProperties.getProperty("topic"));
             consumer = MRClientFactory.createConsumer(dmaapConsumerProperties);
+            producer = MRClientFactory.createBatchingPublisher(dmaapConsumerProperties);
             this.alive = true;
         } catch (IOException e) {
             logger.error("Exception occurred while creating Dmaap Consumer", e);
@@ -110,8 +125,13 @@ 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);
+    }
+
+    protected DmaapMessageHandler createDmaapMessageHandler() {
+        String agentBaseUrl = "http://localhost:" + this.localServerPort;
+        AsyncRestClient agentClient = new AsyncRestClient(agentBaseUrl);
+        return new DmaapMessageHandler(this.producer, this.applicationConfig, agentClient);
     }
 
     @Override
@@ -119,8 +139,12 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer {
         return alive;
     }
 
-    @Override
-    public void stopConsumer() {
-        alive = false;
+    private void sleepAfterFailure() {
+        logger.warn("DMAAP message Consumer is put to Sleep for {} milliseconds", FETCHTIMEOUT);
+        try {
+            sleep.await(FETCHTIMEOUT, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            logger.error("Failed to put the thread to sleep: {}", e);
+        }
     }
 }