Fix minor issue wrt Map/CollectionLikeType vs Map/CollectionType handling

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -9,6 +9,8 @@ Project: jackson-databind
 #2840: `ObjectMapper.activateDefaultTypingAsProperty()` is not using
   parameter `PolymorphicTypeValidator`
  (reported by Daniel W)
+- Fix issues with `MapLikeType.isTrueMapType()`,
+  `CollectionLikeType.isTrueCollectionType()`
 
 2.11.2 (02-Aug-2020)
 

src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java

@@ -383,7 +383,7 @@ protected JsonDeserializer<?> _createDeserializer2(DeserializationContext ctxt,
                 JsonFormat.Value format = beanDesc.findExpectedFormat(null);
                 if ((format == null) || format.getShape() != JsonFormat.Shape.OBJECT) {
                     MapLikeType mlt = (MapLikeType) type;
-                    if (mlt.isTrueMapType()) {
+                    if (mlt instanceof MapType) {
                         return factory.createMapDeserializer(ctxt,(MapType) mlt, beanDesc);
                     }
                     return factory.createMapLikeDeserializer(ctxt, mlt, beanDesc);
@@ -398,7 +398,7 @@ protected JsonDeserializer<?> _createDeserializer2(DeserializationContext ctxt,
                 JsonFormat.Value format = beanDesc.findExpectedFormat(null);
                 if ((format == null) || format.getShape() != JsonFormat.Shape.OBJECT) {
                     CollectionLikeType clt = (CollectionLikeType) type;
-                    if (clt.isTrueCollectionType()) {
+                    if (clt instanceof CollectionType) {
                         return factory.createCollectionDeserializer(ctxt, (CollectionType) clt, beanDesc);
                     }
                     return factory.createCollectionLikeDeserializer(ctxt, clt, beanDesc);

src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java

@@ -614,7 +614,7 @@ protected JsonSerializer<?> buildContainerSerializer(SerializerProvider prov,
              *  But we do need to check class annotations.
              */
             JsonSerializer<Object> keySerializer = _findKeySerializer(prov, beanDesc.getClassInfo());
-            if (mlt.isTrueMapType()) {
+            if (mlt instanceof MapType) {
                 return buildMapSerializer(prov, (MapType) mlt, beanDesc, staticTyping,
                         keySerializer, elementTypeSerializer, elementValueSerializer);
             }
@@ -642,7 +642,7 @@ protected JsonSerializer<?> buildContainerSerializer(SerializerProvider prov,
         }
         if (type.isCollectionLikeType()) {
             CollectionLikeType clt = (CollectionLikeType) type;
-            if (clt.isTrueCollectionType()) {
+            if (clt instanceof CollectionType) {
                 return buildCollectionSerializer(prov,  (CollectionType) clt, beanDesc, staticTyping,
                         elementTypeSerializer, elementValueSerializer);
             }