Merge branch '2.8' into 2.9

Author: cowtowncoder

release-notes/VERSION

@@ -21,6 +21,8 @@ Project: jackson-databind
 #1793: `java.lang.NullPointerException` in `ObjectArraySerializer.acceptJsonFormatVisitor()`
   for array value with `@JsonValue`
  (reported by Vincent D)
+#1804: `ValueInstantiator.canInstantiate()` ignores `canCreateUsingArrayDelegate()`
+ (reported byb henryptung@github)
 
 2.9.1 (07-Sep-2017)
 
@@ -140,9 +142,6 @@ Project: jackson-databind
   `MapperFeature.ALLOW_COERCION_OF_SCALARS`
  (requested by magdel@github)
 
-2.8.11 (not yet released)
-
-
 2.8.10 (24-Aug-2017)
 
 #1657: `StdDateFormat` deserializes dates with no tz/offset as UTC instead of

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

@@ -280,6 +280,7 @@ public JsonDeserializer<Object> buildBeanDeserializer(DeserializationContext ctx
             }
         }
         JsonDeserializer<?> deserializer;
+
         if (type.isAbstract() && !valueInstantiator.canInstantiate()) {
             deserializer = builder.buildAbstract();
         } else {

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

@@ -68,11 +68,12 @@ public String getValueTypeDesc() {
      * be created.
      */
     public boolean canInstantiate() {
-        return canCreateUsingDefault() || canCreateUsingDelegate()
-             || canCreateFromObjectWith() || canCreateFromString()
-             || canCreateFromInt() || canCreateFromLong()
-             || canCreateFromDouble() || canCreateFromBoolean();
-    }    
+        return canCreateUsingDefault()
+                || canCreateUsingDelegate() || canCreateUsingArrayDelegate()
+                || canCreateFromObjectWith() || canCreateFromString()
+                || canCreateFromInt() || canCreateFromLong()
+                || canCreateFromDouble() || canCreateFromBoolean();
+    }
 
     /**
      * Method that can be called to check whether a String-based creator

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

@@ -184,7 +184,7 @@ public String getValueTypeDesc() {
     public Class<?> getValueClass() {
         return _valueClass;
     }
-    
+
     @Override
     public boolean canCreateFromString() {
         return (_fromStringCreator != null);
@@ -209,27 +209,36 @@ public boolean canCreateFromDouble() {
     public boolean canCreateFromBoolean() {
         return (_fromBooleanCreator != null);
     }
-    
+
     @Override
     public boolean canCreateUsingDefault() {
         return (_defaultCreator != null);
     }
 
     @Override
     public boolean canCreateUsingDelegate() {
-        return _delegateType != null;
+        return (_delegateType != null);
     }
 
     @Override
     public boolean canCreateUsingArrayDelegate() {
-        return _arrayDelegateType != null;
+        return (_arrayDelegateType != null);
     }
-    
+
     @Override
     public boolean canCreateFromObjectWith() {
         return (_withArgsCreator != null);
     }
 
+    @Override
+    public boolean canInstantiate() {
+        return canCreateUsingDefault()
+                || canCreateUsingDelegate() || canCreateUsingArrayDelegate()
+                || canCreateFromObjectWith() || canCreateFromString()
+                || canCreateFromInt() || canCreateFromLong()
+                || canCreateFromDouble() || canCreateFromBoolean();
+    }
+
     @Override
     public JavaType getDelegateType(DeserializationConfig config) {
         return _delegateType;
@@ -263,7 +272,7 @@ public Object createUsingDefault(DeserializationContext ctxt) throws IOException
             return ctxt.handleInstantiationProblem(_valueClass, null, rewrapCtorProblem(ctxt, e));
         }
     }
-    
+
     @Override
     public Object createFromObjectWith(DeserializationContext ctxt, Object[] args) throws IOException
     {

src/test/java/com/fasterxml/jackson/databind/creators/DelegatingArrayCreator1804Test.java

@@ -0,0 +1,41 @@
+package com.fasterxml.jackson.databind.creators;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class DelegatingArrayCreator1804Test extends BaseMapTest
+{
+    public static class MyTypeImpl extends MyType {
+        private final List<Integer> values;
+
+        MyTypeImpl(List<Integer> values) {
+            this.values = values;
+        }
+
+        @Override
+        public List<Integer> getValues() {
+            return values;
+        }
+    }
+
+    static abstract class MyType {
+        @JsonValue
+        public abstract List<Integer> getValues();
+
+        @JsonCreator(mode=JsonCreator.Mode.DELEGATING)
+        public static MyType of(List<Integer> values) {
+            return new MyTypeImpl(values);
+        }
+    }
+
+
+    public void testDelegatingArray1804() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        MyType thing = mapper.readValue("[]", MyType.class);
+        assertNotNull(thing);
+    }
+}