Add failing test for #2846 (more type resolution trouble with 2.11.2)

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/ser/TestGenericTypes.java src/test/java/com/fasterxml/jackson/databind/ser/GenericTypeSerializationTest.java

@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class TestGenericTypes extends BaseMapTest
+public class GenericTypeSerializationTest extends BaseMapTest
 {
     static class Account {
         private Long id;        

src/test/java/com/fasterxml/jackson/failing/GenericTypeDeserialization2846Test.java

@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import com.fasterxml.jackson.databind.*;
+
+public class GenericTypeDeserialization2846Test extends BaseMapTest
+{
+    @SuppressWarnings("rawtypes")
+    static class GenericEntity<T> {
+        T field;
+
+        Map map;
+
+        public void setField(T field) {
+            this.field = field;
+        }
+
+        public T getField() {
+            return field;
+        }
+
+        public Map getMap() {
+            return map;
+        }
+
+        public void setMap(Map map) {
+            this.map = map;
+        }
+    }
+
+    static class SimpleEntity {
+        Integer number;
+
+        public void setNumber(Integer number) {
+            this.number = number;
+        }
+
+        public Integer getNumber() {
+            return number;
+        }
+    }
+
+    public void testIssue2821Part2() throws Exception {
+        ObjectMapper m = new ObjectMapper();
+        final String JSON = "{ \"field\": { \"number\": 1 }, \"map\": { \"key\": \"value\" } }";
+        GenericEntity<SimpleEntity> genericEntity = m.readValue(JSON,
+                new TypeReference<GenericEntity<SimpleEntity>>() {});
+        assertNotNull(genericEntity);
+    }
+}