Merge branch '2.11' into 2.12

FasterXML · Sep 6, 2020 · da390a5 · da390a5
2 parents ca3005a + 3e964e2
commit da390a5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -76,6 +76,7 @@ Project: jackson-databind
 #2840: `ObjectMapper.activateDefaultTypingAsProperty()` is not using
   parameter `PolymorphicTypeValidator`
  (reported by Daniel W)
+#2846: Problem deserialization "raw generic" fields (like `Map`) in 2.11.2
 - Fix issues with `MapLikeType.isTrueMapType()`,
   `CollectionLikeType.isTrueCollectionType()`
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedClass.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedClass.java
@@ -226,6 +226,12 @@ public static AnnotatedClass constructWithoutSuperTypes(Class<?> raw, MapperConf
 
     @Override
     public JavaType resolveType(Type type) {
+        // 05-Sep-2020, tatu: [databind#2846][databind#2821] avoid
+        //    passing context in case of Raw class (generic type declared
+        //    without type parametrers) as that can lead to mismatch
+        if (type instanceof Class<?>) {
+            return _typeFactory.constructType(type);
+        }
         return _typeFactory.constructType(type, _bindings);
     }
 

diff --git a/...g/GenericTypeDeserialization2846Test.java → .../deser/jdk/MapRawWithGeneric2846Test.java b/...g/GenericTypeDeserialization2846Test.java → .../deser/jdk/MapRawWithGeneric2846Test.java
@@ -1,12 +1,12 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.deser.jdk;
 
 import java.util.Map;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 
 import com.fasterxml.jackson.databind.*;
 
-public class GenericTypeDeserialization2846Test extends BaseMapTest
+public class MapRawWithGeneric2846Test extends BaseMapTest
 {
     @SuppressWarnings("rawtypes")
     static class GenericEntity<T> {