rebase from master (#6)

* Implement Subscription Handler (#8)

* [DURACI-6697]-Implement Subscription Handler

* fix use of embeded mongo db

* fix mongodbhandler for test

* Implemented Review comments

* Fixed PathVariable annotations for input parameters in RestApi.

* Fixed PathVariable annotations for input parameters in RestApi. (#9)

* Added a fix for Block Origin in webbrowsers while accessing EI RestApi.

* Implement Historical ER Query Service (#6)

*Implement historical Event Repository query Service

* add posibility to query downstream and upstreamfrom ER and test for ER query method

* modify unit test

* Fix updateSubscription RestApi issue that prevented subscription to b… (#11)

* 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.

* Messagebus ack (#12)

* Fixed issue with multiprocessing and added acknowledgement

* 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.

* Test for measure performance EI is added (TrafficGeneratedTest). (#15)

* Test for measure performance EI is added (TrafficGeneratedTest). Number of packages of events (7 events in package) you can add in variable EVENT_PACKAGES. ALL, DEBUG, ERROR, FATAL, INFO, TRACE, WARN parametres are added to a jar file at the time of execution for start EI with logs. No parameters start EI without logs. /// Ex. with logs: java -jar /path/file.jar INFO Ex. without logs: java -jar /path/file.jar /// File ArtifactRules_new.json is modified - added posibility to send SourceChangeCreatedEvent and SourceChangeSubmittedEvent without error.

* problem with rules.path fixed

Author: vasile-baluta

.travis.yml

@@ -13,6 +13,7 @@ before_install:
   - chmod +x pom.xml
 
 script:
-  - mvn -DsomeModule.test.excludes="**/FlowTest.java, **/FlowTest2.java" test
+  - mvn -DsomeModule.test.excludes="**/FlowTest.java, **/FlowTest2.java, **/TrafficGeneratedTest.java" test
   - mvn -DsomeModule.test.includes="**/FlowTest.java" test
   - mvn -DsomeModule.test.includes="**/FlowTest2.java" test
+  - mvn -DsomeModule.test.includes="**/TrafficGeneratedTest.java" test

src/main/java/com/ericsson/ei/App.java

@@ -5,12 +5,30 @@
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 @SpringBootApplication
 @EnableAsync
 @EnableScheduling
 public class App {
 
     public static void main(String[] args) {
+
+        List<String> logLevels = new ArrayList<>();
+        Collections.addAll(logLevels, "ALL", "DEBUG", "ERROR", "FATAL", "INFO", "TRACE", "WARN");
+
+        if(logLevels.contains(args[0])) {
+            System.setProperty("logging.level.root", args[0]);
+            System.setProperty("logging.level.org.springframework.web", args[0]);
+            System.setProperty("logging.level.com.ericsson.ei", args[0]);
+        } else {
+            System.setProperty("logging.level.root", "OFF");
+            System.setProperty("logging.level.org.springframework.web", "OFF");
+            System.setProperty("logging.level.com.ericsson.ei", "OFF");
+        }
+
         SpringApplication.run(App.class, args);
     }
 

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

@@ -44,7 +44,7 @@ public class SubscriptionControllerImpl implements SubscriptionController {
     @ApiOperation(value = "Creates the subscription")
     public ResponseEntity<SubscriptionResponse> createSubscription(@RequestBody Subscription subscription) {
         SubscriptionResponse subscriptionResponse = new SubscriptionResponse();
-        if (!subscriptionService.isDuplicatedSubscription(subscription.getSubscriptionName())) {
+        if (!subscriptionService.doSubscriptionExist(subscription.getSubscriptionName())) {
             subscriptionService.addSubscription(subscription);
             LOG.info("Subscription :" + subscription.getSubscriptionName() + " Inserted Successfully");
             subscriptionResponse.setMsg("Inserted Successfully"); subscriptionResponse.setStatusCode(HttpStatus.OK.value());
@@ -75,20 +75,21 @@ 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.isDuplicatedSubscription(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());
             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());
+            LOG.error("Subscription :" + subscription.getSubscriptionName() + " can't be found.");
+            subscriptionResponse.setMsg("Subscription can't be found"); subscriptionResponse.setStatusCode(HttpStatus.BAD_REQUEST.value());
             return new ResponseEntity<SubscriptionResponse>(subscriptionResponse, HttpStatus.BAD_REQUEST);
         }
 

src/main/java/com/ericsson/ei/handlers/EventHandler.java

@@ -36,17 +36,37 @@ public void eventReceived(String event) {
         idRulesHandler.runIdRules(eventRules, event);
     }
 
+    @Bean
+    public Executor asyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(corePoolSize);
+        executor.setQueueCapacity(queueCapacity);
+        executor.setMaxPoolSize(maxPoolSize);
+        executor.setThreadNamePrefix("EventHandler-");
+        executor.initialize();
+        return executor;
+    }
+
     public void eventReceived(byte[] message) {
         log.info("Thread id " + Thread.currentThread().getId() + " spawned");
         String actualMessage = new String(message);
         log.info("Event received <" + actualMessage + ">");
         eventReceived(actualMessage);
-        if (System.getProperty("flow.test") == "true") {
-            String countStr = System.getProperty("eiffel.intelligence.processedEventsCount");
-            int count = Integer.parseInt(countStr);
-            count++;
-            System.setProperty("eiffel.intelligence.processedEventsCount", "" + count);
-        }
+//        if (System.getProperty("flow.test") == "true") {
+//            String countStr = System.getProperty("eiffel.intelligence.processedEventsCount");
+//            int count = Integer.parseInt(countStr);
+//            count++;
+//            System.setProperty("eiffel.intelligence.processedEventsCount", "" + count);
+//        }
+    }
+
+    @Async
+    public void onMessage(Message message, Channel channel) throws Exception {
+        byte[] messageBody = message.getBody();
+        eventReceived(messageBody);
+        long deliveryTag = message.getMessageProperties().getDeliveryTag();
+        channel.basicAck(deliveryTag, false);
+        int breakHere = 1;
     }
 
     @Async

src/main/java/com/ericsson/ei/rmqhandler/EIMessageListenerAdapter.java

@@ -18,6 +18,7 @@ public void onMessage(Message message, Channel channel) throws Exception {
         if (delegate != this) {
             if (delegate instanceof EventHandler) {
                 if (channel != null) {
+                    channel.basicQos(150);
                     ((EventHandler) delegate).onMessage(message, channel);
                     return;
                 }

src/main/java/com/ericsson/ei/rmqhandler/RmqHandler.java

@@ -52,7 +52,6 @@ public class RmqHandler {
     private String routingKey;
     @Value("${rabbitmq.consumerName}")
     private String consumerName;
-    // SimpleMessageListenerContainer container;
     private RabbitTemplate rabbitTemplate;
     private CachingConnectionFactory factory;
     private SimpleMessageListenerContainer container;
@@ -230,6 +229,7 @@ public void confirm(CorrelationData correlationData, boolean ack, String cause)
 
     public void publishObjectToWaitlistQueue(String message) {
         log.info("publishing message to message bus...");
+        //rabbitMqTemplate().convertAndSend(message);
         waitListRabbitMqTemplate().convertAndSend(message);
     }
 

src/main/java/com/ericsson/ei/rules/RulesHandler.java

@@ -1,10 +1,9 @@
 package com.ericsson.ei.rules;
 
-import java.io.File;
+import java.io.*;
 import java.util.Iterator;
 
 import org.apache.commons.io.FileUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +29,12 @@ public class RulesHandler {
     @PostConstruct public void init() {
         if (parsedJason == null) {
             try {
-                jsonFileContent = FileUtils.readFileToString(new File(jsonFilePath));
+                InputStream in = this.getClass().getResourceAsStream(jsonFilePath);
+                if(in == null) {
+                    jsonFileContent = FileUtils.readFileToString(new File(jsonFilePath));
+                } else {
+                    jsonFileContent = getContent(in);
+                }
                 ObjectMapper objectmapper = new ObjectMapper();
                 parsedJason = objectmapper.readTree(jsonFileContent);
             } catch (Exception e) {
@@ -48,7 +52,6 @@ public RulesObject getRulesForEvent(String event) {
         JsonNode type;
         JsonNode result;
         Iterator<JsonNode> iter = parsedJason.iterator();
-
         while(iter.hasNext()) {
             JsonNode rule = iter.next();
             typeRule = rule.get("TypeRule").toString();
@@ -66,4 +69,21 @@ public RulesObject getRulesForEvent(String event) {
         return null;
     }
 
-}
+    private String getContent(InputStream inputStream){
+        try {
+
+
+            ByteArrayOutputStream result = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int length;
+            while ((length = inputStream.read(buffer)) != -1) {
+                result.write(buffer, 0, length);
+            }
+            return result.toString("UTF-8");}
+        catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+}

src/main/java/com/ericsson/ei/services/ISubscriptionService.java

@@ -47,11 +47,11 @@ public interface ISubscriptionService {
     boolean deleteSubscription(String name);
 
     /**
-     * isDuplicatedSubscription method checks the is there any Subscription By Subscription Name
+     * doSubscriptionExist method checks the is there any Subscription By Subscription Name
      * @param name
      * @return true when Subscription available with same name. Otherwise returns false.
      */
-    boolean isDuplicatedSubscription(String name);
+    boolean doSubscriptionExist(String name);
 
 
 }

src/main/java/com/ericsson/ei/services/SubscriptionService.java

@@ -56,7 +56,7 @@ public Subscription getSubscription(String name) throws SubscriptionNotFoundExce
     }
 
     @Override
-    public boolean isDuplicatedSubscription(String name) {
+    public boolean doSubscriptionExist(String name) {
         String query = String.format(SUBSCRIPTION_NAME, name);
         ArrayList<String> list = subscriptionRepository.getSubscription(query);
         if (list.isEmpty()) {