Merge branch '2.17' into json-array-serialize

Author: cowtowncoder

pom.xml

@@ -9,11 +9,11 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.17.0-SNAPSHOT</version>
+    <version>2.17.2-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-xml</artifactId>
-  <version>2.17.0-SNAPSHOT</version>
+  <version>2.17.2-SNAPSHOT</version>
   <name>Jackson-dataformat-XML</name>
   <packaging>jar</packaging>
   <description>Data format extension for Jackson to offer
@@ -34,7 +34,7 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
     <!-- And presumably import too? -->
 
     <!-- for Reproducible Builds -->
-    <project.build.outputTimestamp>2024-02-27T02:19:55Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-05-05T02:26:37Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
@@ -91,7 +91,7 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
     <dependency>
       <groupId>com.fasterxml.woodstox</groupId>
       <artifactId>woodstox-core</artifactId>
-      <version>6.6.1</version>
+      <version>6.6.2</version>
       <exclusions>
         <exclusion>
 	  <groupId>javax.xml.stream</groupId>

release-notes/CREDITS-2.x

@@ -244,8 +244,30 @@ Motonori IWAMURO (@vmi)
   `XmlBeanSerializerBase#serializeFieldsFiltered()`
  (2.16.1)
 
+Dennis Cornwell (@cornwe19)
+
+* Reported #509: Exception when parsing `List`s of mixed content (since 2.13.0)
+ (2.16.3)
+
+Christopher R. Wicks (@wickstopher)
+
+* Contributed fix for #509: Exception when parsing `List`s of mixed content (since 2.13.0)
+ (2.16.3)
+
 Arthur Chan (@arthurscchan)
 
 * Reported, contributed fix for #618: `ArrayIndexOutOfBoundsException` thrown for invalid
   ending XML string when using JDK default Stax XML parser
  (2.17.0)
+
+Alex H (@ahcodedthat)
+
+* Contributed #643: XML serialization of floating-point infinity is incompatible
+  with JAXB and XML Schema
+ (2.17.0)
+
+Bas Passon (@bpasson)
+
+* Reported, contributed fix for #646: Deserializing fails when using builder classes
+  with `Iterable` Collection setters
+ (2.17.1)

release-notes/VERSION-2.x

@@ -4,7 +4,17 @@ Project: jackson-dataformat-xml
 === Releases ===
 ------------------------------------------------------------------------
 
-2.17.0-rc1 (26-Feb-2024)
+2.18.0 (not yet released)
+
+No changes since 2.17
+
+2.17.1 (04-May-2024)
+
+#646: Deserializing fails when using builder classes with `Iterable` Collection setters
+ (fix contributed by Bas P)
+* Upgrade Woodstox to 6.6.2 (dependency fixes)
+
+2.17.0 (12-Mar-2024)
 
 #324: Support use of `xsi:type` for polymorphic serialization
   (`ToXmlGenerator.Feature.AUTO_DETECT_XSI_TYPE`)
@@ -18,8 +28,21 @@ Project: jackson-dataformat-xml
   (FromXmlParser.Feature.AUTO_DETECT_XSI_TYPE)
 #637: `JacksonXmlAnnotationIntrospector.findNamespace()` should
   properly merge namespace information
+#643: XML serialization of floating-point infinity is incompatible
+  with JAXB and XML Schema
+ (contributed by Alex H)
 * Upgrade Woodstox to 6.6.1 (latest at the time)
 
+2.16.3 (not yet released)
+
+#509: Exception when parsing `List`s of mixed content (since 2.13.0)
+ (reported by Dennis C)
+ (fix contributed by Christopher R. W)
+
+2.16.2 (09-Mar-2024)
+
+No changes since 2.16.1
+
 2.16.1 (24-Dec-2023)
 
 #616: Fix mismatch in `setNextIsUnwrapped(boolean)` in

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java

@@ -13,6 +13,7 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.JsonParser.NumberTypeFP;
 import com.fasterxml.jackson.core.base.ParserMinimalBase;
 import com.fasterxml.jackson.core.exc.StreamConstraintsException;
 import com.fasterxml.jackson.core.io.IOContext;
@@ -925,9 +926,17 @@ public JsonToken nextToken() throws IOException
                     }
                     // 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)"
+"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 above, 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
                 }
 
                 // If not a leaf (or otherwise ignorable), need to transform into property...
@@ -1219,6 +1228,15 @@ public NumberType getNumberType() throws IOException {
         return NumberType.BIG_INTEGER;
     }
 
