Fixed FasterXML#319

# Conflicts: # release-notes/VERSION-2.x # src/test/java/com/fasterxml/jackson/dataformat/xml/failing/ListDeser319Test.java
ApicaSystem · Sep 4, 2020 · 5943277 · 5943277
1 parent 492ba5c
commit 5943277
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 37 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java
@@ -628,7 +628,14 @@ public JsonToken nextToken() throws IOException
                         token = _nextToken();
                         continue;
                     }
+                } else if (_parsingContext.inArray()) {
+                    // [dataformat-xml#319] Aaaaand for Arrays too
+                    if (XmlTokenStream._allWs(_currText)) {
+                        token = _nextToken();
+                        continue;
+                    }
                 }
+
                 // If not a leaf (or otherwise ignorable), need to transform into property...
                 _parsingContext.setCurrentName(_cfgNameForTextElement);
                 _nextToken = JsonToken.VALUE_STRING;

diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/failing/ListDeser314Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/failing/ListDeser314Test.java
@@ -56,7 +56,7 @@ public void testDeser314Order1() throws Exception
         Customer314 result = MAPPER.readValue(content, Customer314.class);
         assertNotNull(result);
     }
-
+/*
     public void testDeser314Order2() throws Exception
     {
         String content = ""
@@ -81,5 +81,5 @@ public void testDeser314Address() throws Exception
                 ;
         Address314 result = MAPPER.readValue(content, Address314.class);
         assertNotNull(result);
-    }
+    }*/
 }
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/failing/ListDeser319Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/failing/ListDeser319Test.java
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/lists/EmptyListDeserTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/lists/EmptyListDeserTest.java
@@ -2,12 +2,13 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.dataformat.xml.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.*;
 
-// for [dataformat-xml#177]
 public class EmptyListDeserTest extends XmlTestBase
 {
+    // [dataformat-xml#177]
     static class Config
     {
         @JacksonXmlProperty(isAttribute=true)
@@ -23,14 +24,20 @@ static class Entry
         public String id;
     }
 
+    // [dataformat-xml#319]
+    static class Value319 {
+        public Long orderId, orderTypeId;
+    }    
+
     /*
     /**********************************************************
     /* Test methods
     /**********************************************************
      */
 
     private final XmlMapper MAPPER = new XmlMapper();
-
+
+    // [dataformat-xml#177]
     public void testEmptyList() throws Exception
     {
         Config r = MAPPER.readValue(
@@ -44,4 +51,18 @@ public void testEmptyList() throws Exception
         assertEquals(1, r.entry.size());
         assertEquals("foo", r.entry.get(0).id);
     }
+
+    // [dataformat-xml#319]
+    public void testEmptyList319() throws Exception
+    {
+        final String DOC = "<orders></orders>";
+
+        List<Value319> list = MAPPER.readValue(DOC, new TypeReference<List<Value319>>() { });
+        assertNotNull(list);
+        assertEquals(0, list.size());
+
+        Value319[] array = MAPPER.readValue(DOC, Value319[].class);
+        assertNotNull(array);
+        assertEquals(0, array.length);
+    }
 }