bugfix - mis-removal of rules

[holmes/rule-management.git] / rulemgt / src / main / java / org / onap / holmes / rulemgt / resources / RuleMgtResources.java

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java
index 133e859..2c9a462 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java
@@ -62,10 +62,9 @@ public class RuleMgtResources {
         try {\r
             ruleChangeResponse = ruleMgtWrapper\r
                     .addCorrelationRule(UserUtil.getUserName(request), ruleCreateRequest);\r
-            log.info("create rule:" + ruleCreateRequest.getRuleName() + " success.");\r
             return ruleChangeResponse;\r
         } catch (CorrelationException e) {\r
-            log.error("create rule:" + ruleCreateRequest.getRuleName() + " failed", e);\r
+            log.error(String.format("failed to create the rule: %s", ruleCreateRequest.getRuleName()), e);\r
             throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
         }\r
     }\r
@@ -85,7 +84,7 @@ public class RuleMgtResources {
             log.info("update rule:" + ruleUpdateRequest.getRuleId() + " successful");\r
             return ruleChangeResponse;\r
         } catch (CorrelationException e) {\r
-            log.error("update rule:" + ruleUpdateRequest.getContent() + " failed", e);\r
+            log.error(String.format("failed to update the rule: %s", ruleUpdateRequest.getRuleId()), e);\r
             throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
         }\r
     }\r
@@ -95,10 +94,9 @@ public class RuleMgtResources {
     public ResponseEntity deleteCorrelationRule(@PathVariable("ruleid") String ruleId) {\r
         try {\r
             ruleMgtWrapper.deleteCorrelationRule(new RuleDeleteRequest(ruleId));\r
-            log.info("delete rule:" + ruleId + " successful");\r
             return ResponseEntity.status(HttpStatus.NO_CONTENT).build();\r
         } catch (CorrelationException e) {\r
-            log.error("delete rule:" + ruleId + " failed", e);\r
+            log.error(String.format("failed to delete the rule: %s", ruleId), e);\r
             throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
         }\r
     }\r
@@ -118,10 +116,9 @@ public class RuleMgtResources {
         try {\r
             ruleQueryListResponse = ruleMgtWrapper\r
                     .getCorrelationRuleByCondition(ruleQueryCondition);\r
-            log.info("query rule successful by condition:" + ruleQueryCondition);\r
             return ruleQueryListResponse;\r
         } catch (CorrelationException e) {\r
-            log.error("query rule failed,cause query condition conversion failure", e);\r
+            log.error(String.format("failed to query the rule: %s", ruleQueryCondition.getName()), e);\r
             throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
         }\r
     }\r