multiple mappings per path possible

Author: nr23730

src/main/java/de/uksh/medic/etl/OpenEhrObds.java

@@ -108,9 +108,7 @@ public static void main(String[] args) throws IOException {
             mapper = jm;
         }
 
-        Settings.getMapping().values().forEach(m -> {
-            initializeAttribute(m, jm);
-        });
+        Settings.getMapping().values().forEach(m -> m.forEach(n -> initializeAttribute(n, jm)));
 
         Logger.info("OpenEhrObds started!");
 
@@ -173,13 +171,13 @@ public static void main(String[] args) throws IOException {
 
     private static void initializeAttribute(Mapping m, ObjectMapper mapper) {
         if (m.getTemplateId() != null) {
-            OPERATIONALTEMPLATE template;
+            OPERATIONALTEMPLATE template = null;
             if (openEhrClient != null) {
                 Optional<OPERATIONALTEMPLATE> oTemplate = openEhrClient.templateEndpoint()
                         .findTemplate(m.getTemplateId());
-                assert oTemplate.isPresent();
-                template = oTemplate.get();
-            } else {
+                template = oTemplate.orElse(null);
+            }
+            if (template == null) {
                 try {
                     template = OPERATIONALTEMPLATE.Factory
                             .parse(new File(new File("templates"), m.getTemplateId() + ".opt"));
@@ -227,7 +225,7 @@ private static void initializeAttribute(Mapping m, ObjectMapper mapper) {
         }
     }
 
-    @SuppressWarnings({"unchecked", "IllegalCatch"})
+    @SuppressWarnings({ "unchecked", "IllegalCatch" })
     public static Map<String, Object> localMap(Set<Entry<String, Object>> xmlSet, String templateId, String path) {
         Binding b = new Binding();
         GroovyShell s = new GroovyShell(b);
@@ -265,52 +263,61 @@ public static void walkTree(Set<Entry<String, Object>> xmlSet, int depth, String
             return;
         }
 
-        boolean split = Settings.getMapping().containsKey(path) && Settings.getMapping().get(path).getSplit();
-        boolean global = Settings.getMapping().containsKey(path) && Settings.getMapping().get(path).getGlobal();
-        boolean update = Settings.getMapping().containsKey(path) && Settings.getMapping().get(path).isUpdate();
-
         Map<String, Object> theMap = resMap;
 
-        if (Settings.getMapping().containsKey(path) && Settings.getMapping().get(path).getSource() != null) {
-            Mapping m = Settings.getMapping().get(path);
+        if (Settings.getMapping().containsKey(path) && Settings.getMapping().get(path) != null
+                && !Settings.getMapping().get(path).isEmpty()) {
 
-            Map<String, Object> mapped = localMap(xmlSet, m.getTemplateId(), path);
-            if (mapped == null) {
-                return;
-            }
-            if (Settings.getCxxmdr() != null) {
-                mapped.putAll(convertMdr(xmlSet, m));
-            }
-            mapped.values().removeIf(Objects::isNull);
-            Utils.listConv(mapped);
-            if (Settings.getCxxmdr() != null) {
-                mapped.entrySet().forEach(e -> FhirUtils.queryFhirTs(FHIR_ATTRIBUTES, m, e, fr));
-            }
-            mapped.values().removeIf(Objects::isNull);
-            Map<String, Object> result = Utils.formatMap(mapped);
+            for (Mapping m : Settings.getMapping().get(path)) {
 
-            boolean done = ((List<Boolean>) result.getOrDefault("done", List.of(true))).get(0);
+                if (m.getSource() == null) {
+                    continue;
+                }
 
-            if (global || !done) {
-                Generator.deepMergeNoReplace(resMap, result);
-                theMap = resMap;
-            } else {
-                Generator.deepMergeNoReplace(result, resMap);
-                theMap = result;
-            }
+                boolean split = m.getSplit();
+                boolean global = m.getGlobal();
+                boolean update = m.isUpdate();
 
-            if (update && result.containsKey("delete")
-                    && Boolean.TRUE.equals(((List<Boolean>) result.get("delete")).getFirst())) {
-                Logger.info("Found DELETE entry, trying to delete composition...");
-                OpenEhrUtils.deleteOpenEhrComposition(openEhrClient, AQLS, m.getTemplateId(),
-                        ((List<String>) result.get("identifier")).getFirst());
-                return;
-            }
+                Map<String, Object> mapped = localMap(xmlSet, m.getTemplateId(), path);
+                if (mapped == null) {
+                    return;
+                }
+                if (Settings.getCxxmdr() != null) {
+                    mapped.putAll(convertMdr(xmlSet, m));
+                }
+                mapped.values().removeIf(Objects::isNull);
+                Utils.listConv(mapped);
+                if (Settings.getCxxmdr() != null) {
+                    mapped.entrySet().forEach(e -> FhirUtils.queryFhirTs(FHIR_ATTRIBUTES, m, e, fr));
+                }
+                mapped.values().removeIf(Objects::isNull);
+                Map<String, Object> result = Utils.formatMap(mapped);
+
+                boolean done = ((List<Boolean>) result.getOrDefault("done", List.of(true))).get(0);
+
+                if (global || !done) {
+                    Generator.deepMergeNoReplace(resMap, result);
+                    theMap = resMap;
+                } else {
+                    Generator.deepMergeNoReplace(result, resMap);
+                    theMap = result;
+                }
+
+                if (update && result.containsKey("delete")
+                        && Boolean.TRUE.equals(((List<Boolean>) result.get("delete")).getFirst())) {
+                    Logger.info("Found DELETE entry, trying to delete composition...");
+                    OpenEhrUtils.deleteOpenEhrComposition(openEhrClient, AQLS, m.getTemplateId(),
+                            ((List<String>) result.get("identifier")).getFirst());
+                    return;
+                }
+
+                if (split && done) {
+                    Logger.info("Building composition.");
+                    buildOpenEhrComposition(m.getTemplateId(), theMap);
+                }
 
-            if (split && done) {
-                Logger.info("Building composition.");
-                buildOpenEhrComposition(m.getTemplateId(), theMap);
             }
+
         }
 
         for (Entry<String, Object> entry : xmlSet) {

src/main/java/de/uksh/medic/etl/settings/Settings.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.net.URI;
 import java.net.URL;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,7 +21,7 @@ public final class Settings {
     private static String mode;
     private static CxxMdrSettings cxxmdr;
     private static KafkaSettings kafka;
-    private static Map<String, Mapping> mapping;
+    private static Map<String, List<Mapping>> mapping;
     private static int depthLimit;
     private static String systemId;
     private static boolean dev;
@@ -109,12 +110,12 @@ public void setKafkaSettings(KafkaSettings newKafka) {
         kafka = newKafka;
     }
 
-    public static Map<String, Mapping> getMapping() {
+    public static Map<String, List<Mapping>> getMapping() {
         return mapping;
     }
 
     @JsonProperty("mapping")
-    public void setMapping(Map<String, Mapping> newMapping) {
+    public void setMapping(Map<String, List<Mapping>> newMapping) {
         mapping = newMapping;
     }