+    /**
+     * XML has no notion of natural/native floating-point type (has to be
+     * provided externally via Schema or so), so need to ensure we indicate that.
+     */
+    @Override // added in 2.17
+    public NumberTypeFP getNumberTypeFP() throws IOException {
+        return NumberTypeFP.UNKNOWN;
+    }
+
     @Override
     public Number getNumberValue() throws IOException {
         if (_numTypesValid == NR_UNKNOWN) {

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/ToXmlGenerator.java

@@ -106,6 +106,37 @@ public enum Feature implements FormatFeature
          * @since 2.17
          */
         AUTO_DETECT_XSI_TYPE(false),
+
+        /**
+         * Feature that determines how floating-point infinity values are
+         * serialized.
+         *<p>
+         * By default, {@link Float#POSITIVE_INFINITY} and
+         * {@link Double#POSITIVE_INFINITY} are serialized as {@code Infinity},
+         * and {@link Float#NEGATIVE_INFINITY} and
+         * {@link Double#NEGATIVE_INFINITY} are serialized as
+         * {@code -Infinity}. This is the representation that Java normally
+         * uses for these values (see {@link Float#toString(float)} and
+         * {@link Double#toString(double)}), but JAXB and other XML
+         * Schema-conforming readers won't understand it.
+         *<p>
+         * With this feature enabled, these values are instead serialized as
+         * {@code INF} and {@code -INF}, respectively. This is the
+         * representation that XML Schema and JAXB use (see the XML Schema
+         * primitive types
+         * <a href="https://www.w3.org/TR/xmlschema-2/#float"><code>float</code></a>
+         * and
+         * <a href="https://www.w3.org/TR/xmlschema-2/#double"><code>double</code></a>).
+         *<p>
+         * When deserializing, Jackson always understands both representations,
+         * so there is no corresponding
+         * {@link com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser.Feature}.
+         *<p>
+         * Feature is disabled by default for backwards compatibility.
+         *
+         * @since 2.17
+         */
+        WRITE_XML_SCHEMA_CONFORMING_FLOATS(false),
         ;
 
         final boolean _defaultState;
@@ -1174,6 +1205,11 @@ public void writeNumber(long l) throws IOException
     @Override
     public void writeNumber(double d) throws IOException
     {
+        if (Double.isInfinite(d) && isEnabled(Feature.WRITE_XML_SCHEMA_CONFORMING_FLOATS)) {
+            writeNumber(d > 0d ? "INF" : "-INF");
+            return;
+        }
+
         _verifyValueWrite("write number");
         if (_nextName == null) {
             handleMissingName();
@@ -1202,6 +1238,11 @@ public void writeNumber(double d) throws IOException
     @Override
     public void writeNumber(float f) throws IOException
     {
+        if (Float.isInfinite(f) && isEnabled(Feature.WRITE_XML_SCHEMA_CONFORMING_FLOATS)) {
+            writeNumber(f > 0f ? "INF" : "-INF");
+            return;
+        }
+
         _verifyValueWrite("write number");
         if (_nextName == null) {
             handleMissingName();

src/main/java/com/fasterxml/jackson/dataformat/xml/util/TypeUtil.java

@@ -11,7 +11,8 @@ public class TypeUtil
     public static boolean isIndexedType(JavaType type)
     {
         Class<?> cls = type.getRawClass();
-        if (type.isContainerType() || type.isIterationType()) {
+        // 25-Mar-2024, tatu [dataformat-xml#646]: Need to support Iterable too
+        if (type.isContainerType() || type.isIterationType() || cls == Iterable.class) {
             // One special case; byte[] will be serialized as base64-encoded String, not real array, so:
             // (actually, ditto for char[]; thought to be a String)
             if (cls == byte[].class || cls == char[].class) {

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/UnexpectedNonWhitespaceText509Test.java renamed to src/test/java/com/fasterxml/jackson/dataformat/xml/deser/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() {

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

@@ -0,0 +1,88 @@
+package com.fasterxml.jackson.dataformat.xml.lists;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+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.JacksonXmlRootElement;
+
+// [dataformat-xml#646]
+public class IterableCollectionBuilder646Test extends XmlTestBase
+{
+	@JsonDeserialize(builder = Parent.Builder.class)
+	@JacksonXmlRootElement(localName = "parent")
+	static class Parent {
+		private final List<Child> children;
+
+		Parent(List<Child> children) {
+			this.children = children;
+		}
+
+		@JsonProperty("child")
+		@JacksonXmlElementWrapper(useWrapping = false)
+		public List<Child> getChildren() {
+			return children;
+		}
+
+		static class Builder {
+			private final List<Child> children = new ArrayList<>();
+
+			@JsonProperty("child")
+			@JacksonXmlElementWrapper(useWrapping = false)
+			public Builder children(Iterable<Child> children) {
+				for (Child c : children) {
+					this.children.add(c);
+				}
+				return this;
+			}
+
+			public Parent build() {
+				return new Parent(children);
+			}
+		}
+	}
+
+	@JsonDeserialize(builder = Child.Builder.class)
+	@JacksonXmlRootElement(localName = "child")
+	static class Child {
+		private final String id;
+
+		public Child(String id) {
+			this.id = id;
+		}
+
+		@JsonProperty("id")
+		public String getId() {
+			return id;
+		}
+
+		static class Builder {
+			private String id;
+
+			@JsonProperty("id")
+			public Builder id(String id) {
+				this.id = id;
+				return this;
+			}
+
+			public Child build() {
+				return new Child(id);
+			}
+		}
+	}
+
+	// -- Test Methods --//
+	private final XmlMapper MAPPER = newMapper();
+
+	public void testIssue646() throws Exception {
+		final String XML = "<parent><child><id>1</id></child></parent>";
+		Parent parent = MAPPER.readValue(XML, Parent.class);
+		assertNotNull(parent);
+		assertNotNull(parent.getChildren());
+		assertEquals(1, parent.getChildren().size());
+	}
+}