Further fixes to #943

Author: cowtowncoder

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

@@ -770,22 +770,6 @@ protected JsonSerializer<?> buildMapSerializer(SerializerProvider prov,
         if (ser == null) {
             ser = findSerializerByAnnotations(prov, type, beanDesc); // (2) Annotations
             if (ser == null) {
-                // 08-Nov-2014, tatu: As per [databind#601], better just use default Map serializer
-                /*
-                if (EnumMap.class.isAssignableFrom(type.getRawClass())
-                        && ((keySerializer == null) || ClassUtil.isJacksonStdImpl(keySerializer))) {
-                    JavaType keyType = type.getKeyType();
-                    // Need to find key enum values...
-                    EnumValues enums = null;
-                    if (keyType.isEnumType()) { // non-enum if we got it as type erased class (from instance)
-                        @SuppressWarnings("unchecked")
-                        Class<Enum<?>> enumClass = (Class<Enum<?>>) keyType.getRawClass();
-                        enums = EnumValues.construct(config, enumClass);
-                    }
-                    ser = new EnumMapSerializer(type.getContentType(), staticTyping, enums,
-                        elementTypeSerializer, elementValueSerializer);
-                } else {
-                */
                 Object filterId = findFilterId(config, beanDesc);
                 AnnotationIntrospector ai = config.getAnnotationIntrospector();
                 MapSerializer mapSer = MapSerializer.construct(ai.findPropertiesToIgnore(beanDesc.getClassInfo(), true),

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

@@ -335,7 +335,7 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
         if (ser == null) {
             ser = _valueSerializer;
         }
-        // [Issue#124]: May have a content converter
+        // [databind#124]: May have a content converter
         ser = findConvertingContentSerializer(provider, property, ser);
         if (ser == null) {
             // 30-Sep-2012, tatu: One more thing -- if explicit content type is annotated,
@@ -533,6 +533,7 @@ public void serializeFields(Map<?,?> value, JsonGenerator gen, SerializerProvide
             Object valueElem = entry.getValue();
             // First, serialize key
             Object keyElem = entry.getKey();
+
             if (keyElem == null) {
                 provider.findNullKeySerializer(_keyType, _property).serialize(null, gen, provider);
             } else {

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

@@ -34,10 +34,8 @@ public static JsonSerializer<Object> getStdKeySerializer(SerializationConfig con
         // [databind#943: Use a dynamic key serializer if we are not given actual
         // type declaration
         if ((rawKeyType == null) || (rawKeyType == Object.class)) {
-            // !!! TODO
             return new Dynamic();
         }
-
         if (rawKeyType == String.class) {
             return DEFAULT_STRING_SERIALIZER;
         }
@@ -69,6 +67,13 @@ public static JsonSerializer<Object> getStdKeySerializer(SerializationConfig con
     public static JsonSerializer<Object> getFallbackKeySerializer(SerializationConfig config,
             Class<?> rawKeyType) {
         if (rawKeyType != null) {
+            // 29-Sep-2015, tatu: Odd case here, of `Enum`, which we may get for `EnumMap`; not sure
+            //   if that is a bug or feature. Regardless, it seems to require dynamic handling
+            //   (compared to getting actual fully typed Enum).
+            //  Note that this might even work from the earlier point, but let's play it safe for now
+            if (rawKeyType == Enum.class) {
+                return new Dynamic();
+            }
             if (rawKeyType.isEnum()) {
                 return new Default(Default.TYPE_ENUM, rawKeyType);
             }
@@ -168,7 +173,8 @@ Object readResolve() {
 
         @Override
         public void serialize(Object value, JsonGenerator g, SerializerProvider provider)
-                throws IOException {
+                throws IOException
+        {
             Class<?> cls = value.getClass();
             PropertySerializerMap m = _dynamicSerializers;
             JsonSerializer<Object> ser = m.serializerFor(cls);

src/test/java/com/fasterxml/jackson/databind/ser/TestEnumSerialization.java

@@ -55,9 +55,11 @@ private EnumWithJsonValue(String n) {
             name = n;
         }
 
-        @JsonValue
         @Override
         public String toString() { return name; }
+
+        @JsonValue
+        public String external() { return "value:"+name; }
     }
 
     protected static interface ToStringMixin {
@@ -254,7 +256,7 @@ public void testSubclassedEnums() throws Exception
 
     public void testEnumsWithJsonValue() throws Exception
     {
-        assertEquals("\"bar\"", MAPPER.writeValueAsString(EnumWithJsonValue.B));
+        assertEquals("\"value:bar\"", MAPPER.writeValueAsString(EnumWithJsonValue.B));
     }
 
     public void testEnumsWithJsonValueUsingMixin() throws Exception
@@ -271,11 +273,9 @@ public void testEnumsWithJsonValueInMap() throws Exception
         EnumMap<EnumWithJsonValue,String> input = new EnumMap<EnumWithJsonValue,String>(EnumWithJsonValue.class);
         input.put(EnumWithJsonValue.B, "x");
         // 24-Sep-2015, tatu: SHOULD actually use annotated method, as per:
-//        assertEquals("{\"bar\":\"x\"}", MAPPER.writeValueAsString(input));
-        // but currently (2.6) will just rely on default serialization, via name()
-        assertEquals("{\"B\":\"x\"}", MAPPER.writeValueAsString(input));
+        assertEquals("{\"value:bar\":\"x\"}", MAPPER.writeValueAsString(input));
     }
-    
+
     /**
      * Test for ensuring that @JsonSerializable is used with Enum types as well
      * as with any other types.

src/test/java/com/fasterxml/jackson/databind/ser/TestKeySerializers.java

@@ -7,12 +7,9 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.module.SimpleSerializers;
-import org.junit.Test;
 
 public class TestKeySerializers extends BaseMapTest
 {
@@ -56,12 +53,19 @@ public String toLC() {
 
     static class ABCKeySerializer extends JsonSerializer<ABC> {
         @Override
-        public void serialize(ABC value, JsonGenerator jgen,
+        public void serialize(ABC value, JsonGenerator gen,
                 SerializerProvider provider) throws IOException {
-            jgen.writeFieldName("xxx"+value);
+            gen.writeFieldName("xxx"+value);
         }
     }
 
+    @JsonSerialize(keyUsing = ABCKeySerializer.class)
+    public static enum ABCMixin { }
+
+    public static enum Outer {
+        inner;
+    }
+
     static class ABCMapWrapper {
         public Map<ABC,String> stuff = new HashMap<ABC,String>();
         public ABCMapWrapper() {
@@ -120,7 +124,7 @@ public void testKarl() throws IOException {
         assertEquals("{\"map\":{\"Karl\":1}}", serialized);
     }
 
-    // [Issue#75]: caching of KeySerializers
+    // [databind#75]: caching of KeySerializers
     public void testBoth() throws IOException
     {
         // Let's NOT use shared one, to ensure caching starts from clean slate
@@ -144,32 +148,21 @@ public void testCustomForEnum() throws IOException
         assertEquals("{\"stuff\":{\"xxxB\":\"bar\"}}", json);
     }
 
-    @JsonSerialize(keyUsing = ABCKeySerializer.class)
-    public static enum ABCMixin { }
-
-    public static enum Outer {
-        inner;
-    }
-
-    public void testCustomEnumInnerMapKey() {
+    public void testCustomEnumInnerMapKey() throws Exception {
         Map<Outer, Object> outerMap = new HashMap<Outer, Object>();
         Map<ABC, Map<String, String>> map = new EnumMap<ABC, Map<String, String>>(ABC.class);
         Map<String, String> innerMap = new HashMap<String, String>();
         innerMap.put("one", "1");
         map.put(ABC.A, innerMap);
         outerMap.put(Outer.inner, map);
         final ObjectMapper mapper = new ObjectMapper();
-        SimpleModule mod = new SimpleModule("test") {
-            @Override
-            public void setupModule(SetupContext context) {
-                context.setMixInAnnotations(ABC.class, ABCMixin.class);
-                SimpleSerializers keySerializers = new SimpleSerializers();
-                keySerializers.addSerializer(ABC.class, new ABCKeySerializer());
-                context.addKeySerializers(keySerializers);
-            }
-        };
+        SimpleModule mod = new SimpleModule("test");
+        mod.setMixInAnnotation(ABC.class, ABCMixin.class);
+        mod.addKeySerializer(ABC.class, new ABCKeySerializer());
         mapper.registerModule(mod);
+
         JsonNode tree = mapper.convertValue(outerMap, JsonNode.class);
+
         JsonNode innerNode = tree.get("inner");
         String key = innerNode.fieldNames().next();
         assertEquals("xxxA", key);