Merge branch '2.19'

cowtowncoder · cowtowncoder · commit 73728de36815 · 2025-01-14T17:50:57.000-08:00
diff --git a/src/test/java/tools/jackson/databind/ObjectReaderTest.java b/src/test/java/tools/jackson/databind/ObjectReaderTest.java
@@ -462,7 +462,7 @@ public void testUnknownFields() throws Exception
         ObjectMapper mapper = JsonMapper.builder().addHandler(new DeserializationProblemHandler(){
             @Override
             public boolean handleUnknownProperty(DeserializationContext ctxt, JsonParser p, ValueDeserializer<?> deserializer, Object beanOrClass, String propertyName) {
-                p.readValueAsTree();
+                ctxt.readTree(p);
                 return true;
             }
         }).build();
diff --git a/src/test/java/tools/jackson/databind/convert/UpdateViaObjectReaderTest.java b/src/test/java/tools/jackson/databind/convert/UpdateViaObjectReaderTest.java
@@ -76,9 +76,8 @@ public DataA deserialize(JsonParser p, DeserializationContext ctxt)
                         +p.currentToken());
                 // never gets here
             }
-            /*JsonNode node =*/ p.readValueAsTree();
+            /*JsonNode node =*/ ctxt.readTree(p);
 
-            p.skipChildren(); // important, must consume input
             DataA da = new DataA();
             da.i = 5;
             return da;
diff --git a/src/test/java/tools/jackson/databind/deser/CustomDeserializersTest.java b/src/test/java/tools/jackson/databind/deser/CustomDeserializersTest.java
@@ -622,7 +622,7 @@ public void testCustomDeserializerWithReadTreeAsValue() throws Exception
         assertEquals(new Point(13, -4), result.point);
 
         // also, try some edge conditions
-        result = MAPPER.readValue(a2q("{'name':4})"), NamedPoint.class);
+        result = MAPPER.readValue(a2q("{'name':4}"), NamedPoint.class);
         assertNotNull(result);
         assertEquals("4", result.name);
         assertNull(result.point);
diff --git a/src/test/java/tools/jackson/databind/deser/DeserConcurrencyTest.java b/src/test/java/tools/jackson/databind/deser/DeserConcurrencyTest.java
@@ -41,6 +41,7 @@ public Bean deserialize(JsonParser p, DeserializationContext ctxt)
                 ctxt.reportInputMismatch(Bean.class,
                         "Deserializer not yet completely resolved");
             }
+            p.skipChildren(); // consume the value
             Bean b = new Bean();
             b.value = 13;
             return b;
