Merge "Add new exception class"

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/i18n/correlation-i18n-en-US.json b/holmes-actions/src/main/java/org/openo/holmes/common/i18n/correlation-i18n-en-US.json
index 9aa6357..9581b40 100644 (file)
--- a/holmes-actions/src/main/java/org/openo/holmes/common/i18n/correlation-i18n-en-US.json
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/i18n/correlation-i18n-en-US.json
@@ -25,5 +25,6 @@
   "RULE_MANAGEMENT_REPEAT_RULE_NAME": "Rule name repetition",\r
   "RULE_MANAGEMENT_RULE_NAME_IS_EMPTY": "Rule name is empty",\r
   "RULE_MANAGEMENT_DATA_FORMAT_ERROR": "Data format error",\r
-  "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR": "Parameter enabled can only be 0 (not enabled) and 1 (enabled)"\r
+  "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR": "Parameter enabled can only be 0 (not enabled) and 1 (enabled)",\r
+  "RULE_MANAGEMENT_DB_ERROR": "db error"\r
 }\r

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/i18n/correlation-i18n-zh-CN.json b/holmes-actions/src/main/java/org/openo/holmes/common/i18n/correlation-i18n-zh-CN.json
index 9ca28fe..1a59c2f 100644 (file)
--- a/holmes-actions/src/main/java/org/openo/holmes/common/i18n/correlation-i18n-zh-CN.json
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/i18n/correlation-i18n-zh-CN.json
@@ -21,5 +21,7 @@
   "RULE_MANAGEMENT_REPEAT_RULE_NAME" : "规则名字重复",\r
   "RULE_MANAGEMENT_RULE_NAME_IS_EMPTY" : "规则名字为空",\r
   "RULE_MANAGEMENT_DATA_FORMAT_ERROR": "数据格式异常",\r
-  "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR" : "参数enabled只能为0（未启用）和1（启用）"\r
+  "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR" : "参数enabled只能为0（未启用）和1（启用）",\r
+  "RULE_MANAGEMENT_DB_ERROR" : "数据库异常"\r
+\r
 }\r

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/utils/I18nProxy.java b/holmes-actions/src/main/java/org/openo/holmes/common/utils/I18nProxy.java
index 2eda5da..2c74f03 100644 (file)
--- a/holmes-actions/src/main/java/org/openo/holmes/common/utils/I18nProxy.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/utils/I18nProxy.java
@@ -51,6 +51,7 @@ public class I18nProxy {
     public static final String RULE_MANAGEMENT_REPEAT_RULE_NAME = "RULE_MANAGEMENT_REPEAT_RULE_NAME";\r
     public static final String RULE_MANAGEMENT_DATA_FORMAT_ERROR = "RULE_MANAGEMENT_DATA_FORMAT_ERROR";\r
     public static final String RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR = "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR";\r
+    public static final String RULE_MANAGEMENT_DB_ERROR = "RULE_MANAGEMENT_DB_ERROR";\r
 \r
     private Optional<I18n> optional = null;\r
 \r