Merge branch '2.11' into 2.12

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -25,8 +25,15 @@ Project: jackson-dataformat-xml
 
 No changes since 2.10.x
 
+2.10.5 (not yet released)
+
+-
+
 2.10.4 (03-May-2020)
 
+#219: Deserialization issue from XML to POJO with Jackson: no String-argument
+   constructor/factory method to deserialize from String value
+  (NOTE: likely fixed earlier, but fix verified after 2.10.4 release)
 - Upgrade Woodstox dependency to 6.2.0 (minor improvement to MSV shading)
 
 2.10.3 (03-Mar-2020)

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/TestDeserialization.java

@@ -68,7 +68,7 @@ public void testMapWithAttr() throws Exception
     	    assertNotNull(map);
     }
 
-    // // Tests for [Issue#64]
+    // // Tests for [dataformat-xml#64]
 
     public void testOptionalAttr() throws Exception
     {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/TestDeserialization219.java

@@ -0,0 +1,64 @@
+package com.fasterxml.jackson.dataformat.xml.deser;
+
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+public class TestDeserialization219 extends XmlTestBase
+{
+    // [dataformat-xml#219]
+    static class Worker219
+    {
+        @JacksonXmlProperty(localName = "developer")
+        String developer;
+        @JacksonXmlProperty(localName = "tester")
+        String tester;
+        @JacksonXmlProperty(localName = "manager")
+        String manager;
+    }
+
+    // [dataformat-xml#219]
+    @JacksonXmlRootElement(localName="line")
+    static class Line219 {
+        public String code; //This should ideally be complex type
+        public String amount;
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    private final XmlMapper MAPPER = newMapper();
+
+    // [dataformat-xml#219]
+    public void testWithAttribute219Worker() throws Exception
+    {
+        final String DOC =
+"<worker>\n" + 
+"  <developer>test1</developer>\n" + 
+"  <tester grade='senior'>test2</tester>\n" + 
+"  <manager>test3</manager>\n" + 
+"</worker>"
+                ;
+        Worker219 result = MAPPER.readValue(DOC, Worker219.class);
+        assertNotNull(result);
+        assertEquals("test3", result.manager);
+    }
+
+    // [dataformat-xml#219]
+    public void testWithAttribute219Line() throws Exception
+    {
+        final String DOC =
+"<line>\n" + 
+"    <code type='ABC'>qsd</code>\n" + 
+"    <amount>138</amount>\n" + 
+"</line>"
+                ;
+        Line219 result = MAPPER.readValue(DOC, Line219.class);
+        assertNotNull(result);
+        assertEquals("138", result.amount);
+    }
+}