Fix #1232

Author: cowtowncoder

release-notes/VERSION

@@ -35,6 +35,7 @@ Project: jackson-databind
 #1217: `@JsonIgnoreProperties` on Pojo fields not working for deserialization
  (reported by Lokesh K)
 #1221: Use `Throwable.addSuppressed()` directly and/or via try-with-resources
+#1232: Add support for `JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES`
 
 2.7.5 (not yet released)
 

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

@@ -72,6 +72,10 @@ public BeanDeserializer(BeanDeserializerBase src, Set<String> ignorableProps) {
         super(src, ignorableProps);
     }
 
+    public BeanDeserializer(BeanDeserializerBase src, BeanPropertyMap props) {
+        super(src, props);
+    }
+
     @Override
     public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper)
     {
@@ -98,12 +102,17 @@ public BeanDeserializer withIgnorableProperties(Set<String> ignorableProps) {
         return new BeanDeserializer(this, ignorableProps);
     }
 
+    @Override
+    public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
+        return new BeanDeserializer(this, props);
+    }
+
     @Override
     protected BeanDeserializerBase asArrayDeserializer() {
         SettableBeanProperty[] props = _beanProperties.getPropertiesInInsertionOrder();
         return new BeanAsArrayDeserializer(this, props);
     }
-    
+
     /*
     /**********************************************************
     /* JsonDeserializer implementation

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

@@ -385,13 +385,54 @@ public BeanDeserializerBase(BeanDeserializerBase src, Set<String> ignorableProps
         _beanProperties = src._beanProperties.withoutProperties(ignorableProps);
     }
 
+    /**
+     * @since 2.8
+     */
+    protected BeanDeserializerBase(BeanDeserializerBase src, BeanPropertyMap beanProps)
+    {
+        super(src._beanType);
+        
+        _classAnnotations = src._classAnnotations;
+        _beanType = src._beanType;
+        
+        _valueInstantiator = src._valueInstantiator;
+        _delegateDeserializer = src._delegateDeserializer;
+        _propertyBasedCreator = src._propertyBasedCreator;
+        
+        _beanProperties = beanProps;
+        _backRefs = src._backRefs;
+        _ignorableProps = src._ignorableProps;
+        _ignoreAllUnknown = src._ignoreAllUnknown;
+        _anySetter = src._anySetter;
+        _injectables = src._injectables;
+        _objectIdReader = src._objectIdReader;
+        
+        _nonStandardCreation = src._nonStandardCreation;
+        _unwrappedPropertyHandler = src._unwrappedPropertyHandler;
+        _needViewProcesing = src._needViewProcesing;
+        _serializationShape = src._serializationShape;
+
+        _vanillaProcessing = src._vanillaProcessing;
+    }
+    
     @Override
     public abstract JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper);
 
     public abstract BeanDeserializerBase withObjectIdReader(ObjectIdReader oir);
 
     public abstract BeanDeserializerBase withIgnorableProperties(Set<String> ignorableProps);
 
+    /**
+     * Mutant factory method that custom sub-classes must override; not left as
+     * abstract to prevent more drastic backwards compatibility problems.
+     *
+     * @since 2.8
+     */
+    public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
+        throw new UnsupportedOperationException("Class "+getClass().getName()
+                +" does not override `withBeanProperties()`, needs to");
+    }
+    
     /**
      * Fluent factory for creating a variant that can handle
      * POJO output as a JSON Array. Implementations may ignore this request
@@ -690,9 +731,22 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
         // One more thing: are we asked to serialize POJO as array?
         JsonFormat.Value format = findFormatOverrides(ctxt, property, handledType());
         JsonFormat.Shape shape = null;
-        if ((format != null) && format.hasShape()) {
-            shape = format.getShape();
+        if (format != null) {
+            if (format.hasShape()) {
+                shape = format.getShape();
+            }
+            // 16-May-2016, tatu: How about per-property case-insensitivity?
+            Boolean B = format.getFeature(JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES);
+            if (B != null) {
+                // !!! TODO
+                BeanPropertyMap propsOrig = _beanProperties;
+                BeanPropertyMap props = propsOrig.withCaseInsensitivity(B.booleanValue());
+                if (props != propsOrig) {
+                    contextual = contextual.withBeanProperties(props);
+                }
+            }
         }
+
         if (shape == null) {
             shape = _serializationShape;
         }

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

@@ -24,12 +24,23 @@ public class BeanDeserializerBuilder
     /**********************************************************
      */
 
+    /**
+     * Introspected information about POJO for deserializer to handle
+     */
     final protected BeanDescription _beanDesc;
 
+    /**
+     * Whether default setting for properties without any view annotations
+     * is to include (true) or exclude (false).
+     */
     final protected boolean _defaultViewInclusion;
-    
+
+    /**
+     * Flag that indicates whether default settings suggest use of case-insensitive
+     * property comparison or not.
+     */
     final protected boolean _caseInsensitivePropertyComparison;
