Added Eiffel Versions to Extraction rules files. (#271)

Author: tobiasake

src/integrationtests/java/com/ericsson/ei/integrationtests/ArtifactFlowRunnerIT.java

@@ -21,7 +21,7 @@ public static void before() {
         System.setProperty("missedNotificationCollectionName", "missed_notification_artifact_flow");
         System.setProperty("sessions.collection.name", "sessions_artifact_flow");
 
-        System.setProperty("rules.path", "/ArtifactRules.json");
+        System.setProperty("rules.path", "/rules/ArtifactRules-Eiffel-Agen-Version.json");
         System.setProperty("rabbitmq.consumerName", "artifact_queue");
     }
 }

src/integrationtests/java/com/ericsson/ei/integrationtests/SourceChangeFlowRunnerIT.java

@@ -21,7 +21,7 @@ public static void before() {
         System.setProperty("missedNotificationCollectionName", "missed_notification_source_change_flow");
         System.setProperty("sessions.collection.name", "sessions_source_change_flow");
 
-        System.setProperty("rules.path", "/SourceChangeObjectRules.json");
+        System.setProperty("rules.path", "/rules/SourceChangeObjectRules-Eiffel-Agen-Version.json");
         System.setProperty("rabbitmq.consumerName", "source_change_queue");
     }
 }

src/integrationtests/java/com/ericsson/ei/integrationtests/TestExecutionRunnerIT.java

@@ -21,7 +21,7 @@ public static void before() {
         System.setProperty("missedNotificationCollectionName", "missed_notification_test_execution_change_flow");
         System.setProperty("sessions.collection.name", "sessions_test_execution_flow");
 
-        System.setProperty("rules.path", "/TestExecutionObjectRules.json");
+        System.setProperty("rules.path", "/rules/TestExecutionObjectRules-Eiffel-Agen-Version.json");
         System.setProperty("rabbitmq.consumerName", "test_execution_queue");
     }
 }

src/integrationtests/resources/features/ArtifactFlowIT.feature

@@ -23,7 +23,7 @@ Feature: Artifact flow Integrationtest
     on mail subscriptions
 
     # Setup Eiffel Intelligence
-    Given the rules "src/main/resources/ArtifactRules.json"
+    Given the rules "src/main/resources/rules/ArtifactRules-Eiffel-Agen-Version.json"
     And the events "src/test/resources/ArtifactFlowTestEvents.json"
     And the resulting aggregated object "src/test/resources/AggregatedDocumentInternalCompositionLatestIT.json";
     And the upstream input "src/test/resources/upStreamInput.json"

src/integrationtests/resources/features/SourceChangeFlowIT.feature

@@ -23,7 +23,7 @@ Feature: Source change flow integrationtest
     REST-POST subscriptions using buildWithParameters and JMESPATH extracted correct 
     data to add to parameter
 
-    Given the rules "src/main/resources/SourceChangeObjectRules.json"
+    Given the rules "src/main/resources/rules/SourceChangeObjectRules-Eiffel-Agen-Version.json"
     And the events "src/test/resources/TestSourceChangeObjectEvents.json"
     And the upstream input "src/test/resources/UpstreamEventsForSourceChange.json"
     And the resulting aggregated object "src/test/resources/aggregatedSourceChangeObject.json";
@@ -55,7 +55,7 @@ Feature: Source change flow integrationtest
     REST-POST subscriptions using buildWithParameters and JMESPATH extracted correct 
     data to add to parameter
 
-    Given the rules "src/main/resources/SourceChangeObjectRules.json"
+    Given the rules "src/main/resources/rules/SourceChangeObjectRules-Eiffel-Agen-Version.json"
     And the events "src/test/resources/TestSourceChangeObjectEvents.json"
     And the upstream input "src/test/resources/UpstreamEventsForSourceChange.json"
     And the resulting aggregated object "src/test/resources/aggregatedSourceChangeObject.json";

src/integrationtests/resources/features/TestExecutionFlowIT.feature

@@ -24,7 +24,7 @@ Feature: Test execution flow integrationtest
     data to add to parameter
 
     # Setup Eiffel Intelligence
-    Given the rules "src/main/resources/TestExecutionObjectRules.json"
+    Given the rules "src/main/resources/rules/TestExecutionObjectRules-Eiffel-Agen-Version.json"
     And the events "src/test/resources/TestExecutionTestEvents.json"
     And the resulting aggregated object "src/test/resources/aggregatedTestActivityObject.json";
     Then the expected aggregated object ID is "e46ef12d-25gb-4d7y-b9fd-8763re66de47"
@@ -55,7 +55,7 @@ Feature: Test execution flow integrationtest
     data to add as a json parameter in the body. This with multiple parameters.
 
     # Setup Eiffel Intelligence
-    Given the rules "src/main/resources/TestExecutionObjectRules.json"
+    Given the rules "src/main/resources/rules/TestExecutionObjectRules-Eiffel-Agen-Version.json"
     And the events "src/test/resources/TestExecutionTestEvents.json"
     And the resulting aggregated object "src/test/resources/aggregatedTestActivityObject.json";
     Then the expected aggregated object ID is "e46ef12d-25gb-4d7y-b9fd-8763re66de47"

src/main/resources/ArtifactRules.json

@@ -7,12 +7,12 @@
     "StartEvent": "YES",
     "IdentifyRules" : "[meta.id]",
     "MatchIdRules": {"_id": "%IdentifyRules_objid%"},
-    "ExtractionRules" : "{ id : meta.id, type : meta.type, time : meta.time, identity : data.identity, fileInformation : data.fileInformation, buildCommand : data.buildCommand }",
+    "ExtractionRules" : "{ id : meta.id, type : meta.type, time : meta.time, gav : data.gav, fileInformation : data.fileInformation, buildCommand : data.buildCommand }",
     "DownstreamIdentifyRules" : "links | [?type=='COMPOSITION'].target",
     "DownstreamMergeRules": "{\"externalComposition\":{\"eventId\":%IdentifyRules%}}",
     "DownstreamExtractionRules" : "{artifacts: [{id : meta.id}]}",
     "HistoryIdentifyRules":"links | [?type=='COMPOSITION'].target",
-    "HistoryExtractionRules":"{id : meta.id, identity : data.identity, fileInformation : data.fileInformation}",
+    "HistoryExtractionRules":"{id : meta.id, gav : data.gav, fileInformation : data.fileInformation}",
     "HistoryPathRules": "{artifacts: [{id: meta.id}]}",
     "ProcessRules" : null
   },

src/main/resources/application.properties

@@ -9,7 +9,7 @@ build.version=
 server.port: 8090
 
 # path to files with rules for aggregating objects
-rules.path: /ArtifactRules.json
+rules.path: /rules/ArtifactRules-Eiffel-Agen-Version.json
 
 # logging levels can be set with the flag below for the top packages
 # deactivated by default because Travis will fail due to log file size.