Fix #2627

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -42,6 +42,8 @@ Project: jackson-databind
  (reported by Bartosz B)
 #2592: `ObjectMapper.setSerializationInclusion()` is ignored for `JsonAnyGetter`
  (reported by Oleksii K)
+#2627: JsonIgnoreProperties(ignoreUnknown = true) does not work on field and method level
+ (reported by robotmrv@github)
 #2632: Failure to resolve generic type parameters on serialization
  (reported by Simone D)
 #2636: ObjectReader readValue lacks Class<T> argument

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

@@ -122,6 +122,11 @@ public BeanDeserializer withIgnorableProperties(Set<String> ignorableProps) {
         return new BeanDeserializer(this, ignorableProps);
     }
 
+    @Override
+    public BeanDeserializerBase withIgnoreAllUnknown(boolean ignoreUnknown) {
+        return new BeanDeserializer(this, ignoreUnknown);
+    }
+
     @Override
     public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
         return new BeanDeserializer(this, props);

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

@@ -400,6 +400,18 @@ protected BeanDeserializerBase(BeanDeserializerBase src, BeanPropertyMap beanPro
 
     public abstract BeanDeserializerBase withIgnorableProperties(Set<String> ignorableProps);
 
+    // NOTE! To be made `abstract` in 2.12 or later
+    /**
+     * @since 2.11
+     */
+    public BeanDeserializerBase withIgnoreAllUnknown(boolean ignoreUnknown) {
+        // Only to prevent some backwards-compatibility issues
+        if (ignoreUnknown == _ignoreAllUnknown) {
+            return this;
+        }
+        return withIgnorableProperties(_ignorableProps);
+    }
+
     /**
      * Mutant factory method that custom sub-classes must override; not left as
      * abstract to prevent more drastic backwards compatibility problems.
@@ -740,6 +752,13 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
                     }
                     contextual = contextual.withIgnorableProperties(ignored);
                 }
+                // 30-Mar-2020, tatu: As per [databind#2627], need to also allow
+                //    per-property override to "ignore all unknown".
+                //  NOTE: there is no way to override with `false` because annotation
+                //  defaults to `false` (i.e. can not know if `false` is explicit value)
+                if (ignorals.getIgnoreUnknown() && !_ignoreAllUnknown) {
+                    contextual = contextual.withIgnoreAllUnknown(true);
+                }
             }
         }
 

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

@@ -136,6 +136,11 @@ public BeanDeserializerBase withIgnorableProperties(Set<String> ignorableProps)
         return new BuilderBasedDeserializer(this, ignorableProps);
     }
 
+    @Override
+    public BeanDeserializerBase withIgnoreAllUnknown(boolean ignoreUnknown) {
+        return new BuilderBasedDeserializer(this, ignoreUnknown);
+    }
+
     @Override
     public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
         return new BuilderBasedDeserializer(this, props);

src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java

@@ -81,6 +81,12 @@ public BeanDeserializerBase withIgnorableProperties(Set<String> ignorableProps)
                 _targetType, _orderedProperties, _buildMethod);
     }
 
+    @Override
+    public BeanDeserializerBase withIgnoreAllUnknown(boolean ignoreUnknown) {
+        return new BeanAsArrayBuilderDeserializer(_delegate.withIgnoreAllUnknown(ignoreUnknown),
+                _targetType, _orderedProperties, _buildMethod);
+    }
+
     @Override
     public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
         return new BeanAsArrayBuilderDeserializer(_delegate.withBeanProperties(props),

src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java

@@ -71,6 +71,12 @@ public BeanDeserializerBase withIgnorableProperties(Set<String> ignorableProps)
                 _orderedProperties);
     }
 
+    @Override
+    public BeanDeserializerBase withIgnoreAllUnknown(boolean ignoreUnknown) {
+        return new BeanAsArrayDeserializer(_delegate.withIgnoreAllUnknown(ignoreUnknown),
+                _orderedProperties);
+    }
+
     @Override
     public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
         return new BeanAsArrayDeserializer(_delegate.withBeanProperties(props),

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

@@ -1,7 +1,10 @@
 package com.fasterxml.jackson.databind.deser.filter;
 
+import java.io.IOException;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -35,6 +38,22 @@ static class Simple1595 {
         public void setName(String name) { this.name = name; }
     }
 
+    // [databind#2627]
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    static class MyPojoValue {
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        MyPojo2627 value;
+
+        public MyPojo2627 getValue() {
+            return value;
+        }
+    }
+
+    static class MyPojo2627 {
+        public String name;
+    }
+
     /*
     /****************************************************************
     /* Unit tests
@@ -88,4 +107,16 @@ public void testIgnoreGetterNotSetter1595() throws Exception
         Simple1595 des = mapper.readValue(aposToQuotes("{'id':123,'name':'jack'}"), Simple1595.class);
         assertEquals("jack", des.getName());
     }
+
+    // [databind#2627]
+    public void testIgnoreUnknownOnField() throws IOException
+    {
+        ObjectMapper objectMapper = new ObjectMapper();
+        String json = "{\"value\": {\"name\": \"my_name\", \"extra\": \"val\"}, \"type\":\"Json\"}";
+        MyPojoValue value = objectMapper.readValue(json, MyPojoValue.class);
+        assertNotNull(value);
+        assertNotNull(value.getValue());
+        assertEquals("my_name", value.getValue().name);
+    }
 }
+

src/test/java/com/fasterxml/jackson/databind/filter/ProblemHandler1767Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/filter/ProblemHandler1767Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.deser.filter;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;