Fixed #1570

Author: cowtowncoder

release-notes/VERSION

@@ -9,6 +9,8 @@ Project: jackson-databind
 #1533: `AsPropertyTypeDeserializer` ignores `DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT`
 #1543: JsonFormat.Shape.NUMBER_INT does not work when defined on enum type in 2.8
  (reported by Alex P)
+#1570: `Enum` key for `Map` ignores `SerializationFeature.WRITE_ENUMS_USING_INDEX`
+ (reported by SolaKun@github)
 #1575: Problem with `@JsonIgnoreProperties` on recursive property (regression in 2.8)
  (reported by anujkumar04@github)
 - Minor fix to creation of `PropertyMetadata`, had one path that could lead to NPE

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

@@ -31,12 +31,15 @@ public void serialize(Object value, JsonGenerator g, SerializerProvider provider
         } else if (cls.isEnum()) {
             // 24-Sep-2015, tatu: Minor improvement over older (2.6.2 and before) code: at least
             //     use name/toString() variation for as per configuration
-            Enum<?> en = (Enum<?>) value;
-
             if (provider.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)) {
-                str = en.toString();
+                str = value.toString();
             } else {
-                str = en.name();
+                Enum<?> en = (Enum<?>) value;
+                if (provider.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)) {
+                    str = String.valueOf(en.ordinal());
+                } else {
+                    str = en.name();
+                }
             }
         } else if (value instanceof Date) {
             provider.defaultSerializeDateKey((Date) value, g);

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

@@ -144,9 +144,19 @@ public void serialize(Object value, JsonGenerator g, SerializerProvider provider
                 break;
             case TYPE_ENUM:
                 {
-                    String str = provider.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
-                            ? value.toString() : ((Enum<?>) value).name();
-                    g.writeFieldName(str);
+                    String key;
+
+                    if (provider.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)) {
+                        key = value.toString();
+                    } else {
+                        Enum<?> e = (Enum<?>) value;
+                        if (provider.isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX)) {
+                            key = String.valueOf(e.ordinal());
+                        } else {
+                            key = e.name();
+                        }
+                    }
+                    g.writeFieldName(key);
                 }
                 break;
             case TYPE_TO_STRING:
@@ -250,6 +260,10 @@ public void serialize(Object value, JsonGenerator g, SerializerProvider serializ
                 return;
             }
             Enum<?> en = (Enum<?>) value;
+            if (serializers.isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX)) {
+                g.writeFieldName(String.valueOf(en.ordinal()));
+                return;
+            }
             g.writeFieldName(_values.serializedValueFor(en));
         }
     }

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

@@ -281,11 +281,17 @@ public void testMapWithEnumKeys() throws Exception
         String json = MAPPER.writeValueAsString(bean);
         assertEquals("{\"map\":{\"B\":3}}", json);
 
-        ObjectMapper m2 = new ObjectMapper();
         // but can change
-        m2.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-        json = m2.writeValueAsString(bean);
+        json = MAPPER.writer()
+                .with(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
+                .writeValueAsString(bean);
         assertEquals("{\"map\":{\"b\":3}}", json);
+
+        // [databind#1570]
+        json = MAPPER.writer()
+                .with(SerializationFeature.WRITE_ENUMS_USING_INDEX)
+                .writeValueAsString(bean);
+        assertEquals(aposToQuotes("{'map':{'"+TestEnum.B.ordinal()+"':3}}"), json);
     }
 
     public void testAsIndex() throws Exception