Change the groupid from openo to onap

[holmes/engine-management.git] / engine-d / src / main / java / org / onap / 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/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 (file)
--- 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\r
  * limitations under the License.\r
  */\r
-package org.openo.holmes.engine.manager;\r
+package org.onap.holmes.engine.manager;\r
 \r
 \r
 import java.io.Serializable;\r
@@ -49,15 +49,14 @@ import org.drools.runtime.StatefulKnowledgeSession;
 import org.drools.runtime.rule.FactHandle;\r
 import org.glassfish.hk2.api.IterableProvider;\r
 import org.jvnet.hk2.annotations.Service;\r
-import org.openo.holmes.common.api.entity.CorrelationRule;\r
-import org.openo.holmes.common.api.stat.Alarm;\r
-import org.openo.holmes.common.config.MQConfig;\r
-import org.openo.holmes.common.constant.AlarmConst;\r
-import org.openo.holmes.common.exception.CorrelationException;\r
-import org.openo.holmes.common.utils.ExceptionUtil;\r
-import org.openo.holmes.common.utils.I18nProxy;\r
-import org.openo.holmes.engine.request.DeployRuleRequest;\r
-import org.openo.holmes.engine.wrapper.RuleMgtWrapper;\r
+import org.onap.holmes.engine.request.DeployRuleRequest;\r
+import org.onap.holmes.common.api.entity.CorrelationRule;\r
+import org.onap.holmes.common.api.stat.Alarm;\r
+import org.onap.holmes.common.config.MQConfig;\r
+import org.onap.holmes.common.constant.AlarmConst;\r
+import org.onap.holmes.common.exception.CorrelationException;\r
+import org.onap.holmes.common.utils.ExceptionUtil;\r
+import org.onap.holmes.engine.wrapper.RuleMgtWrapper;\r
 \r
 @Slf4j\r
 @Service\r
@@ -82,8 +81,8 @@ public class DroolsEngine {
             // 2. start mq listener\r
             registerAlarmTopicListener();\r
         } catch (Exception e) {\r
-            log.error("Start service failed: " + e.getMessage(), e);\r
-            throw ExceptionUtil.buildExceptionResponse("Start service failed!");\r
+            log.error("Failed to start the service: " + e.getMessage(), e);\r
+            throw ExceptionUtil.buildExceptionResponse("Failed to start the drools engine!");\r
         }\r
     }\r
 \r
@@ -169,10 +168,7 @@ public class DroolsEngine {
             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
-            throw new CorrelationException(errorMsg, e);\r
+            throw new CorrelationException("Failed to deploy the rule.", e);\r
         }\r
 \r
         ksession.fireAllRules();\r
@@ -185,19 +181,13 @@ public class DroolsEngine {
         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
-            throw new CorrelationException(errorMsg);\r
+            throw new CorrelationException("The rule " + packageName + " does not exist!");\r
         }\r
 \r
         try {\r
-\r
             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
-            throw new CorrelationException(errorMsg, e);\r
+            throw new CorrelationException("Failed to delete the rule: " + packageName, e);\r
         }\r
     }\r
 \r
@@ -216,9 +206,7 @@ public class DroolsEngine {
     private void judgeRuleContent(Locale locale, KnowledgeBuilder kbuilder, boolean judgePackageName)\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
+            String errorMsg = "There are errors in the rule: " + kbuilder.getErrors().toString();\r
             log.error(errorMsg);\r
             throw new CorrelationException(errorMsg);\r
         }\r
@@ -226,11 +214,7 @@ public class DroolsEngine {
         String packageName = kbuilder.getKnowledgePackages().iterator().next().getName();\r
 \r
         if (packageNames.contains(packageName) && judgePackageName) {\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
+            throw new CorrelationException("The rule " + packageName + " already exists in the drools engine.");\r
         }\r
     }\r
 \r