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

diff --git a/rules/mdons-rule.drl b/rules/mdons-rule.drl
index 4b7dc01..9f4d6ed 100644
--- a/rules/mdons-rule.drl
+++ b/rules/mdons-rule.drl
@@ -8,7 +8,7 @@ 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 org.onap.holmes.common.utils.SpringContextUtil;
 import org.onap.holmes.common.dmaap.store.UniqueRequestIdCache;
 
 
@@ -51,7 +51,7 @@ function PolicyMsg createPolicyMsg(VesAlarm alarm, String serviceInstanceId, Str
     m.setTarget("vserver.vserver-name");
     m.setAai(getAaiObjectPolicy(serviceName, serviceInstanceId));
 
-    ServiceLocatorHolder.getLocator().getService(UniqueRequestIdCache.class).put(alarm.getEventId(), m.getRequestID());
+    SpringContextUtil.getBean(UniqueRequestIdCache.class).put(alarm.getEventId(), m.getRequestID());
     return m;
     }
 	
@@ -74,7 +74,7 @@ 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 dmaapService = SpringContextUtil.getBean(DmaapService.class);
 			dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
 			DroolsLog.printInfo("Published to policy=" + msg.toString());
 
@@ -94,7 +94,7 @@ 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 dmaapService = SpringContextUtil.getBean(DmaapService.class);
 			dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
 			DroolsLog.printInfo("Published to policy=" + msg.toString());