Freestyle query is performed only on aggregated_objects collection (#101)

Author: ValentinTyhonov

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

@@ -24,7 +24,7 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This class represents the REST GET mechanism to extract the aggregated data
@@ -48,9 +48,9 @@ public class QueryAggregatedObjectControllerImpl implements QueryAggregatedObjec
      */
     public ResponseEntity<QueryResponse> getQueryAggregatedObject(@RequestParam("ID") final String id) {
         QueryResponse queryResponse= new QueryResponse();
-        ArrayList<String> response = processAggregatedObject.processQueryAggregatedObject(id);
+        List<String> response = processAggregatedObject.processQueryAggregatedObject(id);
         queryResponse.setResponseEntity(response.toString());
         LOGGER.debug("The response is : " + response.toString());
-        return new ResponseEntity(queryResponse, HttpStatus.OK);
+        return new ResponseEntity<>(queryResponse, HttpStatus.OK);
     }
 }

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

@@ -37,38 +37,38 @@
  */
 @Component
 @CrossOrigin
-@Api(value = "query", description = "REST end-points for the freestyle query service")
+@Api(value = "query", description = "REST endpoints 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));
+            JSONArray result = processQueryParams.filterFormParam(new ObjectMapper().readTree(request));
+            return new ResponseEntity<>(result.toString(), HttpStatus.OK);
         } catch (Exception e) {
             LOGGER.error(e.getMessage());
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        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);
+            JSONArray result = processQueryParams.filterQueryParam(request);
+            LOGGER.debug("Final Output : " + result.toString());
+            return new ResponseEntity<>(result.toString(), HttpStatus.OK);
         } catch (Exception e) {
             LOGGER.error(e.getMessage());
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        LOGGER.debug("Final Output : " + result.toString());
-        return new ResponseEntity(result.toString(), HttpStatus.OK);
     }
 }

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

@@ -51,7 +51,7 @@ public ResponseEntity<QueryResponse> getQueryMissedNotifications(@RequestParam("
         List<String> response = processMissedNotification.processQueryMissedNotification(subscriptionName);
         queryResponse.setResponseEntity(response.toString());
         LOGGER.debug("The response is : " + response.toString());
-        return new ResponseEntity(queryResponse, HttpStatus.OK);
+        return new ResponseEntity<>(queryResponse, HttpStatus.OK);
     }
 
 }

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

