Initial fix for FasterXML#4639

JooHyukKim · Nov 8, 2024 · 96b7439 · 96b7439
1 parent 764c83b
commit 96b7439
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 4 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -506,7 +506,9 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
             if (_anySetter != null) {
                 try {
                     // [databind#4639] Since 2.18.1 AnySetter might not part of the creator, but just some field.
-                    if (_anySetter.isFieldType()) {
+                    if (_anySetter.isFieldType() ||
+                            // [databind#4639] 2.18.2: Also should account for setter type :-/
+                            _anySetter.isSetterType()) {
                         buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));
                     } else {
                         buffer.bufferAnyParameterProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java b/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
@@ -201,6 +201,13 @@ Object readResolve() {
      */
     public boolean isFieldType() { return _setterIsField; }
 
+    /**
+     * Method called to check whether this property is method
+     *
+     * @return 2.18.2
+     */
+    public boolean isSetterType() { return _setter instanceof AnnotatedMethod; }
+
     /**
      * Create an instance of value to pass through Creator parameter.
      *

diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/AnySetterFieldWithCreator4639Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/AnySetterFieldWithCreator4639Test.java
@@ -1,14 +1,16 @@
 package com.fasterxml.jackson.databind.deser;
 
+import java.util.HashMap;
 import java.util.Map;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // [databind#4639] 2.18.1 : regression when using @JsonAnySetter outside of @JsonCreator
@@ -30,13 +32,49 @@ public Bean(@JsonProperty("b") int b, @JsonProperty("d") int d) {
         }
     }
 
+    public static class SomeBean {
+        final int b;
+        final int d;
+        final Map<String, Object> any = new HashMap<>();
+
+        @JsonCreator
+        public SomeBean(@JsonProperty("b") int b, @JsonProperty("d") int d) {
+            this.b = b;
+            this.d = d;
+        }
+
+        @JsonAnySetter
+        public void setAny(String name, Object value) {
+            any.put(name, value);
+        }
+    }
+
+    final ObjectMapper MAPPER = newJsonMapper();
+
     @Test
     public void testJsonAnySetter()
             throws Exception
     {
         String json = "{\"a\":1,\"b\":2,\"c\":3,\"d\":4,\"e\":5,\"f\":6}";
 
-        Bean bean = newJsonMapper().readValue(json, Bean.class);
+        Bean bean = MAPPER.readValue(json, Bean.class);
+        assertEquals(2, bean.b);
+        assertEquals(4, bean.d);
+
+        // failed with:
+        // org.opentest4j.AssertionFailedError:
+        // Expected :{b=2, c=3, e=5, f=6}
+        // Actual   :{e=5, f=6}
+        assertEquals(mapOf("a", 1, "c", 3, "e", 5, "f", 6), bean.any);
+    }
+
+    @Test
+    public void testJsonAnySetterWithField()
+            throws Exception
+    {
+        String json = "{\"a\":1,\"b\":2,\"c\":3,\"d\":4,\"e\":5,\"f\":6}";
+
+        SomeBean bean = MAPPER.readValue(json, SomeBean.class);
         assertEquals(2, bean.b);
         assertEquals(4, bean.d);