Merge branch 'master' into master

Author: tobiasake

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

@@ -17,6 +17,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -29,6 +30,7 @@
 import io.swagger.annotations.ApiOperation;
 
 @Component
+@CrossOrigin
 @Api(value = "subscription", description = "The Subscription API for the store and retrieve the subscriptions from the database")
 public class SubscriptionControllerImpl implements SubscriptionController {
 
@@ -38,6 +40,7 @@ public class SubscriptionControllerImpl implements SubscriptionController {
     private static final Logger LOG = LoggerFactory.getLogger(SubscriptionControllerImpl.class);
 
     @Override
+    @CrossOrigin
     @ApiOperation(value = "Creates the subscription")
     public ResponseEntity<SubscriptionResponse> createSubscription(@RequestBody Subscription subscription) {
         SubscriptionResponse subscriptionResponse = new SubscriptionResponse();
@@ -55,6 +58,7 @@ 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;
@@ -71,6 +75,7 @@ public ResponseEntity<Subscription> getSubscriptionById(@PathVariable String sub
     }
 
     @Override
+    @CrossOrigin
     @ApiOperation(value = "Update the existing subscription by the subscription name")
     public ResponseEntity<SubscriptionResponse> updateSubscriptionById(@PathVariable String subscriptionName, @RequestBody Subscription subscription) {
         LOG.info("Subscription :" + subscriptionName + " update started");
@@ -90,6 +95,7 @@ public ResponseEntity<SubscriptionResponse> updateSubscriptionById(@PathVariable
     }
 
     @Override
+    @CrossOrigin
     @ApiOperation(value = "Removes the subscription from the database")
     public ResponseEntity<SubscriptionResponse> deleteSubscriptionById(@PathVariable String subscriptionName) {
         SubscriptionResponse subscriptionResponse = new SubscriptionResponse();
@@ -107,6 +113,7 @@ public ResponseEntity<SubscriptionResponse> deleteSubscriptionById(@PathVariable
     }
 
     @Override
+    @CrossOrigin
     @ApiOperation(value = "Retrieve all the subscriptions")
     public ResponseEntity<List<Subscription>> getSubscriptions() {
         LOG.info("Subscription : get all records started");