Fix #2415

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -900,3 +900,9 @@ Victor Noël (victornoel@github)
 Chris Mercer (cmercer@github)
   * Reported #2331: `JsonMappingException` through nested getter with generic wildcard return type
    (2.10.0)
+
+Vladimir Tsanev (tsachev@github)
+  * Contributed #2415: Builder-based POJO deserializer should pass builder instance, not type,
+    to `handleUnknownVanilla()` to fix earlier #822
+   (2.10.0)
+ 

release-notes/VERSION-2.x

@@ -14,7 +14,10 @@ Project: jackson-databind
  (reported by andreasbaus@github)
 #2393: `TreeTraversingParser.getLongValue()` incorrectly checks `canConvertToInt()`
  (reported by RabbidDog@github)
- #2416: Optimize `ValueInstantiator` construction for default `Collection`, `Map` types
+#2415: Builder-based POJO deserializer should pass builder instance, not type,
+  to `handleUnknownVanilla()`
+ (proposed by Vladimir T, follow up to #822)
+#2416: Optimize `ValueInstantiator` construction for default `Collection`, `Map` types
 
 2.10.0.pr1 (19-Jul-2019)
 

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java

@@ -1548,23 +1548,27 @@ protected Object handleUnknownProperties(DeserializationContext ctxt,
     /**
      * Helper method called for an unknown property, when using "vanilla"
      * processing.
+     *
+     * @param beanOrBuilder Either POJO instance (if constructed), or builder
+     *   (in case of builder-based approach), that has property we haven't been
+     *   able to handle yet.
      */
     protected void handleUnknownVanilla(JsonParser p, DeserializationContext ctxt,
-            Object bean, String propName)
+            Object beanOrBuilder, String propName)
         throws IOException
     {
         if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-            handleIgnoredProperty(p, ctxt, bean, propName);
+            handleIgnoredProperty(p, ctxt, beanOrBuilder, propName);
         } else if (_anySetter != null) {
             try {
                // should we consider return type of any setter?
-                _anySetter.deserializeAndSet(p, ctxt, bean, propName);
+                _anySetter.deserializeAndSet(p, ctxt, beanOrBuilder, propName);
             } catch (Exception e) {
-                wrapAndThrow(e, bean, propName, ctxt);
+                wrapAndThrow(e, beanOrBuilder, propName, ctxt);
             }
         } else {
             // Unknown: let's call handler method
-            handleUnknownProperty(p, ctxt, bean, propName);         
+            handleUnknownProperty(p, ctxt, beanOrBuilder, propName);         
         }
     }
 

src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java

@@ -468,7 +468,7 @@ protected final Object _deserialize(JsonParser p,
                 }
                 continue;
             }
-            handleUnknownVanilla(p, ctxt, handledType(), propName);
+            handleUnknownVanilla(p, ctxt, builder, propName);
         }
         return builder;
     }

src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java

@@ -216,10 +216,11 @@ static class ValueBuilder822
     {
         public int x;
         private Map<String,Object> stuff = new HashMap<String,Object>();
-        
-        public ValueBuilder822 withX(int x0) {
+
+        // And tweaked slightly for [databind#2415]
+        @JsonCreator
+        public ValueBuilder822(@JsonProperty("x") int x0) {
             this.x = x0;
-            return this;
         }
 
         @JsonAnySetter