Merge branch '2.5'

Conflicts:
	pom.xml
	release-notes/VERSION

Author: cowtowncoder

release-notes/VERSION

@@ -73,7 +73,7 @@ Project: jackson-databind
  (contributed by Lars P)
 - Remove old cglib compatibility tests; cause problems in Eclipse
 
-2.5.4 (not yet released)
+2.5.4 (09-Jun-2015)
 
 #676: Deserialization of class with generic collection inside depends on
   how is was deserialized first time

src/test/java/com/fasterxml/jackson/databind/seq/PolyMapWriterTest.java

@@ -0,0 +1,61 @@
+package com.fasterxml.jackson.databind.seq;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.type.MapType;
+
+// for [databind#827]
+public class PolyMapWriterTest extends BaseMapTest
+{
+    static class CustomKey {
+        String a;
+        int b;
+
+        public String toString() { return "BAD-KEY"; }
+    }
+    
+    public class CustomKeySerializer extends JsonSerializer<CustomKey> {
+        @Override
+        public void serialize(CustomKey key, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+            jsonGenerator.writeFieldName(key.a + "," + key.b);
+        }
+    }
+    
+    @Test
+    public void testPolyCustomKeySerializer() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setVisibility(PropertyAccessor.ALL, Visibility.NONE);
+        mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        
+        SimpleModule module = new SimpleModule("keySerializerModule");
+        module.addKeySerializer(CustomKey.class, new CustomKeySerializer());
+        mapper.registerModule(module);
+
+        Map<CustomKey, String> map = new HashMap<CustomKey, String>();
+        CustomKey key = new CustomKey();
+        key.a = "foo";
+        key.b = 1;
+        map.put(key, "bar");
+
+        final MapType type = mapper.getTypeFactory().constructMapType(
+                Map.class, CustomKey.class, String.class);
+        final ObjectWriter writer = mapper.writerFor(type);
+        String json = writer.writeValueAsString(map);
+               
+        Assert.assertEquals("[\"java.util.HashMap\",{\"foo,1\":\"bar\"}]", json);
+    }
+
+}