Merge branch '2.4'

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

Author: cowtowncoder

release-notes/CREDITS

@@ -139,6 +139,8 @@ Chris Cleveland:
 Benson Margulies:
   * Reported #467: Unwanted POJO's embedded in tree via serialization to tree
    (2.4.0)
+  * Reported #601: ClassCastException for a custom serializer for enum key in `EnumMap`
+   (2.4.4)
 
 Steve Sanbeg: (sanbeg@github)
   * Contributed #482: Make date parsing error behavior consistent with JDK

release-notes/VERSION

@@ -57,6 +57,8 @@ Project: jackson-databind
  (reported by Jerbell@github)
 #592: Wrong `TokenBuffer` delegate deserialization using `@JsonCreator`
  (reported by Eugene L)
+#601: ClassCastException for a custom serializer for enum key in `EnumMap`
+ (reported by Benson M)
 #604: `Map` deserializers not being cached, causing performance problems
 - Minor fix to `EnumSerializer` regarding detection "serialize using index"
 - Minor fix to number serializers, to call proper callback for schema generation

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

@@ -720,9 +720,8 @@ protected JsonSerializer<?> buildMapSerializer(SerializationConfig config,
             if (ser != null) { break; }
         }
         if (ser == null) {
-            /* 05-Nov-2014, tatu: As per [databind#601], may be easier NOT to use specialized
-             *    serializers, if custom serialization of keys is needed.
-             */
+            // 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();
@@ -736,17 +735,17 @@ protected JsonSerializer<?> buildMapSerializer(SerializationConfig config,
                 ser = new EnumMapSerializer(type.getContentType(), staticTyping, enums,
                     elementTypeSerializer, elementValueSerializer);
             } else {
-                Object filterId = findFilterId(config, beanDesc);
-                MapSerializer mapSer = MapSerializer.construct(config.getAnnotationIntrospector().findPropertiesToIgnore(beanDesc.getClassInfo()),
+            */
+            Object filterId = findFilterId(config, beanDesc);
+            MapSerializer mapSer = MapSerializer.construct(config.getAnnotationIntrospector().findPropertiesToIgnore(beanDesc.getClassInfo()),
                     type, staticTyping, elementTypeSerializer,
                     keySerializer, elementValueSerializer, filterId);
-                Object suppressableValue = findSuppressableContentValue(config,
-                        type.getContentType(), beanDesc);
-                if (suppressableValue != null) {
-                    mapSer = mapSer.withContentInclusion(suppressableValue);
-                }
-                ser = mapSer;
+            Object suppressableValue = findSuppressableContentValue(config,
+                    type.getContentType(), beanDesc);
+            if (suppressableValue != null) {
+                mapSer = mapSer.withContentInclusion(suppressableValue);
             }
+            ser = mapSer;
         }
         // [Issue#120]: Allow post-processing
         if (_factoryConfig.hasSerializerModifiers()) {

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

@@ -25,8 +25,11 @@
  * Specialized serializer for {@link EnumMap}s. Somewhat tricky to
  * implement because actual Enum value type may not be available;
  * and if not, it can only be gotten from actual instance.
+ * 
+ * @deprecated Since 2.4.4; standard {@link MapSerializer} works better.
  */
 @JacksonStdImpl
+@Deprecated
 public class EnumMapSerializer
     extends ContainerSerializer<EnumMap<? extends Enum<?>, ?>>
     implements ContextualSerializer

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

@@ -203,13 +203,11 @@ public void testSubclassedEnums() throws Exception
         assertEquals("\"B\"", mapper.writeValueAsString(EnumWithSubClass.B));
     }
 
-    // [JACKSON-193]
     public void testEnumsWithJsonValue() throws Exception
     {
         assertEquals("\"bar\"", mapper.writeValueAsString(EnumWithJsonValue.B));
     }
 
-    // also, for [JACKSON-193], needs to work via mix-ins
     public void testEnumsWithJsonValueUsingMixin() throws Exception
     {
         // can't share, as new mix-ins are added
@@ -218,6 +216,14 @@ public void testEnumsWithJsonValueUsingMixin() throws Exception
         assertEquals("\"b\"", m.writeValueAsString(TestEnum.B));
     }
 
+    // [databind#601]
+    public void testEnumsWithJsonValueInMap() throws Exception
+    {
+        EnumMap<EnumWithJsonValue,String> input = new EnumMap<EnumWithJsonValue,String>(EnumWithJsonValue.class);
+        input.put(EnumWithJsonValue.B, "x");
+        assertEquals("{\""+EnumWithJsonValue.B.toString()+"\":\"x\"}", mapper.writeValueAsString(input));
+    }
+    
     /**
      * Test for ensuring that @JsonSerializable is used with Enum types as well
      * as with any other types.