Merge branch '2.7'

Author: cowtowncoder

release-notes/VERSION

@@ -66,7 +66,7 @@ Project: jackson-databind
 #1277: Add caching of resolved generic types for `TypeFactory`
  (requested by Andriy P)
 
-2.7.6 (not yet released)
+2.7.6 (23-Jul-2016)
 
 #1215: Problem with type specialization for Maps with `@JsonDeserialize(as=subtype)`
  (reported by brentryan@github)

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

@@ -72,12 +72,15 @@ public static JsonSerializer<Object> getStdKeySerializer(SerializationConfig con
      * @since 2.7
      */
     public static JsonSerializer<Object> getFallbackKeySerializer(SerializationConfig config,
-            Class<?> rawKeyType) {
+            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
+            // 11-Aug-2016, tatu: Turns out we get this if `EnumMap` is the root value because
+            //    then there is no static type
             if (rawKeyType == Enum.class) {
                 return new Dynamic();
             }

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

@@ -61,7 +61,7 @@ private EnumWithJsonValue(String n) {
         @JsonValue
         public String external() { return "value:"+name; }
     }
-    
+
     protected static interface ToStringMixin {
         @Override
         @JsonValue public String toString();
@@ -215,6 +215,12 @@ private LC749Enum() { }
         public String toString() { return name().toLowerCase(); }
     }
 
+    // for [databind#1322]
+    protected enum EnumWithJsonProperty {
+        @JsonProperty("aleph")
+        A;
+    }
+
     /*
     /**********************************************************
     /* Tests
@@ -254,8 +260,7 @@ public void testSubclassedEnums() throws Exception
         assertEquals("\"B\"", MAPPER.writeValueAsString(EnumWithSubClass.B));
     }
 
-    public void testEnumsWithJsonValue() throws Exception
-    {
+    public void testEnumsWithJsonValue() throws Exception {
         assertEquals("\"value:bar\"", MAPPER.writeValueAsString(EnumWithJsonValue.B));
     }
 
@@ -415,6 +420,18 @@ public void testEnumMapSerEnableToString() throws Exception {
         m.put(LC749Enum.A, "value");
         assertEquals("{\"a\":\"value\"}", w.writeValueAsString(m));
     }
+
+    // [databind#1322]
+    public void testEnumsWithJsonProperty() throws Exception {
+        assertEquals(quote("aleph"), MAPPER.writeValueAsString(EnumWithJsonProperty.A));
+    }
+
+    // [databind#1322]
+    public void testEnumsWithJsonPropertyInSet() throws Exception
+    {
+        assertEquals("[\"aleph\"]",
+                MAPPER.writeValueAsString(EnumSet.of(EnumWithJsonProperty.A)));
+    }
 }
 
 // [JACKSON-757], non-inner enum

src/test/java/com/fasterxml/jackson/failing/EnumSerialization1322Test.java

@@ -0,0 +1,26 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.EnumMap;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EnumSerialization1322Test extends BaseMapTest
+{
+    // for [databind#1322]
+    protected enum EnumWithJsonProperty {
+        @JsonProperty("aleph")
+        A;
+    }
+
+    private final ObjectMapper MAPPER = new ObjectMapper();
+    
+    // [databind#1322]
+    public void testEnumsWithJsonPropertyAsKey() throws Exception
+    {
+        EnumMap<EnumWithJsonProperty,String> input = new EnumMap<EnumWithJsonProperty,String>(EnumWithJsonProperty.class);
+        input.put(EnumWithJsonProperty.A, "b");
+        assertEquals("{\"aleph\":\"b\"}", MAPPER.writeValueAsString(input));
+    }
+}