Fix #1895

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -22,6 +22,8 @@ Project: jackson-databind
   (requested by Ville K)
 #1878: `@JsonBackReference` property is always ignored when deserializing since 2.9.0
  (reported by reda-alaoui@github)
+#1895: Per-type config override "JsonFormat.Shape.OBJECT" for Map.Entry not working
+ (reported by mcortella@github)
 
 2.9.3 (09-Dec-2017)
 

src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java

@@ -863,8 +863,10 @@ protected JsonSerializer<?> buildMapEntrySerializer(SerializerProvider prov,
     {
         // [databind#865]: Allow serialization "as POJO" -- note: to undo, declare
         //   serialization as `Shape.NATURAL` instead; that's JSON Object too.
-        JsonFormat.Value format = beanDesc.findExpectedFormat(null);
-        if (format != null && format.getShape() == JsonFormat.Shape.OBJECT) {
+        JsonFormat.Value formatOverride = prov.getDefaultPropertyFormat(Map.Entry.class);
+        JsonFormat.Value formatFromAnnotation = beanDesc.findExpectedFormat(null);
+        JsonFormat.Value format = JsonFormat.Value.merge(formatFromAnnotation, formatOverride);
+        if (format.getShape() == JsonFormat.Shape.OBJECT) {
             return null;
         }
         MapEntrySerializer ser = new MapEntrySerializer(valueType, keyType, valueType,

src/main/java/com/fasterxml/jackson/databind/ser/std/BooleanSerializer.java

@@ -140,5 +140,5 @@ public JsonSerializer<?> createContextual(SerializerProvider serializers,
             }
             return this;
         }
-}
+    }
 }

src/test/java/com/fasterxml/jackson/databind/format/MapEntryFormatTest.java

@@ -99,36 +99,12 @@ public EmptyEntryWrapper(String key, String value) {
 
     /*
     /**********************************************************
-    /* Test methods
+    /* Test methods, basic
     /**********************************************************
      */
 
     private final ObjectMapper MAPPER = newObjectMapper();
 
-    public void testAsNaturalRoundtrip() throws Exception
-    {
-        BeanWithMapEntry input = new BeanWithMapEntry("foo" ,"bar");
-        String json = MAPPER.writeValueAsString(input);
-        assertEquals(aposToQuotes("{'entry':{'foo':'bar'}}"), json);
-        BeanWithMapEntry result = MAPPER.readValue(json, BeanWithMapEntry.class);
-        assertEquals("foo", result.entry.getKey());
-        assertEquals("bar", result.entry.getValue());
-    }
-    // should work via class annotation
-    public void testAsObjectRoundtrip() throws Exception
-    {
-        MapEntryAsObject input = new MapEntryAsObject("foo" ,"bar");
-        String json = MAPPER.writeValueAsString(input);
-        assertEquals(aposToQuotes("{'key':'foo','value':'bar'}"), json);
-
-        // 16-Oct-2016, tatu: Happens to work by default because it's NOT basic
-        //   `Map.Entry` but subtype.
-        
-        MapEntryAsObject result = MAPPER.readValue(json, MapEntryAsObject.class);
-        assertEquals("foo", result.getKey());
-        assertEquals("bar", result.getValue());
-    }
-
     public void testInclusion() throws Exception
     {
         assertEquals(aposToQuotes("{'entry':{'a':'b'}}"),
@@ -159,4 +135,45 @@ public void testInclusionWithReference() throws Exception
         assertEquals(aposToQuotes("{}"),
                 MAPPER.writeValueAsString(new EntryWithNonAbsentWrapper("a", null)));
     }
+
+    /*
+    /**********************************************************
+    /* Test methods, as-Object (Shape)
+    /**********************************************************
+     */
+
+    public void testAsNaturalRoundtrip() throws Exception
+    {
+        BeanWithMapEntry input = new BeanWithMapEntry("foo" ,"bar");
+        String json = MAPPER.writeValueAsString(input);
+        assertEquals(aposToQuotes("{'entry':{'foo':'bar'}}"), json);
+        BeanWithMapEntry result = MAPPER.readValue(json, BeanWithMapEntry.class);
+        assertEquals("foo", result.entry.getKey());
+        assertEquals("bar", result.entry.getValue());
+    }
+    // should work via class annotation
+    public void testAsObjectRoundtrip() throws Exception
+    {
+        MapEntryAsObject input = new MapEntryAsObject("foo" ,"bar");
+        String json = MAPPER.writeValueAsString(input);
+        assertEquals(aposToQuotes("{'key':'foo','value':'bar'}"), json);
+
+        // 16-Oct-2016, tatu: Happens to work by default because it's NOT basic
+        //   `Map.Entry` but subtype.
+        
+        MapEntryAsObject result = MAPPER.readValue(json, MapEntryAsObject.class);
+        assertEquals("foo", result.getKey());
+        assertEquals("bar", result.getValue());
+    }
+
+    // [databind#1895]
+    public void testDefaultShapeOverride() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configOverride(Map.Entry.class)
+            .setFormat(JsonFormat.Value.forShape(JsonFormat.Shape.OBJECT));
+        Map.Entry<String,String> input = new BeanWithMapEntry("foo", "bar").entry;
+        assertEquals(aposToQuotes("{'key':'foo','value':'bar'}"),
+                mapper.writeValueAsString(input));
+    }
 }

src/test/java/com/fasterxml/jackson/databind/ser/jdk/AtomicTypeSerializationTest.java

@@ -10,7 +10,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
- * Unit tests for verifying serialization of {@link java.util.concurrent.AtomicReference}
+ * Unit tests for verifying serialization of {@link java.util.concurrent.atomic.AtomicReference}
  * and other atomic types, via various settings.
  */
 public class AtomicTypeSerializationTest