Fix rule check endpoint (#160)

* Fix check-rule endpoint

- Changed query parameters to json in body.

Author: erik-edling

src/functionaltests/java/com/ericsson/ei/rules/RuleCheckSteps.java

@@ -54,16 +54,20 @@ public void file_with_JMESPath_rules_and_file_with_events(String rulesFileName,
         events = FileUtils.readFileToString(new File(TEST_RESOURCES_PATH + eventsFileName), "UTF-8");
     }
 
-    @When("^make a POST request to the REST API \"([^\"]*)\" with request parameter \"([^\"]*)\"$")
-    public void make_a_POST_request_to_the_REST_API_with_request_parameter(String endpoint, String requestParam) throws Throwable {
+    @When("^make a POST request to the REST API \"([^\"]*)\" with a single rule")
+    public void make_a_POST_request_to_the_REST_API_with_request_parameter(String endpoint) throws Throwable {
+        String requestBody = new JSONObject()
+                .put("rule", new JSONObject(rules))
+                .put("event", new JSONObject(events))
+                .toString();
+
         HttpRequest postRequest = new HttpRequest(HttpMethod.POST);
         response = postRequest.setPort(applicationPort)
                 .setHost(hostName)
                 .addHeader("content-type", "application/json")
                 .addHeader("Accept", "application/json")
                 .setEndpoint(endpoint)
-                .setBody(events)
-                .addParam(requestParam, rules)
+                .setBody(requestBody)
                 .performRequest();
     }
 

src/functionaltests/resources/features/ruleCheck.feature

@@ -22,7 +22,7 @@ Feature: Test Rules Checker
   @tag1
   Scenario: Execute JMESPath rule on JSON object
     Given file with JMESPath rules "/ExtractionRule.txt" and file with events "/EiffelArtifactCreatedEvent.json"
-    When make a POST request to the REST API "/rules/rule-check" with request parameter "rule"
+    When make a POST request to the REST API "/rules/rule-check" with a single rule
     Then get response code of 200
     And get content "/ExtractedContent.json"
 
@@ -47,11 +47,10 @@ Feature: Test Rules Checker
     And file with JMESPath rules "/AggregateListRules.json" and file with events "/AggregateListEvents.json"
     When make a POST request to the REST API "/rules/rule-check/aggregation"
     Then get response code of 503
-    
+
   #@tag5
   Scenario: Check status of test rule page using REST API
     When rules checking is enabled
     Then get request from REST API "/rules/rule-check/testRulePageEnabled" return response code of 200 and status as "true"
     When rules checking is not enabled
-    Then get request from REST API "/rules/rule-check/testRulePageEnabled" return response code of 200 and status as "false"    
-      
+    Then get request from REST API "/rules/rule-check/testRulePageEnabled" return response code of 200 and status as "false"

src/main/java/com/ericsson/ei/controller/RuleCheckController.java

@@ -1,13 +1,9 @@
 
 package com.ericsson.ei.controller;
 
-import javax.validation.Valid;
-import com.ericsson.ei.controller.model.RuleCheckBody;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -27,20 +23,19 @@ public interface RuleCheckController {
      */
     @RequestMapping(value = "", method = RequestMethod.POST)
     public ResponseEntity<?> updateRulesRuleCheck(
-        @RequestParam
-        String rule,
-        @RequestParam
-        String jsonContent);
+        @javax.validation.Valid
+        @org.springframework.web.bind.annotation.RequestBody
+        RuleCheckBody ruleCheckBody);
 
     /**
      * This call for run the jmespath rule objects on the Json array of objects, we get aggregation Object as output
      * 
      */
     @RequestMapping(value = "/aggregation", method = RequestMethod.POST)
     public ResponseEntity<?> updateAggregation(
-        @Valid
-        @RequestBody
-        RuleCheckBody ruleCheckBody);
+        @javax.validation.Valid
+        @org.springframework.web.bind.annotation.RequestBody
+        RulesCheckBody rulesCheckBody);
 
     /**
      * This call for the current status of test rule entry point, we get status as output

src/main/java/com/ericsson/ei/controller/RuleCheckControllerImpl.java

@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 
 import com.ericsson.ei.controller.model.RuleCheckBody;
+import com.ericsson.ei.controller.model.RulesCheckBody;
 import com.ericsson.ei.exception.SubscriptionNotFoundException;
 import com.ericsson.ei.jmespath.JmesPathInterface;
 import com.ericsson.ei.services.IRuleCheckService;
@@ -45,19 +46,19 @@
 /**
  * This class implements the Interface for JMESPath API, generated by RAML 0.8
  * Provides interaction with JmesPathInterface class
- * 
+ *
  * Usage: 1. If input contains a rule as an argument and json expression in a
  * text file, then the following curl command may be used. curl -H
  * "Content-type: application/x-www-form-urlencoded" -X POST --data-urlencode
  * jsonContent@testjson.txt
  * http://localhost:8090/jmespathrule/runRule?rule=data.outcome
- * 
+ *
  * 2. If input contains rule and json expression as two String arguments, then
  * the following curl command may be used. curl -H "Content-type:
  * application/x-www-form-urlencoded" -X POST -d
  * jsonContent={"data":{"outcome":{"conclusion":"SUCCESSFUL"},"test":"persistentLogs"}}
  * http://localhost:8090/jmespathrule/runRule?rule=data.outcome
- * 
+ *
  */
 
 @Component
@@ -72,32 +73,35 @@ public class RuleCheckControllerImpl implements RuleCheckController {
 
     @Autowired
     private IRuleCheckService ruleCheckService;
-    
+
     @Setter
     @Value("${testaggregated.enabled:false}")
     private Boolean testEnable;
 
     /**
      * This method interacts with JmesPathInterface class method runRuleOnEvent to
      * evaluate a rule on JSON object.
-     * 
+     *
      * @param rule-
      *            takes a String as a rule that need to be evaluated on JSON content
      * @param jsonContent-
      *            takes JSON object as a String
      * @return a String object
-     * 
+     *
      */
     @Override
     @CrossOrigin
     @ApiOperation(value = "To execute rule on JSON", response = String.class)
     public ResponseEntity<?> updateRulesRuleCheck(
-            @ApiParam(value = "JMESPath rule", required = true) @RequestParam String rule,
-            @ApiParam(value = "JSON object", required = true) @RequestBody String jsonContent) {
+            @ApiParam(value = "JSON object", required = true) @RequestBody RuleCheckBody body) {
+        JSONObject rule = new JSONObject(body.getRule().getAdditionalProperties());
+        JSONObject event = new JSONObject(body.getEvent().getAdditionalProperties());
+
+        String ruleString = rule.toString().replaceAll("\"", "");
         try {
-            JSONObject jsonObj = new JSONObject(jsonContent);
-            String res = jmesPathInterface.runRuleOnEvent(rule, jsonObj.toString()).toString();
-            LOGGER.debug("Query: " + rule + " executed successfully");
+
+            String res = jmesPathInterface.runRuleOnEvent(ruleString, event.toString()).toString();
+            LOGGER.debug("Query: " + body.getRule()+ " executed successfully");
             return new ResponseEntity<>(res, HttpStatus.OK);
         } catch (Exception e) {
             String errorMessage = "Failed to run rule on event. Error message:\n" + e.getMessage();
@@ -110,7 +114,7 @@ public ResponseEntity<?> updateRulesRuleCheck(
     @CrossOrigin
     @ApiOperation(value = "To execute the list of rules on list of Eiffel events. Return the aggregated object(s)", response = String.class)
     public ResponseEntity<?> updateAggregation(
-            @ApiParam(value = "Object that include list of rules and list of Eiffel events", required = true) @RequestBody RuleCheckBody body) {
+            @ApiParam(value = "Object that include list of rules and list of Eiffel events", required = true) @RequestBody RulesCheckBody body) {
         if (testEnable) {
             try {
                 String aggregatedObject = ruleCheckService.prepareAggregatedObject(

src/main/java/com/ericsson/ei/controller/model/Event.java

@@ -0,0 +1,56 @@
+
+package com.ericsson.ei.controller.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+
+})
+public class Event {
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof Event) == false) {
+            return false;
+        }
+        Event rhs = ((Event) other);
+        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}

src/main/java/com/ericsson/ei/controller/model/JsonContent.java

@@ -0,0 +1,56 @@
+
+package com.ericsson.ei.controller.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+
+})
+public class JsonContent {
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof JsonContent) == false) {
+            return false;
+        }
+        JsonContent rhs = ((JsonContent) other);
+        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}

src/main/java/com/ericsson/ei/controller/model/Rule.java

@@ -0,0 +1,56 @@
+
+package com.ericsson.ei.controller.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+
+})
+public class Rule {
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof Rule) == false) {
+            return false;
+        }
+        Rule rhs = ((Rule) other);
+        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}