Extend wait times

prolong waiting time in tests

Author: vasile-baluta

.travis.yml

@@ -22,5 +22,4 @@ script:
 # It is also importan that the first test to be run is a Spring Boot Test since spring boot also downloads
 # another version of embedded mongo db so all Spring Boot tests will end up in a race condition also
   -  mvn -DsomeModule.test.includes="**/QueryServiceTest.java" test
-  -  mvn -DsomeModule.test.excludes="**/QueryServiceTest.java" test
- 
+  -  mvn -DsomeModule.test.excludes="**/QueryServiceTest.java" test 

docs/index.md

@@ -1,12 +1,16 @@
 
 # _Introduction_
 
-Eiffel Intelligence is a service that aggregates informations from different events of a flow with the purpose of notifying subscribers when content of interest has been collected from desired events. The aggregation is stored in a JSON bject. By flow we mean a chain of Eiffel events that are linked together directly or indirectly. 
+Eiffel Intelligence is a service that aggregates information from different events of a flow with the purpose of notifying subscribers when content of interest has been collected from desired flow events. The aggregation is stored in a JSON bject. By flow we mean a chain of Eiffel events that are linked together directly or indirectly. 
 
-Eiffel Intelligence uses a set of rules to define what information will be extracted from an Eiffel event in the flow and at what location to store this information in the aggregated object. Today only one rule set can be run in each instance and the reason is that in an Eiffel domain with million of events flowing we will have multiple extractions and checks for each rule set and multiple rule sets will require large machines and scalability problems.
+Eiffel Intelligence uses a set of rules to define what information will be extracted from an Eiffel event in the flow and at what location to store this information in the aggregated object. Today only one rule set can be run in each instance and the reason is that in an Eiffel domain with millions of events flowing we will have multiple extractions and checks for each rule set and multiple rule sets in same service will require large machines and more difficult optimization.
 
 Eiffel intelligence uses subscriptions to notify interested parties when several evens have occurred with desired content in each event aggregated in an aggregated object. Every time an aggregated object is updated we check whether any subscription is fulfilled by the curent state of the aggregated object. 
 
+[Under the hood](under_hood.md)
+
 [Rules](rules.md)
 
-[Subscriptions](subscription.md)
+[Subscriptions](subscriptions.md)
+
+[Starting Eiffel Intelligence](starting.md)

docs/starting.md

@@ -0,0 +1,4 @@
+# _Starting Eiffel Intelligence service_
+
+## _Prerequisites_
+

docs/under_hood.md

@@ -0,0 +1,7 @@
+# _Under the hood_
+
+A more detailed description of what it happens with an event is described on this page. 
+
+When the service is [started](starting.md) it will connect to configured Mongo DB instance and message bus. The message bus instance must be the same you use to publish the events to. If several message buses are used then it is needed to federate these into one more extra message bus and configure Eiffel Intelligence to use the federated message bus.
+
+When an event is received 

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

@@ -1,6 +1,8 @@
 
 package com.ericsson.ei.controller;
 
+import com.ericsson.ei.controller.model.RuleCheckBody;
+import com.ericsson.ei.controller.model.RulesCheckBody;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -16,6 +16,15 @@
 */
 package com.ericsson.ei.handlers;
 
+import com.ericsson.ei.jmespath.JmesPathInterface;
+import com.ericsson.ei.mongodbhandler.MongoDBHandler;
+import com.ericsson.ei.rules.RulesObject;
+import com.ericsson.ei.subscriptionhandler.SubscriptionHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mongodb.util.JSON;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,15 +35,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.ericsson.ei.jmespath.JmesPathInterface;
-import com.ericsson.ei.mongodbhandler.MongoDBHandler;
-import com.ericsson.ei.rules.RulesObject;
-import com.ericsson.ei.subscriptionhandler.SubscriptionHandler;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.mongodb.util.JSON;
-
 import lombok.Getter;
 import lombok.Setter;
 
@@ -87,10 +87,7 @@ public boolean insertObject(String aggregatedObject, RulesObject rulesObject, St
         }
 
         boolean result = mongoDbHandler.insertDocument(databaseName, collectionName, document.toString());
-        if (result)
-            eventToObjectMap.updateEventToObjectMapInMemoryDB(rulesObject, event, id);
-
-        subscriptionHandler.checkSubscriptionForObject(aggregatedObject, id);
+        postInsertActions(aggregatedObject, rulesObject, event, id, result);
         return result;
     }
 
