From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Sat, 18 Feb 2017 06:27:39 +0000 (+0000)
Subject: Merge "Add new exception class"
X-Git-Tag: release/mercury~33
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=516c3ba3c8768e4f8861aa5626d0077a3ea1b94b;hp=e1fced01d4e9caea31794dbfa0706ca5e9e6a28f;p=holmes%2Fcommon.git

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
--- 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",
   "RULE_MANAGEMENT_RULE_NAME_IS_EMPTY": "Rule name is empty",
   "RULE_MANAGEMENT_DATA_FORMAT_ERROR": "Data format error",
-  "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR": "Parameter enabled can only be 0 (not enabled) and 1 (enabled)"
+  "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR": "Parameter enabled can only be 0 (not enabled) and 1 (enabled)",
+  "RULE_MANAGEMENT_DB_ERROR": "db error"
 }
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
--- 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" : "规则名字重复",
   "RULE_MANAGEMENT_RULE_NAME_IS_EMPTY" : "规则名字为空",
   "RULE_MANAGEMENT_DATA_FORMAT_ERROR": "数据格式异常",
-  "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR" : "参数enabled只能为0（未启用）和1（启用）"
+  "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR" : "参数enabled只能为0（未启用）和1（启用）",
+  "RULE_MANAGEMENT_DB_ERROR" : "数据库异常"
+
 }
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
--- 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";
     public static final String RULE_MANAGEMENT_DATA_FORMAT_ERROR = "RULE_MANAGEMENT_DATA_FORMAT_ERROR";
     public static final String RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR = "RULE_MANAGEMENT_PARAMETER_ENABLED_ERROR";
+    public static final String RULE_MANAGEMENT_DB_ERROR = "RULE_MANAGEMENT_DB_ERROR";
 
     private Optional<I18n> optional = null;