Fix FasterXML#1751: allow non-String scalar Type Ids with @JsonTypeInfo

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -4,6 +4,11 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
+2.14.2 (not yet released)
+
+#1751: `@JsonTypeInfo` does not work if the Type Id is an Integer value
+ (reported by @marvin-we)
+
 2.14.1 (21-Nov-2022)
 
 #3655: `Enum` values can not be read from single-element array even with

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

@@ -144,7 +144,9 @@ protected String _locateTypeId(JsonParser p, DeserializationContext ctxt) throws
         }
         // And then type id as a String
         JsonToken t = p.nextToken();
-        if (t == JsonToken.VALUE_STRING) {
+        if ((t == JsonToken.VALUE_STRING)
+                // 25-Nov-2022, tatu: [databind#1761] Also accept other scalars
+            || ((t != null) && t.isScalarValue())) {
             String result = p.getText();
             p.nextToken();
             return result;
@@ -162,7 +164,8 @@ protected String _locateTypeId(JsonParser p, DeserializationContext ctxt) throws
         // 11-Nov-202, tatu: points to wrong place since we don't pass JsonParser
         //   we actually use (which is usually TokenBuffer created)... should fix
         ctxt.reportWrongTokenException(baseType(), JsonToken.VALUE_STRING,
-                "need JSON String that contains type id (for subtype of %s)", baseTypeName());
+                "need JSON String, Number of Boolean that contains type id (for subtype of %s)",
+                baseTypeName());
         return null;
     }
 

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

@@ -117,29 +117,43 @@ static class Issue506DateBean {
         @JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "type2")
         public Date date;
     }
-        
+
     static class Issue506NumberBean
     {
         @JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "type3")
         @JsonSubTypes({ @Type(Long.class),
             @Type(Integer.class) })
         public Number number;
     }
-    
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.WRAPPER_ARRAY)
+    @JsonSubTypes({ @Type(value = Issue1751ArrImpl.class, name = "0") })
+    static interface Issue1751ArrBase { }
+
+    static class Issue1751ArrImpl implements Issue1751ArrBase { }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY,
+            property = "type")
+    @JsonSubTypes({ @Type(value = Issue1751PropImpl.class, name = "1") })
+    static interface Issue1751PropBase { }
+
+    static class Issue1751PropImpl implements Issue1751PropBase { }
+
     /*
     /**********************************************************
     /* Unit tests
     /**********************************************************
      */
+
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     /**
      * First things first, let's ensure we can serialize using
      * class name, written as main-level property name
      */
     public void testSimpleClassAsProperty() throws Exception
     {
-        ObjectMapper m = new ObjectMapper();
-        Animal a = m.readValue(asJSONObjectValueString("@classy", Cat.class.getName(),
+        Animal a = MAPPER.readValue(asJSONObjectValueString("@classy", Cat.class.getName(),
                 "furColor", "tabby", "name", "Garfield"), Animal.class);
         assertNotNull(a);
         assertEquals(Cat.class, a.getClass());
@@ -181,7 +195,7 @@ public void testTypeAsArray() throws Exception
     // Use basic Animal as contents of a regular List
     public void testListAsArray() throws Exception
     {
-        ObjectMapper m = new ObjectMapper();
+        ObjectMapper m = MAPPER;
         // This time using PROPERTY style (default) again
         String JSON = "[\n"
             +asJSONObjectValueString(m, "@classy", Cat.class.getName(), "name", "Hello", "furColor", "white")
@@ -213,11 +227,10 @@ public void testListAsArray() throws Exception
 
     public void testCagedAnimal() throws Exception
     {
-        ObjectMapper m = new ObjectMapper();
-        String jsonCat = asJSONObjectValueString(m, "@classy", Cat.class.getName(), "name", "Nilson", "furColor", "black");
+        String jsonCat = asJSONObjectValueString(MAPPER, "@classy", Cat.class.getName(), "name", "Nilson", "furColor", "black");
         String JSON = "{\"animal\":"+jsonCat+"}";
 
-        AnimalContainer cont = m.readValue(JSON, AnimalContainer.class);
+        AnimalContainer cont = MAPPER.readValue(JSON, AnimalContainer.class);
         assertNotNull(cont);
         Animal a = cont.animal;
         assertNotNull(a);
@@ -232,7 +245,7 @@ public void testCagedAnimal() throws Exception
      */
     public void testAbstractEmptyBaseClass() throws Exception
     {
-        DummyBase result = new ObjectMapper().readValue(
+        DummyBase result = MAPPER.readValue(
                 "[\""+DummyImpl.class.getName()+"\",{\"x\":3}]", DummyBase.class);
         assertNotNull(result);
         assertEquals(DummyImpl.class, result.getClass());
@@ -245,10 +258,9 @@ public void testIssue506WithDate() throws Exception
         Issue506DateBean input = new Issue506DateBean();
         input.date = new Date(1234L);
 
-        ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(input);
+        String json = MAPPER.writeValueAsString(input);
 
-        Issue506DateBean output = mapper.readValue(json, Issue506DateBean.class);
+        Issue506DateBean output = MAPPER.readValue(json, Issue506DateBean.class);
         assertEquals(input.date, output.date);
     }
 
@@ -258,13 +270,42 @@ public void testIssue506WithNumber() throws Exception
         Issue506NumberBean input = new Issue506NumberBean();
         input.number = Long.valueOf(4567L);
 
-        ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(input);
+        String json = MAPPER.writeValueAsString(input);
 
-        Issue506NumberBean output = mapper.readValue(json, Issue506NumberBean.class);
+        Issue506NumberBean output = MAPPER.readValue(json, Issue506NumberBean.class);
         assertEquals(input.number, output.number);
     }
 
+    // [databind#1751]: allow ints as ids too
+    public void testIntAsTypeId1751Array() throws Exception
+    {
+        Issue1751ArrBase value;
+
+        // Should allow both String and Int:
+        value = MAPPER.readValue("[0, { }]", Issue1751ArrBase.class);
+        assertNotNull(value);
+        assertEquals(Issue1751ArrImpl.class, value.getClass());
+
+        value = MAPPER.readValue("[\"0\", { }]", Issue1751ArrBase.class);
+        assertNotNull(value);
+        assertEquals(Issue1751ArrImpl.class, value.getClass());
+    }
+
+    // [databind#1751]: allow ints as ids too
+    public void testIntAsTypeId1751Prop() throws Exception
+    {
+        Issue1751PropBase value;
+
+        // Should allow both String and Int:
+        value = MAPPER.readValue("{\"type\" : \"1\"}", Issue1751PropBase.class);
+        assertNotNull(value);
+        assertEquals(Issue1751PropImpl.class, value.getClass());
+
+        value = MAPPER.readValue("{\"type\" : 1}", Issue1751PropBase.class);
+        assertNotNull(value);
+        assertEquals(Issue1751PropImpl.class, value.getClass());
+    }
+
     // [databind#2467]: Allow missing "content" for as-array deserialization
     public void testTypeAsArrayWithNullableType() throws Exception
     {