@@ -99,9 +96,9 @@ public boolean insertObject(JsonNode aggregatedObject, RulesObject rulesObject,
     }
 
     /**
-     * This method uses previously locked in database aggregatedObject (lock was set
-     * in lockDocument method) and modifies this document with the new values and
-     * removes the lock in one query
+     * This method uses previously locked in database aggregatedObject (lock was
+     * set in lockDocument method) and modifies this document with the new
+     * values and removes the lock in one query
      * 
      * @param aggregatedObject
      *            String to insert in database
@@ -124,11 +121,16 @@ public boolean updateObject(String aggregatedObject, RulesObject rulesObject, St
         String condition = "{\"_id\" : \"" + id + "\"}";
         String documentStr = document.toString();
         boolean result = mongoDbHandler.updateDocument(databaseName, collectionName, condition, documentStr);
-        if (result) {
+        postInsertActions(aggregatedObject, rulesObject, event, id, result);
+        return result;
+    }
+
+    private void postInsertActions(String aggregatedObject, RulesObject rulesObject, String event, String id,
+            boolean performActions) {
+        if (performActions) {
             eventToObjectMap.updateEventToObjectMapInMemoryDB(rulesObject, event, id);
             subscriptionHandler.checkSubscriptionForObject(aggregatedObject, id);
         }
-        return result;
     }
 
     public boolean updateObject(JsonNode aggregatedObject, RulesObject rulesObject, String event, String id) {
@@ -188,7 +190,8 @@ public String extractObjectId(JsonNode aggregatedDbObject) {
 
     /**
      * Locks the document in database to achieve pessimistic locking. Method
-     * findAndModify is used to optimize the quantity of requests towards database.
+     * findAndModify is used to optimize the quantity of requests towards
+     * database.
      * 
      * @param id
      *            String to search

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

@@ -209,14 +209,14 @@ private long countProcessedEvents(String database, String collection) {
         return table.count();
     }
 
-    private void waitForEventsToBeProcessed(int eventsCount) {
+    protected void waitForEventsToBeProcessed(int eventsCount) {
         // wait for all events to be processed
         long processedEvents = 0;
         while (processedEvents < eventsCount) {
             processedEvents = countProcessedEvents(database, event_map);
             LOGGER.info("Have gotten: " + processedEvents + " out of: " + eventsCount);
             try {
-                TimeUnit.MILLISECONDS.sleep(3000);
+                TimeUnit.MILLISECONDS.sleep(10000);
             } catch (InterruptedException e) {
                 LOGGER.error(e.getMessage(), e);
             }

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

@@ -23,6 +23,17 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
+import com.ericsson.ei.erqueryservice.ERQueryService;
+import com.ericsson.ei.erqueryservice.SearchOption;
+import com.ericsson.ei.handlers.ObjectHandler;
+import com.ericsson.ei.handlers.UpStreamEventsHandler;
+import com.ericsson.ei.rmqhandler.RmqHandler;
+import com.ericsson.ei.rules.RulesHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.rabbitmq.client.Channel;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,18 +58,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 
-import com.ericsson.ei.erqueryservice.ERQueryService;
-import com.ericsson.ei.erqueryservice.SearchOption;
-import com.ericsson.ei.handlers.ObjectHandler;
-import com.ericsson.ei.handlers.UpStreamEventsHandler;
-import com.ericsson.ei.rmqhandler.RmqHandler;
-import com.ericsson.ei.rules.RulesHandler;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.mongodb.client.MongoCollection;
-import com.rabbitmq.client.Channel;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @TestExecutionListeners(listeners = { DependencyInjectionTestExecutionListener.class, TrafficGeneratedTest.class })
 @SpringBootTest
@@ -92,7 +91,7 @@ public class TrafficGeneratedTest extends FlowTestBase {
     private String database;
     @Value("${event_object_map.collection.name}")
     private String event_map;
-    
+
     @Before
     public void before() throws IOException {
         MockitoAnnotations.initMocks(this);
@@ -196,17 +195,6 @@ List<String> getEventNamesToSend() {
         return eventNames;
     }
 
-    private void waitForEventsToBeProcessed(int eventsCount) throws InterruptedException {
-        // wait for all events to be processed
-        long processedEvents = 0;
-        MongoCollection eventMap = getFlowTestConfigs().getMongoClient().getDatabase(database).getCollection(event_map);
-        while (processedEvents < eventsCount) {
-            processedEvents = eventMap.count();
-        }
-        LOGGER.debug("Have gotten: " + processedEvents + " out of: " + eventsCount);
-        TimeUnit.MILLISECONDS.sleep(2000);
-    }
-
     private void checkResult() throws IOException, JSONException {
         String expectedDocument = FileUtils.readFileToString(new File(AGGREGATED_OBJECT_FILE_PATH), "UTF-8");
         ObjectMapper objectmapper = new ObjectMapper();