Fix #1886

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -8,6 +8,8 @@ Project: jackson-databind
 
 #792: Deserialization Not Working Right with Generic Types and Builders
  (reported by Mike G; fix contributed by Ville K)
+#1886: Allow use of `@JsonFormat(with=JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)`
+  on Class
 #1919: Abstract class included as part of known type ids for error message
   when using JsonSubTypes
  (reported by Incara@github)

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

@@ -351,7 +351,8 @@ public JsonDeserializer<?> build()
         Collection<SettableBeanProperty> props = _properties.values();
         _fixAccess(props);
         BeanPropertyMap propertyMap = BeanPropertyMap.construct(_config, props,
-                _collectAliases(props));
+                _collectAliases(props),
+                _findCaseInsensitivity());
         propertyMap.assignIndexes();
 
         // view processing must be enabled if:
@@ -427,7 +428,8 @@ public JsonDeserializer<?> buildBuilderBased(JavaType valueType, String expBuild
         Collection<SettableBeanProperty> props = _properties.values();
         _fixAccess(props);
         BeanPropertyMap propertyMap = BeanPropertyMap.construct(_config, props,
-                _collectAliases(props));
+                _collectAliases(props),
+                _findCaseInsensitivity());
         propertyMap.assignIndexes();
 
         boolean anyViews = !_config.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION);
@@ -531,4 +533,15 @@ protected Map<String,List<PropertyName>> _collectAliases(Collection<SettableBean
         }
         return mapping;
     }
+
+    // @since 2.12
+    protected boolean _findCaseInsensitivity() {
+        // 07-May-2020, tatu: First find combination of per-type config overrides (higher
+        //   precedence) and per-type annotations (lower):
+        JsonFormat.Value format = _beanDesc.findExpectedFormat(null);
+        // and see if any of those has explicit definition; if not, use global baseline default
+        Boolean B = format.getFeature(JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES);
+        return (B == null) ? _config.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
+                : B.booleanValue();
+    }
 }

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

@@ -268,9 +268,23 @@ private final static int findSize(int size)
         return result;
     }
 
+    /**
+     * @since 2.12
+     */
+    public static BeanPropertyMap construct(MapperConfig<?> config,
+            Collection<SettableBeanProperty> props,
+            Map<String,List<PropertyName>> aliasMapping,
+            boolean caseInsensitive) {
+        return new BeanPropertyMap(caseInsensitive,
+                props, aliasMapping,
+                config.getLocale());
+    }
+
     /**
      * @since 2.11
+     * @deprecated since 2.12
      */
+    @Deprecated
     public static BeanPropertyMap construct(MapperConfig<?> config,
             Collection<SettableBeanProperty> props,
             Map<String,List<PropertyName>> aliasMapping) {

src/test/java/com/fasterxml/jackson/databind/misc/CaseInsensitiveDeserTest.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 
 public class CaseInsensitiveDeserTest extends BaseMapTest
 {
@@ -93,13 +94,31 @@ public String getId() {
         }
     }
 
+    // [databind#1886]: allow case-insensitivity by default on a class
+    @JsonFormat(with={ JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES })
+    static class CaseInsensitiveRole {
+        public String ID;
+        public String Name;
+    }
+
+    // [databind#1886]: allow case-insensitivity by default on a class
+    static class CaseInsensitiveRoleContainer {
+        public CaseInsensitiveRole role;
+    }
+
+    // [databind#1886]: ... but also overrides
+    static class CaseSensitiveRoleContainer {
+        @JsonFormat(without={ JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES })
+        public CaseInsensitiveRole role;
+    }
+
     /*
     /********************************************************
     /* Test methods
     /********************************************************
      */
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
     private final ObjectMapper INSENSITIVE_MAPPER = jsonMapperBuilder()
             .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
             .build();
@@ -158,7 +177,7 @@ public void testCreatorWithInsensitive() throws Exception
     }
 
     // And allow config overrides too
-    public void testCaseInsensitiveWithClassFormat() throws Exception
+    public void testCaseInsensitiveViaConfigOverride() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
         mapper.configOverride(Role.class)
@@ -181,4 +200,34 @@ public void testIssue1854() throws Exception
         assertNotNull(result.getItems());
         assertEquals(1, result.getItems().size());
     }
+
+
+    // [databind#1886]: allow case-insensitivity by default on a class
+    public void testCaseInsensitiveViaClassAnnotation() throws Exception
+    {
+        final String CONTAINED = aposToQuotes("{'role': {'id':'3','name':'Bob'}}");
+
+        // First: via wrapper/container:
+        CaseInsensitiveRoleContainer cont = MAPPER.readValue(CONTAINED,
+                        CaseInsensitiveRoleContainer.class);
+        assertEquals("3", cont.role.ID);
+        assertEquals("Bob", cont.role.Name);
+
+        // second: directly as root value
+        CaseInsensitiveRole role = MAPPER.readValue
+                (aposToQuotes("{'id':'12','name':'Billy'}"),
+                        CaseInsensitiveRole.class);
+        assertEquals("12", role.ID);
+        assertEquals("Billy", role.Name);
+
+        // and finally, more complicated; should be possible to force sensitivity:
+        try {
+            /*CaseSensitiveRoleContainer r =*/ MAPPER.readValue(CONTAINED,
+                    CaseSensitiveRoleContainer.class);
+            fail("Should not pass");
+        } catch (UnrecognizedPropertyException e) {
+            verifyException(e, "Unrecognized ");
+            verifyException(e, "\"id\"");
+        }
+    }
 }