Fix FasterXML#509: Do not throw when parsing mixed content arrays

VisualDx · May 10, 2024 · 5d92058 · 5d92058
1 parent 66af793
commit 5d92058
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 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
@@ -845,11 +845,11 @@ public JsonToken nextToken() throws IOException
                         token = _nextToken();
                         continue;
                     }
-                    // 29-Mar-2021, tatu: This seems like an error condition...
-                    //   How should we indicate it? As of 2.13, report as unexpected state
-                    throw _constructError(
-"Unexpected non-whitespace text ('"+_currText+"' in Array context: should not occur (or should be handled)"
-);
+                    // [dataformat-xml#509] 2.13 introduced a defect in which an Exception was thrown here, breaking
+                    // parsing of mixed content arrays (https://github.com/FasterXML/jackson-dataformat-xml/issues/509).
+                    // This exception case was removed to enable continued support of that functionality, but more
+                    // robust state handling may be in order.
+                    // See comment https://github.com/FasterXML/jackson-dataformat-xml/pull/604#issuecomment-1770080319
                 }
 
                 // If not a leaf (or otherwise ignorable), need to transform into property...

diff --git a/...g/UnexpectedNonWhitespaceText509Test.java → ...r/UnexpectedNonWhitespaceText509Test.java b/...g/UnexpectedNonWhitespaceText509Test.java → ...r/UnexpectedNonWhitespaceText509Test.java
@@ -1,12 +1,12 @@
-package com.fasterxml.jackson.dataformat.xml.failing;
+package com.fasterxml.jackson.dataformat.xml.deser;
 
 import java.util.*;
 
 import org.junit.Test;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
 
@@ -31,6 +31,8 @@ public void setKey(java.lang.String value) {
 	}
 
 	static class MetaData {
+		@JacksonXmlElementWrapper(useWrapping = false)
+		@JacksonXmlProperty(localName = "data")
 		protected List<Data> data;
 
 		public List<Data> getData() {