[schema] StructureDefinitionNormalizer - remove snapshot

standard-api · Jul 14, 2023 · db27070 · db27070
1 parent 7722964
commit db27070
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/schema/src/main/java/ai/stapi/schema/structuredefinition/StructureDefinitionNormalizer.java b/schema/src/main/java/ai/stapi/schema/structuredefinition/StructureDefinitionNormalizer.java
@@ -74,7 +74,7 @@ public static Map<String, Object> normalize(Map<String, Object> structureDefinit
           ))
       );
     }
-
+    newMap.remove("snapshot");
     return newMap;
   }
 
@@ -85,8 +85,7 @@ private static ArrayList<ElementDefinition> getFixedElements(
     if (imported.getDifferential() == null) {
       return null;
     }
-    return imported.getDifferential().getElement().stream()
-        .map(element -> {
+    return imported.getDifferential().getElement().stream().map(element -> {
           ArrayList<ElementDefinitionType> fixedTypes = new ArrayList<>();
           if (element.getType() != null) {
             fixedTypes = element.getType().stream()
@@ -149,10 +148,14 @@ private static ArrayList<Map<String, Object>> getFixedElements(
                     ""
                 )
             );
-            fixedType.put("codeRef", fixedCode);
+            fixedType.put("codeRef", new UniqueIdentifier(fixedCode));
+          } else {
+            fixedType.put("codeRef", new UniqueIdentifier(code));
           }
           var targetProfile = (List<String>) type.get("targetProfile");
-          fixedType.put("targetProfileRef", fixTargetProfile(targetProfile));
+          if (targetProfile != null) {
+            fixedType.put("targetProfileRef", fixTargetProfile(targetProfile));
+          }
           return fixedType;
         }).collect(Collectors.toCollection(ArrayList::new));
       }