import io.swagger.annotations.ApiOperation;\r
import io.swagger.annotations.ApiParam;\r
import io.swagger.annotations.SwaggerDefinition;\r
-import java.io.IOException;\r
+import java.util.ArrayList;\r
+import java.util.Date;\r
+import java.util.List;\r
import java.util.Locale;\r
import javax.inject.Inject;\r
import javax.servlet.http.HttpServletRequest;\r
import org.jvnet.hk2.annotations.Service;\r
import org.onap.holmes.common.exception.CorrelationException;\r
import org.onap.holmes.common.utils.ExceptionUtil;\r
-import org.onap.holmes.common.utils.JacksonUtil;\r
+import org.onap.holmes.common.utils.GsonUtil;\r
import org.onap.holmes.common.utils.LanguageUtil;\r
import org.onap.holmes.common.utils.UserUtil;\r
import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;\r
import org.onap.holmes.rulemgt.bean.request.RuleUpdateRequest;\r
import org.onap.holmes.rulemgt.bean.response.RuleAddAndUpdateResponse;\r
import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;\r
+import org.onap.holmes.rulemgt.bean.response.RuleResult4API;\r
import org.onap.holmes.rulemgt.constant.RuleMgtConstant;\r
import org.onap.holmes.rulemgt.wrapper.RuleMgtWrapper;\r
\r
response = RuleAddAndUpdateResponse.class)\r
@Timed\r
public RuleAddAndUpdateResponse addCorrelationRule(@Context HttpServletRequest request,\r
- @ApiParam(value = "The request entity of the HTTP call, which comprises \"rulename\"(required), "\r
- + "\"content\"(required), \"enabled\"(required) and \"description\"(optional)", required = true)\r
+ @ApiParam(value = "The request entity of the HTTP call, which comprises \"ruleName\"(required), "\r
+ + "\"loopControlName\"(required), \"content\"(required), \"enabled\"(required) "\r
+ + "and \"description\"(optional)", required = true)\r
RuleCreateRequest ruleCreateRequest) {\r
Locale locale = LanguageUtil.getLocale(request);\r
RuleAddAndUpdateResponse ruleChangeResponse;\r
@ApiOperation(value = "Update an existing rule; deploy it to the Drools engine if it is enabled.", response = RuleAddAndUpdateResponse.class)\r
@Timed\r
public RuleAddAndUpdateResponse updateCorrelationRule(@Context HttpServletRequest request,\r
- @ApiParam(value = "The request entity of the HTTP call, which comprises \"ruleid\"(required), "\r
+ @ApiParam(value = "The request entity of the HTTP call, which comprises \"ruleId\"(required), "\r
+ "\"content\"(required), \"enabled\"(required) and \"description\"(optional)", required = true)\r
RuleUpdateRequest ruleUpdateRequest) {\r
Locale locale = LanguageUtil.getLocale(request);\r
required = false) @QueryParam("queryrequest") String ruleQueryRequest) {\r
Locale locale = LanguageUtil.getLocale(request);\r
RuleQueryListResponse ruleQueryListResponse;\r
+\r
RuleQueryCondition ruleQueryCondition = getRuleQueryCondition(ruleQueryRequest, request);\r
try {\r
ruleQueryListResponse = ruleMgtWrapper\r
private RuleQueryCondition getRuleQueryCondition(String queryRequest,\r
HttpServletRequest request) {\r
Locale locale = LanguageUtil.getLocale(request);\r
- try {\r
- RuleQueryCondition ruleQueryCondition = JacksonUtil\r
- .jsonToBean(queryRequest, RuleQueryCondition.class);\r
- if (queryRequest == null) {\r
- ruleQueryCondition.setEnabled(RuleMgtConstant.STATUS_RULE_ALL);\r
- } else if (queryRequest.indexOf("enabled") == -1) {\r
- ruleQueryCondition.setEnabled(RuleMgtConstant.STATUS_RULE_ALL);\r
+ RuleQueryCondition ruleQueryCondition = GsonUtil.jsonToBean(queryRequest, RuleQueryCondition.class);\r
+ if (queryRequest == null) {\r
+ if(ruleQueryCondition==null){\r
+ ruleQueryCondition = new RuleQueryCondition();\r
}\r
- return ruleQueryCondition;\r
- } catch (IOException e) {\r
- log.warn("queryRequest convert to json failed", e);\r
- throw ExceptionUtil.buildExceptionResponse("The request format is invalid!");\r
+ ruleQueryCondition.setEnabled(RuleMgtConstant.STATUS_RULE_ALL);\r
+ } else if (queryRequest.indexOf("enabled") == -1) {\r
+ ruleQueryCondition.setEnabled(RuleMgtConstant.STATUS_RULE_ALL);\r
}\r
+ return ruleQueryCondition;\r
}\r
}\r