-    
+
     /*
     /**********************************************************
     /* Accumulated information about properties
@@ -63,6 +74,10 @@ public class BeanDeserializerBuilder
      */
     protected ValueInstantiator _valueInstantiator;
 
+    /**
+     * Handler for Object Id values, if Object Ids are enabled for the
+     * bean type.
+     */
     protected ObjectIdReader _objectIdReader;
 
     /**
@@ -88,7 +103,7 @@ public class BeanDeserializerBuilder
      * In addition, Builder may have additional configuration
      */
     protected JsonPOJOBuilder.Value _builderConfig;
-    
+
     /*
     /**********************************************************
     /* Life-cycle: construction
@@ -309,9 +324,6 @@ public JsonPOJOBuilder.Value getBuilderConfig() {
     /**
      * Method for constructing a {@link BeanDeserializer}, given all
      * information collected.
-     *<p>
-     * NOTE: Signature of this method did unfortunately change between Jackson 2.1
-     * and Jackson 2.2
      */
     public JsonDeserializer<?> build()
     {
@@ -342,7 +354,7 @@ public JsonDeserializer<?> build()
             ObjectIdValueProperty prop = new ObjectIdValueProperty(_objectIdReader, PropertyMetadata.STD_REQUIRED);
             propertyMap = propertyMap.withProperty(prop);
         }
-        
+
         return new BeanDeserializer(this,
                 _beanDesc, propertyMap, _backRefProperties, _ignorableProps, _ignoreAllUnknown,
                 anyViews);

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

@@ -81,6 +81,11 @@ public BuilderBasedDeserializer(BuilderBasedDeserializer src, Set<String> ignora
         super(src, ignorableProps);
         _buildMethod = src._buildMethod;
     }
+
+    public BuilderBasedDeserializer(BuilderBasedDeserializer src, BeanPropertyMap props) {
+        super(src, props);
+        _buildMethod = src._buildMethod;
+    }
 
     @Override
     public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper)
@@ -93,17 +98,22 @@ public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper
     }
 
     @Override
