5480 jackson 3 support

aom/src/main/java/com/nedap/archie/aom/ResourceDescription.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.databind.JsonNode;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -102,22 +101,21 @@ public void setLifecycleState(String lifecycleState) {
      *
      * This deserializer ensures backward compatibility by accepting both formats
      * and always setting the lifecycle state value as a plain String.
+     * Object parameter instead of JsonNode keeps this compatible with both Jackson 2 and 3.
      */
     @JsonSetter("lifecycle_state")
-    private void setLifecycleState(JsonNode node) {
-        if (node == null || node.isNull()) {
+    private void setLifecycleState(Object node) {
+        if (node == null) {
+            this.lifecycleState = null;
+        } else if (node instanceof String) {
+            this.lifecycleState = (String) node;
+        } else if (node instanceof Map) {
+            Object codeString = ((Map<?, ?>) node).get("code_string");
+            this.lifecycleState = (codeString != null) ? codeString.toString() : null;
+        } else {
+            // Empty list or other unexpected type: treat as absent
             this.lifecycleState = null;
-            return;
-        }
-
-        if (node.isTextual()) {
-            this.lifecycleState = node.asText();
-            return;
         }
-
-        JsonNode codeString = node.get("code_string");
-
-        this.lifecycleState = (codeString != null && !codeString.isNull()) ? codeString.asText() : null;
     }
 
     public String getCustodianNamespace() {

aom/src/main/java/com/nedap/archie/rules/ExpressionType.java

@@ -1,12 +1,15 @@
 package com.nedap.archie.rules;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 /**
  * TODO: this should contain all primitive types and primitive types should be merged into this
  * Created by pieter.bos on 27/10/15.
  */
 public enum ExpressionType {
      BOOLEAN, STRING, INTEGER, REAL, DATE, TIME, DATETIME, DURATION, C_STRING;
 
+    @JsonCreator
     public static ExpressionType fromString(String string) {
         switch(string) {
             case "Boolean":
@@ -28,30 +31,26 @@ public static ExpressionType fromString(String string) {
             case "CString":
                 return C_STRING;
         }
+        // Fall back to case-insensitive match against enum constant names (e.g. "C_STRING")
+        for (ExpressionType type : values()) {
+            if (type.name().equalsIgnoreCase(string)) {
+                return type;
+            }
+        }
         return null;
     }
 
     public String toString() {
-        switch(this) {
-            case BOOLEAN:
-                return "Boolean";
-            case STRING:
-                return "String";
-            case INTEGER:
-                return "Integer";
-            case REAL:
-                return "Real";
-            case DATE:
-                return "Date";
-            case TIME:
-                return "Time";
-            case DATETIME:
-                return "DateTime";
-            case DURATION:
-                return "Duration";
-            case C_STRING:
-                return "CString";
-        }
-        return null;
+        return switch (this) {
+            case BOOLEAN -> "Boolean";
+            case STRING -> "String";
+            case INTEGER -> "Integer";
+            case REAL -> "Real";
+            case DATE -> "Date";
+            case TIME -> "Time";
+            case DATETIME -> "DateTime";
+            case DURATION -> "Duration";
+            case C_STRING -> "CString";
+        };
     }
 }

aom/src/main/java/com/nedap/archie/serializer/adl/ADLArchetypeSerializer.java

@@ -4,6 +4,7 @@
 import com.nedap.archie.rminfo.RMObjectMapperProvider;
 
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * @author markopi
@@ -12,17 +13,23 @@ abstract public class ADLArchetypeSerializer<T extends Archetype> {
     protected final T archetype;
     final RMObjectMapperProvider rmObjectMapperProvider;
     Function<String, Archetype> flatArchetypeProvider;
-    protected final ADLStringBuilder builder = new ADLStringBuilder();
+    protected final ADLStringBuilder builder;
 
     private final ADLDefinitionSerializer definitionSerializer;
     private final ADLRulesSerializer rulesSerializer;
 
 
+    // Default constructor — uses the Jackson 2 backed ADLStringBuilder.
     protected ADLArchetypeSerializer(T archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider) {
+        this(archetype, flatArchetypeProvider, rmObjectMapperProvider, new ADLStringBuilder());
+    }
+
+    // Use this constructor to supply a custom ADLStringBuilder, e.g. new ADLStringBuilder3() for Jackson 3.
+    protected ADLArchetypeSerializer(T archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider, ADLStringBuilder builder) {
         this.archetype = archetype;
         this.flatArchetypeProvider = flatArchetypeProvider;
         this.rmObjectMapperProvider = rmObjectMapperProvider;
-
+        this.builder = builder;
         this.definitionSerializer = new ADLDefinitionSerializer(builder, flatArchetypeProvider, rmObjectMapperProvider);
         this.rulesSerializer = new ADLRulesSerializer(builder, definitionSerializer);
     }
@@ -51,6 +58,23 @@ public static String serialize(Archetype archetype, Function<String, Archetype>
     }
 
 
+    /**
+     * Serialize the archetype to ADL, using a custom ADLStringBuilder (e.g. one backed by Jackson 3).
+     */
+    public static String serialize(Archetype archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider, Supplier<ADLStringBuilder> builderSupplier) {
+        if (archetype instanceof Template) {
+            return new ADLTemplateSerializer((Template) archetype, flatArchetypeProvider, rmObjectMapperProvider, builderSupplier.get()).serialize();
+        } else if (archetype instanceof OperationalTemplate) {
+            return new ADLOperationalTemplateSerializer((OperationalTemplate) archetype, flatArchetypeProvider, rmObjectMapperProvider, builderSupplier.get()).serialize();
+        } else if (archetype instanceof TemplateOverlay) {
+            return new ADLTemplateOverlaySerializer((TemplateOverlay) archetype, flatArchetypeProvider, rmObjectMapperProvider, builderSupplier.get()).serialize();
+        } else if (archetype instanceof AuthoredArchetype) {
+            return new ADLAuthoredArchetypeSerializer<>((AuthoredArchetype) archetype, flatArchetypeProvider, rmObjectMapperProvider, builderSupplier.get()).serialize();
+        }
+        throw new AssertionError("Could not serialize archetype of class " +
+                (archetype == null ? null : archetype.getClass().getName()));
+    }
+
     /**
      * Serialize the archetype to ADL
      * @param archetype the archetype to serialize

aom/src/main/java/com/nedap/archie/serializer/adl/ADLAuthoredArchetypeSerializer.java

@@ -16,10 +16,16 @@
  */
 public class ADLAuthoredArchetypeSerializer<T extends AuthoredArchetype> extends ADLArchetypeSerializer<T> {
 
+    // Default constructor — uses the Jackson 2 backed ADLStringBuilder.
     public ADLAuthoredArchetypeSerializer(T archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider) {
         super(archetype, flatArchetypeProvider, rmObjectMapperProvider);
     }
 
+    // Use this constructor to supply a custom ADLStringBuilder, e.g. new ADLStringBuilder3() for Jackson 3.
+    public ADLAuthoredArchetypeSerializer(T archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider, ADLStringBuilder builder) {
+        super(archetype, flatArchetypeProvider, rmObjectMapperProvider, builder);
+    }
+
     @Override
     protected void appendLanguage() {
         if (archetype.getOriginalLanguage() == null) return;

aom/src/main/java/com/nedap/archie/serializer/adl/ADLOperationalTemplateSerializer.java

@@ -11,10 +11,16 @@
  */
 class ADLOperationalTemplateSerializer extends ADLAuthoredArchetypeSerializer<OperationalTemplate> {
 
+    // Default constructor — uses the Jackson 2 backed ADLStringBuilder.
     public ADLOperationalTemplateSerializer(OperationalTemplate archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider) {
         super(archetype, flatArchetypeProvider, rmObjectMapperProvider);
     }
 
+    // Use this constructor to supply a custom ADLStringBuilder, e.g. new ADLStringBuilder3() for Jackson 3.
+    public ADLOperationalTemplateSerializer(OperationalTemplate archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider, ADLStringBuilder builder) {
+        super(archetype, flatArchetypeProvider, rmObjectMapperProvider, builder);
+    }
+
     @Override
     protected String serialize() {
         super.serialize();

aom/src/main/java/com/nedap/archie/serializer/adl/ADLStringBuilder.java

@@ -55,7 +55,7 @@ public ADLStringBuilder indent() {
 
     public ADLStringBuilder odin(Object structure) {
         try {
-            // Pass the current ident depth to the ODINPrettyPrinter
+            // Pass the current indent depth to the ODINPrettyPrinter
             ObjectWriter objectWriter = odinMapper.writer().with(new ODINPrettyPrinter(builder.getIndentDepth()));
 
             String odin = objectWriter.writeValueAsString(structure).trim();
@@ -138,8 +138,4 @@ public int getIndentDepth() {
         return builder.getIndentDepth();
     }
 
-    public ODINMapper getOdinMapper() {
-        return odinMapper;
-    }
 }
-

aom/src/main/java/com/nedap/archie/serializer/adl/ADLTemplateOverlaySerializer.java

@@ -12,10 +12,16 @@
 class ADLTemplateOverlaySerializer extends ADLArchetypeSerializer<TemplateOverlay> {
 
 
+    // Default constructor — uses the Jackson 2 backed ADLStringBuilder.
     public ADLTemplateOverlaySerializer(TemplateOverlay archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider) {
         super(archetype, flatArchetypeProvider, rmObjectMapperProvider);
     }
 
+    // Use this constructor to supply a custom ADLStringBuilder, e.g. new ADLStringBuilder3() for Jackson 3.
+    public ADLTemplateOverlaySerializer(TemplateOverlay archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider, ADLStringBuilder builder) {
+        super(archetype, flatArchetypeProvider, rmObjectMapperProvider, builder);
+    }
+
     @Override
     protected String headTag() {
         return "template_overlay";

aom/src/main/java/com/nedap/archie/serializer/adl/ADLTemplateSerializer.java

@@ -12,10 +12,16 @@
  */
 class ADLTemplateSerializer extends ADLAuthoredArchetypeSerializer<Template> {
 
+    // Default constructor — uses the Jackson 2 backed ADLStringBuilder.
     public ADLTemplateSerializer(Template archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider) {
         super(archetype, flatArchetypeProvider, rmObjectMapperProvider);
     }
 
+    // Use this constructor to supply a custom ADLStringBuilder, e.g. new ADLStringBuilder3() for Jackson 3.
+    public ADLTemplateSerializer(Template archetype, Function<String, Archetype> flatArchetypeProvider, RMObjectMapperProvider rmObjectMapperProvider, ADLStringBuilder builder) {
+        super(archetype, flatArchetypeProvider, rmObjectMapperProvider, builder);
+    }
+
     @Override
     protected String headTag() {
         return "template";

aom/src/main/java/com/nedap/archie/serializer/adl/jackson3/ADLStringBuilder3.java

@@ -0,0 +1,31 @@
+package com.nedap.archie.serializer.adl.jackson3;
+
+import com.nedap.archie.serializer.adl.ADLStringBuilder;
+import org.openehr.odin.jackson3.ODINMapper3;
+import org.openehr.odin.jackson3.ODINPrettyPrinter3;
+
+/**
+ * Jackson 3 variant of {@link ADLStringBuilder}.
+ * Identical behaviour, but uses ODINMapper3 for ODIN serialization instead of the Jackson 2 ODINMapper.
+ */
+public class ADLStringBuilder3 extends ADLStringBuilder {
+
+    private final ODINMapper3 odinMapper;
+
+    public ADLStringBuilder3() {
+        odinMapper = (ODINMapper3) new ArchetypeODINMapperFactory3().createMapper();
+    }
+
+    @Override
+    public ADLStringBuilder odin(Object structure) {
+        try {
+            String odin = odinMapper.writer()
+                    .with(new ODINPrettyPrinter3(getIndentDepth()))
+                    .writeValueAsString(structure).trim();
+            append(odin).newline();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return this;
+    }
+}

aom/src/main/java/com/nedap/archie/serializer/adl/jackson3/ArchetypeODINMapperFactory3.java

@@ -0,0 +1,24 @@
+package com.nedap.archie.serializer.adl.jackson3;
+
+import com.nedap.archie.aom.terminology.ArchetypeTerm;
+import com.nedap.archie.aom.terminology.ArchetypeTerminology;
+import com.nedap.archie.serializer.adl.jackson.ArchetypeTerminologyMixin;
+import org.openehr.odin.jackson3.ODINMapper3;
+import tools.jackson.databind.MapperFeature;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.module.SimpleModule;
+
+public class ArchetypeODINMapperFactory3 {
+
+    public ObjectMapper createMapper() {
+        SimpleModule module = new SimpleModule("archetype-odin-module");
+        module.addSerializer(ArchetypeTerm.class, new ArchetypeTermOdinSerializer());
+        module.setMixInAnnotation(ArchetypeTerminology.class, ArchetypeTerminologyMixin.class);
+
+        return ODINMapper3.builder()
+                .deactivateDefaultTyping()
+                .disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
+                .addModule(module)
+                .build();
+    }
+}

aom/src/main/java/com/nedap/archie/serializer/adl/jackson3/ArchetypeTermOdinSerializer.java

@@ -0,0 +1,31 @@
+package com.nedap.archie.serializer.adl.jackson3;
+
+import com.nedap.archie.aom.terminology.ArchetypeTerm;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.ValueSerializer;
+
+import java.util.Map;
+
+/**
+ * ArchetypeTerm implements Map, so gets serialized with the Mapserializer instead of object. Do this manually
+ */
+public class ArchetypeTermOdinSerializer extends ValueSerializer<ArchetypeTerm> {
+
+    @Override
+    public void serialize(ArchetypeTerm value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException {
+        gen.writeStartObject();
+        gen.writeName("text");
+        gen.writeString(value.getText());
+        if (value.getDescription() != null) {
+            gen.writeName("description");
+            gen.writeString(value.getDescription());
+        }
+        for (Map.Entry<String, String> entry : value.getOtherItems().entrySet()) {
+            gen.writeName(entry.getKey());
+            gen.writeString(entry.getValue());
+        }
+        gen.writeEndObject();
+    }
+}

archie-utils/src/main/java/com/nedap/archie/json/RulesSectionMixin.java

@@ -1,8 +1,7 @@
 package com.nedap.archie.json;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-@JsonSerialize(converter = RulesSectionToListConverter.class)
+@com.fasterxml.jackson.databind.annotation.JsonSerialize(converter = RulesSectionToListConverter.class)
+@tools.jackson.databind.annotation.JsonSerialize(converter = com.nedap.archie.json3.RulesSectionToListConverter.class)
 public interface RulesSectionMixin {
 
 }

archie-utils/src/main/java/com/nedap/archie/json3/ArchieDurationModule.java

@@ -0,0 +1,26 @@
+package com.nedap.archie.json3;
+
+import org.threeten.extra.PeriodDuration;
+import tools.jackson.databind.module.SimpleModule;
+
+import java.time.Duration;
+import java.time.Period;
+import java.time.temporal.TemporalAmount;
+
+/**
+ * A Jackson module that overrides the standard JavaTimeModule serializers and deserializers for ISO 8601 Durations.
+ * It supports the negative format as used in OpenEHR, and it can parse PeriodDurations if required
+ */
+public class ArchieDurationModule extends SimpleModule {
+
+    public ArchieDurationModule() {
+        super("archie-duration-module");
+
+        addDeserializer(TemporalAmount.class, new DurationDeserializer());
+
+        addSerializer(Duration.class, new DurationSerializer());
+        addSerializer(TemporalAmount.class, new DurationSerializer());
+        addSerializer(Period.class, new DurationSerializer());
+        addSerializer(PeriodDuration.class, new DurationSerializer());
+    }
+}