Merge branch '2.9'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -14,6 +14,7 @@ Project: jackson-databind
  (contributed by Deblock T)
 #1931: Two more `c3p0` gadgets to exploit default typing issue
  (reported by lilei@venusgroup.com.cn)
+#1932: `EnumMap` cannot deserialize with type inclusion as property
 #1940: `Float` values with integer value beyond `int` lose precision if
   bound to `long`
  (reported by Aniruddha M)

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

@@ -221,7 +221,7 @@ public EnumMap<?,?> deserialize(JsonParser p, DeserializationContext ctxt)
         }
         // Ok: must point to START_OBJECT
         JsonToken t = p.currentToken();
-        if (t != JsonToken.START_OBJECT && t != JsonToken.FIELD_NAME && t != JsonToken.END_OBJECT) {
+        if ((t != JsonToken.START_OBJECT) && (t != JsonToken.FIELD_NAME) && (t != JsonToken.END_OBJECT)) {
             // (empty) String may be ok however; or single-String-arg ctor
             if (t == JsonToken.VALUE_STRING) {
                 return (EnumMap<?,?>) _valueInstantiator.createFromString(ctxt, p.getText());
@@ -243,25 +243,37 @@ public EnumMap<?,?> deserialize(JsonParser p, DeserializationContext ctxt,
 
         final JsonDeserializer<Object> valueDes = _valueDeserializer;
         final TypeDeserializer typeDeser = _valueTypeDeserializer;
-        String keyName;
 
-        while ((keyName = p.nextFieldName()) != null) {
+        String keyStr;
+        if (p.isExpectedStartObjectToken()) {
+            keyStr = p.nextFieldName();
+        } else {
+            JsonToken t = p.currentToken();
+            if (t != JsonToken.FIELD_NAME) {
+                if (t == JsonToken.END_OBJECT) {
+                    return result;
+                }
+                ctxt.reportWrongTokenException(this, JsonToken.FIELD_NAME, null);
+            }
+            keyStr = p.currentName();
+        }
+
+        for (; keyStr != null; keyStr = p.nextFieldName()) {
             // but we need to let key deserializer handle it separately, nonetheless
-            Enum<?> key = (Enum<?>) _keyDeserializer.deserializeKey(keyName, ctxt);
+            Enum<?> key = (Enum<?>) _keyDeserializer.deserializeKey(keyStr, ctxt);
+            JsonToken t = p.nextToken();
             if (key == null) {
                 if (!ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
-                    return (EnumMap<?,?>) ctxt.handleWeirdStringValue(_enumClass, keyName,
+                    return (EnumMap<?,?>) ctxt.handleWeirdStringValue(_enumClass, keyStr,
                             "value not one of declared Enum instance names for %s",
                             _containerType.getKeyType());
                 }
                 // 24-Mar-2012, tatu: Null won't work as a key anyway, so let's
                 //  just skip the entry then. But we must skip the value as well, if so.
-                p.nextToken();
                 p.skipChildren();
                 continue;
             }
             // And then the value...
-            JsonToken t = p.nextToken();
             // note: MUST check for nulls separately: deserializers will
             // not handle them (and maybe fail or return bogus data)
             Object value;
@@ -278,7 +290,7 @@ public EnumMap<?,?> deserialize(JsonParser p, DeserializationContext ctxt,
                     value = valueDes.deserializeWithType(p, ctxt, typeDeser);
                 }
             } catch (Exception e) {
-                return wrapAndThrow(e, result, keyName);
+                return wrapAndThrow(e, result, keyStr);
             }
             result.put(key, value);
         }
@@ -332,6 +344,7 @@ public EnumMap<?,?> _deserializeUsingProperties(JsonParser p, DeserializationCon
             if (prop != null) {
                 // Last property to set?
                 if (buffer.assignParameter(prop, prop.deserialize(p, ctxt))) {
+                    p.nextToken(); // from value to END_OBJECT or FIELD_NAME
                     EnumMap<?,?> result;
                     try {
                         result = (EnumMap<?,?>)creator.build(ctxt, buffer);

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

@@ -435,10 +435,10 @@ protected final void _readAndBind(JsonParser p, DeserializationContext ctxt,
             keyStr = p.nextFieldName();
         } else {
             JsonToken t = p.currentToken();
-            if (t == JsonToken.END_OBJECT) {
-                return;
-            }
             if (t != JsonToken.FIELD_NAME) {
+                if (t == JsonToken.END_OBJECT) {
+                    return;
+                }
                 ctxt.reportWrongTokenException(this, JsonToken.FIELD_NAME, null);
             }
             keyStr = p.currentName();
@@ -571,7 +571,7 @@ public Map<Object,Object> _deserializeUsingCreator(JsonParser p, Deserialization
             if (prop != null) {
                 // Last property to set?
                 if (buffer.assignParameter(prop, prop.deserialize(p, ctxt))) {
-                    p.nextToken();
+                    p.nextToken(); // from value to END_OBJECT or FIELD_NAME
                     Map<Object,Object> result;
                     try {
                         result = (Map<Object,Object>)creator.build(ctxt, buffer);

src/test/java/com/fasterxml/jackson/databind/deser/jdk/EnumMapDeserializationTest.java

@@ -3,9 +3,8 @@
 import java.util.EnumMap;
 import java.util.Map;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
 
@@ -61,6 +60,21 @@ public FromPropertiesEnumMap(@JsonProperty("a") int a,
         }
     }
 
+    // [databind#1859]
+    public enum Enum1859 {
+        A, B, C;
+    }
+
+    static class Pojo1859
+    {
+        public EnumMap<Enum1859, String> values;
+
+        public Pojo1859() { }
+        public Pojo1859(EnumMap<Enum1859, String> v) {
+            values = v;
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods, basic
@@ -129,6 +143,38 @@ public void testCustomEnumMapFromProps() throws Exception
         assertEquals(2, map.size());
     }
 
+    /*
+    /**********************************************************
+    /* Test methods: polymorphic
+    /**********************************************************
+     */
+
+    // [databind#1859]
+    public void testEnumMapAsPolymorphic() throws Exception
+    {
+        EnumMap<Enum1859, String> enumMap = new EnumMap<>(Enum1859.class);
+        enumMap.put(Enum1859.A, "Test");
+        enumMap.put(Enum1859.B, "stuff");
+        Pojo1859 input = new Pojo1859(enumMap);
+
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.enableDefaultTypingAsProperty(ObjectMapper.DefaultTyping.NON_FINAL, "@type");
+
+        // 05-Mar-2018, tatu: Original issue had this; should not make difference:
+         /*
+        TypeResolverBuilder<?> mapTyperAsPropertyType = new ObjectMapper.DefaultTypeResolverBuilder(ObjectMapper.DefaultTyping.NON_FINAL);
+        mapTyperAsPropertyType.init(JsonTypeInfo.Id.CLASS, null);
+        mapTyperAsPropertyType.inclusion(JsonTypeInfo.As.PROPERTY);
+        mapper.setDefaultTyping(mapTyperAsPropertyType);
+         */
+
+        String json = mapper.writeValueAsString(input);
+        Pojo1859 result = mapper.readValue(json, Pojo1859.class);
+        assertNotNull(result);
+        assertNotNull(result.values);
+        assertEquals(2, result.values.size());
+    }
+
     /*
     /**********************************************************
     /* Test methods: handling of invalid values