add alarm synchronization related operation

[holmes/engine-management.git] / engine-d / src / main / java / org / onap / holmes / engine / dmaap / SubscriberAction.java

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java
index 8d80a6b..b02cbe4 100644 (file)
--- a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java
@@ -21,31 +21,42 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
+import lombok.extern.slf4j.Slf4j;
 import org.jvnet.hk2.annotations.Service;
+import org.onap.holmes.common.utils.DbDaoUtil;
 import org.onap.holmes.dsa.dmaappolling.Subscriber;
+import org.onap.holmes.engine.db.AlarmInfoDao;
 import org.onap.holmes.engine.manager.DroolsEngine;
 
 @Service
+@Slf4j
 public class SubscriberAction {
 
     @Inject
     private DroolsEngine droolsEngine;
+    @Inject
+    private DbDaoUtil daoUtil;
     private HashMap<String, DMaaPAlarmPolling> pollingTasks = new HashMap<>();
 
     public synchronized void addSubscriber(Subscriber subscriber) {
-        if (!pollingTasks.containsKey(subscriber.getTopic())) {
-            DMaaPAlarmPolling pollingTask = new DMaaPAlarmPolling(subscriber, droolsEngine);
+        String topic = subscriber.getTopic();
+        if (topic != null && !pollingTasks.containsKey(topic)) {
+            AlarmInfoDao alarmInfoDao = daoUtil.getJdbiDaoByOnDemand(AlarmInfoDao.class);
+            DMaaPAlarmPolling pollingTask = new DMaaPAlarmPolling(subscriber, droolsEngine, alarmInfoDao);
             Thread thread = new Thread(pollingTask);
             thread.start();
-            pollingTasks.put(subscriber.getTopic(), pollingTask);
+            pollingTasks.put(topic, pollingTask);
+            log.info("Subscribe to topic: " + subscriber.getUrl());
         }
     }
 
     public synchronized void removeSubscriber(Subscriber subscriber) {
-        if (pollingTasks.containsKey(subscriber.getTopic())) {
-            pollingTasks.get(subscriber.getTopic()).stopTask();
-            pollingTasks.remove(subscriber.getTopic());
+        String topic = subscriber.getTopic();
+        if (topic != null && pollingTasks.containsKey(topic)) {
+            pollingTasks.get(topic).stopTask();
+            pollingTasks.remove(topic);
         }
+        log.info("Topic unsubscribed: " + subscriber.getUrl());
     }
 
     @PreDestroy