1466-instantiate-csv-data-as-rdf: fix parsing for various conditions, and added tests

Author: qhouyee

stack-clients/src/main/java/com/cmclinnovations/stack/clients/utils/YarrrmlFile.java

@@ -190,8 +190,9 @@ private void updateMappings(AliasMap<Object> output) {
                 newSubjectMap.put(TARGETS_KEY, TARGET_REF_KEY);
             }
             mappingValue.put(SUBJECT_KEY, newSubjectMap, SUBJECT_ALT_KEY, SUBJECT_ALT_TWO_KEY);
-
-            mappingValue.put(PRED_OBJ_KEY, updatePredObjMappings(mappingValue), PRED_OBJ_ALT_KEY);
+            if (mappingValue.containsKey(PRED_OBJ_KEY, PRED_OBJ_ALT_KEY)) {
+                mappingValue.put(PRED_OBJ_KEY, updatePredObjMappings(mappingValue), PRED_OBJ_ALT_KEY);
+            }
             ruleMappings.put(field, mappingValue);
         });
         output.put(MAPPING_KEY, ruleMappings, MAPPING_ALT_KEY, MAPPING_ALT_TWO_KEY);
@@ -249,17 +250,35 @@ private List<Object> updatePredObjMappings(AliasMap<Object> mappingObj) {
                 if (currentObjectsObj instanceof Map<?, ?>) {
                     AliasMap<Object> currentObjectsMap = this.castToAliasMap(currentObjectsObj);
                     this.updateFunctionMappingsIfPresent(currentObjectsMap);
+                } else if (currentObjectsObj instanceof List) {
+                    List<Object> currentObjList = this.castToListObject(currentObjectsObj);
+                    for (int j = 0; j < currentObjList.size(); j++) {
+                        AliasMap<Object> objectNode = this.castToAliasMap(currentObjList.get(j));
+                        this.updateConditionMappings(objectNode);
+                        currentObjList.set(j, objectNode);
+                    }
+                    currentPOMap.put(OBJ_KEY, currentObjList, OBJ_ALT_KEY,
+                            OBJ_ALT_TWO_KEY);
                 }
-                // All conditions are functions
-                if (currentPOMap.containsKey(CONDITION_KEY)) {
-                    AliasMap<Object> conditionMap = this.castToAliasMap(currentPOMap.get(CONDITION_KEY));
-                    this.updateFunctionMappingsIfPresent(conditionMap);
-                }
+
+                this.updateConditionMappings(currentPOMap);
             }
         }
         return predObjList;
     }
 
