bit more test coverage for MapDeserializer, merging

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java

@@ -205,30 +205,27 @@ public void setIgnorableProperties(Set<String> ignorable) {
     public void resolve(DeserializationContext ctxt) throws JsonMappingException
     {
         // May need to resolve types for delegate- and/or property-based creators:
-        if (_valueInstantiator != null) {
-            if (_valueInstantiator.canCreateUsingDelegate()) {
-                JavaType delegateType = _valueInstantiator.getDelegateType(ctxt.getConfig());
-                if (delegateType == null) {
-                    ctxt.reportBadDefinition(_containerType, String.format(
+        if (_valueInstantiator.canCreateUsingDelegate()) {
+            JavaType delegateType = _valueInstantiator.getDelegateType(ctxt.getConfig());
+            if (delegateType == null) {
+                ctxt.reportBadDefinition(_containerType, String.format(
 "Invalid delegate-creator definition for %s: value instantiator (%s) returned true for 'canCreateUsingDelegate()', but null for 'getDelegateType()'",
-                            _containerType,
-                            _valueInstantiator.getClass().getName()));
-                }
-                /* Theoretically should be able to get CreatorProperty for delegate
-                 * parameter to pass; but things get tricky because DelegateCreator
-                 * may contain injectable values. So, for now, let's pass nothing.
-                 */
-                _delegateDeserializer = findDeserializer(ctxt, delegateType, null);
-            } else if (_valueInstantiator.canCreateUsingArrayDelegate()) {
-                JavaType delegateType = _valueInstantiator.getArrayDelegateType(ctxt.getConfig());
-                if (delegateType == null) {
-                    ctxt.reportBadDefinition(_containerType, String.format(
+                _containerType,
+                _valueInstantiator.getClass().getName()));
+            }
+            // Theoretically should be able to get CreatorProperty for delegate
+            // parameter to pass; but things get tricky because DelegateCreator
+            // may contain injectable values. So, for now, let's pass nothing.
+            _delegateDeserializer = findDeserializer(ctxt, delegateType, null);
+        } else if (_valueInstantiator.canCreateUsingArrayDelegate()) {
+            JavaType delegateType = _valueInstantiator.getArrayDelegateType(ctxt.getConfig());
+            if (delegateType == null) {
+                ctxt.reportBadDefinition(_containerType, String.format(
 "Invalid delegate-creator definition for %s: value instantiator (%s) returned true for 'canCreateUsingArrayDelegate()', but null for 'getArrayDelegateType()'",
-                            _containerType,
-                            _valueInstantiator.getClass().getName()));
-                }
-                _delegateDeserializer = findDeserializer(ctxt, delegateType, null);
+                    _containerType,
+                    _valueInstantiator.getClass().getName()));
             }
+            _delegateDeserializer = findDeserializer(ctxt, delegateType, null);
         }
         if (_valueInstantiator.canCreateFromObjectWith()) {
             SettableBeanProperty[] creatorProps = _valueInstantiator.getFromObjectArguments(ctxt.getConfig());
@@ -272,7 +269,7 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
         }
         Set<String> ignored = _ignorableProperties;
         AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-        if (intr != null && property != null) {
+        if (_neitherNull(intr, property)) {
             AnnotatedMember member = property.getMember();
             if (member != null) {
                 JsonIgnoreProperties.Value ignorals = intr.findPropertyIgnorals(member);
@@ -328,9 +325,8 @@ public ValueInstantiator getValueInstantiator() {
      */
     @Override
     public boolean isCachable() {
-        /* As per [databind#735], existence of value or key deserializer (only passed
-         * if annotated to use non-standard one) should also prevent caching.
-         */
+        // As per [databind#735], existence of value or key deserializer (only passed
+        // if annotated to use non-standard one) should also prevent caching.
         return (_valueDeserializer == null)
                 && (_keyDeserializer == null)
                 && (_valueTypeDeserializer == null)

src/test/java/com/fasterxml/jackson/databind/deser/merge/MapMergeTest.java

@@ -6,7 +6,8 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonMerge;
-
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.*;
 
 public class MapMergeTest extends BaseMapTest
@@ -31,6 +32,17 @@ public MergedMap(Map<String,Object> src) {
         }
     }
 
+    static class MergedIntMap
+    {
+        @JsonMerge
+        public Map<Integer,Object> values;
+
+        protected MergedIntMap() {
+            values = new LinkedHashMap<>();
+            values.put(Integer.valueOf(13), "a");
+        }
+    }
+
     /*
     /********************************************************
     /* Test methods, Map merging
@@ -42,14 +54,41 @@ public MergedMap(Map<String,Object> src) {
             .disable(MapperFeature.IGNORE_MERGE_FOR_UNMERGEABLE)
     ;
 
+    private final ObjectMapper MAPPER_SKIP_NULLS = newObjectMapper()
+            .setDefaultSetterInfo(JsonSetter.Value.forContentNulls(Nulls.SKIP));
+    ;
+    
     public void testShallowMapMerging() throws Exception
     {
-        MergedMap v = MAPPER.readValue(aposToQuotes("{'values':{'c':'y'}}"), MergedMap.class);
+        final String JSON = aposToQuotes("{'values':{'c':'y','d':null}}");
+        MergedMap v = MAPPER.readValue(JSON, MergedMap.class);
+        assertEquals(3, v.values.size());
+        assertEquals("y", v.values.get("c"));
+        assertEquals("x", v.values.get("a"));
+        assertNull(v.values.get("d"));
+
+        // but also, skip nulls
+        v = MAPPER_SKIP_NULLS.readValue(JSON, MergedMap.class);
         assertEquals(2, v.values.size());
         assertEquals("y", v.values.get("c"));
         assertEquals("x", v.values.get("a"));
     }
 
+    public void testShallowNonStringMerging() throws Exception
+    {
+        final String JSON = aposToQuotes("{'values':{'72':'b','666':null}}");
+        MergedIntMap v = MAPPER.readValue(JSON , MergedIntMap.class);
+        assertEquals(3, v.values.size());
+        assertEquals("a", v.values.get(Integer.valueOf(13)));
+        assertEquals("b", v.values.get(Integer.valueOf(72)));
+        assertNull(v.values.get(Integer.valueOf(666)));
+
+        v = MAPPER_SKIP_NULLS.readValue(JSON , MergedIntMap.class);
+        assertEquals(2, v.values.size());
+        assertEquals("a", v.values.get(Integer.valueOf(13)));
+        assertEquals("b", v.values.get(Integer.valueOf(72)));
+    }
+    
     @SuppressWarnings("unchecked")
     public void testDeeperMapMerging() throws Exception
     {