Fixed #1297

Author: cowtowncoder

release-notes/CREDITS

@@ -509,3 +509,7 @@ Ari Fogel (arifogel@github)
 Andriy Plokhotnyuk (plokhotnyuk@github)
   * Requested #1277: Add caching of resolved generic types for `TypeFactory`
    (2.8.0)
+
+Arek Gabiga (arekgabiga@github)
+  * Reported #1297: Deserialization of generic type with Map.class
+   (2.8.1)

release-notes/VERSION

@@ -12,6 +12,8 @@ Project: jackson-databind
 #1289: Optimize construction of `ArrayList`, `LinkedHashMap` instances
 #1291: Backward-incompatible behaviour of 2.8: deserializing enum types
    with two static factory methods fail by default
+#1297: Deserialization of generic type with Map.class
+ (reported by Arek G)
 
 2.8.0 (04-Jul-2016)
 

src/main/java/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.java

@@ -441,8 +441,8 @@ public JavaType getParameterType(int index) {
             return _base.getParameterType(index);
         }
 
-        @SuppressWarnings("deprecation")
         @Override
+        @Deprecated
         public Type getGenericParameterType(int index) {
             return _base.getGenericParameterType(index);
         }

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

@@ -281,7 +281,7 @@ public Class<?> findClass(String className) throws ClassNotFoundException
         Throwable prob = null;
         ClassLoader loader = this.getClassLoader();
         if (loader == null) {
-          loader = 	Thread.currentThread().getContextClassLoader();
+            loader = 	Thread.currentThread().getContextClassLoader();
         }
         if (loader != null) {
             try {
@@ -1013,7 +1013,7 @@ private JavaType _mapType(Class<?> rawClass, TypeBindings bindings,
             JavaType superClass, JavaType[] superInterfaces)
     {
         JavaType kt, vt;
-        
+
         // 28-May-2015, tatu: Properties are special, as per [databind#810]; fake "correct" parameter sig
         if (rawClass == Properties.class) {
             kt = vt = CORE_TYPE_STRING;
@@ -1307,6 +1307,10 @@ protected JavaType[] _resolveSuperInterfaces(ClassStack context, Class<?> rawTyp
     protected JavaType _fromWellKnownClass(ClassStack context, Class<?> rawType, TypeBindings bindings,
             JavaType superClass, JavaType[] superInterfaces)
     {
+        if (bindings == null) {
+            bindings = TypeBindings.emptyBindings();
+        }
+        
         // Quite simple when we resolving exact class/interface; start with that
         if (rawType == Map.class) {
             return _mapType(rawType, bindings, superClass, superInterfaces);

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

@@ -5,7 +5,7 @@
 /**
  * Failing test related to [databind#609]
  */
-public class TestLocalType609 extends BaseMapTest
+public class TestLocalTypes extends BaseMapTest
 {
     static class EntityContainer {
         RuleForm entity;

src/test/java/com/fasterxml/jackson/databind/type/TestLocalType609.java renamed to src/test/java/com/fasterxml/jackson/databind/type/TestLocalTypes.java

@@ -29,14 +29,17 @@ public Set<java.util.Map.Entry<K, Collection<V>>> entrySet() {
             }
         }
     }
-    
+
+    // for [databind#76]
+    @SuppressWarnings("serial")
+    static class HashTree<K, V> extends HashMap<K, HashTree<K, V>> { }
+
     /*
     /**********************************************************
     /* Test methods
     /**********************************************************
      */
 
-    // [JACKSON-677]
     public void testInnerType() throws Exception
     {
         TypeFactory tf = TypeFactory.defaultInstance();
@@ -49,4 +52,12 @@ public void testInnerType() throws Exception
         JavaType vt2 = valueType.getContentType();
         assertEquals(Object.class, vt2.getRawClass());
     }
+
+    // for [databind#76]
+    public void testRecursiveType()
+    {
+        TypeFactory tf = TypeFactory.defaultInstance();
+        JavaType type = tf.constructType(HashTree.class);
+        assertNotNull(type);
+    }
 }

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

@@ -70,7 +70,11 @@ static class StringListBean {
 
     static class CollectionLike<E> { }
     static class MapLike<K,V> { }
-    
+
+    static class Wrapper1297<T> {
+        public T content;
+    }
+
     /*
     /**********************************************************
     /* Unit tests
@@ -565,5 +569,14 @@ public void testCacheClearing()
         tf.clearCache();
         assertEquals(0, tf._typeCache.size());
     }
+
+    // for [databind#1297]
+    public void testRawMapType()
+    {
+        TypeFactory tf = TypeFactory.defaultInstance().withModifier(null); // to get a new copy
+
+        JavaType type = tf.constructParametricType(Wrapper1297.class, Map.class);
+        assertNotNull(type);
+        assertEquals(Wrapper1297.class, type.getRawClass());
+    }
 }
-