Merge branch 'master' into master

Author: vasile-baluta

pom.xml

@@ -107,6 +107,7 @@
             <artifactId>commons-io</artifactId>
             <version>1.3.2</version>
         </dependency>
+
         <!-- <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId>
             <version>1.7.25</version> </dependency> -->
 
@@ -176,7 +177,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
 
-            <!-- PhoenixNAP RAML Code Generator plugin used to generate sources
+            <!-- PhoenixNAP RAML Code Generator plugin used to generate sources 
                 from raml -->
             <plugin>
                 <groupId>com.phoenixnap.oss</groupId>

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

@@ -85,6 +85,7 @@ public ResponseEntity<List<Subscription>> getSubscriptionById(@PathVariable Stri
     }
 
     @Override
+
     //@CrossOrigin
     @ApiOperation(value = "Update the existing subscription by the subscription name")
     public ResponseEntity<SubscriptionResponse> updateSubscriptions(@RequestBody Subscription subscription) {

src/main/java/com/ericsson/ei/erqueryservice/ERQueryService.java

@@ -1,4 +1,5 @@
 /*
+
    Copyright 2017 Ericsson AB.
    For a full list of individual contributors, please see the commit history.
 

src/main/java/com/ericsson/ei/subscriptionhandler/InformSubscription.java

@@ -96,6 +96,7 @@ public void informSubscriber(String aggregatedObject, JsonNode subscriptionJson)
                     if (result == HttpStatus.OK.value())
                         break;
                 }
+
                 if (result != HttpStatus.OK.value() && result != HttpStatus.CREATED.value() && result != HttpStatus.NO_CONTENT.value()) {
                     String input = prepareMissedNotification(aggregatedObject, subscriptionName, notificationMeta);
                     log.info("Input missed Notification document : " + input);

src/main/java/com/ericsson/ei/subscriptionhandler/RunSubscription.java

@@ -91,7 +91,6 @@ public boolean runSubscriptionOnObject(String aggregatedObject, ArrayNode fulfil
      * @param aggregatedObject
      * @return JsonNode
      */
-
     public ArrayNode checkRequirementType(Iterator<JsonNode> requirementIterator, String aggregatedObject) {
         ArrayNode fulfilledRequirements = new ObjectMapper().createArrayNode();
         ;
@@ -104,19 +103,13 @@ public ArrayNode checkRequirementType(Iterator<JsonNode> requirementIterator, St
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
-
-
-
         while (requirementIterator.hasNext()) {
             requirement = requirementIterator.next();
             log.info("Requirements : " + requirement.toString());
             fulfilledRequirements.add(requirement);
         }
 
         return fulfilledRequirements;
-
-
-
     }
 
 }

src/main/java/com/ericsson/ei/subscriptionhandler/SubscriptionHandler.java

@@ -106,11 +106,6 @@ public void extractConditions(String aggregatedObject, String subscriptionData)
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
-
-
-
-
-
         ArrayNode requirementNode = (ArrayNode) subscriptionJson.get("requirements");
         log.info("RequirementNode : " + requirementNode.toString());
         Iterator<JsonNode> requirementIterator = requirementNode.elements();
@@ -123,7 +118,6 @@ public void extractConditions(String aggregatedObject, String subscriptionData)
             }
         } else
             log.info("The subscription conditions did not match for the aggregatedObject");
-
     }
 
     /**

src/main/resources/application.properties

@@ -48,4 +48,4 @@ email.subject: Email Subscription Notification
 notification.failAttempt: 3
 notification.ttl.value: 600
 
-er.url: http://localhost:8080/search/
+er.url: http://localhost:8080/search/

src/test/java/com/ericsson/ei/subscriptionhandler/test/SubscriptionHandlerTest.java

@@ -97,7 +97,6 @@ public void initMocks() {
         System.out.println("Database connected");
     }
 
-
     @Test
     public void checkRequirementTypeTest() {
         ObjectMapper mapper = new ObjectMapper();
@@ -117,7 +116,6 @@ public void checkRequirementTypeTest() {
         assertEquals(output.toString(), expectedOutput.toString());
     }
 
-
     @Test
     public void runSubscriptionOnObjectTest() {
         ObjectMapper mapper = new ObjectMapper();
@@ -134,7 +132,6 @@ public void runSubscriptionOnObjectTest() {
         assertEquals(output, true);
     }
 
-
     @Test
     public void MissedNotificationTest() {
         handler.extractConditions(aggregatedObject, subscriptionData);