fix null pointer exception

Author: Vasile Baluta

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

@@ -1,7 +1,6 @@
 
 package com.ericsson.ei.controller;
 
-import com.ericsson.ei.controller.model.QueryResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -1,7 +1,6 @@
 
 package com.ericsson.ei.controller;
 
-import com.ericsson.ei.controller.model.QueryResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -2,7 +2,6 @@
 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;

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

@@ -26,7 +26,7 @@ public interface SubscriptionController {
      * 
      */
     @RequestMapping(value = "", method = RequestMethod.GET)
-    public ResponseEntity<List<com.ericsson.ei.controller.model.Subscription>> getSubscriptions();
+    public ResponseEntity<List<String>> getSubscriptions();
 
     /**
      * Takes the subscription rules, the name for subscription and the user name of the person registering this subscription and saves the subscription in subscription database. The name needs to be unique.
@@ -36,34 +36,34 @@ public interface SubscriptionController {
     public ResponseEntity<?> createSubscription(
         @Valid
         @RequestBody
-        List<com.ericsson.ei.controller.model.Subscription> subscription);
+        List<String> string);
 
     /**
      * Modify an existing Subscription.
      * 
      */
     @RequestMapping(value = "", method = RequestMethod.PUT)
-    public ResponseEntity<com.ericsson.ei.controller.model.SubscriptionResponse> updateSubscriptions(
+    public ResponseEntity<SubscriptionResponse> updateSubscriptions(
         @Valid
         @RequestBody
-        List<com.ericsson.ei.controller.model.Subscription> subscription);
+        List<String> string);
 
     /**
      * Returns the subscription rules for given subscription name.
      * 
      */
     @RequestMapping(value = "/{subscriptionName}", method = RequestMethod.GET)
-    public ResponseEntity<List<com.ericsson.ei.controller.model.Subscription>> getSubscriptionById(
+    public ResponseEntity<List<String>> getSubscriptionById(
         @PathVariable(required = false)
-        String subscriptionName);
+        java.lang.String subscriptionName);
 
     /**
      * Removes the subscription from the database.
      * 
      */
     @RequestMapping(value = "/{subscriptionName}", method = RequestMethod.DELETE)
-    public ResponseEntity<com.ericsson.ei.controller.model.SubscriptionResponse> deleteSubscriptionById(
+    public ResponseEntity<SubscriptionResponse> deleteSubscriptionById(
         @PathVariable(required = false)
-        String subscriptionName);
+        java.lang.String subscriptionName);
 
 }

src/test/java/com/ericsson/ei/flowtests/FlowTestBase.java

@@ -77,8 +77,6 @@ public abstract class FlowTestBase extends AbstractTestExecutionListener {
 
     private static ObjectMapper objectMapper = new ObjectMapper();
 
-    // final FlowTestConfigs configs = new FlowTestConfigs();
-
     private static HashMap<String, FlowTestConfigs> configsMap = new HashMap<String, FlowTestConfigs>();
 
     @Override
@@ -90,11 +88,6 @@ public void beforeTestClass(TestContext testContext) throws Exception {
         getFlowTestConfigs().init();
     }
 
-    // @BeforeClass
-    // public static void setUp() throws Exception {
-    //
-    // }
-
     @PostConstruct
     public void init() throws Exception {
         mongoDBHandler.setMongoClient(getFlowTestConfigs().getMongoClient());
@@ -104,7 +97,6 @@ public void init() throws Exception {
 
     protected FlowTestConfigs getFlowTestConfigs() {
         return configsMap.get(getClasName());
-        // return configs;
     }
 
     private void createFlowTestConfigs() {

src/test/java/com/ericsson/ei/subscription/SubscriptionServiceTest.java

@@ -88,8 +88,10 @@ public void initMocks() {
 
     @AfterClass
     public static void tearDownMongoDB() throws Exception {
-        testsFactory.shutdown();
-        mongoClient.close();
+        if (testsFactory != null)
+            testsFactory.shutdown();
+        if (mongoClient != null)
+            mongoClient.close();
     }
 
     @Test
@@ -123,8 +125,7 @@ public void testUpdateSubscription() {
             // the subscription(subscriptionName=Subscription_Test_Modify)
             subscription = mapper.readValue(jsonArray.getJSONObject(1).toString(), Subscription.class);
             String expectedModifiedSubscriptionName = subscription2.getSubscriptionName();
-            boolean addSubscription = subscriptionService.modifySubscription(subscription,
-                    subscriptionName);
+            boolean addSubscription = subscriptionService.modifySubscription(subscription, subscriptionName);
 
             // test update done successfully
             assertEquals(addSubscription, true);