Simplified updateSubscription RestApi, so SubscritionName is only spe… …cified in json file/object. (#14)

* Fix updateSubscription RestApi issue that prevented subscription to be updated.

* Changed name on isDuplicateSubscriptions functions to doSubscriptionExist. Fixed impacted unit test due to this change.

* Simplified updateSubscription RestApi, so SubscritionName is only specified in json file/object.

Author: tobiasake

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

@@ -37,25 +37,23 @@ public ResponseEntity<?> createSubscription(
         com.ericsson.ei.controller.model.Subscription subscription);
 
     /**
-     * Returns the subscription rules for given subscription name.
+     * Modify an existing Subscription.
      * 
      */
-    @RequestMapping(value = "/{subscriptionName}", method = RequestMethod.GET)
-    public ResponseEntity<com.ericsson.ei.controller.model.Subscription> getSubscriptionById(
-        @PathVariable
-        String subscriptionName);
+    @RequestMapping(value = "", method = RequestMethod.PUT)
+    public ResponseEntity<com.ericsson.ei.controller.model.SubscriptionResponse> updateSubscriptions(
+        @javax.validation.Valid
+        @org.springframework.web.bind.annotation.RequestBody
+        com.ericsson.ei.controller.model.Subscription subscription);
 
     /**
-     * Modify an existing Subscription.
+     * Returns the subscription rules for given subscription name.
      * 
      */
-    @RequestMapping(value = "/{subscriptionName}", method = RequestMethod.PUT)
-    public ResponseEntity<com.ericsson.ei.controller.model.SubscriptionResponse> updateSubscriptionById(
+    @RequestMapping(value = "/{subscriptionName}", method = RequestMethod.GET)
+    public ResponseEntity<com.ericsson.ei.controller.model.Subscription> getSubscriptionById(
         @PathVariable
-        String subscriptionName,
-        @javax.validation.Valid
-        @org.springframework.web.bind.annotation.RequestBody
-        com.ericsson.ei.controller.model.Subscription subscription);
+        String subscriptionName);
 
     /**
      * Removes the subscription from the database.

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

@@ -75,12 +75,13 @@ public ResponseEntity<Subscription> getSubscriptionById(@PathVariable String sub
     }
 
     @Override
-    @CrossOrigin
+    //@CrossOrigin
     @ApiOperation(value = "Update the existing subscription by the subscription name")
-    public ResponseEntity<SubscriptionResponse> updateSubscriptionById(@PathVariable String subscriptionName, @RequestBody Subscription subscription) {
+    public ResponseEntity<SubscriptionResponse> updateSubscriptions(@RequestBody Subscription subscription) {
+    	String subscriptionName = subscription.getSubscriptionName();
         LOG.info("Subscription :" + subscriptionName + " update started");
         SubscriptionResponse subscriptionResponse = new SubscriptionResponse();
-        if (subscriptionService.doSubscriptionExist(subscription.getSubscriptionName())) {
+        if (subscriptionService.doSubscriptionExist(subscriptionName)) {
             subscriptionService.modifySubscription(subscription, subscriptionName);
             LOG.info("Subscription :" + subscriptionName + " update completed");
             subscriptionResponse.setMsg("Updated Successfully"); subscriptionResponse.setStatusCode(HttpStatus.OK.value());

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

@@ -41,7 +41,18 @@
       description: 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. 
       body:
         application/json:
-          schema: subscription               
+          schema: subscription  
+
+    put:      
+      description: Modify an existing Subscription. 
+      body:
+        application/json:
+          schema: subscription
+      responses:
+        200:        
+          body:
+            application/json:
+              schema: subscriptionResponse            
 
     /{subscriptionName}:    
       uriParameters:
@@ -59,17 +70,6 @@
             body:
               application/json:
                 schema: subscription  
-  
-      put:      
-        description: Modify an existing Subscription. 
-        body:
-          application/json:
-            schema: subscription
-        responses:
-          200:        
-            body:
-              application/json:
-                schema: subscriptionResponse
 
 
       delete:

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

@@ -70,7 +70,7 @@ public void updateSubscription() throws Exception {
         Mockito.when(subscriptionService.modifySubscription(Mockito.any(Subscription.class), Mockito.anyString()))
                 .thenReturn(false);
         // Send subscription as body to /subscriptions
-        RequestBuilder requestBuilder = MockMvcRequestBuilders.put("/subscriptions/Subscription_Test")
+        RequestBuilder requestBuilder = MockMvcRequestBuilders.put("/subscriptions")
                 .accept(MediaType.APPLICATION_JSON).content(jsonArray.getJSONObject(0).toString())
                 .contentType(MediaType.APPLICATION_JSON);
 
@@ -86,7 +86,7 @@ public void updateSubscription() throws Exception {
     public void updateSubscriptionFailWhenSubscriptionDoNotExist() throws Exception {
         Mockito.when(subscriptionService.doSubscriptionExist(Mockito.anyString())).thenReturn(false);
         // Send subscription as body to /subscriptions
-        RequestBuilder requestBuilder = MockMvcRequestBuilders.put("/subscriptions/Subscription_Test")
+        RequestBuilder requestBuilder = MockMvcRequestBuilders.put("/subscriptions")
                 .accept(MediaType.APPLICATION_JSON).content(jsonArray.getJSONObject(0).toString())
                 .contentType(MediaType.APPLICATION_JSON);