X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rules%2Fmdons-rule.drl;h=9f4d6edb2ae0928f535af415a06130296361f5d7;hb=4627750077003db93420c053faa66310b27af7b1;hp=c4bc80338dfa67d5df26e3d4a3fab7eaae6e7098;hpb=a041fdb31505fc086e9416126e43f03e7cd50442;p=holmes%2Frule-management.git

diff --git a/rules/mdons-rule.drl b/rules/mdons-rule.drl
index c4bc803..9f4d6ed 100644
--- a/rules/mdons-rule.drl
+++ b/rules/mdons-rule.drl
@@ -8,9 +8,9 @@ import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;
 import org.onap.holmes.common.dmaap.DmaapService;
 import org.onap.holmes.common.utils.DroolsLog;
-import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import org.onap.holmes.common.utils.SpringContextUtil;
+import org.onap.holmes.common.dmaap.store.UniqueRequestIdCache;
+
 
 import java.util.List;
 import java.util.Map;
@@ -50,8 +50,8 @@ function PolicyMsg createPolicyMsg(VesAlarm alarm, String serviceInstanceId, Str
     m.setClosedLoopAlarmEnd(alarm.getLastEpochMicrosec());
     m.setTarget("vserver.vserver-name");
     m.setAai(getAaiObjectPolicy(serviceName, serviceInstanceId));
-	
-    DmaapService.alarmUniqueRequestID.put(alarm.getEventId(), m.getRequestID());
+
+    SpringContextUtil.getBean(UniqueRequestIdCache.class).put(alarm.getEventId(), m.getRequestID());
     return m;
     }
 	
@@ -74,8 +74,8 @@ rule "Process Alarms MSA"
 		Map<String, String> map = processAlarm($a.getSourceId() + "-XPDR1");
 		for(Map.Entry<String,String> entry : map.entrySet()){
 		    PolicyMsg msg = createPolicyMsg($a, entry.getKey(), entry.getValue());
-			DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
-			dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_Output_Event");
+			DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
+			dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
 			DroolsLog.printInfo("Published to policy=" + msg.toString());
 
 		}
@@ -94,8 +94,8 @@ rule "Process Alarms TAPI"
 		Map<String, String> map = processAlarm($a.getEventId());
 		for(Map.Entry<String,String> entry : map.entrySet()){
 		    PolicyMsg msg = createPolicyMsg($a, entry.getKey(), entry.getValue());
-			DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
-			dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_Output_Event");
+			DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
+			dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
 			DroolsLog.printInfo("Published to policy=" + msg.toString());
 
 		}
@@ -127,4 +127,4 @@ rule "Process Alarms cleared TAPI"
 		processAlarmCleared($a.getEventId());
 		$a.setRootFlag(1);
 
-end	
\ No newline at end of file
+end