Merge branch 'message_bus_acknowledgement' into master

Author: vasile-baluta

.travis.yml

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

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

@@ -36,7 +36,6 @@ public void eventReceived(String event) {
         idRulesHandler.runIdRules(eventRules, event);
     }
 
-
     public void eventReceived(byte[] message) {
         log.info("Thread id " + Thread.currentThread().getId() + " spawned");
         String actualMessage = new String(message);

src/test/java/com/ericsson/ei/flowtests/FlowTest.java

@@ -3,11 +3,14 @@
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.util.ArrayList;
 
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
 public class FlowTest extends FlowTestBase {

src/test/java/com/ericsson/ei/flowtests/FlowTest2.java

@@ -6,6 +6,7 @@
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;