X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageConsumerImpl.java;h=74cfe0da80cf035335066a34cde99f56f750f0a1;hb=7e09b1b60b090846b8a7bf85b03b9f16ca697d7f;hp=63de1975aef36214ebf6930f7a67e175dc60efbc;hpb=ff56d2600d074ac0a4473c81b8193004a316c2f8;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 63de1975..74cfe0da 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
@@ -1,62 +1,123 @@
+/*-
+ * ========================LICENSE_START=================================
+ * O-RAN-SC
+ * %%
+ * Copyright (C) 2019 Nordix Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================LICENSE_END===================================
+ */
+
 package org.oransc.policyagent.dmaap;
 
+import java.io.IOException;
 import java.util.Properties;
-
-import org.onap.dmaap.mr.client.impl.MRConsumerImpl;
+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.configuration.ApplicationConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
+@EnableScheduling
 public class DmaapMessageConsumerImpl implements DmaapMessageConsumer {
 
-    private final ApplicationConfig applicationConfig;
+    private static final Logger logger = LoggerFactory.getLogger(DmaapMessageConsumerImpl.class);
 
-    protected MRConsumerImpl consumer;
+    private boolean alive = false;
+    protected MRConsumer consumer;
+    private MRConsumerResponse response = null;
 
     @Autowired
     public DmaapMessageConsumerImpl(ApplicationConfig applicationConfig) {
-        this.applicationConfig = applicationConfig;
+        Properties dmaapConsumerConfig = applicationConfig.getDmaapConsumerConfig();
+        init(dmaapConsumerConfig);
     }
 
+    @Scheduled(fixedRate = 1000 * 60)
     @Override
     public void run() {
-        // TODO Auto-generated method stub
+        while (this.alive) {
+            try {
+                Iterable<String> dmaapMsgs = fetchAllMessages();
+                for (String msg : dmaapMsgs) {
+                    processMsg(msg);
+                }
+            } catch (Exception e) {
+                logger.error("{}: cannot fetch because of ", this, e.getMessage(), e);
+            }
+        }
+    }
 
+    private Iterable<String> fetchAllMessages() {
+        response = consumer.fetchWithReturnConsumerResponse();
+        if (response == null) {
+            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();
     }
 
     @Override
-    public void init(Properties baseProperties) {
-        Properties dmaapConsumerConfig = applicationConfig.getDmaapConsumerConfig();
+    public void init(Properties properties) {
         // Initialize the DMAAP with the properties
-        // TODO Auto-generated method stub
-
+        // Do we need to do any validation of properties before calling the factory?
+        Properties prop = new Properties();
+        prop.setProperty("ServiceName", "localhost:6845/events");
+        prop.setProperty("topic", "A1-P");
+        prop.setProperty("host", "localhost:6845");
+        prop.setProperty("contenttype", "application/json");
+        prop.setProperty("username", "admin");
+        prop.setProperty("password", "admin");
+        prop.setProperty("group", "users");
+        prop.setProperty("id", "policy-agent");
+        prop.setProperty("TransportType", "HTTPNOAUTH");
+        prop.setProperty("timeout", "15000");
+        prop.setProperty("limit", "1000");
+        try {
+            consumer = MRClientFactory.createConsumer(prop);
+            this.alive = true;
+        } catch (IOException e) {
+            logger.error("Exception occurred while creating Dmaap Consumer", e);
+        }
     }
 
     @Override
     public void processMsg(String msg) throws Exception {
-        // Call the Controller once you get the message from DMAAP
+        System.out.println("sysout" + msg);
         // Call the concurrent Task executor to handle the incoming request
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean isReady() {
-        // TODO Auto-generated method stub
-        return false;
+        // Validate the Input & if its valid, post the ACCEPTED Response back to DMAAP
+        // through REST CLIENT
+        // Call the Controller with the extracted payload
     }
 
     @Override
-    public boolean isRunning() {
-        // TODO Auto-generated method stub
-        return false;
+    public boolean isAlive() {
+        return alive;
     }
 
     @Override
     public void stopConsumer() {
-        // TODO Auto-generated method stub
-
+        alive = false;
     }
-
 }