Free style query (#60)

* ADD: freestyle query service

* ADD: RAML implementation

* ADD: RAML implementation

* fixes

* ADD: unit test

* Fix: merge conflict

* fixes

* Update service

* FIX: test

* CHANGE: loggers, endpoints and raml

* Fix test

* ADD: tests scenarios

* FIX: test

* FIX: response entity

Author: ned29

.travis.yml

@@ -13,10 +13,4 @@ before_install:
   - chmod +x pom.xml
 
 script:
-  - mvn -DsomeModule.test.excludes="**/FlowTest.java, **/FlowTest2.java, **/TrafficGeneratedTest.java, **/FlowTestExternalComposition.java, **/FlowTestTestExecution.java, **/FlowSourceChangeObject.java" test
-  - mvn -DsomeModule.test.includes="**/FlowTest.java" test
-  - mvn -DsomeModule.test.includes="**/FlowTest2.java" test
-  - mvn -DsomeModule.test.includes="**/TrafficGeneratedTest.java" test
-  - mvn -DsomeModule.test.includes="**/FlowTestExternalComposition.java" test
-  - mvn -DsomeModule.test.includes="**/FlowSourceChangeObject.java" test
-  - mvn -DsomeModule.test.includes="**/FlowTestTestExecution.java" test
+  - mvn clean install

pom.xml

@@ -185,6 +185,11 @@
             <version>1.16.16</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jongo</groupId>
+            <artifactId>jongo</artifactId>
+            <version>1.3.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/com/ericsson/ei/controller/AggregatedObjectController.java renamed to src/main/java/com/ericsson/ei/controller/QueryAggregatedObjectController.java

@@ -15,8 +15,8 @@
  * 
  */
 @RestController
-@RequestMapping(value = "/query/aggregatedObject", produces = "application/json")
-public interface AggregatedObjectController {
+@RequestMapping(value = "/queryAggregatedObject", produces = "application/json")
+public interface QueryAggregatedObjectController {
 
 
     /**

src/main/java/com/ericsson/ei/controller/AggregatedObjectControllerImpl.java renamed to src/main/java/com/ericsson/ei/controller/QueryAggregatedObjectControllerImpl.java

@@ -13,8 +13,8 @@
 */
 package com.ericsson.ei.controller;
 
-import java.util.ArrayList;
-
+import com.ericsson.ei.controller.model.QueryResponse;
+import com.ericsson.ei.queryservice.ProcessAggregatedObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,34 +24,33 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.ericsson.ei.controller.model.QueryResponse;
-import com.ericsson.ei.queryservice.ProcessAggregatedObject;
+import java.util.ArrayList;
 
 /**
  * This class represents the REST GET mechanism to extract the aggregated data
  * on the basis of the ID from the aggregatedObject.
- * 
  */
 @Component
 @CrossOrigin
-public class AggregatedObjectControllerImpl implements AggregatedObjectController {
+public class QueryAggregatedObjectControllerImpl implements QueryAggregatedObjectController {
 
-    static Logger log = (Logger) LoggerFactory.getLogger(AggregatedObjectControllerImpl.class);
+    private static Logger LOGGER = (Logger) LoggerFactory.getLogger(QueryAggregatedObjectControllerImpl.class);
 
     @Autowired
     private ProcessAggregatedObject processAggregatedObject;
 
     /**
      * This method is responsible for the REST Get mechanism to extract the
      * aggregated data on the basis of the ID from the aggregatedObject.
-     * 
+     *
      * @param id
      * @return ResponseEntity
      */
     public ResponseEntity<QueryResponse> getQueryAggregatedObject(@RequestParam("ID") final String id) {
+        QueryResponse queryResponse= new QueryResponse();
         ArrayList<String> response = processAggregatedObject.processQueryAggregatedObject(id);
-        log.info("The response is : " + response.toString());
-        return new ResponseEntity(response.toString(), HttpStatus.OK);
+        queryResponse.setResponseEntity(response.toString());
+        LOGGER.debug("The response is : " + response.toString());
+        return new ResponseEntity(queryResponse, HttpStatus.OK);
     }
-
-}
+}

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

@@ -0,0 +1,39 @@
+
+package com.ericsson.ei.controller;
+
+import org.springframework.http.ResponseEntity;
+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;
+
+
+/**
+ * No description
+ * (Generated with springmvc-raml-parser v.0.10.11)
+ * 
+ */
+@RestController
+@RequestMapping(value = "/query", produces = "application/json")
+public interface QueryController {
+
+
+    /**
+     * The REST GET method is used to query Aggregated Objects with the criterias requested, which are present as query parameters in the request URL.
+     * 
+     */
+    @RequestMapping(value = "", method = RequestMethod.GET)
+    public ResponseEntity<?> getQuery(
+        @RequestParam
+        String request);
+
+    /**
+     * The REST POST method is used to query Aggregated Objects with the criterias requested, which are present in the request body of the request URL.
+     * 
+     */
+    @RequestMapping(value = "", method = RequestMethod.POST)
+    public ResponseEntity<?> updateQuery(
+        @RequestParam
+        String request);
+
+}

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

@@ -0,0 +1,74 @@
+/*
+   Copyright 2018 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+package com.ericsson.ei.controller;
+
+import com.ericsson.ei.controller.model.QueryResponse;
+import com.ericsson.ei.queryservice.ProcessQueryParams;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.json.JSONArray;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * This class represents the REST end-points for the query service. It can take
+ * both query parameters and form parameters as criterias.
+ */
+@Component
+@CrossOrigin
+@Api(value = "query", description = "REST end-points for the freestyle query service")
+public class QueryControllerImpl implements QueryController {
+
+    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(QueryControllerImpl.class);
+
+    @Autowired
+    private ProcessQueryParams processQueryParams;
+
+    private JSONArray result = null;
+
+    @Override
+    @CrossOrigin
+    @ApiOperation(value = "")
+    public ResponseEntity<?> updateQuery(@RequestParam(value = "request") String request) {
+        try {
+            result = processQueryParams.filterFormParam(new ObjectMapper().readTree(request));
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage());
+        }
+        return new ResponseEntity(result.toString(), HttpStatus.OK);
+    }
+
+    @Override
+    @CrossOrigin
+    @ApiOperation(value = "")
+    public ResponseEntity<?> getQuery(@RequestParam(value = "request") final String request) {
+        try {
+            result = processQueryParams.filterQueryParam(request);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage());
+        }
+        LOGGER.debug("Final Output : " + result.toString());
+        return new ResponseEntity(result.toString(), HttpStatus.OK);
+    }
+}

src/main/java/com/ericsson/ei/controller/MissedNotificationController.java renamed to src/main/java/com/ericsson/ei/controller/QueryMissedNotificationController.java

@@ -15,8 +15,8 @@
  * 
  */
 @RestController
-@RequestMapping(value = "/query/missedNotifications", produces = "application/json")
-public interface MissedNotificationController {
+@RequestMapping(value = "/queryMissedNotifications", produces = "application/json")
+public interface QueryMissedNotificationController {
 
 
     /**

src/main/java/com/ericsson/ei/controller/MissedNotificationControllerImpl.java renamed to src/main/java/com/ericsson/ei/controller/QueryMissedNotificationControllerImpl.java

@@ -13,9 +13,8 @@
 */
 package com.ericsson.ei.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.ericsson.ei.controller.model.QueryResponse;
+import com.ericsson.ei.queryservice.ProcessMissedNotification;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,35 +24,34 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.ericsson.ei.controller.model.QueryResponse;
-import com.ericsson.ei.queryservice.ProcessMissedNotification;
+import java.util.List;
 
 /**
  * This class represents the REST GET mechanism to extract the aggregated data
  * on the basis of the SubscriptionName from the Missed Notification Object.
- * 
  */
 @Component
 @CrossOrigin
-public class MissedNotificationControllerImpl implements MissedNotificationController {
+public class QueryMissedNotificationControllerImpl implements QueryMissedNotificationController {
 
-    static Logger log = (Logger) LoggerFactory.getLogger(MissedNotificationControllerImpl.class);
+    private final static Logger LOGGER = (Logger) LoggerFactory.getLogger(QueryMissedNotificationControllerImpl.class);
 
     @Autowired
     private ProcessMissedNotification processMissedNotification;
 
     /**
      * This method is responsible for the REST GET mechanism to extract the data on
      * the basis of the SubscriptionName from the Missed Notification Object.
-     * 
+     *
      * @param subscriptionName
      * @return ResponseEntity
      */
-    public ResponseEntity<QueryResponse> getQueryMissedNotifications(
-            @RequestParam("SubscriptionName") final String subscriptionName) {
+    public ResponseEntity<QueryResponse> getQueryMissedNotifications(@RequestParam("SubscriptionName") final String subscriptionName) {
+        QueryResponse queryResponse = new QueryResponse();
         List<String> response = processMissedNotification.processQueryMissedNotification(subscriptionName);
-        log.info("The response is : " + response.toString());
-        return new ResponseEntity(response.toString(), HttpStatus.OK);
+        queryResponse.setResponseEntity(response.toString());
+        LOGGER.debug("The response is : " + response.toString());
+        return new ResponseEntity(queryResponse, HttpStatus.OK);
     }
 
 }

src/main/java/com/ericsson/ei/queryservice/ProcessAggregatedObject.java

@@ -13,25 +13,29 @@
 */
 package com.ericsson.ei.queryservice;
 
-import java.util.ArrayList;
-
-import javax.annotation.PostConstruct;
-
+import com.ericsson.ei.mongodbhandler.MongoDBHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mongodb.DB;
+import com.mongodb.MongoClient;
+import org.bson.Document;
+import org.jongo.Jongo;
+import org.jongo.MongoCollection;
+import org.jongo.MongoCursor;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.ericsson.ei.mongodbhandler.MongoDBHandler;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
 
 /**
  * This class represents the mechanism to extract the aggregated data on the
  * basis of the ID from the aggregatedObject.
- * 
- * 
  */
 @Component
 public class ProcessAggregatedObject {
@@ -42,38 +46,67 @@ public class ProcessAggregatedObject {
     @Value("${database.name}")
     private String aggregationDataBaseName;
 
-    static Logger log = (Logger) LoggerFactory.getLogger(ProcessAggregatedObject.class);
+    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(ProcessAggregatedObject.class);
 
     @Autowired
-    MongoDBHandler handler;
+    private MongoDBHandler handler;
 
     /**
      * The method is responsible to extract the aggregated data on the basis of
      * the ID from the aggregatedObject.
-     * 
+     *
      * @param id
      * @return ArrayList
      */
     public ArrayList<String> processQueryAggregatedObject(String id) {
         ObjectMapper mapper = new ObjectMapper();
         String condition = "{\"_id\" : \"" + id + "\"}";
-        log.info("The condition is : " + condition);
+        LOGGER.debug("The condition is : " + condition);
         JsonNode jsonCondition = null;
         try {
             jsonCondition = mapper.readTree(condition);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            LOGGER.error(e.getMessage(), e);
         }
-        log.info("The Json condition is : " + jsonCondition);
+        LOGGER.debug("The Json condition is : " + jsonCondition);
         ArrayList<String> response = handler.find(aggregationDataBaseName, aggregationCollectionName,
                 jsonCondition.toString());
         return response;
     }
 
+    /**
+     * This method is responsible for fetching all the aggregatedObjects from
+     * the Aggregation database and return it as JSONArray.
+     *
+     * @param request
+     * @param AggregationDataBaseName
+     * @param AggregationCollectionName
+     * @return JSONArray
+     */
+    public JSONArray processQueryAggregatedObject(JsonNode request, String AggregationDataBaseName, String AggregationCollectionName) {
+        DB db = new MongoClient().getDB(AggregationDataBaseName);
+        Jongo jongo = new Jongo(db);
+        MongoCollection aggObjects = jongo.getCollection(AggregationCollectionName);
+        LOGGER.debug("Successfully connected to AggregatedObject database");
+        MongoCursor<Document> allDocuments = aggObjects.find(request.toString()).as(Document.class);
+        LOGGER.debug("Number of document returned from AggregatedObject collection is : " + allDocuments.count());
+        JSONArray jsonArray = new JSONArray();
+        JSONObject doc = null;
+        while (allDocuments.hasNext()) {
+            Document temp = allDocuments.next();
+            try {
+                doc = new JSONObject(temp.toJson());
+            } catch (Exception e) {
+                LOGGER.error(e.getMessage(), e);
+            }
+            jsonArray.put(doc);
+        }
+        return jsonArray;
+    }
+
     @PostConstruct
     public void init() {
-        log.debug("The Aggregated Database is : " + aggregationDataBaseName);
-        log.debug("The Aggregated Collection is : " + aggregationCollectionName);
+        LOGGER.debug("The Aggregated Database is : " + aggregationDataBaseName);
+        LOGGER.debug("The Aggregated Collection is : " + aggregationCollectionName);
     }
-
-}
+}