Fix #1919

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -8,6 +8,9 @@ Project: jackson-databind
 
 #792: Deserialization Not Working Right with Generic Types and Builders
  (reported by Mike G; fix contributed by Ville K)
+#1919: Abstract class included as part of known type ids for error message
+  when using JsonSubTypes
+ (reported by Incara@github)
 #2091: `ReferenceType` does not expose valid containedType
  (reported by Nate B)
 #2683: Explicitly fail (de)serialization of `java.time.*` types in absence of

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.java

@@ -22,9 +22,9 @@ public abstract class TypeDeserializerBase
     implements java.io.Serializable
 {
     private static final long serialVersionUID = 1;
-    
+
     protected final TypeIdResolver _idResolver;
-    
+
     protected final JavaType _baseType;
 
     /**
@@ -47,9 +47,9 @@ public abstract class TypeDeserializerBase
      * in cases where type id is to be exposed as part of JSON.
      */
     protected final String _typePropertyName;
-    
+
     protected final boolean _typeIdVisible;
-    
+
     /**
      * For efficient operation we will lazily build mappings from type ids
      * to actual deserializers, once needed.

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.java

@@ -164,7 +164,15 @@ protected JavaType _typeFromId(String id) {
 
     @Override
     public String getDescForKnownTypeIds() {
-        return new TreeSet<String>(_idToType.keySet()).toString();
+        // 05-May-2020, tatu: As per [databind#1919], only include ids for
+        //    non-abstract types
+        final TreeSet<String> ids = new TreeSet<>();
+        for (Map.Entry<String, JavaType> entry : _idToType.entrySet()) {
+            if (entry.getValue().isConcrete()) {
+                ids.add(entry.getKey());
+            }
+        }
+        return ids.toString();
     }
 
     @Override

src/test/java/com/fasterxml/jackson/databind/jsontype/TestSubtypes.java

@@ -4,12 +4,9 @@
 
 import java.util.*;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.databind.JsonMappingException;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
@@ -95,7 +92,9 @@ public POJOWrapper(Sub sub1, Sub sub2) {
 
     @JsonTypeInfo(use=JsonTypeInfo.Id.NAME, include=As.PROPERTY, property="type")
     @JsonSubTypes({ @JsonSubTypes.Type(ImplX.class),
-          @JsonSubTypes.Type(ImplY.class) })
+        @JsonSubTypes.Type(ImplY.class),
+        @JsonSubTypes.Type(ImplAbs.class)
+    })
     static abstract class BaseX { }
 
     @JsonTypeName("x")
@@ -111,6 +110,11 @@ static class ImplY extends BaseX {
         public int y;
     }
 
+    // for [databind#919] testing
+    @JsonTypeName("abs")
+    abstract static class ImplAbs extends BaseX {
+    }
+
     // [databind#663]
     static class AtomicWrapper {
         public BaseX value;
@@ -372,16 +376,16 @@ public void testDefaultImplViaModule() throws Exception
         bean = mapper.readValue("{\"#type\":\"foobar\"}", SuperTypeWithoutDefault.class);
         assertEquals(DefaultImpl505.class, bean.getClass());
         assertEquals(0, ((DefaultImpl505) bean).a);
-
     }
-
+    
     public void testErrorMessage() throws Exception {
         ObjectMapper mapper = new ObjectMapper();
         try {
             mapper.readValue("{ \"type\": \"z\"}", BaseX.class);
             fail("Should have failed");
-        } catch (JsonMappingException e) {
-            verifyException(e, "known type ids =");
+        } catch (InvalidTypeIdException e) {
+            verifyException(e, "Could not resolve type id 'z' as a subtype of");
+            verifyException(e, "known type ids = [x, y]");
         }
     }