Merge branch '2.19'

Author: cowtowncoder

.github/workflows/main.yml

@@ -60,7 +60,7 @@ jobs:
       run: ./mvnw -B -q -ff -ntp test
     - name: Publish code coverage
       if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
-      uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
+      uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./target/site/jacoco/jacoco.xml

src/test/java/tools/jackson/dataformat/xml/deser/XsiNilBasicTest.java

@@ -30,7 +30,10 @@ public static class DoubleWrapper2 {
         public DoubleWrapper2() { }
     }
 
-    private final XmlMapper MAPPER = newMapper();
+    // 30-Jan-2025, tatu: To tease out [dataformat-xml#714] let's do this:
+    private final XmlMapper MAPPER = mapperBuilder()
+            .enable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
+            .build();
 
     // 30-Jan-2025, tatu: Due to [databind#3406] fail on trailing tokens,
     //    a likely bug surfaced around Root level `null`s. But for now let's
@@ -103,6 +106,7 @@ public void testWithDoubleAsMixed() throws Exception
     }
 
     // [dataformat-xml#714]: trailing bogus `JsonToken.END_OBJECT`
+    /*
     @Test
     public void testRootPojoAsNull() throws Exception
     {
@@ -111,6 +115,7 @@ public void testRootPojoAsNull() throws Exception
                 Point.class);
         assertNull(bean);
     }
+    */
 
     @Test
     public void testRootPojoAsNonNull() throws Exception
@@ -149,8 +154,8 @@ public void testDisableXsiNilLeafProcessing() throws Exception
                     .readValue(DOC).toString());
     }
 
-    // [dataformat-xml#468]: Allow disabling xsi:nil special handling
     // [dataformat-xml#714]: trailing bogus `JsonToken.END_OBJECT`
+    /*
     @Test
     public void testDisableXsiNilRootProcessing() throws Exception
     {
@@ -166,4 +171,5 @@ public void testDisableXsiNilRootProcessing() throws Exception
         assertEquals(a2q("{'nil':'true'}"),
                 noXsiNilReader.readValue(DOC).toString());
     }
+    */
 }

src/test/java/tools/jackson/dataformat/xml/deser/builder/BuilderSimpleTest.java

@@ -22,7 +22,7 @@ public class BuilderSimpleTest extends XmlTestUtil
     // // Simple 2-property value class, builder with standard naming
 
     @JsonDeserialize(builder=SimpleBuilderXY.class)
-    static class ValueClassXY
+    public static class ValueClassXY
     {
         final int _x, _y;
 
@@ -32,7 +32,7 @@ protected ValueClassXY(int x, int y) {
         }
     }
 
