Fix #1554

Author: cowtowncoder

release-notes/VERSION

@@ -62,6 +62,7 @@ Project: jackson-databind
  (reported by Lyor G)
 #1550: Unexpected behavior with `@JsonInclude(JsonInclude.Include.NON_EMPTY)` and
  `java.util.Date` serialization
+#1554: Support deserialization of `Shape.OBJECT` ("as POJO") for `Map`s (and map-like types)
 
 2.8.8 (not yet released)
 

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

@@ -372,11 +372,19 @@ protected JsonDeserializer<?> _createDeserializer2(DeserializationContext ctxt,
                 return factory.createArrayDeserializer(ctxt, (ArrayType) type, beanDesc);
             }
             if (type.isMapLikeType()) {
-                MapLikeType mlt = (MapLikeType) type;
-                if (mlt.isTrueMapType()) {
-                    return factory.createMapDeserializer(ctxt,(MapType) mlt, beanDesc);
+                // 11-Mar-2017, tatu: As per [databind#1554], also need to block
+                //    handling as Map if overriden with "as POJO" option.
+                // Ideally we'd determine it bit later on (to allow custom handler checks)
+                // but that won't work for other reasons. So do it here.
+                // (read: rewrite for 3.0)
+                JsonFormat.Value format = beanDesc.findExpectedFormat(null);
+                if ((format == null) || format.getShape() != JsonFormat.Shape.OBJECT) {
+                    MapLikeType mlt = (MapLikeType) type;
+                    if (mlt.isTrueMapType()) {
+                        return factory.createMapDeserializer(ctxt,(MapType) mlt, beanDesc);
+                    }
+                    return factory.createMapLikeDeserializer(ctxt, mlt, beanDesc);
                 }
-                return factory.createMapLikeDeserializer(ctxt, mlt, beanDesc);
             }
             if (type.isCollectionLikeType()) {
                 /* 03-Aug-2012, tatu: As per [databind#40], one exception is if shape

src/test/java/com/fasterxml/jackson/databind/format/MapFormat476Test.java renamed to src/test/java/com/fasterxml/jackson/databind/format/MapFormatShapeTest.java

@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.databind.*;
 
 @SuppressWarnings("serial")
-public class MapFormat476Test extends BaseMapTest
+public class MapFormatShapeTest extends BaseMapTest
 {
     @JsonPropertyOrder({ "extra" })
     static class Map476Base extends LinkedHashMap<String,Integer> {
@@ -56,14 +56,14 @@ public Bean476Override(int value) {
 
     /*
     /**********************************************************
-    /* Test methods
+    /* Test methods, serialization
     /**********************************************************
      */
 
     final private ObjectMapper MAPPER = objectMapper();
     // for [databind#476]: Maps as POJOs
 
-    public void testAsPOJOViaClass() throws Exception
+    public void testSerializeAsPOJOViaClass() throws Exception
     {
         String result = MAPPER.writeValueAsString(new Bean476Container(1,2,0));
         assertEquals(aposToQuotes("{'a':{'extra':13,'empty':false},'b':{'value':2}}"),
@@ -73,19 +73,33 @@ public void testAsPOJOViaClass() throws Exception
     // Can't yet use per-property overrides at all, see [databind#1419]
 
     /*
-    public void testAsPOJOViaProperty() throws Exception
+    public void testSerializeAsPOJOViaProperty() throws Exception
     {
         String result = MAPPER.writeValueAsString(new Bean476Container(1,0,3));
         assertEquals(aposToQuotes("{'a':{'extra':13,'empty':false},'c':{'empty':false,'value':3}}"),
                 result);
     }
 
-    public void testNaturalViaOverride() throws Exception
+    public void testSerializeNaturalViaOverride() throws Exception
     {
         String result = MAPPER.writeValueAsString(new Bean476Override(123));
         assertEquals(aposToQuotes("{'stuff':{'value':123}}"),
                 result);
     }
     */
 
+    /*
+    /**********************************************************
+    /* Test methods, deserialization/roundtrip
+    /**********************************************************
+     */
+
+    // [databind#1554]
+    public void testDeserializeAsPOJOViaClass() throws Exception
+    {
+        Map476AsPOJO result = MAPPER.readValue(aposToQuotes("{'extra':42}"),
+                Map476AsPOJO.class);
+        assertEquals(0, result.size());
+        assertEquals(42, result.extra);
+    }
 }