Solved getSubscriptionById() RestAPI not responding with empy JSON, responded with empty string before this fix, when no Subscription was found, which caused errors in webBrowser using EI Frontend. (#22)

* Removed Timeout parameter from subscripion code since the parameter will not be used.

* Solved getSubscriptionById() RestAPI not responding with empy JSON, responded with empty string before this fix, when no Subscription was found, which caused errors in webBrowser using EI Frontend.

* Solved getSubscriptionById() RestAPI not responding with empy JSON, responded with empty string before this fix, when no Subscription was found, which caused errors in webBrowser using EI Frontend.

Author: tobiasake

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

@@ -51,7 +51,7 @@ public ResponseEntity<com.ericsson.ei.controller.model.SubscriptionResponse> upd
      * 
      */
     @RequestMapping(value = "/{subscriptionName}", method = RequestMethod.GET)
-    public ResponseEntity<com.ericsson.ei.controller.model.Subscription> getSubscriptionById(
+    public ResponseEntity<List<com.ericsson.ei.controller.model.Subscription>> getSubscriptionById(
         @PathVariable
         String subscriptionName);
 

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

@@ -39,6 +39,7 @@ public class SubscriptionControllerImpl implements SubscriptionController {
 
     private static final Logger LOG = LoggerFactory.getLogger(SubscriptionControllerImpl.class);
 
+    
     @Override
     @CrossOrigin
     @ApiOperation(value = "Creates the subscription")
@@ -51,7 +52,7 @@ public ResponseEntity<SubscriptionResponse> createSubscription(@RequestBody Subs
             return new ResponseEntity<SubscriptionResponse>(subscriptionResponse, HttpStatus.OK);
         } else {
             LOG.error("Subscription :" + subscription.getSubscriptionName() + " identified as duplicate subscription");
-            subscriptionResponse.setMsg("Duplicate Subscription"); subscriptionResponse.setStatusCode(HttpStatus.BAD_REQUEST.value());
+            subscriptionResponse.setMsg("Subscription already exists"); subscriptionResponse.setStatusCode(HttpStatus.BAD_REQUEST.value());
             return new ResponseEntity<SubscriptionResponse>(subscriptionResponse, HttpStatus.BAD_REQUEST);
         }
 
@@ -60,16 +61,17 @@ public ResponseEntity<SubscriptionResponse> createSubscription(@RequestBody Subs
     @Override
     @CrossOrigin
     @ApiOperation(value = "Returns the subscription rules for given subscription name")
-    public ResponseEntity<Subscription> getSubscriptionById(@PathVariable String subscriptionName) {
-        Subscription subscription = null;
+    public ResponseEntity<List<Subscription>> getSubscriptionById(@PathVariable String subscriptionName) {
+    	List<Subscription> subscriptionList = new ArrayList<Subscription>();
         try {
             LOG.info("Subscription :" + subscriptionName + " fetch started");
-            subscription = subscriptionService.getSubscription(subscriptionName);
+            subscriptionList.add(subscriptionService.getSubscription(subscriptionName));
             LOG.info("Subscription :" + subscriptionName + " fetched");
-            return new ResponseEntity<Subscription>(subscription, HttpStatus.OK);
+            return new ResponseEntity<List<Subscription>> (subscriptionList, HttpStatus.OK);
         } catch (SubscriptionNotFoundException e) {
             LOG.error("Subscription :" + subscriptionName + " not found in records");
-            return new ResponseEntity<Subscription>(subscription, HttpStatus.OK);
+            return new ResponseEntity<List<Subscription>> (subscriptionList, HttpStatus.OK);
+            
         }
 
     }

src/main/resources/public/raml/subscription.raml

@@ -66,10 +66,11 @@
       get:
         description: Returns the subscription rules for given subscription name. 
         responses:
-          200:          
+          200:        
             body:
               application/json:
-                schema: subscription  
+                schema: subscriptionList
+              
 
 
       delete:

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

@@ -108,10 +108,10 @@ public void getSubScriptionByName() throws Exception {
 
         MvcResult result = mockMvc.perform(requestBuilder).andReturn();
 
-        Subscription subscription = mapper.readValue(result.getResponse().getContentAsString().toString(),
-                Subscription.class);
+        Subscription[] subscription = mapper.readValue(result.getResponse().getContentAsString().toString(),
+                Subscription[].class);
         assertEquals(HttpStatus.OK.value(), result.getResponse().getStatus());
-        assertEquals("Subscription_Test", subscription.getSubscriptionName());
+        assertEquals("Subscription_Test", subscription[0].getSubscriptionName());
     }
 
     @Test
@@ -125,7 +125,7 @@ public void getSubScriptionByNameNotFound() throws Exception {
         MvcResult result = mockMvc.perform(requestBuilder).andReturn();
 
         assertEquals(HttpStatus.OK.value(), result.getResponse().getStatus());
-        assertEquals("", result.getResponse().getContentAsString());
+        assertEquals("[]", result.getResponse().getContentAsString());
     }
 
     @Test