@@ -40,14 +40,14 @@
 @Component
 public class ProcessAggregatedObject {
 
+    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(ProcessAggregatedObject.class);
+
     @Value("${aggregated.collection.name}")
     private String aggregationCollectionName;
 
     @Value("${spring.data.mongodb.database}")
     private String aggregationDataBaseName;
 
-    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(ProcessAggregatedObject.class);
-
     @Autowired
     private MongoDBHandler handler;
 
@@ -78,7 +78,7 @@ public ArrayList<String> processQueryAggregatedObject(String id) {
      * The method is responsible to extract the aggregated data on the basis of
      * the ID from the aggregatedObject.
      * 
-     * @param id
+     * @param templateName
      * @return ArrayList
      */
     public ArrayList<String> getAggregatedObjectByTemplateName(String templateName) {
@@ -131,7 +131,7 @@ public JSONArray processQueryAggregatedObject(JsonNode request, String Aggregati
 
     @PostConstruct
     public void init() {
-        LOGGER.debug("The Aggregated Database is : " + aggregationDataBaseName);
-        LOGGER.debug("The Aggregated Collection is : " + aggregationCollectionName);
+        LOGGER.debug("The Aggregated Database is : " + aggregationDataBaseName
+            + "\nThe Aggregated Collection is : " + aggregationCollectionName);
     }
 }

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

@@ -16,22 +16,13 @@
 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 javax.annotation.PostConstruct;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,13 +33,13 @@
 @Component
 public class ProcessMissedNotification {
 
+    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(ProcessMissedNotification.class);
+
     @Value("${missedNotificationCollectionName}")
     private String missedNotificationCollectionName;
 
     @Value("${missedNotificationDataBaseName}")
-    private String missedNotificationDataBaseName;
-
-    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(ProcessMissedNotification.class);
+    private String missedNotificationDatabaseName;
 
     @Autowired
     private MongoDBHandler handler;
@@ -71,7 +62,7 @@ public List<String> processQueryMissedNotification(String subscriptionName) {
             LOGGER.error(e.getMessage(), e);
         }
         LOGGER.debug("The Json condition is : " + jsonCondition);
-        ArrayList<String> output = handler.find(missedNotificationDataBaseName, missedNotificationCollectionName,
+        List<String> output = handler.find(missedNotificationDatabaseName, missedNotificationCollectionName,
                 jsonCondition.toString());
         return output.stream().map(a -> {
             try {
@@ -84,40 +75,10 @@ public List<String> processQueryMissedNotification(String subscriptionName) {
 
     }
 
-    /**
-     * This method is responsible for fetching all the missed notifications from
-     * the missed Notification database and return it as JSONArray.
-     *
-     * @param request
-     * @param MissedNotificationDataBaseName
-     * @param MissedNotificationCollectionName
-     * @return JSONArray
-     */
-    public JSONArray processQueryMissedNotification(JsonNode request, String MissedNotificationDataBaseName, String MissedNotificationCollectionName) {
-        DB db = new MongoClient().getDB(MissedNotificationDataBaseName);
-        Jongo jongo = new Jongo(db);
-        MongoCollection aggObjects = jongo.getCollection(MissedNotificationCollectionName);
-        LOGGER.debug("Successfully connected to MissedNotification database");
-        MongoCursor<Document> allDocuments = aggObjects.find(request.toString()).as(Document.class);
-        LOGGER.debug("Number of document returned from Notification 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() {
-        LOGGER.debug("The Aggregated Database is : " + missedNotificationDataBaseName);
-        LOGGER.debug("The Aggregated Collection is : " + missedNotificationCollectionName);
+        LOGGER.debug("MissedNotification Database is : " + missedNotificationDatabaseName
+            + "\nMissedNotification Collection is : " + missedNotificationCollectionName);
     }
 
 }

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

@@ -18,7 +18,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,6 @@
 
 import javax.annotation.PostConstruct;
 import java.io.IOException;
-import java.util.stream.IntStream;
 
 /**
  * This class is responsible to fetch the criterias from both the query
@@ -43,20 +41,11 @@ public class ProcessQueryParams {
     private String aggregationCollectionName;
 
     @Value("${spring.data.mongodb.database}")
-    private String dataBaseName;
-
-    @Value("${missedNotificationCollectionName}")
-    private String missedNotificationCollectionName;
-
-    @Value("${missedNotificationDataBaseName}")
-    private String missedNotificationDataBaseName;
+    private String databaseName;
 
     @Autowired
     private ProcessAggregatedObject processAggregatedObject;
 
-    @Autowired
-    private ProcessMissedNotification processMissedNotification;
-
     /**
      * This method takes the parameters from the REST POST request body. If the
      * Aggregated Object matches the condition, then it is returned.
@@ -70,32 +59,15 @@ public JSONArray filterFormParam(JsonNode request) throws IOException {
         JsonNode options = request.get("options");
         LOGGER.debug("The criteria is : " + criteria.toString());
         LOGGER.debug("The options is : " + options.toString());
+        JSONArray resultAggregatedObject;
         if (options.toString().equals("{}") || options.isNull()) {
-            return getProcessQuery(criteria);
+            resultAggregatedObject = processAggregatedObject.processQueryAggregatedObject(criteria, databaseName, aggregationCollectionName);
         } else {
             String result = "{ \"$and\" : [ " + criteria.toString() + "," + options.toString() + " ] }";
-            return getProcessQuery(new ObjectMapper().readTree(result));
-        }
-    }
-
-    /**
-     * This method is responsible for concatenating two JSONArrays.
-     *
-     * @param firstArray
-     * @param secondArray
-     * @return JSONArray
-     * @throws JSONException
-     */
-    private static JSONArray concatArray(JSONArray firstArray, JSONArray secondArray) throws JSONException {
-        JSONArray result = new JSONArray();
-        JSONArray[] inputs = new JSONArray[] { firstArray, secondArray };
-        for (JSONArray input : inputs) {
-            for (int i = 0; i < input.length(); i++) {
-                result.put(input.get(i));
-            }
+            resultAggregatedObject = processAggregatedObject.processQueryAggregatedObject(new ObjectMapper().readTree(result), databaseName, aggregationCollectionName);
         }
-
-        return result;
+        LOGGER.debug("resultAggregatedObject : " + resultAggregatedObject.toString());
+        return resultAggregatedObject;
     }
 
     /**
@@ -120,39 +92,12 @@ public JSONArray filterQueryParam(String request) {
             criteria.put(key, value);
         }
         LOGGER.debug(criteria.toString());
-        return getProcessQuery(criteria);
-    }
-
-    /**
-     * Process parameters to create a JsonNode request to query the Aggregated
-     * Objects.
-     *
-     * @param criteria
-     * @return
-     */
-    private JSONArray getProcessQuery(JsonNode criteria) {
-        JSONArray resultAggregatedObject = processAggregatedObject.processQueryAggregatedObject(criteria, dataBaseName,
-                aggregationCollectionName);
-        JSONArray resultMissedNotification = processMissedNotification.processQueryMissedNotification(criteria,
-                missedNotificationDataBaseName, missedNotificationCollectionName);
-        LOGGER.debug("resultAggregatedObject : " + resultAggregatedObject.toString());
-        LOGGER.debug("resultMissedNotification : " + resultMissedNotification.toString());
-        JSONArray result = null;
-        try {
-            result = ProcessQueryParams.concatArray(resultAggregatedObject, resultMissedNotification);
-        } catch (Exception e) {
-            LOGGER.error(e.getMessage());
-        }
-        LOGGER.debug("Final Result is : " + result.toString());
-        return result;
+        return processAggregatedObject.processQueryAggregatedObject(criteria, databaseName, aggregationCollectionName);
     }
 
     @PostConstruct
     public void print() {
-        LOGGER.debug("Values from application.properties file");
-        LOGGER.debug("AggregationCollectionName : " + aggregationCollectionName);
-        LOGGER.debug("AggregationDataBaseName : " + dataBaseName);
-        LOGGER.debug("MissedNotificationCollectionName : " + missedNotificationCollectionName);
-        LOGGER.debug("MissedNotificationDataBaseName : " + missedNotificationDataBaseName);
+        LOGGER.debug("Aggregation Database : " + databaseName
+            + "\nAggregation Collection is : " + aggregationCollectionName);
     }
 }