-    static class SimpleBuilderXY
+    public static class SimpleBuilderXY
     {
         public int x, y;
 
@@ -54,7 +54,7 @@ public ValueClassXY build() {
     // // 3-property value, with more varied builder
 
     @JsonDeserialize(builder=BuildABC.class)
-    static class ValueClassABC
+    public static class ValueClassABC
     {
         final int a, b, c;
 
@@ -66,7 +66,7 @@ protected ValueClassABC(int a, int b, int c) {
     }
 
     @JsonIgnoreProperties({ "d" })
-    static class BuildABC
+    public static class BuildABC
     {
         public int a; // to be used as is
         private int b, c;
@@ -91,16 +91,16 @@ public ValueClassABC build() {
     // // Then Builder that is itself immutable
 
     @JsonDeserialize(builder=BuildImmutable.class)
-    static class ValueImmutable
+    public static class ValueImmutable
     {
         final int value;
         protected ValueImmutable(int v) { value = v; }
     }
 
-    static class BuildImmutable {
+    public static class BuildImmutable {
         private final int value;
-        
-        private BuildImmutable() { this(0); }
+
+        public BuildImmutable() { this(0); }
         private BuildImmutable(int v) {
             value = v;
         }
@@ -114,14 +114,14 @@ public ValueImmutable build() {
     // And then with custom naming:
 
     @JsonDeserialize(builder=BuildFoo.class)
-    static class ValueFoo
+    public static class ValueFoo
     {
         final int value;
-        protected ValueFoo(int v) { value = v; }
+        public ValueFoo(int v) { value = v; }
     }
 
     @JsonPOJOBuilder(withPrefix="foo", buildMethodName="construct")
-    static class BuildFoo {
+    public static class BuildFoo {
         private int value;
 
         public BuildFoo fooValue(int v) {
@@ -137,20 +137,20 @@ public ValueFoo construct() {
     // for [databind#761]
 
     @JsonDeserialize(builder=ValueInterfaceBuilder.class)
-    interface ValueInterface {
+    public interface ValueInterface {
         int getX();
     }
 
     @JsonDeserialize(builder=ValueInterface2Builder.class)
-    interface ValueInterface2 {
+    public interface ValueInterface2 {
         int getX();
     }
 
-    static class ValueInterfaceImpl implements ValueInterface
+    public static class ValueInterfaceImpl implements ValueInterface
     {
         final int _x;
 
-        protected ValueInterfaceImpl(int x) {
+        public ValueInterfaceImpl(int x) {
             _x = x+1;
         }
 
@@ -160,11 +160,11 @@ public int getX() {
         }
     }
 
-    static class ValueInterface2Impl implements ValueInterface2
+    public static class ValueInterface2Impl implements ValueInterface2
     {
         final int _x;
 
-        protected ValueInterface2Impl(int x) {
+        public ValueInterface2Impl(int x) {
             _x = x+1;
         }
 
@@ -174,7 +174,7 @@ public int getX() {
         }
     }
 
-    static class ValueInterfaceBuilder
+    public static class ValueInterfaceBuilder
     {
         public int x;
 
@@ -188,7 +188,7 @@ public ValueInterface build() {
         }
     }
 
-    static class ValueInterface2Builder
+    public static class ValueInterface2Builder
     {
         public int x;
 
@@ -206,7 +206,7 @@ public ValueInterface2Impl build() {
     // [databind#777]
     @JsonDeserialize(builder = SelfBuilder777.class)
     @JsonPOJOBuilder(buildMethodName = "", withPrefix = "with")
-    static class SelfBuilder777 {
+    public static class SelfBuilder777 {
         public int x;
 
         public SelfBuilder777 withX(int value) {

src/test/java/tools/jackson/dataformat/xml/tofix/XsiNilBasic714Test.java

@@ -0,0 +1,54 @@
+package tools.jackson.dataformat.xml.tofix;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.*;
+
+import tools.jackson.dataformat.xml.XmlMapper;
+import tools.jackson.dataformat.xml.XmlReadFeature;
+import tools.jackson.dataformat.xml.XmlTestUtil;
+import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class XsiNilBasic714Test extends XmlTestUtil
+{
+    private final static String XSI_NS_DECL = "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'";
+
+    // 30-Jan-2025, tatu: To tease out [dataformat-xml#714] let's do this:
+    private final XmlMapper MAPPER = mapperBuilder()
+            .enable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
+            .build();
+
+    // [dataformat-xml#714]: trailing END_OBJECT
+    @JacksonTestFailureExpected
+    @Test
+    public void testRootPojoAsNull() throws Exception
+    {
+        Point bean = MAPPER.readValue(
+"<Point "+XSI_NS_DECL+" xsi:nil='true' />",
+                Point.class);
+        assertNull(bean);
+    }
+
+    // [dataformat-xml#468]: Allow disabling xsi:nil special handling
+
+    // [dataformat-xml#714]: trailing END_OBJECT
+    @JacksonTestFailureExpected
+    @Test
+    public void testDisableXsiNilRootProcessing() throws Exception
+    {
+        final ObjectReader r = MAPPER.readerFor(JsonNode.class);
+        final String DOC = "<Point "+XSI_NS_DECL+" xsi:nil='true'></Point>";
+
+        // with default processing:
+        assertEquals("null", r.readValue(DOC).toString());
+
+        // 07-Jul-2021, tatu: Alas! 2.x sets format feature flags too late to
+        //   affect root element (3.0 works correctly). So cannot test
+
+        ObjectReader noXsiNilReader = r.without(XmlReadFeature.PROCESS_XSI_NIL);
+        assertEquals(a2q("{'nil':'true'}"),
+                noXsiNilReader.readValue(DOC).toString());
+    }
+}