X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fengine%2Fdmaap%2FDMaaPAlarmPolling.java;h=5e8da833d5969e38bd081d1a3be6277325920bbc;hb=c4bd70c1f74cd04c441f76de4359e166a089660a;hp=99ba3d78d8bea688178a711bffc2973fc8fa6269;hpb=2cb2e9902f2bb2bd3c84c64e8682891decae8fcb;p=holmes%2Fengine-management.git

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
index 99ba3d7..5e8da83 100644
--- a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
@@ -21,10 +21,9 @@ import org.onap.holmes.common.api.stat.VesAlarm;
 import org.onap.holmes.common.exception.AlarmInfoException;
 import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.dsa.dmaappolling.Subscriber;
-import org.onap.holmes.engine.db.AlarmInfoDao;
+import org.onap.holmes.engine.db.AlarmInfoDaoService;
 import org.onap.holmes.engine.manager.DroolsEngine;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -33,27 +32,27 @@ public class DMaaPAlarmPolling implements Runnable {
     private Subscriber subscriber;
     private DroolsEngine droolsEngine;
     private volatile boolean isAlive = true;
-    private AlarmInfoDao alarmInfoDao;
+    private AlarmInfoDaoService alarmInfoDaoService;
 
 
-    public DMaaPAlarmPolling(Subscriber subscriber, DroolsEngine droolsEngine, AlarmInfoDao alarmInfoDao) {
+    public DMaaPAlarmPolling(Subscriber subscriber, DroolsEngine droolsEngine, AlarmInfoDaoService alarmInfoDaoService) {
         this.subscriber = subscriber;
         this.droolsEngine = droolsEngine;
-        this.alarmInfoDao = alarmInfoDao;
+        this.alarmInfoDaoService = alarmInfoDaoService;
     }
 
     public void run() {
         while (isAlive) {
-            List<VesAlarm> vesAlarmList = new ArrayList<>();
+            List<VesAlarm> vesAlarmList;
             try {
                 vesAlarmList = subscriber.subscribe();
                 vesAlarmList.forEach(vesAlarm -> {
                     try {
                         AlarmInfo alarmInfo = getAlarmInfo(vesAlarm);
                         if (alarmInfo.getAlarmIsCleared() != 1) {
-                            alarmInfoDao.saveAlarm(alarmInfo);
+                            alarmInfoDaoService.saveAlarm(alarmInfo);
                         } else {
-                            alarmInfoDao.deleteAlarm(alarmInfo);
+                            alarmInfoDaoService.deleteAlarm(alarmInfo);
                         }
                         droolsEngine.putRaisedIntoStream(vesAlarm);