dont track unknown props in buffer if ignoreAllUnknown is true (FasterXML#3082)

Dont track unknown props in buffer if ignoreAllUnknown is true.

(cherry picked from commit 23f9c61)

Author: dhofftgt

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

@@ -506,12 +506,15 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
                 }
                 continue;
             }
-            // Ok then, let's collect the whole field; name and value
-            if (unknown == null) {
-                unknown = new TokenBuffer(p, ctxt);
+
+            if(!_ignoreAllUnknown) {
+                // Ok then, let's collect the whole field; name and value
+                if (unknown == null) {
+                    unknown = new TokenBuffer(p, ctxt);
+                }
+                unknown.writeFieldName(propName);
+                unknown.copyCurrentStructure(p);
             }
-            unknown.writeFieldName(propName);
-            unknown.copyCurrentStructure(p);
         }
 
         // We hit END_OBJECT, so:

src/test/java/com/fasterxml/jackson/databind/deser/filter/IgnoreUnknownPropertyUsingPropertyBasedTest.java

@@ -0,0 +1,81 @@
+package com.fasterxml.jackson.databind.deser.filter;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class IgnoreUnknownPropertyUsingPropertyBasedTest extends BaseMapTest {
+
+  private final ObjectMapper MAPPER = newJsonMapper();
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  static class IgnoreUnknownAnySetter {
+
+    int a, b;
+
+    @JsonCreator
+    public IgnoreUnknownAnySetter(@JsonProperty("a") int a, @JsonProperty("b") int b) {
+      this.a = a;
+      this.b = b;
+    }
+
+    Map<String, Object> props = new HashMap<>();
+
+    @JsonAnySetter
+    public void addProperty(String key, Object value) {
+      props.put(key, value);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getProperties() {
+      return props;
+    }
+  }
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  static class IgnoreUnknownUnwrapped {
+
+    int a, b;
+    
+    @JsonCreator
+    public IgnoreUnknownUnwrapped(@JsonProperty("a") int a, @JsonProperty("b") int b) {
+      this.a = a;
+      this.b = b;
+    }
+
+    @JsonUnwrapped
+    UnwrappedChild child;
+
+    static class UnwrappedChild {
+      public int x, y;
+    }
+  }
+  
+  public void testAnySetterWithFailOnUnknownDisabled() throws Exception {
+    IgnoreUnknownAnySetter value = MAPPER.readValue("{\"a\":1, \"b\":2, \"x\":3, \"y\": 4}", IgnoreUnknownAnySetter.class);
+    assertNotNull(value);
+    assertEquals(1, value.a);
+    assertEquals(2, value.b);
+    assertEquals(3, value.props.get("x"));
+    assertEquals(4, value.props.get("y"));
+    assertEquals(2, value.props.size());
+  }
+
+  public void testUnwrappedWithFailOnUnknownDisabled() throws Exception {
+    IgnoreUnknownUnwrapped value = MAPPER.readValue("{\"a\":1, \"b\": 2, \"x\":3, \"y\":4}", IgnoreUnknownUnwrapped.class);
+    assertNotNull(value);
+    assertEquals(1, value.a);
+    assertEquals(2, value.b);
+    assertEquals(3, value.child.x);
+    assertEquals(4, value.child.y);
+  }
+
+}

src/test/java/com/fasterxml/jackson/databind/deser/filter/TestUnknownPropertyDeserialization.java

@@ -78,6 +78,33 @@ static class IgnoreUnknown {
         public int a;
     }
 
+    @JsonIgnoreProperties(ignoreUnknown=true)
+    static class IgnoreUnknownAnySetter {
+
+        Map<String, Object> props = new HashMap<>();
+        
+        @JsonAnySetter
+        public void addProperty(String key, Object value) {
+            props.put(key, value);
+        }
+
+        @JsonAnyGetter
+        public Map<String, Object> getProperties() {
+            return props;
+        }
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown=true)
+    static class IgnoreUnknownUnwrapped {
+      
+      @JsonUnwrapped
+      UnwrappedChild child;
+      
+      static class UnwrappedChild {
+        public int a, b;
+      }
+    }
+
     @SuppressWarnings("serial")
     @JsonIgnoreProperties({"a", "d"})
     static class IgnoreMap extends HashMap<String,Object> { }
@@ -228,6 +255,21 @@ public void testClassWithIgnoreUnknown() throws Exception
         assertEquals(-3, result.a);
     }
 
+    public void testAnySetterWithFailOnUnknownDisabled() throws Exception
+    {
+        IgnoreUnknownAnySetter value = MAPPER.readValue("{\"x\":\"y\", \"a\":\"b\"}",  IgnoreUnknownAnySetter.class);
+        assertNotNull(value);
+        assertEquals(2, value.props.size());
+    }
+
+    public void testUnwrappedWithFailOnUnknownDisabled() throws Exception
+    {
+      IgnoreUnknownUnwrapped value = MAPPER.readValue("{\"a\":1, \"b\":2}",  IgnoreUnknownUnwrapped.class);
+      assertNotNull(value);
+      assertEquals(1, value.child.a);
+      assertEquals(2, value.child.b);
+    }
+
     /**
      * Test that verifies that use of {@link JsonIgnore} will add implicit
      * skipping of matching properties.