fix handling of ER upstream response

Author: Vasile Baluta

pom.xml

@@ -245,31 +245,7 @@
 
     </dependencies>
     <build>
-        <plugins>
-		
-            <plugin>
-               	<groupId>org.eluder.coveralls</groupId>
-               	<artifactId>coveralls-maven-plugin</artifactId>
-    	       	<version>4.3.0</version>
-    		<configuration>
-        		<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
-    		</configuration>
-	    </plugin>
-	
-	    <plugin>
-    		<groupId>org.jacoco</groupId>
-    		<artifactId>jacoco-maven-plugin</artifactId>
-    		<version>0.7.6.201602180812</version>
-    		<executions>
-        		<execution>
-            			<id>prepare-agent</id>
-            			<goals>
-                			<goal>prepare-agent</goal>
-            			</goals>
-        		</execution>
-    		</executions>
-	   </plugin>
-		
+        <plugins>		          		
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

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

@@ -19,6 +19,7 @@
 import com.ericsson.ei.rules.RulesHandler;
 import com.ericsson.ei.rules.RulesObject;
 import com.fasterxml.jackson.databind.JsonNode;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,15 +108,21 @@ private void traverseTree(final JsonNode jsonArray, final String aggregatedObjec
             final String pathInAggregatedObject) {
 
         final JsonNode parent = jsonArray.get(0);
-        RulesObject rules = rulesHandler.getRulesForEvent(parent.toString());
-
-        String np = historyExtractionHandler.runHistoryExtraction(aggregatedObjectId, rules, parent.toString(),
-                pathInAggregatedObject);
+        JsonNode parentId = parent.at("/meta/id");
+        String np = pathInAggregatedObject;
+        if (!aggregatedObjectId.equals(parentId.textValue())) {
+            // parent event is not the same as the starting event so we can
+            // start collecting history
+            RulesObject rules = rulesHandler.getRulesForEvent(parent.toString());
+
+            np = historyExtractionHandler.runHistoryExtraction(aggregatedObjectId, rules, parent.toString(),
+                    pathInAggregatedObject);
+        }
         String prevNp = null;
         for (int i = 1; i < jsonArray.size(); i++) {
             if (jsonArray.get(i).isObject()) {
                 String event = jsonArray.get(i).toString();
-                rules = rulesHandler.getRulesForEvent(event);
+                RulesObject rules = rulesHandler.getRulesForEvent(event);
                 prevNp = historyExtractionHandler.runHistoryExtraction(aggregatedObjectId, rules, event,
                         pathInAggregatedObject);
             } else {

src/main/java/com/ericsson/ei/jmespath/JmesPathInterface.java

@@ -16,13 +16,13 @@
  */
 package com.ericsson.ei.jmespath;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import io.burt.jmespath.Expression;
 import io.burt.jmespath.JmesPath;
 import io.burt.jmespath.function.FunctionRegistry;
@@ -50,14 +50,16 @@ public JsonNode runRuleOnEvent(String rule, String input) {
         if (input == null) {
             input = "";
         }
-        Expression<JsonNode> expression = jmespath.compile(rule);
+
+        JsonNode result = null;
         ObjectMapper objectMapper = new ObjectMapper();
         try {
+            Expression<JsonNode> expression = jmespath.compile(rule);
             event = objectMapper.readValue(input, JsonNode.class);
+            result = expression.search(event);
         } catch (Exception e) {
             log.info(e.getMessage(), e);
         }
-        JsonNode result = expression.search(event);
 
         return result;
     }

src/main/java/com/ericsson/ei/jsonmerge/MergePrepare.java

@@ -209,10 +209,7 @@ public String getMergePath(String originObject, String mergeRule, boolean skipPa
         String stringObject = "";
         String stringRule = "";
         JSONObject objectJSONObject = null;
-        JsonNode objectJsonNode = null;
         try {
-            ObjectMapper objectmapper = new ObjectMapper();
-            objectJsonNode = objectmapper.readTree(originObject);
             objectJSONObject = new JSONObject(originObject);
             stringObject = objectJSONObject.toString();
             Object ruleJSONObject = new JSONObject(mergeRule);
@@ -249,10 +246,6 @@ public String getMergePath(String originObject, String mergeRule, boolean skipPa
             if (pos > 0)
                 ruleKey = ruleKey.substring(0, pos);
             try {
-                // Object object = objectJSONObject.get(ruleKey);
-                // Object object = objectJsonNode.get(ruleKey);
-                // Object object1 = objectJsonNode.path(ruleKey);
-                // Object object2 = objectJsonNode.at(ruleKey);
                 JsonNode jsonResult = jmesPathInterface.runRuleOnEvent(ruleKey, originObject);
                 if (!(jsonResult instanceof NullNode))
                     mergePath = ruleKey;

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

@@ -71,7 +71,7 @@ public String getDownstreamMergeRules() {
     }
 
     public String getHistoryExtractionRules() {
-        return rulesObject.get("HistoryExtractionRules").textValue();
+        return getTextValue("HistoryExtractionRules");
     }
 
     public String getHistoryPathRules() {
@@ -83,18 +83,18 @@ public String fetchProcessRules() {
     }
 
     public String getTextValue(String fieldName) {
-         JsonNode jsonNode = rulesObject.get(fieldName);
-         if (jsonNode != null)
-             return jsonNode.textValue();
-         return null;
+        JsonNode jsonNode = rulesObject.get(fieldName);
+        if (jsonNode != null)
+            return jsonNode.textValue();
+        return null;
     }
 
     public String getString(String fieldName) {
         JsonNode jsonNode = rulesObject.get(fieldName);
         if (jsonNode != null)
             return jsonNode.toString();
         return "";
-   }
+    }
 
     public boolean equals(Object other) {
         if (other instanceof RulesObject) {

src/test/resources/arrayAggregationUpstreamResult.json

@@ -1,3 +1,8 @@
+[{
+  "data":{"customData":[{"key":"Type","value":"Source"}],"name":"TestCompositionName","version":"TestCompositionVersion"},
+  "links":[{"target":"84e9dfe1-09f7-4002-83b9-1aff4b7844a2","type":"ELEMENT"}, {"target":"cdffc8e9-5ee5-45c5-9f0e-0e89cea51dcf","type":"ELEMENT"}],
+  "meta":{"id":"175f08ff-1e4b-4265-a0d4-36e744297dc3","time":1529405139338,"type":"EiffelCompositionDefinedEvent","version":"1.1.0"}
+},
 [
 {
   "data":{"customData":[],"gav":{"artifactId":"artifact id","groupId":"group id","version":"0.0.0a"}},
@@ -9,4 +14,5 @@
   "links":[],
   "meta":{"id":"cdffc8e9-5ee5-45c5-9f0e-0e89cea51dcf","time":1529405139319,"type":"EiffelArtifactCreatedEvent","version":"1.1.0"}
 }
+]
 ]