Fix aggregate git identifier rules (#187)

Author: erik-edling

src/functionaltests/resources/queryAggregatedObject5.json

@@ -4,5 +4,5 @@
      "aggregatedObject.gav.artifactId":"sub-system",
      "aggregatedObject.gav.version":"1.1.0"
 	},
-  "filter" : "incomplete_path_filter(@, 'svnIdentifier')"
-}
+  "filter" : "incomplete_path_filter(@, 'gitIdentifier')"
+}

src/main/resources/ArtifactRules_new.json

@@ -125,7 +125,7 @@
     "ExtractionRules" : "",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules": "",
-    "HistoryExtractionRules": "{SCCEventId: meta.id, author:data.author, issues:data.issues}",
+    "HistoryExtractionRules": "{SCCEventId: meta.id, gitIdentifier:data.gitIdentifier, author:data.author, issues:data.issues}",
     "HistoryPathRules": "{sourceCreations: [{SCCEventId: meta.id}]}",
     "ProcessRules":null,
     "ProcessFunction" : null
@@ -141,9 +141,9 @@
     "ExtractionRules" : "",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules":"links | [?type=='CHANGE'].target",
-    "HistoryExtractionRules": "{SCSEventId: meta.id,svnIdentifier:data.svnIdentifier, submitter:data.submitter}",
+    "HistoryExtractionRules": "{SCSEventId: meta.id,gitIdentifier:data.gitIdentifier, submitter:data.submitter}",
     "HistoryPathRules": "{sourceChanges: [{SCSEventId: meta.id}]}",
     "ProcessRules":null,
     "ProcessFunction" : null
   }
-]
+]

src/test/java/com/ericsson/ei/jmespath/test/TestIncompleteJmesPathFilter.java

@@ -19,7 +19,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.BeforeClass;
@@ -68,8 +67,8 @@ public void testFilterObjectWithKey() throws Exception {
 
     @Test
     public void testFilterObjectWithManyKeys() throws Exception {
-        String expectedResult = "{\"time\":\"[1481875921843, 1481875988767, 1481875921763, 1481875944272, 5005, 1481875891763, 2000]\",\"svnIdentifier\":\"null\"}";
-        String processRule = "{time : incomplete_path_filter(@, 'time'), svnIdentifier : incomplete_path_filter(@, 'svnIdentifier')}";
+        String expectedResult = "{\"time\":\"[1481875921843, 1481875988767, 1481875921763, 1481875944272, 5005, 1481875891763, 2000]\",\"gitIdentifier\":\"null\"}";
+        String processRule = "{time : incomplete_path_filter(@, 'time'), gitIdentifier : incomplete_path_filter(@, 'gitIdentifier')}";
         JsonNode result = unitUnderTest.runRuleOnEvent(processRule, jsonInput);
         assertEquals(result.toString(), expectedResult);
     }

src/test/resources/AggregatedDocumentInternalCompositionLatest.json

@@ -41,7 +41,7 @@
                                        "email":"jane.doe@company.com"
                                     },
                                     "SCSEventId":"3ce9df6e-cd45-4320-ae66-945f038caa1b",
-                                    "svnIdentifier":null,
+                                    "gitIdentifier":null,
                                     "sourceCreations":[
                                        {
                                           "SCCEventId":"ac085e24-ac4c-41be-912d-08c7afd32285",
@@ -197,4 +197,4 @@
          }
       ]
    }
-}
+}

src/test/resources/ArtifactRules_new.json

@@ -125,7 +125,7 @@
     "ExtractionRules" : "",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules": "",
-    "HistoryExtractionRules": "{SCCEventId: meta.id, author:data.author, issues:data.issues}",
+    "HistoryExtractionRules": "{SCCEventId: meta.id, gitIdentifier:data.gitIdentifier, author:data.author, issues:data.issues}",
     "HistoryPathRules": "{sourceCreations: [{SCCEventId: meta.id}]}",
     "ProcessRules":null,
     "ProcessFunction" : null
@@ -141,9 +141,9 @@
     "ExtractionRules" : "",
     "ArrayMergeOptions": "",
     "HistoryIdentifyRules":"links | [?type=='CHANGE'].target",
-    "HistoryExtractionRules": "{SCSEventId: meta.id,svnIdentifier:data.svnIdentifier, submitter:data.submitter}",
+    "HistoryExtractionRules": "{SCSEventId: meta.id,gitIdentifier:data.gitIdentifier, submitter:data.submitter}",
     "HistoryPathRules": "{sourceChanges: [{SCSEventId: meta.id}]}",
     "ProcessRules":null,
     "ProcessFunction" : null
   }
-]
+]

src/test/resources/RulesHandlerOutput.json

@@ -9,7 +9,7 @@
    "ExtractionRules":"",
    "ArrayMergeOptions":"",
    "HistoryIdentifyRules":"",
-   "HistoryExtractionRules":"{SCCEventId: meta.id, author:data.author, issues:data.issues}",
+   "HistoryExtractionRules":"{SCCEventId: meta.id, gitIdentifier:data.gitIdentifier, author:data.author, issues:data.issues}",
    "HistoryPathRules":"{sourceCreations: [{SCCEventId: meta.id}]}",
    "ProcessRules":null,
    "ProcessFunction":null

src/test/resources/test_events.json

@@ -312,11 +312,11 @@
             }
         },
         "data": {
-            "svnIdentifier": {
+            "gitIdentifier": {
                 "revision": 42,
                 "directory": "trunk",
                 "repoName": "Mainline",
-                "repoUri": "svn://repohost/mainline"
+                "repoUri": "https://github.com/johndoe/myPrivateRepo.git"
             },
             "submitter": {
                 "name": "Jane Doe",