Allow @JsonAnySetter on Creator constructors

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

@@ -867,6 +867,8 @@ protected void _addExplicitPropertyCreator(DeserializationContext ctxt,
             JacksonInject.Value injectId = candidate.injection(i);
             AnnotatedParameter param = candidate.parameter(i);
             PropertyName name = candidate.paramName(i);
+            Boolean hasAnySetter = null;
+
             if (name == null) {
                 // 21-Sep-2017, tatu: Looks like we want to block accidental use of Unwrapped,
                 //   as that will not work with Creators well at all
@@ -879,10 +881,17 @@ protected void _addExplicitPropertyCreator(DeserializationContext ctxt,
                     */
                 }
                 name = candidate.findImplicitParamName(i);
-                _validateNamedPropertyParameter(ctxt, beanDesc, candidate, i,
+                // [databind#562] Allow @JsonAnySetter in creators. Introspection is done here only because of
+                // _validateNamedPropertyParameter() check. Otherwise, in constructCreatorProperty seems appropriate....
+                hasAnySetter = ctxt.getAnnotationIntrospector().hasAnySetter(param);
+                if (Boolean.TRUE.equals(hasAnySetter)) {
+                    // no-op
+                } else {
+                    _validateNamedPropertyParameter(ctxt, beanDesc, candidate, i,
                         name, injectId);
+                }
             }
-            properties[i] = constructCreatorProperty(ctxt, beanDesc, name, i, param, injectId);
+            properties[i] = constructCreatorProperty(ctxt, beanDesc, name, i, param, injectId, hasAnySetter);
         }
         creators.addPropertyCreator(candidate.creator(), true, properties);
     }
