Fix deduction deserializer with DefaultTypeResolverBuilder (pending #) (#3505)

Author: Bluexin

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

@@ -1784,15 +1784,14 @@ public TypeDeserializer findTypeDeserializer(DeserializationConfig config,
 
         // Ok: if there is no explicit type info handler, we may want to
         // use a default. If so, config object knows what to use.
-        Collection<NamedType> subtypes = null;
         if (b == null) {
             b = config.getDefaultTyper(baseType);
             if (b == null) {
                 return null;
             }
-        } else {
-            subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByTypeId(config, ac);
         }
+        final Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByTypeId(config, ac);
+
         // May need to figure out default implementation, if none found yet
         // (note: check for abstract type is not 100% mandatory, more of an optimization)
         if ((b.getDefaultImpl() == null) && baseType.isAbstract()) {

src/test/java/com/fasterxml/jackson/databind/deser/TestDeserializerFactoryWithDefaultTypeResolverBuilder.java

@@ -0,0 +1,77 @@
+package com.fasterxml.jackson.databind.deser;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.jsontype.NamedType;
+import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+// Tests for [databind#pending] causing a NPE when setting a DefaultTypeResolverBuilder
+// and registering subtypes through ObjectMapper (no annotations)
+public class TestDeserializerFactoryWithDefaultTypeResolverBuilder extends BaseMapTest {
+
+    private interface Parent {
+        class ChildOne implements Parent {
+            public String one;
+        }
+
+        class ChildTwo implements Parent {
+            public String two;
+        }
+    }
+
+    // This class is technically not needed for the test to fail without the fix
+    // (AsDeductionTypeDeserializer will crash in #buildFingerprints), but was
+    // added to have more assertions on the subtypes values
+    private static final class AssertingTypeResolverBuilder extends ObjectMapper.DefaultTypeResolverBuilder {
+
+        public AssertingTypeResolverBuilder() {
+            super(ObjectMapper.DefaultTyping.NON_CONCRETE_AND_ARRAYS,
+                    BasicPolymorphicTypeValidator.builder().allowIfSubType(Parent.class).build());
+        }
+
+        @Override
+        public TypeDeserializer buildTypeDeserializer(DeserializationConfig config, JavaType baseType, Collection<NamedType> subtypes) {
+            // this also gets called for String, not sure if that's expected with PTV
+            // this behaviour is outside the scope of this test
+            if (baseType.isAbstract()) {
+                assertNotNull(subtypes);
+                assertEquals(2, subtypes.size());
+                final List<NamedType> expected = new ArrayList<>(2);
+                expected.add(new NamedType(Parent.ChildOne.class));
+                expected.add(new NamedType(Parent.ChildTwo.class));
+                assertTrue(subtypes.containsAll(expected));
+            }
+
+            return super.buildTypeDeserializer(config, baseType, subtypes);
+        }
+    }
+
+    public void testDeductionWithDefaultTypeResolverBuilder() {
+        final ObjectMapper mapper = jsonMapperBuilder()
+                .registerSubtypes(Parent.ChildOne.class, Parent.ChildTwo.class)
+                .setDefaultTyping(new AssertingTypeResolverBuilder()
+                        .init(JsonTypeInfo.Id.DEDUCTION, null))
+                .build();
+
+        try {
+            final Parent firstRead = mapper.readValue("{ \"one\": \"Hello World\" }", Parent.class);
+            assertNotNull(firstRead);
+            assertTrue(firstRead instanceof Parent.ChildOne);
+            assertEquals("Hello World", ((Parent.ChildOne) firstRead).one);
+            final Parent secondRead = mapper.readValue("{ \"two\": \"Hello World\" }", Parent.class);
+            assertNotNull(secondRead);
+            assertTrue(secondRead instanceof Parent.ChildTwo);
+            assertEquals("Hello World", ((Parent.ChildTwo) secondRead).two);
+        } catch (Exception e) {
+            fail("This call should not throw");
+        }
+    }
+}