Fix test and restructure

[holmes/engine-management.git] / engine-d / src / main / java / org / openo / holmes / engine / manager / DroolsEngine.java

diff --git a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
index ad1b4e5..a97cae9 100644 (file)
--- a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
+++ b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
@@ -18,8 +18,10 @@ package org.openo.holmes.engine.manager;
 \r
 import java.io.Serializable;\r
 import java.io.StringReader;\r
+import java.util.HashSet;\r
 import java.util.List;\r
 import java.util.Locale;\r
+import java.util.Set;\r
 import javax.annotation.PostConstruct;\r
 import javax.inject.Inject;\r
 import javax.jms.Connection;\r
@@ -62,21 +64,14 @@ import org.openo.holmes.engine.wrapper.RuleMgtWrapper;
 public class DroolsEngine {\r
 \r
     private final static int ENABLE = 1;\r
-\r
+    private final Set<String> packageNames = new HashSet<String>();\r
     @Inject\r
     private RuleMgtWrapper ruleMgtWrapper;\r
-\r
     private KnowledgeBase kbase;\r
-\r
     private KnowledgeBaseConfiguration kconf;\r
-\r
     private StatefulKnowledgeSession ksession;\r
-\r
-    private KnowledgeBuilder kbuilder;\r
-\r
     @Inject\r
     private IterableProvider<MQConfig> mqConfigProvider;\r
-\r
     private ConnectionFactory connectionFactory;\r
 \r
     @PostConstruct\r
@@ -94,9 +89,9 @@ public class DroolsEngine {
 \r
     private void registerAlarmTopicListener() {\r
         String brokerURL =\r
-                "tcp://" + mqConfigProvider.get().brokerIp + ":" + mqConfigProvider.get().brokerPort;\r
+            "tcp://" + mqConfigProvider.get().brokerIp + ":" + mqConfigProvider.get().brokerPort;\r
         connectionFactory = new ActiveMQConnectionFactory(mqConfigProvider.get().brokerUsername,\r
-                mqConfigProvider.get().brokerPassword, brokerURL);\r
+            mqConfigProvider.get().brokerPassword, brokerURL);\r
 \r
         AlarmMqMessageListener listener = new AlarmMqMessageListener();\r
         listener.receive();\r
@@ -123,8 +118,6 @@ public class DroolsEngine {
 \r
         this.kconf.setProperty("drools.assertBehaviour", "equality");\r
 \r
-        this.kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();\r
-\r
         this.kbase = KnowledgeBaseFactory.newKnowledgeBase("D-ENGINE", this.kconf);\r
 \r
         this.ksession = kbase.newStatefulKnowledgeSession();\r
@@ -147,7 +140,7 @@ public class DroolsEngine {
         StringReader reader = new StringReader(ruleContent);\r
         Resource res = ResourceFactory.newReaderResource(reader);\r
 \r
-        kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();\r
+        KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();\r
 \r
         kbuilder.add(res, ResourceType.DRL);\r
 \r
@@ -161,55 +154,40 @@ public class DroolsEngine {
     }\r
 \r
     public synchronized String deployRule(DeployRuleRequest rule, Locale locale)\r
-            throws CorrelationException {\r
+        throws CorrelationException {\r
         StringReader reader = new StringReader(rule.getContent());\r
         Resource res = ResourceFactory.newReaderResource(reader);\r
 \r
-        kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();\r
+        KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();\r
 \r
         kbuilder.add(res, ResourceType.DRL);\r
 \r
-        if (kbuilder.hasErrors()) {\r
-\r
-            String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,\r
-                    I18nProxy.ENGINE_CONTENT_ILLEGALITY,\r
-                    new String[]{kbuilder.getErrors().toString()});\r
-            throw new CorrelationException(errorMsg);\r
-        }\r
-\r
-        KnowledgePackage kpackage = kbuilder.getKnowledgePackages().iterator().next();\r
+        judgeRuleContent(locale, kbuilder);\r
 \r
-        if (kbase.getKnowledgePackages().contains(kpackage)) {\r
-\r
-            String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,\r
-                    I18nProxy.ENGINE_CONTENT_ILLEGALITY, new String[]{\r
-                            I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_CONTAINS_PACKAGE)});\r
-\r
-            throw new CorrelationException(errorMsg);\r
-        }\r
+        String packageName = kbuilder.getKnowledgePackages().iterator().next().getName();\r
         try {\r
-\r
+            packageNames.add(packageName);\r
             kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());\r
         } catch (Exception e) {\r
 \r
             String errorMsg =\r
-                    I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_DEPLOY_RULE_FAILED);\r
+                I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_DEPLOY_RULE_FAILED);\r
             throw new CorrelationException(errorMsg, e);\r
         }\r
 \r
         ksession.fireAllRules();\r
-        return kpackage.getName();\r
+        return packageName;\r
     }\r
 \r
     public synchronized void undeployRule(String packageName, Locale locale)\r
-            throws CorrelationException {\r
+        throws CorrelationException {\r
 \r
         KnowledgePackage pkg = kbase.getKnowledgePackage(packageName);\r
 \r
         if (null == pkg) {\r
             String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,\r
-                    I18nProxy.ENGINE_DELETE_RULE_NULL,\r
-                    new String[]{packageName});\r
+                I18nProxy.ENGINE_DELETE_RULE_NULL,\r
+                new String[]{packageName});\r
             throw new CorrelationException(errorMsg);\r
         }\r
 \r
@@ -218,27 +196,42 @@ public class DroolsEngine {
             kbase.removeKnowledgePackage(pkg.getName());\r
         } catch (Exception e) {\r
             String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,\r
-                    I18nProxy.ENGINE_DELETE_RULE_FAILED, new String[]{packageName});\r
+                I18nProxy.ENGINE_DELETE_RULE_FAILED, new String[]{packageName});\r
             throw new CorrelationException(errorMsg, e);\r
         }\r
     }\r
 \r
     public void compileRule(String content, Locale locale)\r
-            throws CorrelationException {\r
+        throws CorrelationException {\r
         StringReader reader = new StringReader(content);\r
         Resource res = ResourceFactory.newReaderResource(reader);\r
 \r
-        kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();\r
+        KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();\r
 \r
         kbuilder.add(res, ResourceType.DRL);\r
 \r
+        judgeRuleContent(locale, kbuilder);\r
+    }\r
+\r
+    private void judgeRuleContent(Locale locale, KnowledgeBuilder kbuilder)\r
+        throws CorrelationException {\r
         if (kbuilder.hasErrors()) {\r
             String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,\r
-                    I18nProxy.ENGINE_CONTENT_ILLEGALITY,\r
-                    new String[]{kbuilder.getErrors().toString()});\r
+                I18nProxy.ENGINE_CONTENT_ILLEGALITY,\r
+                new String[]{kbuilder.getErrors().toString()});\r
             log.error(errorMsg);\r
             throw new CorrelationException(errorMsg);\r
         }\r
+\r
+        String packageName = kbuilder.getKnowledgePackages().iterator().next().getName();\r
+\r
+        if (packageNames.contains(packageName)) {\r
+            String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,\r
+                I18nProxy.ENGINE_CONTENT_ILLEGALITY, new String[]{\r
+                    I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_CONTAINS_PACKAGE)});\r
+\r
+            throw new CorrelationException(errorMsg);\r
+        }\r
     }\r
 \r
     public void putRaisedIntoStream(Alarm raiseAlarm) {\r