Merge branch '2.8'

Author: cowtowncoder

release-notes/VERSION

@@ -53,7 +53,11 @@ Project: jackson-databind
 #1454: Support `@JsonFormat.lenient` for `java.util.Date`, `java.util.Calendar`
 #1474: Replace use of `Class.newInstance()` (deprecated in Java 9) with call via Constructor
 
-2.8.7 (not yet released)
+2.8.8 (not yet released)
+
+#1533: `AsPropertyTypeDeserializer` ignores `DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT`
+
+2.8.7 (21-Feb-2017)
 
 #935: `@JsonProperty(access = Access.READ_ONLY)` - unexpected behaviour
 #1317: '@JsonIgnore' annotation not working with creator properties, serialization

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java

@@ -151,11 +151,20 @@ protected Object _deserializeTypedUsingDefaultImpl(JsonParser p,
             return result;
         }
         // or, something for which "as-property" won't work, changed into "wrapper-array" type:
-        if (p.getCurrentToken() == JsonToken.START_ARRAY) {
+        if (p.isExpectedStartArrayToken()) {
             return super.deserializeTypedFromAny(p, ctxt);
         }
+        if (p.hasToken(JsonToken.VALUE_STRING)) {
+            if (ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
+                String str = p.getText().trim();
+                if (str.isEmpty()) {
+                    return null;
+                }
+            }
+        }
         ctxt.reportWrongTokenException(baseType(), JsonToken.FIELD_NAME,
-                "missing property '"+_typePropertyName+"' that is to contain type id  (for class "+baseTypeName()+")");
+                String.format("missing property '%s' that is to contain type id  (for class %s)",
+                _typePropertyName, baseTypeName()));
         return null;
     }
 

src/test/java/com/fasterxml/jackson/databind/jsontype/TestPolymorphicWithDefaultImpl.java

@@ -129,6 +129,16 @@ static class BaseWrapper {
         public BaseClass value;
     }
 
+    // [databind#1533]
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY,
+            property = "type")
+    static class AsProperty {
+    }
+
+    static class AsPropertyWrapper {
+        public AsProperty value;
+    }
+
     /*
     /**********************************************************
     /* Unit tests, deserialization
@@ -247,6 +257,28 @@ public void testUnknownClassAsSubtype() throws Exception
         assertNull(w.value);
     }
 
+    public void testWithoutEmptyStringAsNullObject1533() throws Exception
+    {
+        ObjectReader r = MAPPER.readerFor(AsPropertyWrapper.class)
+                .without(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+        try {
+            r.readValue("{ \"value\": \"\" }");
+            fail("Expected " + JsonMappingException.class);
+        } catch (JsonMappingException e) {
+            verifyException(e, "missing property 'type'");
+            verifyException(e, "contain type id");
+        }
+    }
+
+    // [databind#1533]
+    public void testWithEmptyStringAsNullObject1533() throws Exception
+    {
+        ObjectReader r = MAPPER.readerFor(AsPropertyWrapper.class)
+                .with(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+        AsPropertyWrapper wrapper = r.readValue("{ \"value\": \"\" }");
+        assertNull(wrapper.value);
+    }
+
     /*
     /**********************************************************
     /* Unit tests, serialization