Merge branch '2.11' into 2.12

Author: yawkat

eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/EclipseCollectionsDeserializers.java

@@ -170,7 +170,8 @@ public JsonDeserializer<?> findCollectionDeserializer(
             JsonDeserializer<?> elementDeserializer
     ) throws JsonMappingException {
         if (REFERENCE_TYPES.contains(type.getRawClass())) {
-            return findReferenceDeserializer(type, elementTypeDeserializer, elementDeserializer);
+            return findReferenceDeserializer(type, type.getContentType(),
+                                             elementTypeDeserializer, elementDeserializer);
         }
         return null;
     }
@@ -184,7 +185,8 @@ public JsonDeserializer<?> findCollectionLikeDeserializer(
             JsonDeserializer<?> elementDeserializer
     ) throws JsonMappingException {
         if (REFERENCE_TYPES.contains(type.getRawClass())) {
-            return findReferenceDeserializer(type, elementTypeDeserializer, elementDeserializer);
+            return findReferenceDeserializer(type, type.getContentType(),
+                                             elementTypeDeserializer, elementDeserializer);
         }
         return null;
     }
@@ -225,7 +227,7 @@ public JsonDeserializer<?> findBeanDeserializer(
 
         //noinspection SuspiciousMethodCalls
         if (REFERENCE_TYPES.contains(type.getRawClass())) {
-            return findReferenceDeserializer(type, null, null);
+            return findReferenceDeserializer(type, type.containedTypeOrUnknown(0), null, null);
         }
 
         EclipseMapDeserializer<?, ?, ?, ?> mapDeserializer = EclipseMapDeserializers.createDeserializer(type);
@@ -239,10 +241,11 @@ public JsonDeserializer<?> findBeanDeserializer(
     @SuppressWarnings({ "ObjectEquality", "LocalVariableNamingConvention", "ConstantConditions" })
     private JsonDeserializer<?> findReferenceDeserializer(
             JavaType containerType,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer
+            JavaType elementType,
+            TypeDeserializer elementTypeDeserializer,
+            JsonDeserializer<?> elementDeserializer
     ) {
         Class<?> rawClass = containerType.getRawClass();
-        JavaType elementType = containerType.containedType(0);
 
         // bags
         if (rawClass == MutableBag.class || rawClass == Bag.class || rawClass == UnsortedBag.class) {

eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/EclipseCollectionsTypeModifier.java

@@ -14,7 +14,7 @@ public JavaType modifyType(JavaType type, Type jdkType, TypeBindings context, Ty
         if (!type.isCollectionLikeType()) {
             JavaType collectionType = type.findSuperType(ImmutableCollection.class);
             if (collectionType != null) {
-                return CollectionLikeType.upgradeFrom(type, collectionType.containedType(0));
+                return CollectionLikeType.upgradeFrom(type, collectionType.containedTypeOrUnknown(0));
             }
         }
         return type;

eclipse-collections/src/test/java/com/fasterxml/jackson/datatype/eclipsecollections/DeserializerTest.java

@@ -316,6 +316,10 @@ public void mutableCollection() throws IOException {
         testCollection(Lists.mutable.of("1", "2", "3"),
                        "[\"1\", \"2\", \"3\"]",
                        new TypeReference<MutableCollection<String>>() {});
+        //noinspection rawtypes
+        testCollection(Lists.mutable.of("1", "2", "3"),
+                       "[\"1\", \"2\", \"3\"]",
+                       new TypeReference<MutableCollection>() {});
         testCollection(BooleanLists.mutable.of(true, false, true),
                        "[true, false, true]",
                        MutableBooleanCollection.class);
@@ -335,6 +339,10 @@ public void immutableCollection() throws IOException {
         testCollection(Lists.immutable.of("1", "2", "3"),
                        "[\"1\", \"2\", \"3\"]",
                        new TypeReference<ImmutableCollection<String>>() {});
+        //noinspection rawtypes
+        testCollection(Lists.immutable.of("1", "2", "3"),
+                       "[\"1\", \"2\", \"3\"]",
+                       new TypeReference<ImmutableCollection>() {});
         testCollection(BooleanLists.immutable.of(true, false, true),
                        "[true, false, true]",
                        ImmutableBooleanCollection.class);