+    /**
+     * Updates the condition mappings, which will contain a function if present.
+     * 
+     * @param mapObj The mappings field object.
+     */
+    private void updateConditionMappings(AliasMap<Object> mapObj) {
+        if (mapObj.containsKey(CONDITION_KEY)) {
+            AliasMap<Object> conditionMap = this.castToAliasMap(mapObj.get(CONDITION_KEY));
+            this.updateFunctionMappingsIfPresent(conditionMap);
+        }
+    }
+
     /**
      * Recursively updates function mappings within a YARRRML-compliant data
      * structure.
@@ -276,16 +295,16 @@ private void updateFunctionMappingsIfPresent(AliasMap<Object> mapObj) {
         if (mapObj.containsKey(PARAMS_KEY, PARAMS_ALT_KEY)) {
             List<Object> paramObjs = this
                     .castToListObject(mapObj.get(PARAMS_KEY, PARAMS_ALT_KEY));
-            for (int j = 0; j < paramObjs.size(); j++) {
-                Object paramObj = paramObjs.get(j);
+            for (int i = 0; i < paramObjs.size(); i++) {
+                Object paramObj = paramObjs.get(i);
                 // Detected use of shortcut, transforming into long form
                 if (paramObj instanceof List) {
                     List<Object> paramList = this.castToListObject(paramObj);
                     if (paramList.size() == 2) {
                         Map<String, Object> transformedParam = new HashMap<>();
                         transformedParam.put("parameter", paramList.get(0).toString());
                         transformedParam.put(VALUE_KEY, paramList.get(1).toString());
-                        paramObjs.set(j, transformedParam);
+                        paramObjs.set(i, transformedParam);
                     }
                 } else if (paramObj instanceof Map<?, ?>) {
                     Object functionParamValue = this.castToAliasMap(paramObj).get(VALUE_KEY);

stack-clients/src/test/java/com/cmclinnovations/stack/clients/utils/YarrrmlFileTest.java

@@ -23,6 +23,8 @@ class YarrrmlFileTest {
         private static final String EXPECTED_THREE_FILE_NAME = "yml/expected/rules_functions.yml";
         private static final String TEST_FOUR_FILE_NAME = "yml/test/rules2_functions.yml";
         private static final String EXPECTED_FOUR_FILE_NAME = "yml/expected/rules2_functions.yml";
+        private static final String TEST_FIVE_FILE_NAME = "yml/test/rules_condition.yml";
+        private static final String EXPECTED_FIVE_FILE_NAME = "yml/expected/rules_condition.yml";
 
         @Test
         void testDefaultConstructor() {
@@ -85,6 +87,17 @@ void testAddRules_SuccessFunctionShorcutFormat() throws IOException, URISyntaxEx
                                 yarrrmlFile.getRules());
         }
 
+        @Test
+        void testAddRules_SuccessConditionFormat() throws IOException, URISyntaxException {
+                Path rulesFilePath = Paths.get(YarrrmlFileTest.class.getResource(TEST_FIVE_FILE_NAME).toURI());
+                YarrrmlFile yarrrmlFile = new YarrrmlFile();
+                yarrrmlFile.addRules(rulesFilePath, TEST_ENDPOINT);
+                Assertions.assertEquals(this.genExpectedYarrrmlContents(
+                                YarrrmlFileTest.class.getResource(EXPECTED_FIVE_FILE_NAME),
+                                rulesFilePath, TEST_ENDPOINT),
+                                yarrrmlFile.getRules());
+        }
+
         private AliasMap<Object> genExpectedYarrrmlContents(URL expectedFilePath, Path expectedSourceLocation,
                         String endpoint)
                         throws IOException, URISyntaxException {

stack-clients/src/test/resources/com/cmclinnovations/stack/clients/utils/yml/expected/rules_condition.yml

@@ -0,0 +1,46 @@
+prefixes:
+  rdfs: "http://www.w3.org/2000/01/rdf-schema#"
+  base: "https://theworldavatar.io/kg/"
+  grel: "http://users.ugent.be/~bjdmeest/function/grel.ttl#"
+
+mappings:
+  person-name:
+    sources: source-ref
+    po:
+    - p: base:hasValue
+      o: $(name)
+      condition:
+        function: idlab-fn:notEqual
+        parameters:
+        - parameter: grel:valueParameter
+          value: $(name)
+        - parameter: grel:valueParameter
+          value: ''
+    s:
+      value: base:person/name/$(id)
+      targets: target-ref
+  person:
+    sources: source-ref
+    s:
+      value: base:person/$(id)
+      targets: target-ref
+    po:
+    - p: base:hasName
+      o:
+      - mapping: person-name
+        condition:
+          function: idlab-fn:notEqual
+          parameters:
+          - parameter: grel:valueParameter
+            value: $(name)
+          - parameter: grel:valueParameter
+            value: ''
+sources:
+  source-ref:
+    referenceFormulation: csv
+    access: [source]
+targets:
+  target-ref:
+    serialization: turtle
+    type: sd
+    access: [target]

stack-clients/src/test/resources/com/cmclinnovations/stack/clients/utils/yml/test/rules_condition.yml

@@ -0,0 +1,27 @@
+prefixes:
+  rdfs: "http://www.w3.org/2000/01/rdf-schema#"
+  base: "https://theworldavatar.io/kg/"
+  grel: "http://users.ugent.be/~bjdmeest/function/grel.ttl#"
+
+mappings:
+  person:
+    s: base:person/$(id)
+    po:
+      - p: base:hasName
+        o:
+          - mapping: person-name
+            condition:
+              function: idlab-fn:notEqual
+              parameters:
+                - [grel:valueParameter, $(name)]
+                - [grel:valueParameter, ""]
+  person-name:
+    subject: base:person/name/$(id)
+    po:
+      - p: base:hasValue
+        o: $(name)
+        condition:
+          function: idlab-fn:notEqual
+          parameters:
+            - [grel:valueParameter, $(name)]
+            - [grel:valueParameter, ""]