Merge branch '2.11' into 2.12

FasterXML · Jan 27, 2021 · 666a6ac · 666a6ac
2 parents 9b91c1c + eb3ebd9
commit 666a6ac
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -1189,6 +1189,11 @@ Lucian H (symposion@github)
     with `@JsonIdentityInfo`, `PropertyGenerator`
   (2.11.4)
 
+Gian Merlino (gianm@github)
+  * Reported #3022: Property ignorals cause `BeanDeserializer `to forget how to read
+   from arrays (not copying `_arrayDelegateDeserializer`)
+  (2.11.5 / 2.12.2)
+
 Marc Carter (drekbour@github)
   * Contributed #43 implementation: Add option to resolve type from multiple existing properties,
    `@JsonTypeInfo(use=DEDUCTION)`
@@ -1293,5 +1298,3 @@ SunYiJun (xiaosunzhu@github)
   * Reported, suggested fix for #2979: Conflicting in POJOPropertiesCollector when
     having namingStrategy
    (2.12.1)
-
---- END ---
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -4,6 +4,12 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
+2.12.2 (not yet released)
+
+#3022: Property ignorals cause `BeanDeserializer `to forget how to read
+  from arrays (not copying `_arrayDelegateDeserializer`)
+ (reported by Gian M)
+
 2.12.1 (08-Jan-2021)
 
 #2962: Auto-detection of constructor-based creator method skipped if there is

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java
@@ -66,12 +66,18 @@ public abstract class BeanDeserializerBase
     /**
      * Deserializer that is used iff delegate-based creator is
      * to be used for deserializing from JSON Object.
+     *<p>
+     * NOTE: cannot be {@code final} because we need to get it during
+     * {@code resolve()} method (and not contextualization).
      */
     protected JsonDeserializer<Object> _delegateDeserializer;
 
     /**
      * Deserializer that is used iff array-delegate-based creator
      * is to be used for deserializing from JSON Object.
+     *<p>
+     * NOTE: cannot be {@code final} because we need to get it during
+     * {@code resolve()} method (and not contextualization).
      */
     protected JsonDeserializer<Object> _arrayDelegateDeserializer;
 
@@ -211,7 +217,11 @@ protected BeanDeserializerBase(BeanDeserializerBuilder builder,
     {
         super(beanDesc.getType());
         _beanType = beanDesc.getType();
+
         _valueInstantiator = builder.getValueInstantiator();
+        _delegateDeserializer = null;
+        _arrayDelegateDeserializer = null;
+        _propertyBasedCreator = null;
 
         _beanProperties = properties;
         _backRefs = backRefs;
@@ -264,6 +274,7 @@ protected BeanDeserializerBase(BeanDeserializerBase src, boolean ignoreAllUnknow
 
         _valueInstantiator = src._valueInstantiator;
         _delegateDeserializer = src._delegateDeserializer;
+        _arrayDelegateDeserializer = src._arrayDelegateDeserializer;
         _propertyBasedCreator = src._propertyBasedCreator;
 
         _beanProperties = src._beanProperties;
@@ -291,6 +302,7 @@ protected BeanDeserializerBase(BeanDeserializerBase src, NameTransformer unwrapp
 
         _valueInstantiator = src._valueInstantiator;
         _delegateDeserializer = src._delegateDeserializer;
+        _arrayDelegateDeserializer = src._arrayDelegateDeserializer;
         _propertyBasedCreator = src._propertyBasedCreator;
 
         _backRefs = src._backRefs;
@@ -329,6 +341,7 @@ public BeanDeserializerBase(BeanDeserializerBase src, ObjectIdReader oir)
 
         _valueInstantiator = src._valueInstantiator;
         _delegateDeserializer = src._delegateDeserializer;
+        _arrayDelegateDeserializer = src._arrayDelegateDeserializer;
         _propertyBasedCreator = src._propertyBasedCreator;
 
         _backRefs = src._backRefs;
@@ -371,6 +384,7 @@ public BeanDeserializerBase(BeanDeserializerBase src,
 
         _valueInstantiator = src._valueInstantiator;
         _delegateDeserializer = src._delegateDeserializer;
+        _arrayDelegateDeserializer = src._arrayDelegateDeserializer;
         _propertyBasedCreator = src._propertyBasedCreator;
 
         _backRefs = src._backRefs;
@@ -403,6 +417,7 @@ protected BeanDeserializerBase(BeanDeserializerBase src, BeanPropertyMap beanPro
 
         _valueInstantiator = src._valueInstantiator;
         _delegateDeserializer = src._delegateDeserializer;
+        _arrayDelegateDeserializer = src._arrayDelegateDeserializer;
         _propertyBasedCreator = src._propertyBasedCreator;
 
         _beanProperties = beanProps;

diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java
@@ -295,7 +295,6 @@ private Value2354 build() {
         }
     }
 
-
     /*
     /**********************************************************
     /* Test methods
-Original file line number
+Diff line change
@@ Expand Up / @@ -295,7 +295,6 @@ private Value2354 build() { @@
             }
         }
         /*
         /**********************************************************
         /* Test methods
@@ Expand Down @@