Revert "merge (#20)" (#21)

This reverts commit 470e899.

Author: ned29

.travis.yml

@@ -13,4 +13,10 @@ before_install:
   - chmod +x pom.xml
 
 script:
-  - mvn clean install
+  - 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

pom.xml

@@ -185,11 +185,6 @@
             <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/QueryAggregatedObjectController.java renamed to src/main/java/com/ericsson/ei/controller/AggregatedObjectController.java

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

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

@@ -13,8 +13,8 @@
 */
 package com.ericsson.ei.controller;
 
-import com.ericsson.ei.controller.model.QueryResponse;
-import com.ericsson.ei.queryservice.ProcessAggregatedObject;
+import java.util.ArrayList;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,33 +24,34 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.ArrayList;
+import com.ericsson.ei.controller.model.QueryResponse;
+import com.ericsson.ei.queryservice.ProcessAggregatedObject;
 
 /**
  * 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 QueryAggregatedObjectControllerImpl implements QueryAggregatedObjectController {
+public class AggregatedObjectControllerImpl implements AggregatedObjectController {
 
-    private static Logger LOGGER = (Logger) LoggerFactory.getLogger(QueryAggregatedObjectControllerImpl.class);
+    static Logger log = (Logger) LoggerFactory.getLogger(AggregatedObjectControllerImpl.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);
-        queryResponse.setResponseEntity(response.toString());
-        LOGGER.debug("The response is : " + response.toString());
-        return new ResponseEntity(queryResponse, HttpStatus.OK);
+        log.info("The response is : " + response.toString());
+        return new ResponseEntity(response.toString(), HttpStatus.OK);
     }
-}
+
+}

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

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

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

@@ -13,8 +13,9 @@
 */
 package com.ericsson.ei.controller;
 
-import com.ericsson.ei.controller.model.QueryResponse;
-import com.ericsson.ei.queryservice.ProcessMissedNotification;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,34 +25,35 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.List;
+import com.ericsson.ei.controller.model.QueryResponse;
+import com.ericsson.ei.queryservice.ProcessMissedNotification;
 
 /**
  * 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 QueryMissedNotificationControllerImpl implements QueryMissedNotificationController {
+public class MissedNotificationControllerImpl implements MissedNotificationController {
 
-    private final static Logger LOGGER = (Logger) LoggerFactory.getLogger(QueryMissedNotificationControllerImpl.class);
+    static Logger log = (Logger) LoggerFactory.getLogger(MissedNotificationControllerImpl.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) {
-        QueryResponse queryResponse = new QueryResponse();
+    public ResponseEntity<QueryResponse> getQueryMissedNotifications(
+            @RequestParam("SubscriptionName") final String subscriptionName) {
         List<String> response = processMissedNotification.processQueryMissedNotification(subscriptionName);
-        queryResponse.setResponseEntity(response.toString());
-        LOGGER.debug("The response is : " + response.toString());
-        return new ResponseEntity(queryResponse, HttpStatus.OK);
+        log.info("The response is : " + response.toString());
+        return new ResponseEntity(response.toString(), HttpStatus.OK);
     }
 
 }

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

@@ -13,29 +13,25 @@
 */
 package com.ericsson.ei.queryservice;
 
-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 java.util.ArrayList;
+
+import javax.annotation.PostConstruct;
+
 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 com.ericsson.ei.mongodbhandler.MongoDBHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * This class represents the mechanism to extract the aggregated data on the
  * basis of the ID from the aggregatedObject.
+ * 
+ * 
  */
 @Component
 public class ProcessAggregatedObject {
@@ -46,67 +42,38 @@ public class ProcessAggregatedObject {
     @Value("${database.name}")
     private String aggregationDataBaseName;
 
-    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(ProcessAggregatedObject.class);
+    static Logger log = (Logger) LoggerFactory.getLogger(ProcessAggregatedObject.class);
 
     @Autowired
-    private MongoDBHandler handler;
+    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 + "\"}";
-        LOGGER.debug("The condition is : " + condition);
+        log.info("The condition is : " + condition);
         JsonNode jsonCondition = null;
         try {
             jsonCondition = mapper.readTree(condition);
         } catch (Exception e) {
-            LOGGER.error(e.getMessage(), e);
+            log.error(e.getMessage(), e);
         }
-        LOGGER.debug("The Json condition is : " + jsonCondition);
+        log.info("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() {
-        LOGGER.debug("The Aggregated Database is : " + aggregationDataBaseName);
-        LOGGER.debug("The Aggregated Collection is : " + aggregationCollectionName);
+        log.debug("The Aggregated Database is : " + aggregationDataBaseName);
+        log.debug("The Aggregated Collection is : " + aggregationCollectionName);
     }
-}
+
+}