-    public BuilderBasedDeserializer withObjectIdReader(ObjectIdReader oir) {
+    public BeanDeserializerBase withObjectIdReader(ObjectIdReader oir) {
         return new BuilderBasedDeserializer(this, oir);
     }
 
     @Override
-    public BuilderBasedDeserializer withIgnorableProperties(Set<String> ignorableProps) {
+    public BeanDeserializerBase withIgnorableProperties(Set<String> ignorableProps) {
         return new BuilderBasedDeserializer(this, ignorableProps);
     }
 
     @Override
-    protected BeanAsArrayBuilderDeserializer asArrayDeserializer() {
+    public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
+        return new BuilderBasedDeserializer(this, props);
+    }
+
+    @Override
+    protected BeanDeserializerBase asArrayDeserializer() {
         SettableBeanProperty[] props = _beanProperties.getPropertiesInInsertionOrder();
         return new BeanAsArrayBuilderDeserializer(this, props, _buildMethod);
     }

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

@@ -58,19 +58,25 @@ public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper
     }
 
     @Override
-    public BeanAsArrayBuilderDeserializer withObjectIdReader(ObjectIdReader oir) {
+    public BeanDeserializerBase withObjectIdReader(ObjectIdReader oir) {
         return new BeanAsArrayBuilderDeserializer(_delegate.withObjectIdReader(oir),
                 _orderedProperties, _buildMethod);
     }
 
     @Override
-    public BeanAsArrayBuilderDeserializer withIgnorableProperties(Set<String> ignorableProps) {
+    public BeanDeserializerBase withIgnorableProperties(Set<String> ignorableProps) {
         return new BeanAsArrayBuilderDeserializer(_delegate.withIgnorableProperties(ignorableProps),
                 _orderedProperties, _buildMethod);
     }
 
     @Override
-    protected BeanAsArrayBuilderDeserializer asArrayDeserializer() {
+    public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
+        return new BeanAsArrayBuilderDeserializer(_delegate.withBeanProperties(props),
+                _orderedProperties, _buildMethod);
+    }
+
+    @Override
+    protected BeanDeserializerBase asArrayDeserializer() {
         return this;
     }
 

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

@@ -60,17 +60,23 @@ public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper
     }
 
     @Override
-    public BeanAsArrayDeserializer withObjectIdReader(ObjectIdReader oir) {
+    public BeanDeserializerBase withObjectIdReader(ObjectIdReader oir) {
         return new BeanAsArrayDeserializer(_delegate.withObjectIdReader(oir),
                 _orderedProperties);
     }
 
     @Override
-    public BeanAsArrayDeserializer withIgnorableProperties(Set<String> ignorableProps) {
+    public BeanDeserializerBase withIgnorableProperties(Set<String> ignorableProps) {
         return new BeanAsArrayDeserializer(_delegate.withIgnorableProperties(ignorableProps),
                 _orderedProperties);
     }
 
+    @Override
+    public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
+        return new BeanAsArrayDeserializer(_delegate.withBeanProperties(props),
+                _orderedProperties);
+    }
+    
     @Override
     protected BeanDeserializerBase asArrayDeserializer() {
         return this;

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

@@ -61,7 +61,34 @@ public BeanPropertyMap(boolean caseInsensitive, Collection<SettableBeanProperty>
         _propsInOrder = props.toArray(new SettableBeanProperty[props.size()]);
         init(props);
     }
-    
+
+    /**
+     * @since 2.8
+     */
+    protected BeanPropertyMap(BeanPropertyMap base, boolean caseInsensitive)
+    {
+        _caseInsensitive = caseInsensitive;
+
+        // 16-May-2016, tatu: Alas, not enough to just change flag, need to re-init
+        //    as well.
+        _propsInOrder = Arrays.copyOf(base._propsInOrder, base._propsInOrder.length);
+        init(Arrays.asList(_propsInOrder));
+    }
+
+    /**
+     * Mutant factory method that constructs a new instance if desired case-insensitivity
+     * state differs from the state of this instance; if states are the same, returns
+     * <code>this</code>.
+     *
+     * @since 2.8
+     */
+    public BeanPropertyMap withCaseInsensitivity(boolean state) {
+        if (_caseInsensitive == state) {
+            return this;
+        }
+        return new BeanPropertyMap(this, state);
+    }
+
     protected void init(Collection<SettableBeanProperty> props)
     {
         _size = props.size();
@@ -346,7 +373,7 @@ public SettableBeanProperty find(String key)
         if (_caseInsensitive) {
             key = key.toLowerCase();
         }
-
+            
         // inlined `_hashCode(key)`
         int slot = key.hashCode() & _hashMask;
 //        int h = key.hashCode();

src/test/java/com/fasterxml/jackson/databind/misc/CaseInsensitiveDeser.java renamed to src/test/java/com/fasterxml/jackson/databind/misc/CaseInsensitiveDeserTest.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 
-public class CaseInsensitiveDeser extends BaseMapTest
+public class CaseInsensitiveDeserTest extends BaseMapTest
 {
     // [databind#1036]
     static class BaseResponse {
@@ -45,7 +45,7 @@ static class Issue476Type {
     // [databind#566]
     public void testCaseInsensitiveDeserialization() throws Exception
     {
-     final String JSON = "{\"Value1\" : {\"nAme\" : \"fruit\", \"vALUe\" : \"apple\"}, \"valUE2\" : {\"NAME\" : \"color\", \"value\" : \"red\"}}";
+        final String JSON = "{\"Value1\" : {\"nAme\" : \"fruit\", \"vALUe\" : \"apple\"}, \"valUE2\" : {\"NAME\" : \"color\", \"value\" : \"red\"}}";
 
         // first, verify default settings which do not accept improper case
         ObjectMapper mapper = new ObjectMapper();
@@ -62,7 +62,7 @@ public void testCaseInsensitiveDeserialization() throws Exception
 
         // Definitely not OK to enable dynamically - the BeanPropertyMap (which is the consumer of this particular feature) gets cached.
         mapper = new ObjectMapper();
-        mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
+        mapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES);
         ObjectReader r = mapper.readerFor(Issue476Bean.class);
         Issue476Bean result = r.readValue(JSON);
         assertEquals(result.value1.name, "fruit");

src/test/java/com/fasterxml/jackson/databind/struct/FormatFeaturesTest.java

@@ -26,7 +26,7 @@ static class WrapWriteWithArrays
 
         public boolean[] bools = new boolean[] { true };
     }
-    
+
     @JsonPropertyOrder( { "strings", "ints", "bools", "enums" })
     static class WrapWriteWithCollections
     {
@@ -89,6 +89,12 @@ static class Role {
         public String Name;
     }
 
+    static class CaseInsensitiveRoleWrapper
+    {
+        @JsonFormat(with={ JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES })
+        public Role role;
+    }
+
     /*
     /**********************************************************
     /* Test methods, writing with single-element unwrapping
@@ -208,10 +214,20 @@ public void testSingleElementListRead() throws Exception {
     }
 
     public void testSingleEnumSetRead() throws Exception {
-        String json = aposToQuotes("{ 'values': 'B' }");
-        EnumSetWrapper result = MAPPER.readValue(json, EnumSetWrapper.class);
+        EnumSetWrapper result = MAPPER.readValue(aposToQuotes("{ 'values': 'B' }"),
+                EnumSetWrapper.class);
         assertNotNull(result.values);
         assertEquals(1, result.values.size());
         assertEquals(ABC.B, result.values.iterator().next());
     }
+
+    // [databind#1232]: allow per-property case-insensitivity
+    public void testCaseInsensitive() throws Exception {
+        CaseInsensitiveRoleWrapper w = MAPPER.readValue
+                (aposToQuotes("{'role':{'id':'12','name':'Foo'}}"),
+                        CaseInsensitiveRoleWrapper.class);
+        assertNotNull(w);
+        assertEquals("12", w.role.ID);
+        assertEquals("Foo", w.role.Name);
+    }
 }