Fix modify rules of fault

Issue-ID: HOLMES-52

Change-Id: I93115414570d118f4a1d88c2b1a612d4a44d2811
Signed-off-by: youbowu <wu.youbo@zte.com.cn>

diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
index cdae89e..8e9055b 100644 (file)
--- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
+++ b/rulemgt/src/main/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
@@ -64,7 +64,7 @@ public class EngineWrapper {
             log.info("Call delete rule rest interface in engine successfully.");\r
             return true;\r
         } else {\r
-            throw new CorrelationException(I18nProxy.ENGINE_DELETE_RULE_FAILED);\r
+            throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_DELETE_RULE_FAILED);\r
         }\r
     }\r
 \r

diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDao.java b/rulemgt/src/main/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDao.java
index d77cc09..487684e 100644 (file)
--- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDao.java
+++ b/rulemgt/src/main/java/org/openo/holmes/rulemgt/db/CorrelationRuleQueryDao.java
@@ -118,7 +118,10 @@ public class CorrelationRuleQueryDao {
                 }\r
             }\r
             whereSql = whereSql.trim();\r
-            return whereSql.substring(0, whereSql.length() - "AND".length());\r
+            if(!"WHERE".equals(whereSql)){\r
+                return whereSql.substring(0, whereSql.length() - "AND".length());\r
+            }\r
+            return "";\r
         } catch (Exception e) {\r
             throw new CorrelationException(I18nProxy.RULE_MANAGEMENT_CREATE_QUERY_SQL_FAILED, e);\r
         }\r

diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/wrapper/RuleMgtWrapper.java b/rulemgt/src/main/java/org/openo/holmes/rulemgt/wrapper/RuleMgtWrapper.java
index afd80b1..58d461f 100644 (file)
--- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/wrapper/RuleMgtWrapper.java
+++ b/rulemgt/src/main/java/org/openo/holmes/rulemgt/wrapper/RuleMgtWrapper.java
@@ -100,8 +100,8 @@ public class RuleMgtWrapper {
         if (oldCorrelationRule.getEnabled() == RuleMgtConstant.STATUS_RULE_OPEN) {\r
             engineWarpper.deleteRuleFromEngine(oldCorrelationRule.getPackageName());\r
         }\r
+        newCorrelationRule.setPackageName(deployRule2Engine(newCorrelationRule));\r
         correlationRuleDao.updateRule(newCorrelationRule);\r
-        deployRule2Engine(newCorrelationRule);\r
         return ruleChangeResponse;\r
     }\r
 \r
@@ -155,11 +155,12 @@ public class RuleMgtWrapper {
         String tempContent = ruleCreateRequest.getContent();\r
         CorrelationRule correlationRule = new CorrelationRule();\r
         String ruleId = "rule_" + System.currentTimeMillis();\r
+        String description = ruleCreateRequest.getDescription() == null ? "" : ruleCreateRequest.getDescription();\r
         correlationRule.setRid(ruleId);\r
         if (tempContent != null) {\r
             correlationRule.setContent(tempContent.trim());\r
         }\r
-        correlationRule.setDescription(ruleCreateRequest.getDescription());\r
+        correlationRule.setDescription(description);\r
         correlationRule.setCreateTime(new Date());\r
         correlationRule.setUpdateTime(new Date());\r
         correlationRule.setName(ruleCreateRequest.getRuleName());\r
@@ -176,9 +177,10 @@ public class RuleMgtWrapper {
     private CorrelationRule convertRuleUpdateRequest2CorrelationRule(String modifier,\r
             RuleUpdateRequest ruleUpdateRequest, String ruleName) throws CorrelationException {\r
         CorrelationRule correlationRule = new CorrelationRule();\r
+        String description = ruleUpdateRequest.getDescription() == null ? "" : ruleUpdateRequest.getDescription();\r
         correlationRule.setRid(ruleUpdateRequest.getRuleId());\r
         correlationRule.setContent(ruleUpdateRequest.getContent());\r
-        correlationRule.setDescription(ruleUpdateRequest.getDescription());\r
+        correlationRule.setDescription(description);\r
         correlationRule.setEnabled(ruleUpdateRequest.getEnabled());\r
         correlationRule.setUpdateTime(new Date());\r
         correlationRule.setModifier(modifier);\r
@@ -211,9 +213,10 @@ public class RuleMgtWrapper {
         List<RuleResult4API> ruleResult4APIs = new ArrayList<RuleResult4API>();\r
         for (CorrelationRule correlationRule : correlationRules) {\r
             RuleResult4API ruleResult4API = new RuleResult4API();\r
+            String description = correlationRule.getDescription() == null ? "" : correlationRule.getDescription();\r
             ruleResult4API.setRuleId(correlationRule.getRid());\r
             ruleResult4API.setRuleName(correlationRule.getName());\r
-            ruleResult4API.setDescription(correlationRule.getDescription());\r
+            ruleResult4API.setDescription(description);\r
             ruleResult4API.setContent(correlationRule.getContent());\r
             ruleResult4API.setCreateTime(correlationRule.getCreateTime());\r
             ruleResult4API.setCreator(correlationRule.getCreator());\r

diff --git a/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java b/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
index fe7696b..38afa47 100644 (file)
--- a/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
+++ b/rulemgt/src/test/java/org/openo/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
@@ -129,7 +129,7 @@ public class EngineWrapperTest {
     @Test\r
     public void deleteRuleFromEngine_http_status_not_ok() throws Exception {\r
         thrown.expect(CorrelationException.class);\r
-        thrown.expectMessage(I18nProxy.ENGINE_DELETE_RULE_FAILED);\r
+        thrown.expectMessage(I18nProxy.RULE_MANAGEMENT_DELETE_RULE_FAILED);\r
 \r
         EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class)))\r
                 .andReturn(response);\r