diff --git a/src/test/java/tools/jackson/databind/deser/JacksonTypesDeserTest.java b/src/test/java/tools/jackson/databind/deser/JacksonTypesDeserTest.java
@@ -78,21 +78,25 @@ public void testJavaType() throws Exception
     public void testTokenBufferWithSample() throws Exception
     {
         // First, try standard sample doc:
-        TokenBuffer result = MAPPER.readValue(SAMPLE_DOC_JSON_SPEC, TokenBuffer.class);
-        verifyJsonSpecSampleDoc(result.asParser(ObjectReadContext.empty()), true);
-        result.close();
+        try (TokenBuffer result = MAPPER.readValue(SAMPLE_DOC_JSON_SPEC, TokenBuffer.class)) {
+            verifyJsonSpecSampleDoc(result.asParser(ObjectReadContext.empty()), true);
+        }
     }
 
     @SuppressWarnings("resource")
     @Test
     public void testTokenBufferWithSequence() throws Exception
     {
+        final ObjectMapper mapper = jsonMapperBuilder()
+                .disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
+                .build();
+        
         // and then sequence of other things
-        JsonParser p = MAPPER.createParser("[ 32, [ 1 ], \"abc\", { \"a\" : true } ]");
+        JsonParser p = mapper.createParser("[ 32, [ 1 ], \"abc\", { \"a\" : true } ]");
         assertToken(JsonToken.START_ARRAY, p.nextToken());
 
         assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
-        TokenBuffer buf = MAPPER.readValue(p, TokenBuffer.class);
+        TokenBuffer buf = mapper.readValue(p, TokenBuffer.class);
 
         // check manually...
         JsonParser bufParser = buf.asParser(ObjectReadContext.empty());
@@ -101,7 +105,7 @@ public void testTokenBufferWithSequence() throws Exception
         assertNull(bufParser.nextToken());
 
         // then bind to another
-        buf = MAPPER.readValue(p, TokenBuffer.class);
+        buf = mapper.readValue(p, TokenBuffer.class);
         bufParser = buf.asParser(ObjectReadContext.empty());
         assertToken(JsonToken.START_ARRAY, bufParser.nextToken());
         assertToken(JsonToken.VALUE_NUMBER_INT, bufParser.nextToken());
@@ -110,13 +114,13 @@ public void testTokenBufferWithSequence() throws Exception
         assertNull(bufParser.nextToken());
 
         // third one, with automatic binding
-        buf = MAPPER.readValue(p, TokenBuffer.class);
-        String str = MAPPER.readValue(buf.asParser(ObjectReadContext.empty()), String.class);
+        buf = mapper.readValue(p, TokenBuffer.class);
+        String str = mapper.readValue(buf.asParser(ObjectReadContext.empty()), String.class);
         assertEquals("abc", str);
 
         // and ditto for last one
-        buf = MAPPER.readValue(p, TokenBuffer.class);
-        Map<?,?> map = MAPPER.readValue(buf.asParser(ObjectReadContext.empty()), Map.class);
+        buf = mapper.readValue(p, TokenBuffer.class);
+        Map<?,?> map = mapper.readValue(buf.asParser(ObjectReadContext.empty()), Map.class);
         assertEquals(1, map.size());
         assertEquals(Boolean.TRUE, map.get("a"));
 
diff --git a/src/test/java/tools/jackson/databind/deser/SetterlessPropertiesDeserTest.java b/src/test/java/tools/jackson/databind/deser/SetterlessPropertiesDeserTest.java
@@ -23,22 +23,22 @@ public class SetterlessPropertiesDeserTest
 {
     static class CollectionBean
     {
-        List<String> _values = new ArrayList<String>();
+        List<String> _values = new ArrayList<>();
 
         public List<String> getValues() { return _values; }
     }
 
     static class MapBean
     {
-        Map<String,Integer> _values = new HashMap<String,Integer>();
+        Map<String,Integer> _values = new HashMap<>();
 
         public Map<String,Integer> getValues() { return _values; }
     }
 
     // testing to verify that field has precedence over getter, for lists
     static class Dual
     {
-        @JsonProperty("list") protected List<Integer> values = new ArrayList<Integer>();
+        @JsonProperty("list") protected List<Integer> values = new ArrayList<>();
 
         public Dual() { }
 
@@ -129,7 +129,7 @@ public void testSetterlessPrecedence() throws Exception
         ObjectMapper m = jsonMapperBuilder()
                 .enable(MapperFeature.USE_GETTERS_AS_SETTERS)
                 .build();
-        Dual value = m.readValue("{\"list\":[1,2,3]}, valueType)", Dual.class);
+        Dual value = m.readValue("{\"list\":[1,2,3]}", Dual.class);
         assertNotNull(value);
         assertEquals(3, value.values.size());
     }
diff --git a/src/test/java/tools/jackson/databind/deser/bean/BeanDeserializerTest.java b/src/test/java/tools/jackson/databind/deser/bean/BeanDeserializerTest.java
@@ -169,7 +169,9 @@ public Issue1912SubBean(String a) {
         }
     }
 
-    public static class Issue1912CustomBeanDeserializer extends ValueDeserializer<Issue1912Bean> {
+    public static class Issue1912CustomBeanDeserializer
+        extends ValueDeserializer<Issue1912Bean>
+    {
         private BeanDeserializer defaultDeserializer;
 
         public Issue1912CustomBeanDeserializer(BeanDeserializer defaultDeserializer) {
@@ -179,16 +181,26 @@ public Issue1912CustomBeanDeserializer(BeanDeserializer defaultDeserializer) {
         @Override
         public Issue1912Bean deserialize(JsonParser p, DeserializationContext ctxt)
         {
-            // this is need on some cases, this populate _propertyBasedCreator
-            defaultDeserializer.resolve(ctxt);
-
             p.nextName(); // read subBean
-            p.nextToken(); // read start object
+            if (p.nextToken() != JsonToken.START_OBJECT) {
+                throw new IllegalArgumentException("Unexpected token "+p.currentToken());
+            }
 
             Issue1912SubBean subBean = (Issue1912SubBean) defaultDeserializer.findProperty("subBean").deserialize(p, ctxt);
+            // Must also read trailing END_OBJECT
+            if (p.nextToken() != JsonToken.END_OBJECT) {
+                throw new IllegalArgumentException("Unexpected token "+p.currentToken());
+            }
 
             return new Issue1912Bean(subBean);
         }
+
+        @Override
+        public ValueDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property)
+        {
+            return new Issue1912CustomBeanDeserializer(
+                    (BeanDeserializer) defaultDeserializer.createContextual(ctxt, property));
+        }
     }
 
     public static class Issue1912CustomPropertyDeserializer extends ValueDeserializer<Issue1912SubBean>
diff --git a/src/test/java/tools/jackson/databind/deser/builder/BuilderSimpleTest.java b/src/test/java/tools/jackson/databind/deser/builder/BuilderSimpleTest.java
@@ -409,7 +409,7 @@ public void testBuilderMethodReturnMoreSpecific() throws Exception
     @Test
     public void testSelfBuilder777() throws Exception
     {
-        SelfBuilder777 result = MAPPER.readValue(a2q("{'x':3}'"),
+        SelfBuilder777 result = MAPPER.readValue(a2q("{'x':3}"),
                 SelfBuilder777.class);
         assertNotNull(result);
         assertEquals(3, result.x);
diff --git a/src/test/java/tools/jackson/databind/deser/enums/EnumDeserializationTest.java b/src/test/java/tools/jackson/databind/deser/enums/EnumDeserializationTest.java
@@ -283,11 +283,16 @@ public void testSimple() throws Exception
     {
         // First "good" case with Strings
         String JSON = "\"OK\" \"RULES\"  null";
-        // multiple main-level mappings, need explicit parser:
-        JsonParser p = MAPPER.createParser(JSON);
+        // multiple main-level mappings, need explicit parser
+        // (and possibly prevent validation of trailing tokens)
+        ObjectMapper mapper = jsonMapperBuilder()
+                .disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
+                .build();
+        
+        JsonParser p = mapper.createParser(JSON);
 
-        assertEquals(TestEnum.OK, MAPPER.readValue(p, TestEnum.class));
-        assertEquals(TestEnum.RULES, MAPPER.readValue(p, TestEnum.class));
+        assertEquals(TestEnum.OK, mapper.readValue(p, TestEnum.class));
+        assertEquals(TestEnum.RULES, mapper.readValue(p, TestEnum.class));
 
         // should be ok; nulls are typeless; handled by mapper, not by deserializer
         assertNull(MAPPER.readValue(p, TestEnum.class));
@@ -296,11 +301,11 @@ public void testSimple() throws Exception
         assertFalse(p.hasCurrentToken());
 
         // Then alternative with index (0 means first entry)
-        assertEquals(TestEnum.JACKSON, MAPPER.readValue(" 0 ", TestEnum.class));
+        assertEquals(TestEnum.JACKSON, mapper.readValue(" 0 ", TestEnum.class));
 
         // Then error case: unrecognized value
         try {
-            /*Object result =*/ MAPPER.readValue("\"NO-SUCH-VALUE\"", TestEnum.class);
+            /*Object result =*/ mapper.readValue("\"NO-SUCH-VALUE\"", TestEnum.class);
             fail("Expected an exception for bogus enum value...");
         } catch (MismatchedInputException jex) {
             verifyException(jex, "not one of the values accepted for Enum class");
@@ -309,8 +314,8 @@ public void testSimple() throws Exception
     }
 
     /**
-     * Enums are considered complex if they have code (and hence sub-classes)... an
-     * example is TimeUnit
+     * Enums are considered complex if they have code (and hence sub-classes)...
+     * an example is TimeUnit
      */
     @Test
     public void testComplexEnum() throws Exception
diff --git a/src/test/java/tools/jackson/databind/deser/filter/ProblemHandlerTest.java b/src/test/java/tools/jackson/databind/deser/filter/ProblemHandlerTest.java
@@ -369,6 +369,10 @@ public void testInstantiationExceptionHandling() throws Exception
     public void testMissingInstantiatorHandling() throws Exception
     {
         ObjectMapper mapper = jsonMapperBuilder()
+            // 14-Jan-2025, tatu: Need to disable trailing tokens (for 3.0)
+            //   for this to work (handler not consuming all tokens as it should
+            //   but no time to fully fix right now)
+            .disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
             .addHandler(new MissingInstantiationHandler(new NoDefaultCtor(13)))
             .build();
         NoDefaultCtor w = mapper.readValue("{ \"x\" : true }", NoDefaultCtor.class);
diff --git a/src/test/java/tools/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java b/src/test/java/tools/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java
@@ -416,12 +416,14 @@ public void testUUIDAux() throws Exception
             byte[] data = bytes.toByteArray();
             assertEquals(16, data.length);
 
-            buf.writePOJO(data);
-
-            UUID value2 = MAPPER.readValue(buf.asParser(ObjectReadContext.empty()), UUID.class);
-
-            assertEquals(value, value2);
-            buf.close();
+            // Let's create fresh TokenBuffer, not reuse one
+            try (TokenBuffer buf2 = TokenBuffer.forGeneration()) {
+                buf2.writePOJO(data);
+    
+                UUID value2 = MAPPER.readValue(buf2.asParser(), UUID.class);
+    
+                assertEquals(value, value2);
+            }
         }
     }
 }
diff --git a/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java b/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java
@@ -8,8 +8,7 @@
 
 import com.fasterxml.jackson.annotation.*;
 
-import tools.jackson.core.JsonGenerator;
-import tools.jackson.core.JsonParser;
+import tools.jackson.core.*;
 import tools.jackson.databind.*;
 import tools.jackson.databind.annotation.*;
 import tools.jackson.databind.cfg.MapperConfig;
@@ -95,20 +94,22 @@ public void setEnumProperty(EnumExample enumProperty)
     public static class QNameSerializer extends ValueSerializer<QName> {
 
         @Override
-        public void serialize(QName value, JsonGenerator g, SerializationContext provider)
+        public void serialize(QName value, JsonGenerator g, SerializationContext ctxt)
         {
             g.writeString(value.toString());
         }
     }
 
-
     public static class QNameDeserializer extends StdDeserializer<QName>
     {
         public QNameDeserializer() { super(QName.class); }
         @Override
         public QName deserialize(JsonParser p, DeserializationContext ctxt)
         {
-            return QName.valueOf(p.readValueAs(String.class));
+            if (!p.hasToken(JsonToken.VALUE_STRING)) {
+                 throw new IllegalArgumentException("Unexpected token "+p.currentToken());
+            }
+            return QName.valueOf(p.getText());
         }
     }
 
diff --git a/src/test/java/tools/jackson/databind/misc/TestBlocking.java b/src/test/java/tools/jackson/databind/misc/TestBlocking.java
@@ -26,21 +26,24 @@ public class TestBlocking
     @Test
     public void testEagerAdvance() throws IOException
     {
-        ObjectMapper mapper = new ObjectMapper();
-        JsonParser jp = createParserUsingReader("[ 1  ");
-        assertToken(JsonToken.START_ARRAY, jp.nextToken());
-        assertToken(JsonToken.VALUE_NUMBER_INT, jp.nextToken());
+        ObjectMapper mapper = jsonMapperBuilder()
+                .disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
+                .build();
+        JsonParser p = createParserUsingReader("[ 1  ");
+        assertToken(JsonToken.START_ARRAY, p.nextToken());
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
 
         // And then try to map just a single entry: shouldn't fail:
-        Integer I = mapper.readValue(jp, Integer.class);
+        Integer I = mapper.readValue(p, Integer.class);
         assertEquals(Integer.valueOf(1), I);
 
         // and should fail only now:
         try {
-            jp.nextToken();
+            p.nextToken();
+            fail("Should not pass");
         } catch (JacksonException ioe) {
             verifyException(ioe, "Unexpected end-of-input: expected close marker for ARRAY");
         }
-        jp.close();
+        p.close();
     }
 }
diff --git a/src/test/java/tools/jackson/databind/node/JsonNodeConversionsTest.java b/src/test/java/tools/jackson/databind/node/JsonNodeConversionsTest.java
@@ -161,7 +161,7 @@ public static class LeafDeserializer extends ValueDeserializer<Leaf>
         @Override
         public Leaf deserialize(JsonParser p, DeserializationContext ctxt)
         {
-            JsonNode tree = (JsonNode) p.readValueAsTree();
+            JsonNode tree = ctxt.readTree(p);
             Leaf leaf = new Leaf();
             leaf.value = tree.get("value").intValue();
             return leaf;
diff --git a/src/test/java/tools/jackson/databind/node/TreeReadViaMapperTest.java b/src/test/java/tools/jackson/databind/node/TreeReadViaMapperTest.java
@@ -146,7 +146,9 @@ public void testNullViaParser() throws Exception
     @Test
     public void testMultiple() throws Exception
     {
-        final ObjectMapper mapper = objectMapper();
+        ObjectMapper mapper = jsonMapperBuilder()
+                .disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
+                .build();
         String JSON = "12  \"string\" [ 1, 2, 3 ]";
         JsonParser p = mapper.createParser(new StringReader(JSON));
         JsonNode result = mapper.readTree(p);

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ public void testUnknownFields() throws Exception`
`462`	`462`	`ObjectMapper mapper = JsonMapper.builder().addHandler(new DeserializationProblemHandler(){`
`463`	`463`	`@Override`
`464`	`464`	`public boolean handleUnknownProperty(DeserializationContext ctxt, JsonParser p, ValueDeserializer<?> deserializer, Object beanOrClass, String propertyName) {`
`465`		`- p.readValueAsTree();`
	`465`	`+ ctxt.readTree(p);`
`466`	`466`	`return true;`
`467`	`467`	`}`
`468`	`468`	`}).build();`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public Bean deserialize(JsonParser p, DeserializationContext ctxt)`
`41`	`41`	`ctxt.reportInputMismatch(Bean.class,`
`42`	`42`	`"Deserializer not yet completely resolved");`
`43`	`43`	`}`
	`44`	`+ p.skipChildren(); // consume the value`
`44`	`45`	`Bean b = new Bean();`
`45`	`46`	`b.value = 13;`
`46`	`47`	`return b;`
Original file line number	Diff line number	Diff line change
`@@ -23,22 +23,22 @@ public class SetterlessPropertiesDeserTest`
`23`	`23`	`{`
`24`	`24`	`static class CollectionBean`
`25`	`25`	`{`
`26`		`- List<String> _values = new ArrayList<String>();`
	`26`	`+ List<String> _values = new ArrayList<>();`
`27`	`27`
`28`	`28`	`public List<String> getValues() { return _values; }`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`static class MapBean`
`32`	`32`	`{`
`33`		`- Map<String,Integer> _values = new HashMap<String,Integer>();`
	`33`	`+ Map<String,Integer> _values = new HashMap<>();`
`34`	`34`
`35`	`35`	`public Map<String,Integer> getValues() { return _values; }`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// testing to verify that field has precedence over getter, for lists`
`39`	`39`	`static class Dual`
`40`	`40`	`{`
`41`		`- @JsonProperty("list") protected List<Integer> values = new ArrayList<Integer>();`
	`41`	`+ @JsonProperty("list") protected List<Integer> values = new ArrayList<>();`
`42`	`42`
`43`	`43`	`public Dual() { }`
`44`	`44`
`@@ -129,7 +129,7 @@ public void testSetterlessPrecedence() throws Exception`
`129`	`129`	`ObjectMapper m = jsonMapperBuilder()`
`130`	`130`	`.enable(MapperFeature.USE_GETTERS_AS_SETTERS)`
`131`	`131`	`.build();`
`132`		`- Dual value = m.readValue("{\"list\":[1,2,3]}, valueType)", Dual.class);`
	`132`	`+ Dual value = m.readValue("{\"list\":[1,2,3]}", Dual.class);`
`133`	`133`	`assertNotNull(value);`
`134`	`134`	`assertEquals(3, value.values.size());`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ public void testBuilderMethodReturnMoreSpecific() throws Exception`
`409`	`409`	`@Test`
`410`	`410`	`public void testSelfBuilder777() throws Exception`
`411`	`411`	`{`
`412`		`- SelfBuilder777 result = MAPPER.readValue(a2q("{'x':3}'"),`
	`412`	`+ SelfBuilder777 result = MAPPER.readValue(a2q("{'x':3}"),`
`413`	`413`	`SelfBuilder777.class);`
`414`	`414`	`assertNotNull(result);`
`415`	`415`	`assertEquals(3, result.x);`