still need to make adjustments to serialization, xml tests failing

meotchwilliams · meotchwilliams · commit 1115d88feb0d · 2026-06-04T18:36:25.000-06:00
diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializer.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializer.java
@@ -1,19 +1,23 @@
 package com.mx.path.model.mdx.model.ondemand;
 
-import java.io.IOException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import com.mx.path.model.mdx.model.MdxList;
 import com.mx.path.model.mdx.model.ondemand.mixins.MixinDefinition;
 import com.mx.path.model.mdx.model.ondemand.mixins.XmlSkipInternalAnnotationsIntrospector;
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.PropertyNamingStrategies;
 import tools.jackson.databind.SerializationContext;
 import tools.jackson.databind.SerializationFeature;
 import tools.jackson.databind.ValueSerializer;
+import tools.jackson.databind.ext.javatime.ser.LocalDateSerializer;
+import tools.jackson.databind.module.SimpleModule;
 import tools.jackson.dataformat.xml.XmlMapper;
 import tools.jackson.dataformat.xml.ser.ToXmlGenerator;
 
@@ -42,14 +46,17 @@ public MdxOnDemandMdxListSerializer(MixinDefinition... mixinDefinitions) {
         .annotationIntrospector(new XmlSkipInternalAnnotationsIntrospector())
         .propertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
         .enable(SerializationFeature.INDENT_OUTPUT)
-        .registerModule(new JavaTimeModule().addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ISO_DATE)))
-        .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        .addModule(new SimpleModule("CustomLocalDateModule").addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ISO_DATE)))
+//        .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        .addMixIns(Arrays.stream(mixinDefinitions)
+                .collect(Collectors.toMap(MixinDefinition::getTarget, MixinDefinition::getMixin)))
+        .build();
 
-    for (MixinDefinition mixin : mixinDefinitions) {
-      if (mixin != null) {
-        mapper.addMixIn(mixin.getTarget(), mixin.getMixin());
-      }
-    }
+//    for (MixinDefinition mixin : mixinDefinitions) {
+//      if (mixin != null) {
+//        mapper.addMixIn(mixin.getTarget(), mixin.getMixin());
+//      }
+//    }
   }
 
   /**
@@ -60,7 +67,7 @@ public MdxOnDemandMdxListSerializer(MixinDefinition... mixinDefinitions) {
    * @param value
    * @param gen
    * @param context
-   * @throws IOException
+   * @throws JacksonException
    */
   @Override
   public final void serialize(MdxListWrapper value, JsonGenerator gen, SerializationContext context) throws JacksonException {
diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializer.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializer.java
@@ -47,10 +47,11 @@ public MdxOnDemandSerializer(MixinDefinition... mixinDefinitions) {
         .enable(SerializationFeature.INDENT_OUTPUT)
         .addModule(new SimpleModule("CustomLocalDateModule").addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ISO_DATE)))
 //        .configure(SerializationFeatu re.WRITE_DATES_AS_TIMESTAMPS, false)
-            .addMixIns(Arrays.stream(mixinDefinitions)
-                    .collect(Collectors.toMap(MixinDefinition::getTarget, MixinDefinition::getMixin)))
-            .build();
+        .addMixIns(Arrays.stream(mixinDefinitions)
+            .collect(Collectors.toMap(MixinDefinition::getTarget, MixinDefinition::getMixin)))
+        .build();
 
+//    mapper.serializationConfig()
 //    for (MixinDefinition mixinDefinition : mixinDefinitions) {
 //      this.mapper.addMixIn(mixinDefinition.getTarget(), mixinDefinition.getMixin());
 //    }
diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/AccountXmlMixin.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/AccountXmlMixin.java
@@ -4,8 +4,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.mx.path.model.mdx.model.ondemand.MdxOnDemandLocalDateSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
 
 @JsonRootName("account")
 public interface AccountXmlMixin {
diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/OnDemandAccountsXmlMixin.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/OnDemandAccountsXmlMixin.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.mx.path.model.mdx.model.MdxList;
 import com.mx.path.model.mdx.model.account.Account;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 
 @JsonRootName("accounts")
 public interface OnDemandAccountsXmlMixin {
diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/TransactionsPageMixin.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/TransactionsPageMixin.java
@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.mx.path.model.mdx.model.MdxList;
 import com.mx.path.model.mdx.model.account.Transaction;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
 public interface TransactionsPageMixin {
 
diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/XmlSkipInternalAnnotationsIntrospector.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/XmlSkipInternalAnnotationsIntrospector.java
@@ -1,6 +1,7 @@
 package com.mx.path.model.mdx.model.ondemand.mixins;
 
 import com.mx.path.core.common.model.Internal;
+import tools.jackson.databind.cfg.MapperConfig;
 import tools.jackson.databind.introspect.AnnotatedMember;
 import tools.jackson.dataformat.xml.JacksonXmlAnnotationIntrospector;
 
@@ -9,7 +10,7 @@
  */
 public class XmlSkipInternalAnnotationsIntrospector extends JacksonXmlAnnotationIntrospector {
   @Override
-  public final boolean hasIgnoreMarker(AnnotatedMember m) {
-    return m.hasAnnotation(Internal.class) || super.hasIgnoreMarker(m);
+  public final boolean hasIgnoreMarker(MapperConfig<?> config, AnnotatedMember m) {
+    return m.hasAnnotation(Internal.class) || super.hasIgnoreMarker(config, m);
   }
 }
diff --git a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializerTest.groovy b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializerTest.groovy
@@ -1,10 +1,10 @@
 package com.mx.path.model.mdx.model.ondemand
 
-import com.fasterxml.jackson.core.JsonParser
-import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.mx.path.model.mdx.model.account.Account
 
 import spock.lang.Specification
+import tools.jackson.core.JsonParser
+import tools.jackson.dataformat.xml.XmlMapper
 
 class MdxOnDemandDeserializerTest extends Specification {
   MdxOnDemandDeserializer<Account> subject
diff --git a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializerTest.groovy b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializerTest.groovy
@@ -1,11 +1,12 @@
 package com.mx.path.model.mdx.model.ondemand
 
+import tools.jackson.core.JsonGenerator
+import tools.jackson.databind.SerializationContext
+import tools.jackson.dataformat.xml.XmlFactory
+import tools.jackson.dataformat.xml.ser.ToXmlGenerator
+
 import static com.mx.path.extensions.StringStaticExtension.sanitizeXml
 
-import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.databind.SerializerProvider
-import com.fasterxml.jackson.dataformat.xml.XmlFactory
-import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator
 import com.mx.path.model.mdx.model.MdxList
 import com.mx.path.model.mdx.model.account.Account
 import com.mx.path.model.mdx.model.account.Transaction
@@ -32,7 +33,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock
     def list = new MdxListWrapper(null, transactions)
 
     when:
-    subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(list, (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -50,7 +51,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock
     def list = new MdxListWrapper(null, transactions)
 
     when:
-    subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(list, (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -70,7 +71,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock
     def list = new MdxListWrapper("transactions", transactions)
 
     when:
-    subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(list, (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -83,7 +84,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock
     def list = new MdxListWrapper("transactions", transactions)
 
     when:
-    subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(list, (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -110,7 +111,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock
     def list = new MdxListWrapper("transactions", transactions.wrapped())
 
     when:
-    subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(list, (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -154,7 +155,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock
     def list = new MdxListWrapper("accounts", transactions.wrapped())
 
     when:
-    subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(list, (JsonGenerator) generator, (SerializationContext) null)
 
     then:
     def expectedResponse= "<mdx version=\"5.0\">\n" +
diff --git a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializerTest.groovy b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializerTest.groovy
@@ -1,13 +1,14 @@
 package com.mx.path.model.mdx.model.ondemand
 
+import tools.jackson.core.JsonGenerator
+import tools.jackson.databind.SerializationContext
+import tools.jackson.dataformat.xml.XmlFactory
+import tools.jackson.dataformat.xml.ser.ToXmlGenerator
+
 import static com.mx.path.extensions.StringStaticExtension.sanitizeXml
 
 import java.time.LocalDate
 
-import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.databind.SerializerProvider
-import com.fasterxml.jackson.dataformat.xml.XmlFactory
-import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator
 import com.mx.path.model.mdx.model.MdxList
 import com.mx.path.model.mdx.model.account.Account
 import com.mx.path.model.mdx.model.account.OnDemandAccounts
@@ -45,7 +46,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery {
     }
 
     when:
-    subject.serialize(account, (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(account, (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -69,7 +70,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery {
     }
 
     when:
-    subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -98,7 +99,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery {
     }
 
     when:
-    subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -139,7 +140,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery {
     def onDemandAccounts = new OnDemandAccounts(accounts)
 
     when:
-    subject.serialize(onDemandAccounts.wrapped(), (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(onDemandAccounts.wrapped(), (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -173,7 +174,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery {
     def onDemandAccounts = new OnDemandAccounts(accounts)
 
     when:
-    subject.serialize(onDemandAccounts.wrapped(), (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(onDemandAccounts.wrapped(), (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -191,7 +192,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery {
     }
 
     when:
-    subject.serialize(transaction, (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(transaction, (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
@@ -214,7 +215,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery {
 
     when:
     print("BALANCE: "+account.balance)
-    subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializerProvider) null)
+    subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializationContext) null)
     generator.flush()
 
     then:
