X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fengine%2Fmanager%2FDroolsEngine.java;fp=engine-d%2Fsrc%2Fmain%2Fjava%2Forg%2Fopeno%2Fholmes%2Fengine%2Fmanager%2FDroolsEngine.java;h=c8835cc11fa69c30a711274872a28dc3b4b26fa0;hb=7ab5d3b5150f3941f61f40bc27c94909bcbdfe7d;hp=f8d96263ab6b1fc8d7d39628473465a54521dd8e;hpb=4ced1931f4e031761d6d16484bb59a975dfcdc68;p=holmes%2Fengine-management.git

diff --git a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
similarity index 80%
rename from engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
rename to engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
index f8d9626..c8835cc 100644
--- a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.holmes.engine.manager;
+package org.onap.holmes.engine.manager;
 
 
 import java.io.Serializable;
@@ -49,15 +49,14 @@ import org.drools.runtime.StatefulKnowledgeSession;
 import org.drools.runtime.rule.FactHandle;
 import org.glassfish.hk2.api.IterableProvider;
 import org.jvnet.hk2.annotations.Service;
-import org.openo.holmes.common.api.entity.CorrelationRule;
-import org.openo.holmes.common.api.stat.Alarm;
-import org.openo.holmes.common.config.MQConfig;
-import org.openo.holmes.common.constant.AlarmConst;
-import org.openo.holmes.common.exception.CorrelationException;
-import org.openo.holmes.common.utils.ExceptionUtil;
-import org.openo.holmes.common.utils.I18nProxy;
-import org.openo.holmes.engine.request.DeployRuleRequest;
-import org.openo.holmes.engine.wrapper.RuleMgtWrapper;
+import org.onap.holmes.engine.request.DeployRuleRequest;
+import org.onap.holmes.common.api.entity.CorrelationRule;
+import org.onap.holmes.common.api.stat.Alarm;
+import org.onap.holmes.common.config.MQConfig;
+import org.onap.holmes.common.constant.AlarmConst;
+import org.onap.holmes.common.exception.CorrelationException;
+import org.onap.holmes.common.utils.ExceptionUtil;
+import org.onap.holmes.engine.wrapper.RuleMgtWrapper;
 
 @Slf4j
 @Service
@@ -82,8 +81,8 @@ public class DroolsEngine {
             // 2. start mq listener
             registerAlarmTopicListener();
         } catch (Exception e) {
-            log.error("Start service failed: " + e.getMessage(), e);
-            throw ExceptionUtil.buildExceptionResponse("Start service failed!");
+            log.error("Failed to start the service: " + e.getMessage(), e);
+            throw ExceptionUtil.buildExceptionResponse("Failed to start the drools engine!");
         }
     }
 
@@ -169,10 +168,7 @@ public class DroolsEngine {
             packageNames.add(packageName);
             kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
         } catch (Exception e) {
-
-            String errorMsg =
-                I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_DEPLOY_RULE_FAILED);
-            throw new CorrelationException(errorMsg, e);
+            throw new CorrelationException("Failed to deploy the rule.", e);
         }
 
         ksession.fireAllRules();
@@ -185,19 +181,13 @@ public class DroolsEngine {
         KnowledgePackage pkg = kbase.getKnowledgePackage(packageName);
 
         if (null == pkg) {
-            String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,
-                I18nProxy.ENGINE_DELETE_RULE_NULL,
-                new String[]{packageName});
-            throw new CorrelationException(errorMsg);
+            throw new CorrelationException("The rule " + packageName + " does not exist!");
         }
 
         try {
-
             kbase.removeKnowledgePackage(pkg.getName());
         } catch (Exception e) {
-            String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,
-                I18nProxy.ENGINE_DELETE_RULE_FAILED, new String[]{packageName});
-            throw new CorrelationException(errorMsg, e);
+            throw new CorrelationException("Failed to delete the rule: " + packageName, e);
         }
     }
 
@@ -216,9 +206,7 @@ public class DroolsEngine {
     private void judgeRuleContent(Locale locale, KnowledgeBuilder kbuilder, boolean judgePackageName)
         throws CorrelationException {
         if (kbuilder.hasErrors()) {
-            String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,
-                I18nProxy.ENGINE_CONTENT_ILLEGALITY,
-                new String[]{kbuilder.getErrors().toString()});
+            String errorMsg = "There are errors in the rule: " + kbuilder.getErrors().toString();
             log.error(errorMsg);
             throw new CorrelationException(errorMsg);
         }
@@ -226,11 +214,7 @@ public class DroolsEngine {
         String packageName = kbuilder.getKnowledgePackages().iterator().next().getName();
 
         if (packageNames.contains(packageName) && judgePackageName) {
-            String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,
-                I18nProxy.ENGINE_CONTENT_ILLEGALITY, new String[]{
-                    I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_CONTAINS_PACKAGE)});
-
-            throw new CorrelationException(errorMsg);
+            throw new CorrelationException("The rule " + packageName + " already exists in the drools engine.");
         }
     }