Merge branch '2.x' into 3.0

Author: cowtowncoder

src/main/java/tools/jackson/databind/deser/bean/PropertyBasedCreator.java

@@ -249,7 +249,8 @@ public SettableBeanProperty findCreatorProperty(int propertyIndex) {
      */
     public PropertyValueBuffer startBuilding(JsonParser p, DeserializationContext ctxt,
             ObjectIdReader oir) {
-        return new PropertyValueBuffer(p, ctxt, _propertyCount, oir, null);
+        return new PropertyValueBuffer(p, ctxt, _propertyCount, oir, null,
+                _injectablePropIndexes);
     }
 
     /**
@@ -260,7 +261,8 @@ public PropertyValueBuffer startBuilding(JsonParser p, DeserializationContext ct
     public PropertyValueBuffer startBuildingWithAnySetter(JsonParser p, DeserializationContext ctxt,
             ObjectIdReader oir, SettableAnyProperty anySetter
     ) {
-        return new PropertyValueBuffer(p, ctxt, _propertyCount, oir, anySetter);
+        return new PropertyValueBuffer(p, ctxt, _propertyCount, oir, anySetter,
+                _injectablePropIndexes);
     }
 
     public Object build(DeserializationContext ctxt, PropertyValueBuffer buffer)

src/main/java/tools/jackson/databind/deser/bean/PropertyValueBuffer.java

@@ -69,7 +69,7 @@ public class PropertyValueBuffer
     /**
      * If we get non-creator parameters before or between
      * creator parameters, those need to be buffered. Buffer
-     * is just a simple linked list
+     * is just a simple linked list.
      */
     protected PropertyValue _buffered;
 
@@ -80,7 +80,7 @@ public class PropertyValueBuffer
     protected Object _idValue;
 
     /**
-     * "Any setter" property bound to a Creator parameter (via {@code @JsonAnySetter})
+     * "Any setter" property bound to a Creator parameter (via {@code @JsonAnySetter}).
      *
      * @since 2.18
      */
@@ -94,14 +94,25 @@ public class PropertyValueBuffer
      */
     protected PropertyValue _anyParamBuffered;
 
+    /**
+     * Indexes properties that are injectable, if any; {@code null} if none.
+     *
+     * @since 2.21
+     */
+    protected final BitSet _injectablePropIndexes;
+
     /*
     /**********************************************************************
     /* Life-cycle
     /**********************************************************************
      */
 
+    /**
+     * @since 3.1
+     */
     public PropertyValueBuffer(JsonParser p, DeserializationContext ctxt, int paramCount,
-            ObjectIdReader oir, SettableAnyProperty anyParamSetter)
+            ObjectIdReader oir, SettableAnyProperty anyParamSetter,
+            BitSet injectablePropIndexes)
     {
         _parser = p;
         _context = ctxt;
@@ -119,6 +130,8 @@ public PropertyValueBuffer(JsonParser p, DeserializationContext ctxt, int paramC
         } else {
             _anyParamSetter = anyParamSetter;
         }
+        _injectablePropIndexes = (injectablePropIndexes == null)
+                ? null : (BitSet) injectablePropIndexes.clone();
     }
 
     /**