Allow @JsonAnySetter on Creator constructors

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

@@ -401,7 +401,7 @@ private void _addImplicitDelegatingConstructors(DeserializationContext ctxt,
 
                 if (injectable != null) {
                     ++injectCount;
-                    properties[i] = constructCreatorProperty(ctxt, beanDesc, null, i, param, injectable);
+                    properties[i] = constructCreatorProperty(ctxt, beanDesc, null, i, param, injectable, false);
                     continue;
                 }
                 NameTransformer unwrapper = intr.findUnwrappingNameTransformer(param);
@@ -472,7 +472,7 @@ private boolean _addExplicitDelegatingCreator(DeserializationContext ctxt,
             AnnotatedParameter param = candidate.parameter(i);
             JacksonInject.Value injectId = candidate.injection(i);
             if (injectId != null) {
-                properties[i] = constructCreatorProperty(ctxt, beanDesc, null, i, param, injectId);
+                properties[i] = constructCreatorProperty(ctxt, beanDesc, null, i, param, injectId, false);
                 continue;
             }
             if (ix < 0) {
@@ -508,6 +508,7 @@ private void _addSelectedPropertiesBasedCreator(DeserializationContext ctxt,
     {
         final int paramCount = candidate.paramCount();
         SettableBeanProperty[] properties = new SettableBeanProperty[paramCount];
+        int anySetterIndex = -1;
 
         for (int i = 0; i < paramCount; ++i) {
             JacksonInject.Value injectId = candidate.injection(i);
@@ -520,14 +521,25 @@ private void _addSelectedPropertiesBasedCreator(DeserializationContext ctxt,
                 if (unwrapper != null) {
                     _reportUnwrappedCreatorProperty(ctxt, beanDesc, param);
                 }
-                // Must be injectable or have name; without either won't work
-                if ((name == null) && (injectId == null)) {
-                    ctxt.reportBadTypeDefinition(beanDesc,
+                // [databind#562] Allow @JsonAnySetter in creators
+                if (Boolean.TRUE.equals(ctxt.getAnnotationIntrospector().hasAnySetter(param))) {
+                    if (anySetterIndex >= 0) {
+                        ctxt.reportBadTypeDefinition(beanDesc,
+                                "More than one 'any-setter' specified (parameters #%d vs #%d)",
+                                anySetterIndex, i);
+                    }
+                    anySetterIndex = i;
+                } else {
+                    // Must be injectable or have name; without either won't work
+                    if ((name == null) && (injectId == null)) {
+                        ctxt.reportBadTypeDefinition(beanDesc,
 "Argument #%d of Creator %s has no property name (and is not Injectable): can not use as property-based Creator",
 i, candidate);
+                    }
                 }
             }
-            properties[i] = constructCreatorProperty(ctxt, beanDesc, name, i, param, injectId);
+            properties[i] = constructCreatorProperty(ctxt, beanDesc, name, i, param, injectId,
+                    anySetterIndex == i);
         }
         creators.addPropertyCreator(candidate.creator(), true, properties);
     }
@@ -600,11 +612,14 @@ private void _reportUnwrappedCreatorProperty(DeserializationContext ctxt,
      * Method that will construct a property object that represents
      * a logical property passed via Creator (constructor or static
      * factory method)
+     *
+     * @since 2.18
      */
     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();
@@ -642,7 +657,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();
@@ -655,6 +670,20 @@ protected SettableBeanProperty constructCreatorProperty(DeserializationContext c
         return prop;
     }
 
+    /**
+     * @deprecated since 2.18, use {@link #constructCreatorProperty(DeserializationContext, BeanDescription,
+     * PropertyName, int, AnnotatedParameter, JacksonInject.Value, boolean)} instead.
+     */
+    @Deprecated
+    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, false);
+    }
+
     /**
      * Helper method copied from {@code POJOPropertyBuilder} since that won't be
      * applied to creator parameters

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

@@ -415,7 +415,9 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
         throws IOException
     {
         final PropertyBasedCreator creator = _propertyBasedCreator;
-        PropertyValueBuffer buffer = creator.startBuilding(p, ctxt, _objectIdReader);
+        PropertyValueBuffer buffer = (_anySetter != null)
+            ? creator.startBuildingWithAnySetter(p, ctxt, _objectIdReader, _anySetter)
+            : creator.startBuilding(p, ctxt, _objectIdReader);
         TokenBuffer unknown = null;
         final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
 
@@ -497,7 +499,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
             // "any property"?
             if (_anySetter != null) {
                 try {
-                    buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(p, ctxt));
+                    buffer.bufferAnySetter(ctxt, p, creator, propName);
                 } catch (Exception e) {
                     wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
                 }

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(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...
@@ -558,6 +561,7 @@ protected void addBeanProps(DeserializationContext ctxt,
                 }
             }
         }
+
         final boolean useGettersAsSetters = ctxt.isEnabled(MapperFeature.USE_GETTERS_AS_SETTERS)
                 && ctxt.isEnabled(MapperFeature.AUTO_DETECT_GETTERS);
 
@@ -661,6 +665,18 @@ protected void addBeanProps(DeserializationContext ctxt,
         }
     }
 
+    // since 2.18
+    private AnnotatedMember _findCreatorPropWithAnySetter(SettableBeanProperty[] creatorProps) {
+        if (creatorProps != null) {
+            for (SettableBeanProperty prop : creatorProps) {
+                if (((CreatorProperty) prop).isAnySetter()) {
+                    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 +824,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 +836,22 @@ protected SettableAnyProperty constructAnySetter(DeserializationContext ctxt,
                     valueType, null, mutator,
                     PropertyMetadata.STD_OPTIONAL);
 
+        // [databind#562] Allow @JsonAnySetter in creators
+        } else if (mutator instanceof AnnotatedParameter){
+            AnnotatedParameter af = (AnnotatedParameter) mutator;
+            // get the type from the content type of the map object
+            JavaType fieldType = af.getType();
+            if (!fieldType.isMapLikeType()) {
+                return ctxt.reportBadDefinition(beanDesc.getType(), String.format(
+                    "Unsupported type for any-setter: %s -- only support `Map`s, `JsonNode` and `ObjectNode` ",
+                    ClassUtil.getTypeDescription(fieldType)));
+            }
+            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 if (isField) {
             AnnotatedField af = (AnnotatedField) mutator;
             // get the type from the content type of the map object
@@ -880,6 +913,11 @@ protected SettableAnyProperty constructAnySetter(DeserializationContext ctxt,
             return SettableAnyProperty.constructForMapField(ctxt,
                     prop, mutator, valueType, keyDeser, deser, typeDeser);
         }
+       // [databind#562] Allow @JsonAnySetter in creators
+        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,42 @@ 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 _isAnySetter;
+
+    /**
+     * @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 isAnySetter)
     {
         super(name, type, wrapperName, typeDeser, contextAnnotations, metadata);
         _annotated = param;
         _creatorIndex = index;
         _injectableValue = injectable;
         _fallbackSetter = null;
+        _isAnySetter = isAnySetter; // [databind#562] since 2.18
+    }
+
+    /**
+     * @since 2.11
+     * @deprecated since 2.18. use later version instead.
+     */
+    @Deprecated
+    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, false);
     }
 
     /**
@@ -122,17 +146,34 @@ 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.
      */
+    @Deprecated
     public static CreatorProperty construct(PropertyName name, JavaType type, PropertyName wrapperName,
             TypeDeserializer typeDeser,
             Annotations contextAnnotations, AnnotatedParameter param,
             int index, JacksonInject.Value injectable,
             PropertyMetadata metadata)
     {
         return new CreatorProperty(name, type, wrapperName, typeDeser, contextAnnotations,
-                param, index, injectable, metadata);
+                param, index, injectable, metadata, false);
     }
 
     /**
@@ -145,6 +186,7 @@ protected CreatorProperty(CreatorProperty src, PropertyName newName) {
         _fallbackSetter = src._fallbackSetter;
         _creatorIndex = src._creatorIndex;
         _ignorable = src._ignorable;
+        _isAnySetter = src._isAnySetter; // [databind#562] since 2.18
     }
 
     protected CreatorProperty(CreatorProperty src, JsonDeserializer<?> deser,
@@ -155,6 +197,7 @@ protected CreatorProperty(CreatorProperty src, JsonDeserializer<?> deser,
         _fallbackSetter = src._fallbackSetter;
         _creatorIndex = src._creatorIndex;
         _ignorable = src._ignorable;
+        _isAnySetter = src._isAnySetter; // [databind#562] since 2.18
     }
 
     @Override
@@ -320,6 +363,13 @@ public boolean isInjectionOnly() {
 
     //  public boolean isInjectionOnly() { return false; }
 
+    /**
+     * @since 2.18
+     */
+    public boolean isAnySetter() {
+        return _isAnySetter;
+    }
+
     /*
     /**********************************************************
     /* Overridden methods, other
@@ -354,4 +404,13 @@ private void _reportMissingSetter(JsonParser p, DeserializationContext ctxt) thr
             throw InvalidDefinitionException.from(p, msg, getType());
         }
     }
+
+    /**
+     * @since 2.18
+     */
+    public Map<Object, Object> createAnyPropertyMap(DeserializationContext context, SettableAnyProperty anySetter)
+        throws IOException
+    {
+        return ((SettableAnyProperty.MapParamAnyProperty) anySetter).createAnyPropertyMap(context);
+    }
 }