Merge branch '3.x' into fix/issue-615

Author: mcvayc

.github/workflows/main.yml

@@ -93,7 +93,7 @@ jobs:
         parse_coverage() {
           local csv_file=$1 col_missed=$2 col_covered=$3
           awk -F',' -v m="$col_missed" -v c="$col_covered" \
-            'NR>1 && $1=="jackson-dataformat-xml" {
+            'NR>1 && tolower($1)==tolower("jackson-dataformat-xml") {
               total_missed += $m;
               total_covered += $c;
             }

release-notes/VERSION

@@ -7,7 +7,9 @@ Version: 3.x (for earlier see VERSION-2.x)
 
 3.2.0 (not yet released)
 
-No changes since 3.1
+#802: Serialization with Polymorphisme and `EXTERNAL_PROPERTY` = duplicate property
+ (reported by @ Adrien-dev25 )
+ (fix by @cowtowncoder, w/ Claude code)
 
 3.1.0 (23-Feb-2026)
 

src/test/java/tools/jackson/dataformat/xml/ser/PolymorphicExternalTest.java

@@ -0,0 +1,87 @@
+package tools.jackson.dataformat.xml.ser;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.*;
+
+import tools.jackson.dataformat.xml.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+// [dataformat-xml#802] Test for EXTERNAL_PROPERTY type info duplication
+public class PolymorphicExternalTest extends XmlTestUtil
+{
+    static class Cage {
+        public String id;
+        public String type;
+
+        @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type",
+                include = JsonTypeInfo.As.EXTERNAL_PROPERTY)
+        @JsonSubTypes({
+                @JsonSubTypes.Type(value = Cat.class, name = "CAT"),
+                @JsonSubTypes.Type(value = Dog.class, name = "DOG")
+        })
+        public Animal animal;
+    }
+
+    public abstract static class Animal { }
+
+    public static class Cat extends Animal {
+        public String firstName = "My name is cat";
+    }
+
+    public static class Dog extends Animal {
+        public String lastName = "My name is dog";
+    }
+
+    private final XmlMapper MAPPER = newMapper();
+
+    @Test
+    public void testExternalPropertyNoDuplicate() throws Exception
+    {
+        Cage cage = new Cage();
+        cage.id = "123";
+        cage.type = "CAT";
+        cage.animal = new Cat();
+
+        String xml = MAPPER.writeValueAsString(cage);
+        //System.out.println("Serialized XML: " + xml);
+
+        // Count occurrences of "<type>" - should be exactly 1
+        int count = countOccurrences(xml, "<type>");
+        assertEquals(1, count,
+                "Expected exactly one <type> element but found " + count + " in: " + xml);
+    }
+
+    @Test
+    public void testExternalPropertyRoundTrip() throws Exception
+    {
+        Cage cage = new Cage();
+        cage.id = "123";
+        cage.type = "CAT";
+        cage.animal = new Cat();
+
+        String xml = MAPPER.writeValueAsString(cage);
+        System.out.println("Serialized XML: " + xml);
+
+        // Should be able to round-trip
+        Cage result = MAPPER.readValue(xml, Cage.class);
+        assertNotNull(result);
+        assertEquals("123", result.id);
+        // Note: with EXTERNAL_PROPERTY, the external type handler consumes
+        // the "type" element for type resolution, so the bean property is null
+        // (same behavior as JSON)
+        assertInstanceOf(Cat.class, result.animal);
+        assertEquals("My name is cat", ((Cat) result.animal).firstName);
+    }
+
+    private static int countOccurrences(String str, String sub) {
+        int count = 0;
+        int idx = 0;
+        while ((idx = str.indexOf(sub, idx)) != -1) {
+            count++;
+            idx += sub.length();
+        }
+        return count;
+    }
+}

src/test/java/tools/jackson/dataformat/xml/tofix/ElementWrapperWithCreator795Test.java

@@ -0,0 +1,84 @@
+package tools.jackson.dataformat.xml.tofix;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+import tools.jackson.dataformat.xml.XmlTestUtil;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+// [dataformat-xml#795] Element wrapper not applied with creator-based deserialization
+public class ElementWrapperWithCreator795Test extends XmlTestUtil
+{
+    static class HttpHeader {
+        private String name;
+        private String value;
+
+        protected HttpHeader() { }
+        public HttpHeader(String name, String value) {
+            this.name = name;
+            this.value = value;
+        }
+
+        public String getName() { return name; }
+        public void setName(String n) { name = n; }
+        public String getValue() { return value; }
+        public void setValue(String v) { value = v; }
+    }
+
+    // Creator-based (immutable) class: wrapper + creator triggers name mismatch
+    static class Config {
+        @JacksonXmlElementWrapper(localName = "httpHeaders")
+        @JacksonXmlProperty(localName = "property")
+        final List<HttpHeader> httpHeaders;
+
+        @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+        public Config(
+                @JacksonXmlElementWrapper(localName = "httpHeaders")
+                @JacksonXmlProperty(localName = "property")
+                List<HttpHeader> httpHeaders)
+        {
+            this.httpHeaders = httpHeaders;
+        }
+
+        public List<HttpHeader> getHttpHeaders() { return httpHeaders; }
+    }
+
+    private static final String XML =
+            "<Config>"
+            + "<httpHeaders>"
+            + "<property>"
+            + "<name>X-JFrog-Art-Api</name>"
+            + "<value>myApiToken</value>"
+            + "</property>"
+            + "</httpHeaders>"
+            + "</Config>";
+
+    @Test
+    public void testSerializeWithWrapper() throws Exception
+    {
+        Config config = new Config(List.of(new HttpHeader("X-JFrog-Art-Api", "myApiToken")));
+        String xml = newMapper().writeValueAsString(config);
+        assertEquals(XML, xml);
+    }
+
+    // Deserialization fails: XmlBeanDeserializerModifier renames property to wrapper name
+    // ("httpHeaders") but creator property retains original name ("property"), causing mismatch.
+    @JacksonTestFailureExpected
+    @Test
+    public void testDeserializeWithWrapper() throws Exception
+    {
+        Config result = newMapper().readValue(XML, Config.class);
+        assertNotNull(result.getHttpHeaders());
+        assertEquals(1, result.getHttpHeaders().size());
+        assertEquals("X-JFrog-Art-Api", result.getHttpHeaders().get(0).getName());
+        assertEquals("myApiToken", result.getHttpHeaders().get(0).getValue());
+    }
+}