Add a test to verify weird-key handler also works

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java

@@ -125,7 +125,7 @@ public Object deserializeKey(String key, DeserializationContext ctxt)
                 return result;
             }
         } catch (Exception re) {
-            return ctxt.handleWeirdKey(_keyClass, key, "not a valid representation: %s", re.getMessage());
+            return ctxt.handleWeirdKey(_keyClass, key, "not a valid representation, problem: %s", re.getMessage());
         }
         if (_keyClass.isEnum() && ctxt.getConfig().isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
             return null;

src/test/java/com/fasterxml/jackson/databind/filter/ProblemHandlerTest.java

@@ -1,13 +1,37 @@
 package com.fasterxml.jackson.databind.filter;
 
 import java.io.IOException;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 
 public class ProblemHandlerTest extends BaseMapTest
 {
+    static class WeirdKeyHandler
+        extends DeserializationProblemHandler
+    {
+        protected final Object key;
+
+        public WeirdKeyHandler(Object key0) {
+            key = key0;
+        }
+
+        @Override
+        public Object handleWeirdKey(DeserializationContext ctxt,
+                Class<?> rawKeyType, String keyValue,
+                String failureMsg)
+            throws IOException
+        {
+            return key;
+        }
+    }
+
+    static class IntKeyMapWrapper {
+        public Map<Integer,String> stuff;
+    }
+
     static class TypeIdHandler
         extends DeserializationProblemHandler
     {
@@ -37,6 +61,18 @@ static class BaseWrapper {
     /**********************************************************
      */
 
+    public void testWeirdKeyHandling() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper()
+            .addHandler(new WeirdKeyHandler(7));
+        IntKeyMapWrapper w = mapper.readValue("{\"stuff\":{\"foo\":\"abc\"}}",
+                IntKeyMapWrapper.class);
+        Map<Integer,String> map = w.stuff;
+        assertEquals(1, map.size());
+        assertEquals("abc", map.values().iterator().next());
+        assertEquals(Integer.valueOf(7), map.keySet().iterator().next());
+    }
+
     public void testInvalidTypeId() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper()