Merge branch '2.12' into 2.13

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/dataformat/xml/lists/ListDeser469Test.java

@@ -0,0 +1,95 @@
+package com.fasterxml.jackson.dataformat.xml.lists;
+
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+
+// Trying to reproduce [dataformat-xml#469]
+public class ListDeser469Test extends XmlTestBase
+{
+    static class OuterBean {
+        @JacksonXmlProperty(localName = "Middle", namespace = "http://jackson.test.model")
+        public MiddleBean middle;
+    }
+
+    @JsonPropertyOrder({"inner1", "inner2"})
+    static class MiddleBean
+    {
+        @JacksonXmlProperty(localName = "Inner1", namespace = "http://jackson.test.model")
+        public InnerBean1 inner1;
+
+        @JacksonXmlElementWrapper(useWrapping = false)
+        @JacksonXmlProperty(localName = "Inner2", namespace = "http://jackson.test.model")
+        public List<InnerBean2> inner2;
+    }
+
+    static class InnerBean1
+    {
+        @JacksonXmlProperty(localName = "Str", isAttribute = true)
+        public String str;
+
+        @JacksonXmlProperty(localName = "InnerBean1Item", namespace = "http://jackson.test.model")
+        public List<InnerBean1Item> item;
+    }
+
+    static class InnerBean1Item
+    {
+        @JacksonXmlProperty(localName = "Id", isAttribute = true)
+        public String id;
+    }
+
+    static class InnerBean2
+    {
+        @JacksonXmlProperty(localName = "Str2", isAttribute = true)
+        public String str2;
+
+        protected InnerBean2() { }
+        public InnerBean2(String s) { str2 = s; }
+    }
+
+    private final XmlMapper MAPPER = newMapper();
+
+    public void testIssue469() throws Exception
+    {
+        // First: create POJO value to test round-trip:
+        {
+            OuterBean source = new OuterBean();
+            source.middle = new MiddleBean();
+            List<InnerBean2> items = new ArrayList<>();
+            items.add(new InnerBean2("foo"));
+            source.middle.inner2 = items;
+
+            String xml = MAPPER.writerWithDefaultPrettyPrinter()
+                    .writeValueAsString(source);
+
+            OuterBean result = MAPPER.readValue(xml, OuterBean.class);
+
+            MiddleBean mid = result.middle;
+            assertNotNull(mid);
+            assertNotNull(mid.inner2);
+            assertEquals(1, mid.inner2.size());
+            assertEquals("foo", mid.inner2.get(0).str2);
+        }
+
+        // And then verify from XML String
+        String xmlInput = "<OuterBean xmlns='http://jackson.test.model'>\n" +
+            "  <Middle>\n" +
+            "    <Inner1/>\n" +
+            "    <Inner2 Str2='aaaa'/>\n" +
+            "  </Middle>\n" +
+            "</OuterBean>\n";
+
+        OuterBean outer = MAPPER.readValue(xmlInput, OuterBean.class);
+
+        MiddleBean mid = outer.middle;
+        assertNotNull(mid);
+
+        assertNotNull(mid.inner2);
+        assertEquals(1, mid.inner2.size());
+        assertEquals("aaaa", mid.inner2.get(0).str2);
+    }
+}