Replaced ServiceLocator with SpringContextUtil

[holmes/rule-management.git] / rules / mdons-rule.drl

diff --git a/rules/mdons-rule.drl b/rules/mdons-rule.drl
index 4b7dc01..9f4d6ed 100644 (file)
--- 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;\r
 import org.onap.holmes.common.dmaap.DmaapService;\r
 import org.onap.holmes.common.utils.DroolsLog;\r
-import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;\r
+import org.onap.holmes.common.utils.SpringContextUtil;\r
 import org.onap.holmes.common.dmaap.store.UniqueRequestIdCache;\r
 \r
 \r
@@ -51,7 +51,7 @@ function PolicyMsg createPolicyMsg(VesAlarm alarm, String serviceInstanceId, Str
     m.setTarget("vserver.vserver-name");\r
     m.setAai(getAaiObjectPolicy(serviceName, serviceInstanceId));\r
 \r
-    ServiceLocatorHolder.getLocator().getService(UniqueRequestIdCache.class).put(alarm.getEventId(), m.getRequestID());\r
+    SpringContextUtil.getBean(UniqueRequestIdCache.class).put(alarm.getEventId(), m.getRequestID());\r
     return m;\r
     }\r
        \r
@@ -74,7 +74,7 @@ rule "Process Alarms MSA"
                Map<String, String> map = processAlarm($a.getSourceId() + "-XPDR1");\r
                for(Map.Entry<String,String> entry : map.entrySet()){\r
                    PolicyMsg msg = createPolicyMsg($a, entry.getKey(), entry.getValue());\r
-                       DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\r
+                       DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);\r
                        dmaapService.publishPolicyMsg(msg, "dcae_cl_out");\r
                        DroolsLog.printInfo("Published to policy=" + msg.toString());\r
 \r
@@ -94,7 +94,7 @@ rule "Process Alarms TAPI"
                Map<String, String> map = processAlarm($a.getEventId());\r
                for(Map.Entry<String,String> entry : map.entrySet()){\r
                    PolicyMsg msg = createPolicyMsg($a, entry.getKey(), entry.getValue());\r
-                       DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\r
+                       DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);\r
                        dmaapService.publishPolicyMsg(msg, "dcae_cl_out");\r
                        DroolsLog.printInfo("Published to policy=" + msg.toString());\r
 \r