X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2Fresources%2FRuleMgtResources.java;h=d3c01ae7be5e516636cac4a0f60137ad43af449a;hb=3a2c70f1ee024dbad4dc091d3105064641908e1d;hp=00adc6317fe33ab938727b95e59da98a405df15a;hpb=bb5de24c15f98ea156590eb8f34c17e3c90865df;p=holmes%2Frule-management.git

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 00adc63..d3c01ae 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java
@@ -20,7 +20,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.SwaggerDefinition;
-import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -39,7 +41,7 @@ import net.sf.json.JSONObject;
 import org.jvnet.hk2.annotations.Service;
 import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.common.utils.ExceptionUtil;
-import org.onap.holmes.common.utils.JacksonUtil;
+import org.onap.holmes.common.utils.GsonUtil;
 import org.onap.holmes.common.utils.LanguageUtil;
 import org.onap.holmes.common.utils.UserUtil;
 import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;
@@ -48,6 +50,7 @@ import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;
 import org.onap.holmes.rulemgt.bean.request.RuleUpdateRequest;
 import org.onap.holmes.rulemgt.bean.response.RuleAddAndUpdateResponse;
 import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;
+import org.onap.holmes.rulemgt.bean.response.RuleResult4API;
 import org.onap.holmes.rulemgt.constant.RuleMgtConstant;
 import org.onap.holmes.rulemgt.wrapper.RuleMgtWrapper;
 
@@ -68,8 +71,9 @@ public class RuleMgtResources {
             response = RuleAddAndUpdateResponse.class)
     @Timed
     public RuleAddAndUpdateResponse addCorrelationRule(@Context HttpServletRequest request,
-            @ApiParam(value = "The request entity of the HTTP call, which comprises \"rulename\"(required), "
-                    + "\"content\"(required), \"enabled\"(required) and \"description\"(optional)", required = true)
+            @ApiParam(value = "The request entity of the HTTP call, which comprises \"ruleName\"(required), "
+                    + "\"loopControlName\"(required), \"content\"(required), \"enabled\"(required) "
+                    + "and \"description\"(optional)", required = true)
                     RuleCreateRequest ruleCreateRequest) {
         Locale locale = LanguageUtil.getLocale(request);
         RuleAddAndUpdateResponse ruleChangeResponse;
@@ -89,7 +93,7 @@ public class RuleMgtResources {
     @ApiOperation(value = "Update an existing rule; deploy it to the Drools engine if it is enabled.", response = RuleAddAndUpdateResponse.class)
     @Timed
     public RuleAddAndUpdateResponse updateCorrelationRule(@Context HttpServletRequest request,
-            @ApiParam(value = "The request entity of the HTTP call, which comprises \"ruleid\"(required), "
+            @ApiParam(value = "The request entity of the HTTP call, which comprises \"ruleId\"(required), "
                     + "\"content\"(required), \"enabled\"(required) and \"description\"(optional)", required = true)
                     RuleUpdateRequest ruleUpdateRequest) {
         Locale locale = LanguageUtil.getLocale(request);
@@ -133,6 +137,7 @@ public class RuleMgtResources {
                     required = false) @QueryParam("queryrequest") String ruleQueryRequest) {
         Locale locale = LanguageUtil.getLocale(request);
         RuleQueryListResponse ruleQueryListResponse;
+
         RuleQueryCondition ruleQueryCondition = getRuleQueryCondition(ruleQueryRequest, request);
         try {
             ruleQueryListResponse = ruleMgtWrapper
@@ -148,18 +153,15 @@ public class RuleMgtResources {
     private RuleQueryCondition getRuleQueryCondition(String queryRequest,
             HttpServletRequest request) {
         Locale locale = LanguageUtil.getLocale(request);
-        try {
-            RuleQueryCondition ruleQueryCondition = JacksonUtil
-                    .jsonToBean(queryRequest, RuleQueryCondition.class);
-            if (queryRequest == null) {
-                ruleQueryCondition.setEnabled(RuleMgtConstant.STATUS_RULE_ALL);
-            } else if (queryRequest.indexOf("enabled") == -1) {
-                ruleQueryCondition.setEnabled(RuleMgtConstant.STATUS_RULE_ALL);
+        RuleQueryCondition ruleQueryCondition = GsonUtil.jsonToBean(queryRequest, RuleQueryCondition.class);
+        if (queryRequest == null) {
+            if(ruleQueryCondition==null){
+                ruleQueryCondition = new RuleQueryCondition();
             }
-            return ruleQueryCondition;
-        } catch (IOException e) {
-            log.warn("queryRequest convert to json failed", e);
-            throw ExceptionUtil.buildExceptionResponse("The request format is invalid!");
+            ruleQueryCondition.setEnabled(RuleMgtConstant.STATUS_RULE_ALL);
+        } else if (queryRequest.indexOf("enabled") == -1) {
+            ruleQueryCondition.setEnabled(RuleMgtConstant.STATUS_RULE_ALL);
         }
+        return ruleQueryCondition;
     }
 }