Fix #2021

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -25,6 +25,7 @@ Project: jackson-databind
  (reported by Carter K)
 #2019: Abstract Type mapping in 2.9 fails when multiple modules are registered
  (reported by asger82@github)
+#2021: Delegating JsonCreator disregards `JsonDeserialize.using` annotation
 #2023: `JsonFormat.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT` not working
   with `null` coercion with `@JsonSetter`
 

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

@@ -339,7 +339,7 @@ protected ValueInstantiator _constructDefaultValueInstantiator(DeserializationCo
         if (beanDesc.getType().isConcrete()) {
             _addDeserializerConstructors(ctxt, beanDesc, vchecker, intr, creators, creatorDefs);
         }
-        return creators.constructValueInstantiator(config);
+        return creators.constructValueInstantiator(ctxt);
     }
 
     protected Map<AnnotatedWithParams,BeanPropertyDefinition[]> _findCreatorsFromProperties(DeserializationContext ctxt,

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

@@ -617,26 +617,33 @@ protected void _replaceProperty(BeanPropertyMap props, SettableBeanProperty[] cr
         }
     }
 
-    private JsonDeserializer<Object> _findDelegateDeserializer(DeserializationContext ctxt, JavaType delegateType,
-            AnnotatedWithParams delegateCreator) throws JsonMappingException {
+    @SuppressWarnings("unchecked")
+    private JsonDeserializer<Object> _findDelegateDeserializer(DeserializationContext ctxt,
+            JavaType delegateType, AnnotatedWithParams delegateCreator) throws JsonMappingException
+    {
         // Need to create a temporary property to allow contextual deserializers:
         BeanProperty.Std property = new BeanProperty.Std(TEMP_PROPERTY_NAME,
                 delegateType, null, delegateCreator,
                 PropertyMetadata.STD_OPTIONAL);
-
         TypeDeserializer td = delegateType.getTypeHandler();
         if (td == null) {
             td = ctxt.getConfig().findTypeDeserializer(delegateType);
         }
-        JsonDeserializer<Object> dd = findDeserializer(ctxt, delegateType, property);
+        // 04-May-2018, tatu: [databind#2021] check if there's custom deserializer attached
+        //    to type (resolved from parameter)
+        JsonDeserializer<Object> dd = delegateType.getValueHandler();
+        if (dd == null) {
+            dd = findDeserializer(ctxt, delegateType, property);
+        } else {
+            dd = (JsonDeserializer<Object>) ctxt.handleSecondaryContextualization(dd, property, delegateType);
+        }
         if (td != null) {
             td = td.forProperty(property);
             return new TypeWrappedDeserializer(td, dd);
         }
         return dd;
     }
 
-
     /**
      * Helper method that can be used to see if specified property is annotated
      * to indicate use of a converter for property value (in case of container types,

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

@@ -81,12 +81,13 @@ public CreatorCollector(BeanDescription beanDesc, MapperConfig<?> config) {
                 .isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS);
     }
 
-    public ValueInstantiator constructValueInstantiator(DeserializationConfig config)
+    public ValueInstantiator constructValueInstantiator(DeserializationContext ctxt)
         throws JsonMappingException
     {
-        final JavaType delegateType = _computeDelegateType(config,
+        final DeserializationConfig config = ctxt.getConfig();
+        final JavaType delegateType = _computeDelegateType(ctxt,
                 _creators[C_DELEGATE], _delegateArgs);
-        final JavaType arrayDelegateType = _computeDelegateType(config,
+        final JavaType arrayDelegateType = _computeDelegateType(ctxt,
                 _creators[C_ARRAY_DELEGATE], _arrayDelegateArgs);
         final JavaType type = _beanDesc.getType();
 
@@ -224,7 +225,7 @@ public boolean hasPropertyBasedCreator() {
     /**********************************************************
      */
 
-    private JavaType _computeDelegateType(MapperConfig<?> config,
+    private JavaType _computeDelegateType(DeserializationContext ctxt,
             AnnotatedWithParams creator, SettableBeanProperty[] delegateArgs)
         throws JsonMappingException
     {
@@ -241,11 +242,28 @@ private JavaType _computeDelegateType(MapperConfig<?> config,
                 }
             }
         }
-        // 03-May-2018, tatu: [databind#2016] need to check possible annotation-based
-        //    type refinement(s)
+        final DeserializationConfig config = ctxt.getConfig();
+
+        // 03-May-2018, tatu: need to check possible annotation-based
+        //   custom deserializer [databind#2012],
+        //   type refinement(s) [databind#2016]. 
         JavaType baseType = creator.getParameterType(ix);
-        return config.getAnnotationIntrospector().refineDeserializationType(config,
-                creator.getParameter(ix), baseType);
+        AnnotationIntrospector intr = config.getAnnotationIntrospector();
+        if (intr != null) {
+            AnnotatedParameter delegate = creator.getParameter(ix);
+            
+            // First: custom deserializer(s):
+            Object deserDef = intr.findDeserializer(delegate);
+            if (deserDef != null) {
+                JsonDeserializer<Object> deser = ctxt.deserializerInstance(delegate, deserDef);
+                baseType = baseType.withValueHandler(deser);
+            } else {
+                // Second: type refinement(s), if no explicit deserializer was located
+                baseType = intr.refineDeserializationType(config,
+                        delegate, baseType);
+            }
+        }
+        return baseType;
     }
 
     private <T extends AnnotatedMember> T _fixAccess(T member) {

src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java

@@ -997,15 +997,21 @@ protected BeanPropertyWriter _constructVirtualProperty(JsonAppend.Prop prop,
     @Override
     public PropertyName findNameForSerialization(Annotated a)
     {
+        boolean useDefault = false;
         JsonGetter jg = _findAnnotation(a, JsonGetter.class);
         if (jg != null) {
-            return PropertyName.construct(jg.value());
+            String s = jg.value();
+            // 04-May-2018, tatu: Should allow for "nameless" `@JsonGetter` too
+            if (!s.isEmpty()) {
+                return PropertyName.construct(s);
+            }
+            useDefault = true;
         }
         JsonProperty pann = _findAnnotation(a, JsonProperty.class);
         if (pann != null) {
             return PropertyName.construct(pann.value());
         }
-        if (_hasOneOf(a, ANNOTATIONS_TO_INFER_SER)) {
+        if (useDefault || _hasOneOf(a, ANNOTATIONS_TO_INFER_SER)) {
             return PropertyName.USE_DEFAULT;
         }
         return null;

src/test/java/com/fasterxml/jackson/databind/creators/DelegatingArrayCreator1804Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/DelegatingArrayCreator1804Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.util.List;
 

src/test/java/com/fasterxml/jackson/failing/DelegatingCreatorAnnotations2021Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/DelegatingCreatorAnnotations2021Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.io.IOException;
 

src/test/java/com/fasterxml/jackson/failing/NullConversionWithCreatorTest.java

@@ -6,6 +6,7 @@
 
 public class NullConversionWithCreatorTest extends BaseMapTest
 {
+    // [databind#2024]
     static class EmptyFromNullViaCreator {
         Point p;
 
@@ -24,6 +25,7 @@ public EmptyFromNullViaCreator(@JsonSetter(nulls=Nulls.AS_EMPTY)
      */
     private final ObjectMapper MAPPER = newObjectMapper();
 
+    // [databind#2024]
     public void testEmptyFromNullViaCreator() throws Exception
     {
         EmptyFromNullViaCreator result = MAPPER.readValue(aposToQuotes("{'p':null}"),