Minor cleanup

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java

@@ -239,7 +239,7 @@ public void _addPlaceholder(String name) {
     protected void _resolveBindings(Type t)
     {
         if (t == null) return;
-        
+
         Class<?> raw;
         if (t instanceof ParameterizedType) {
             ParameterizedType pt = (ParameterizedType) t;

src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java

@@ -876,6 +876,7 @@ protected JavaType _fromParamType(ParameterizedType type, TypeBindings context)
 
         // Ok: Map or Collection?
         if (Map.class.isAssignableFrom(rawType)) {
+            // 19-Mar-2015, tatu: Looks like 2nd arg ough to be Map.class, but that causes fails
             JavaType subtype = constructSimpleType(rawType, rawType, pt);
             JavaType[] mapParams = findTypeParameters(subtype, Map.class);
             if (mapParams.length != 2) {
@@ -884,6 +885,7 @@ protected JavaType _fromParamType(ParameterizedType type, TypeBindings context)
             return MapType.construct(rawType, mapParams[0], mapParams[1]);
         }
         if (Collection.class.isAssignableFrom(rawType)) {
+            // 19-Mar-2015, tatu: Looks like 2nd arg ough to be Collection.class, but that causes fails
             JavaType subtype = constructSimpleType(rawType, rawType, pt);
             JavaType[] collectionParams = findTypeParameters(subtype, Collection.class);
             if (collectionParams.length != 1) {

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

@@ -144,32 +144,6 @@ static class MapWithTypedValues extends LinkedHashMap<String,String> { }
     @JsonTypeInfo(use = Id.CLASS)
     public static class Mixin691 { }
 
-    // For [databind#47]
-    
-    public static class Wat
-    {
-        private final String wat;
-
-        @JsonCreator
-        Wat(String wat) {
-            this.wat = wat;
-        }
-
-        @JsonValue
-        public String getWat() {
-            return wat;
-        }
-
-        @Override
-        public String toString() {
-            return "(String)[Wat: " + wat + "]";
-        }
-    }
-
-    // For [databind#47]
-    @SuppressWarnings("serial")
-    static class WatMap extends HashMap<Wat,Boolean> { }
-
     /*
     /**********************************************************
     /* Test methods
@@ -302,15 +276,15 @@ public void testNonNullValueMapViaProp() throws IOException
     }
 
     // [databind#47]
-    public void testMapJsonValueKey() throws Exception
+    public void testMapJsonValueKey47() throws Exception
     {
         WatMap input = new WatMap();
         input.put(new Wat("3"), true);
 
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(input);
         assertEquals(aposToQuotes("{'3':true}"), json);
-    }
+    }    
 
     // [databind#682]
     public void testClassKey() throws IOException
@@ -344,14 +318,4 @@ public void testNullJsonInTypedMap691() throws Exception {
         String json = mapper.writeValueAsString(map);
         assertEquals("{\"@class\":\"java.util.HashMap\",\"NULL\":null}", json);
     }
-
-    public void testMapJsonValueKey47() throws Exception
-    {
-        WatMap input = new WatMap();
-        input.put(new Wat("3"), true);
-
-        ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(input);
-        assertEquals(aposToQuotes("{'3':true}"), json);
-    }    
 }

src/test/java/com/fasterxml/jackson/databind/type/TestTypeBindings.java

@@ -45,8 +45,8 @@ public void testAbstract() throws Exception
         TypeBindings b = new TypeBindings(tf, AbstractType.class);
         assertEquals(2, b.getBindingCount());
         JavaType obType = tf.constructType(Object.class);
-        assertEquals(obType, b.findType("A"));
-        assertEquals(obType, b.findType("B"));
+        assertEquals(obType, b.findType("A", true));
+        assertEquals(obType, b.findType("B", true));
     }
 
     public void testSimple() throws Exception
@@ -55,8 +55,8 @@ public void testSimple() throws Exception
         // concrete class does have bindings however
         TypeBindings b = new TypeBindings(tf, LongStringType.class);
         assertEquals(2, b.getBindingCount());
-        assertEquals(tf.constructType(Long.class), b.findType("A"));
-        assertEquals(tf.constructType(String.class), b.findType("B"));
+        assertEquals(tf.constructType(Long.class), b.findType("A", true));
+        assertEquals(tf.constructType(String.class), b.findType("B", true));
     }