Fix #3252, regression between 2.12 and 2.13.0-rc1

Author: cowtowncoder

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

@@ -499,14 +499,17 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
             // 29-Mar-2021, tatu: [databind#3082] May skip collection if we know
             //    they'd just get ignored (note: any-setter handled above; unwrapped
             //    properties also separately handled)
-            if (!_ignoreAllUnknown) {
-                // Ok then, let's collect the whole field; name and value
-                if (unknown == null) {
-                    unknown = ctxt.bufferForInputBuffering(p);
-                }
-                unknown.writeFieldName(propName);
-                unknown.copyCurrentStructure(p);
+            if (_ignoreAllUnknown) {
+                // 22-Aug-2021, tatu: [databind#3252] must ensure we do skip the whole value
+                p.skipChildren();
+                continue;
+            }
+            // Ok then, let's collect the whole field; name and value
+            if (unknown == null) {
+                unknown = ctxt.bufferForInputBuffering(p);
             }
+            unknown.writeFieldName(propName);
+            unknown.copyCurrentStructure(p);
         }
 
         // We hit END_OBJECT, so:

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

@@ -1664,7 +1664,6 @@ protected void handleUnknownVanilla(JsonParser p, DeserializationContext ctxt,
             Object beanOrBuilder, String propName)
         throws IOException
     {
-
         if (IgnorePropertiesUtil.shouldIgnore(propName, _ignorableProps, _includableProps)) {
             handleIgnoredProperty(p, ctxt, beanOrBuilder, propName);
         } else if (_anySetter != null) {

src/test/java/com/fasterxml/jackson/databind/deser/creators/CreatorPropertiesTest.java

@@ -1,8 +1,14 @@
 package com.fasterxml.jackson.databind.deser.creators;
 
 import java.beans.ConstructorProperties;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
 import com.fasterxml.jackson.databind.*;
 
 public class CreatorPropertiesTest extends BaseMapTest
@@ -58,13 +64,29 @@ public Lombok1371Bean(int _x, int _y) {
         }
     }
 
+    // [databind#3252]: ensure full skipping of ignored properties
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Value3252 {
+        @JsonProperty("name")
+        private final String name;
+        @JsonProperty("dumbMap")
+        private final Map<String, String> dumbMap;
+
+        @JsonCreator
+        public Value3252(@JsonProperty("name") String name,
+                @JsonProperty("dumbMap") Map<String, String> dumbMap) {
+            this.name = name;
+            this.dumbMap = (dumbMap == null) ? Collections.emptyMap() : dumbMap;
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods
     /**********************************************************
      */
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     // [databind#905]
     public void testCreatorPropertiesAnnotation() throws Exception
@@ -104,4 +126,19 @@ public void testConstructorPropertiesInference() throws Exception
         assertEquals(3, result.x);
         assertEquals(5, result.y);
     }
+
+    // [databind#3252]: ensure full skipping of ignored properties
+    public void testSkipNonScalar3252() throws Exception
+    {
+        List<Value3252> testData = MAPPER.readValue(a2q(
+"[\n"+
+"      {'name': 'first entry'},\n"+
+"      {'name': 'second entry', 'breaker': ['' ]},\n"+
+"      {'name': 'third entry'}\n"+
+"    ]\n"),
+            new TypeReference<List<Value3252>>() {});
+
+//System.err.println("JsON: "+MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(testData));       
+        assertEquals(3, testData.size());
+    }
 }