@@ -1187,7 +1196,8 @@ protected void _reportUnwrappedCreatorProperty(DeserializationContext ctxt,
     protected SettableBeanProperty constructCreatorProperty(DeserializationContext ctxt,
             BeanDescription beanDesc, PropertyName name, int index,
             AnnotatedParameter param,
-            JacksonInject.Value injectable)
+            JacksonInject.Value injectable,
+            Boolean hasAnySetter)
         throws JsonMappingException
     {
         final DeserializationConfig config = ctxt.getConfig();
@@ -1225,7 +1235,7 @@ protected SettableBeanProperty constructCreatorProperty(DeserializationContext c
         // so it is not called directly here
         SettableBeanProperty prop = CreatorProperty.construct(name, type, property.getWrapperName(),
                 typeDeser, beanDesc.getClassAnnotations(), param, index, injectable,
-                metadata);
+                metadata, hasAnySetter);
         JsonDeserializer<?> deser = findDeserializerFromAnnotation(ctxt, param);
         if (deser == null) {
             deser = type.getValueHandler();
@@ -1238,6 +1248,19 @@ protected SettableBeanProperty constructCreatorProperty(DeserializationContext c
         return prop;
     }
 
+    /**
+     * @deprecated Since 2.18, use {@link #constructCreatorProperty(DeserializationContext, BeanDescription,
+     * PropertyName, int, AnnotatedParameter, JacksonInject.Value, Boolean)} instead.
+     */
+    protected SettableBeanProperty constructCreatorProperty(DeserializationContext ctxt,
+            BeanDescription beanDesc, PropertyName name, int index,
+            AnnotatedParameter param,
+            JacksonInject.Value injectable)
+        throws JsonMappingException
+    {
+        return constructCreatorProperty(ctxt, beanDesc, name, index, param, injectable, null);
+    }
+
     private PropertyName _findParamName(AnnotatedParameter param, AnnotationIntrospector intr)
     {
         if (intr != null) {

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

@@ -497,7 +497,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
             // "any property"?
             if (_anySetter != null) {
                 try {
-                    buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));
+                    buffer.bufferMapProperty(propName, _anySetter.deserialize(p, ctxt));
                 } catch (Exception e) {
                     wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                 }
@@ -523,10 +523,15 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
         // We hit END_OBJECT, so:
         Object bean;
         try {
-            bean = creator.build(ctxt, buffer);
+            if (_anySetter != null) {
+                bean = creator.buildWithAnySetter(ctxt, buffer, _anySetter);
+            } else {
+                bean = creator.build(ctxt, buffer);
+            }
         } catch (Exception e) {
             return wrapInstantiationProblem(e, ctxt);
         }
+
         // 13-Apr-2020, tatu: [databind#2678] need to handle injection here
         if (_injectables != null) {
             injectValues(ctxt, bean);

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

@@ -544,8 +544,11 @@ protected void addBeanProps(DeserializationContext ctxt,
 
         // Also, do we have a fallback "any" setter?
         AnnotatedMember anySetter = beanDesc.findAnySetterAccessor();
+        AnnotatedMember creatorPropWithAnySetter = _findCreatorPropWithAnySetter(ctxt, creatorProps);
         if (anySetter != null) {
             builder.setAnySetter(constructAnySetter(ctxt, beanDesc, anySetter));
+        } else if (creatorPropWithAnySetter != null) {
+            builder.setAnySetter(constructAnySetter(ctxt, beanDesc, creatorPropWithAnySetter));
         } else {
             // 23-Jan-2018, tatu: although [databind#1805] would suggest we should block
             //   properties regardless, for now only consider unless there's any setter...
@@ -661,6 +664,23 @@ protected void addBeanProps(DeserializationContext ctxt,
         }
     }
 
+    private AnnotatedMember _findCreatorPropWithAnySetter(DeserializationContext ctxt, SettableBeanProperty[] creatorProps) {
+        if (creatorProps != null) {
+            AnnotationIntrospector ai = ctxt.getAnnotationIntrospector();
+            for (SettableBeanProperty prop : creatorProps) {
+                AnnotatedMember m = prop.getMember();
+                if (m != null) {
+                    Boolean hasAnySetter = ai.hasAnySetter(m);
+                    if (hasAnySetter != null && hasAnySetter) {
+                        return prop.getMember();
+                    }
+                }
+
+            }
+        }
+        return null;
+    }
+
     private boolean _isSetterlessType(Class<?> rawType) {
         // May also need to consider getters
         // for Map/Collection properties; but with lowest precedence
@@ -808,6 +828,7 @@ protected SettableAnyProperty constructAnySetter(DeserializationContext ctxt,
         JavaType keyType;
         JavaType valueType;
         final boolean isField = mutator instanceof AnnotatedField;
+        boolean isMapParam = false;
 
         if (mutator instanceof AnnotatedMethod) {
             // we know it's a 2-arg method, second arg is the value
@@ -819,6 +840,23 @@ protected SettableAnyProperty constructAnySetter(DeserializationContext ctxt,
                     valueType, null, mutator,
                     PropertyMetadata.STD_OPTIONAL);
 
+        } else if (mutator instanceof AnnotatedParameter){
+            AnnotatedParameter af = (AnnotatedParameter) mutator;
+            // get the type from the content type of the map object
+            JavaType fieldType = af.getType();
+            // 31-Jul-2022, tatu: Not just Maps any more but also JsonNode, so:
+            if (fieldType.isMapLikeType()) {
+                fieldType = resolveMemberAndTypeAnnotations(ctxt, mutator, fieldType);
+                keyType = fieldType.getKeyType();
+                valueType = fieldType.getContentType();
+                prop = new BeanProperty.Std(PropertyName.NO_NAME,
+                    fieldType, null, mutator, PropertyMetadata.STD_OPTIONAL);
+                isMapParam = true;
+            } else {
+                return ctxt.reportBadDefinition(beanDesc.getType(), String.format(
+                    "Unsupported type for any-setter: %s -- only support `Map`s, `JsonNode` and `ObjectNode` ",
+                    ClassUtil.getTypeDescription(fieldType)));
+            }
         } else if (isField) {
             AnnotatedField af = (AnnotatedField) mutator;
             // get the type from the content type of the map object
@@ -880,6 +918,10 @@ protected SettableAnyProperty constructAnySetter(DeserializationContext ctxt,
             return SettableAnyProperty.constructForMapField(ctxt,
                     prop, mutator, valueType, keyDeser, deser, typeDeser);
         }
+        if (isMapParam) {
+            return SettableAnyProperty.constructForMapParameter(ctxt,
+                    prop, mutator, valueType, keyDeser, deser, typeDeser);
+        }
         return SettableAnyProperty.constructForMethod(ctxt,
                 prop, mutator, valueType, keyDeser, deser, typeDeser);
     }

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

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.core.JsonParser;
@@ -76,19 +77,40 @@ public class CreatorProperty
     protected boolean _ignorable;
 
     /**
-     * @since 2.11
+     * Marker flag to indicate that current property is used to handle "any setter" via `@JsonAnySetter`.
+     *
+     * @since 2.18
+     */
+    protected final Boolean _isAnySetterProp;
+
+    /**
+     * @since 2.18
      */
     protected CreatorProperty(PropertyName name, JavaType type, PropertyName wrapperName,
             TypeDeserializer typeDeser,
             Annotations contextAnnotations, AnnotatedParameter param,
             int index, JacksonInject.Value injectable,
-            PropertyMetadata metadata)
+            PropertyMetadata metadata, Boolean isAnySetterProp)
     {
         super(name, type, wrapperName, typeDeser, contextAnnotations, metadata);
         _annotated = param;
         _creatorIndex = index;
         _injectableValue = injectable;
         _fallbackSetter = null;
+        _isAnySetterProp = isAnySetterProp; // [databind#562] Since 2.18
+    }
+
+    /**
+     * @since 2.11
+     * @deprecated Since 2.18. use factory later version instead.
+     */
+    protected CreatorProperty(PropertyName name, JavaType type, PropertyName wrapperName,
+            TypeDeserializer typeDeser,
+            Annotations contextAnnotations, AnnotatedParameter param,
+            int index, JacksonInject.Value injectable,
+            PropertyMetadata metadata)
+    {
+        this(name, type, wrapperName, typeDeser, contextAnnotations, param, index, injectable, metadata, null);
     }
 
     /**
@@ -122,8 +144,24 @@ public CreatorProperty(PropertyName name, JavaType type, PropertyName wrapperNam
      *    method parameter; used for accessing annotations of the property
      * @param injectable Information about injectable value, if any
      * @param index Index of this property within creator invocation
-     *
+     * @param isAnySetter Marker flag to indicate that current property is used to handle "any setter" via `@JsonAnySetter`.
+     *                    
+     * @since 2.18
+     */
+    public static CreatorProperty construct(PropertyName name, JavaType type, PropertyName wrapperName,
+            TypeDeserializer typeDeser,
+            Annotations contextAnnotations, AnnotatedParameter param,
+            int index, JacksonInject.Value injectable,
+            PropertyMetadata metadata,
+            Boolean isAnySetter)
+    {
+        return new CreatorProperty(name, type, wrapperName, typeDeser, contextAnnotations,
+                param, index, injectable, metadata, isAnySetter);
+    }
+
+    /**
      * @since 2.11
+     * @deprecated Since 2.18. use later version instead.
      */
     public static CreatorProperty construct(PropertyName name, JavaType type, PropertyName wrapperName,
             TypeDeserializer typeDeser,
@@ -132,7 +170,7 @@ public static CreatorProperty construct(PropertyName name, JavaType type, Proper
             PropertyMetadata metadata)
     {
         return new CreatorProperty(name, type, wrapperName, typeDeser, contextAnnotations,
-                param, index, injectable, metadata);
+                param, index, injectable, metadata, null);
     }
 
     /**
@@ -145,6 +183,7 @@ protected CreatorProperty(CreatorProperty src, PropertyName newName) {
         _fallbackSetter = src._fallbackSetter;
         _creatorIndex = src._creatorIndex;
         _ignorable = src._ignorable;
+        _isAnySetterProp = src._isAnySetterProp; // [databind#562] Since 2.18
     }
 
     protected CreatorProperty(CreatorProperty src, JsonDeserializer<?> deser,
@@ -155,6 +194,7 @@ protected CreatorProperty(CreatorProperty src, JsonDeserializer<?> deser,
         _fallbackSetter = src._fallbackSetter;
         _creatorIndex = src._creatorIndex;
         _ignorable = src._ignorable;
+        _isAnySetterProp = src._isAnySetterProp; // [databind#562] Since 2.18
     }
 
     @Override
@@ -320,6 +360,13 @@ public boolean isInjectionOnly() {
 
     //  public boolean isInjectionOnly() { return false; }
 
+    /**
+     * @since 2.18
+     */
+    public boolean isAnySetterProp() {
+        return Boolean.TRUE.equals(_isAnySetterProp);
+    }
+
     /*
     /**********************************************************
     /* Overridden methods, other
@@ -354,4 +401,17 @@ private void _reportMissingSetter(JsonParser p, DeserializationContext ctxt) thr
             throw InvalidDefinitionException.from(p, msg, getType());
         }
     }
+
+    /**
+     * @since 2.18
+     */
+    public Map<Object, Object> initMap(DeserializationContext context, SettableAnyProperty anySetter)
+        throws IOException
+    {
+        if (!isAnySetterProp()) {
+            throw new IllegalStateException("Cannot create Map for non-AnySetter creator property");
+        }
+        SettableAnyProperty.MapParameterAnyProperty mapParap = (SettableAnyProperty.MapParameterAnyProperty) anySetter;
+        return mapParap.initMap(context);
+    }
 }

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

@@ -117,6 +117,28 @@ public static SettableAnyProperty constructForJsonNodeField(DeserializationConte
                 ctxt.getNodeFactory());
     }
 
+    /**
+     * @since 2.18
+     */
+    public static SettableAnyProperty constructForMapParameter(DeserializationContext ctxt,
+            BeanProperty property,
+            AnnotatedMember field, JavaType valueType,
+            KeyDeserializer keyDeser,
+            JsonDeserializer<Object> valueDeser, TypeDeserializer typeDeser)
+    {
+        Class<?> mapType = field.getRawType();
+        // 02-Aug-2022, tatu: Ideally would be resolved to a concrete type by caller but
+        //    alas doesn't appear to happen. Nor does `BasicDeserializerFactory` expose method
+        //    for finding default or explicit mappings.
+        if (mapType == Map.class) {
+            mapType = LinkedHashMap.class;
+        }
+        ValueInstantiator vi = JDKValueInstantiators.findStdValueInstantiator(ctxt.getConfig(), mapType);
+        return new MapParameterAnyProperty(property, field, valueType,
+                keyDeser, valueDeser, typeDeser,
+                vi);
+    }
+
     // Abstract @since 2.14
     public abstract SettableAnyProperty withValueDeserializer(JsonDeserializer<Object> deser);
 
@@ -437,4 +459,49 @@ public SettableAnyProperty withValueDeserializer(JsonDeserializer<Object> deser)
             return this;
         }
     }
+
+    /**
+     * @since 2.18
+     */
+    protected static class MapParameterAnyProperty extends SettableAnyProperty
+        implements java.io.Serializable
+    {
+        private static final long serialVersionUID = 1L;
+
+        protected final ValueInstantiator _valueInstantiator;
+
+        public MapParameterAnyProperty(BeanProperty property,
+                                       AnnotatedMember field, JavaType valueType,
+                                       KeyDeserializer keyDeser,
+                                       JsonDeserializer<Object> valueDeser, TypeDeserializer typeDeser,
+                                       ValueInstantiator inst) {
+            super(property, field, valueType,
+                keyDeser, valueDeser, typeDeser);
+            _valueInstantiator = inst;
+        }
+
+        @Override
+        public SettableAnyProperty withValueDeserializer(JsonDeserializer<Object> deser) {
+            return new MapParameterAnyProperty(_property, _setter, _type,
+                _keyDeserializer, deser, _valueTypeDeserializer,
+                _valueInstantiator);
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        protected void _set(Object instance, Object propName, Object value) throws Exception {
+            throw new UnsupportedOperationException("Cannot set any properties for constructor parameter of type `Map`");
+        }
+
+        protected Map<Object, Object> initMap(DeserializationContext ctxt)
+            throws IOException
+        {
+            if (_valueInstantiator == null) {
+                throw JsonMappingException.from(ctxt, String.format(
+                    "Cannot create an instance of %s for use as \"any-setter\" '%s'",
+                    ClassUtil.nameOf(_type.getRawClass()), _property.getName()));
+            }
+            return  (Map<Object, Object>) _valueInstantiator.createUsingDefault(ctxt);
+        }
+    }
 }

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

@@ -301,6 +301,13 @@ public Object createFromObjectWith(DeserializationContext ctxt,
         return createFromObjectWith(ctxt, buffer.getParameters(props));
     }
 
+    public Object createFromObjectWith(DeserializationContext ctxt,
+            SettableBeanProperty[] props, PropertyValueBuffer buffer, SettableAnyProperty anySetter)
+        throws IOException
+    {
+        return createFromObjectWith(ctxt, buffer.getParametersWithAnySetter(props, anySetter));
+    }
+
     /**
      * Method to called to create value instance from JSON Object using
      * an intermediate "delegate" value to pass to createor method