Verified #594 works for 2.5.0, improved access handling

Author: cowtowncoder

release-notes/CREDITS

@@ -188,3 +188,6 @@ Konstantin Labun (kulabun@github)
   * Reported #647: Deserialization fails when @JsonUnwrapped property contains an object with same property name
    (2.5.0)
 
+Christopher Smith (chrylis@github)
+  * Reported #594: `@JsonValue` on enum not used when enum value is a Map key
+   (2.5.0)

release-notes/VERSION

@@ -42,6 +42,8 @@ Project: jackson-databind
  (requested by herau@github)
 #576: Add fluent API for adding mixins
  (contributed by Adam S, adstro@github)
+#594: `@JsonValue` on enum not used when enum value is a Map key
+ (reported by chrylis@github)
 #596: Add support for `@JsonProperty.defaultValue`, exposed via `BeanProperty.getMetadata().getDefaultValue()`
 #597: Improve error messaging for cases where JSON Creator returns null (which
   is illegal)

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

@@ -230,7 +230,11 @@ public JsonSerializer<Object> createKeySerializer(SerializationConfig config,
                         final Class<?> rawType = am.getRawReturnType();
                         JsonSerializer<?> delegate = StdKeySerializers.getStdKeySerializer(config,
                                 rawType, true);
-                        ser = new JsonValueSerializer(am.getAnnotated(), delegate);
+                        Method m = am.getAnnotated();
+                        if (config.canOverrideAccessModifiers()) {
+                            ClassUtil.checkAndFixAccess(m);
+                        }
+                        ser = new JsonValueSerializer(m, delegate);
                     } else {
                         ser = StdKeySerializers.getDefault();
                     }

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

@@ -149,8 +149,7 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
      */
 
     @Override
-    public void serialize(Object bean, JsonGenerator jgen, SerializerProvider prov)
-        throws IOException, JsonGenerationException
+    public void serialize(Object bean, JsonGenerator jgen, SerializerProvider prov) throws IOException
     {
         try {
             Object value = _accessorMethod.invoke(bean);
@@ -188,8 +187,7 @@ public void serialize(Object bean, JsonGenerator jgen, SerializerProvider prov)
 
     @Override
     public void serializeWithType(Object bean, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer0)
-        throws IOException, JsonProcessingException
+            TypeSerializer typeSer0) throws IOException
     {
         // Regardless of other parts, first need to find value to serialize:
         Object value = null;

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

@@ -177,13 +177,13 @@ public ByteArraySerializer() {
         }
 
         @Override
-        public boolean isEmpty(byte[] value) {
+        public boolean isEmpty(SerializerProvider prov, byte[] value) {
             return (value == null) || (value.length == 0);
         }
 
         @Override
         public void serialize(byte[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
+            throws IOException
         {
             jgen.writeBinary(provider.getConfig().getBase64Variant(),
                     value, 0, value.length);
@@ -192,7 +192,7 @@ public void serialize(byte[] value, JsonGenerator jgen, SerializerProvider provi
         @Override
         public void serializeWithType(byte[] value, JsonGenerator jgen, SerializerProvider provider,
                 TypeSerializer typeSer)
-            throws IOException, JsonGenerationException
+            throws IOException
         {
             typeSer.writeTypePrefixForScalar(value, jgen);
             jgen.writeBinary(provider.getConfig().getBase64Variant(),
@@ -323,7 +323,7 @@ public static class CharArraySerializer extends StdSerializer<char[]>
         public CharArraySerializer() { super(char[].class); }
 
         @Override
-        public boolean isEmpty(char[] value) {
+        public boolean isEmpty(SerializerProvider prov, char[] value) {
             return (value == null) || (value.length == 0);
         }
 

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

@@ -163,7 +163,25 @@ static class PoOverrideAsNumber
         @JsonFormat(shape=Shape.NUMBER)
         public PoNUM value = PoNUM.B;
     }
-    
+
+    static enum MyEnum594 {
+        VALUE_WITH_A_REALLY_LONG_NAME_HERE("longValue");
+
+        private final String key;
+        private MyEnum594(String k) { key = k; }
+
+        @JsonValue
+        public String getKey() { return key; }
+    }
+
+    static class MyStuff594 {
+        public Map<MyEnum594,String> stuff = new EnumMap<MyEnum594,String>(MyEnum594.class);
+        
+        public MyStuff594(String value) {
+            stuff.put(MyEnum594.VALUE_WITH_A_REALLY_LONG_NAME_HERE, value);
+        }
+    }
+
     /*
     /**********************************************************
     /* Tests
@@ -316,6 +334,12 @@ public void testOverrideEnumAsString() throws Exception {
     public void testOverrideEnumAsNumber() throws Exception {
         assertEquals("{\"value\":1}", mapper.writeValueAsString(new PoOverrideAsNumber()));
     }
+
+    // [databind#594]
+    public void testJsonValueForEnumMapKey() throws Exception {
+        assertEquals(aposToQuotes("{'stuff':{'longValue':'foo'}}"),
+                mapper.writeValueAsString(new MyStuff594("foo")));
+    }
 }
 
 // [JACKSON-757], non-inner enum