Continue BasicDeserializerFactory refactoring (#4541)

Author: cowtowncoder

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

@@ -247,12 +247,12 @@ protected ValueInstantiator _constructDefaultValueInstantiator(DeserializationCo
             BeanDescription beanDesc)
         throws JsonMappingException
     {
+        final MapperConfig<?> config = ctxt.getConfig();
+        final PotentialCreators potentialCreators = beanDesc.getPotentialCreators();
         final CreatorCollectionState ccState;
         final ConstructorDetector ctorDetector;
-        final PotentialCreators potentialCreators = beanDesc.getPotentialCreators();
 
         {
-            final MapperConfig<?> config = ctxt.getConfig();
             // need to construct suitable visibility checker:
             final VisibilityChecker<?> vchecker = config.getDefaultVisibilityChecker(beanDesc.getBeanClass(),
                     beanDesc.getClassInfo());
@@ -292,6 +292,16 @@ protected ValueInstantiator _constructDefaultValueInstantiator(DeserializationCo
             if (isNonStaticInnerClass) {
                 // TODO: look for `@JsonCreator` annotated ones, throw explicit exception?
             } else {
+                // First things first: the "default constructor" (zero-arg
+                // constructor; whether implicit or explicit) is NOT included
+                // in list of constructors, so needs to be handled separately.
+                AnnotatedConstructor defaultCtor = beanDesc.findDefaultConstructor();
+                if (defaultCtor != null) {
+                    if (!ccState.creators.hasDefaultCreator() || _hasCreatorAnnotation(config, defaultCtor)) {
+                        ccState.creators.setDefaultCreator(defaultCtor);
+                    }
+                }
+
                 // 18-Sep-2020, tatu: Although by default implicit introspection is allowed, 2.12
                 //   has settings to prevent that either generally, or at least for JDK types
                 final boolean findImplicit = ctorDetector.shouldIntrospectorImplicitConstructors(beanDesc.getBeanClass());
@@ -354,7 +364,13 @@ public ValueInstantiator _valueInstantiatorInstance(DeserializationConfig config
 
     /*
     /**********************************************************************
-    /* Creator introspection: constructor creator introspection
+    /* Creator introspection: new (2.18) helper methods
+    /**********************************************************************
+     */
+
+    /*
+    /**********************************************************************
+    /* OLD Creator introspection: constructor creator introspection
     /**********************************************************************
      */
 
@@ -369,15 +385,6 @@ protected void _addExplicitConstructorCreators(DeserializationContext ctxt,
         final VisibilityChecker<?> vchecker = ccState.vchecker;
         final Map<AnnotatedWithParams, BeanPropertyDefinition[]> creatorParams = ccState.creatorParams;
 
-        // First things first: the "default constructor" (zero-arg
-        // constructor; whether implicit or explicit) is NOT included
-        // in list of constructors, so needs to be handled separately.
-        AnnotatedConstructor defaultCtor = beanDesc.findDefaultConstructor();
-        if (defaultCtor != null) {
-            if (!creators.hasDefaultCreator() || _hasCreatorAnnotation(config, defaultCtor)) {
-                creators.setDefaultCreator(defaultCtor);
-            }
-        }
         // 21-Sep-2017, tatu: First let's handle explicitly annotated ones
         for (AnnotatedConstructor ctor : beanDesc.getConstructors()) {
             JsonCreator.Mode creatorMode = intr.findCreatorAnnotation(config, ctor);

src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java

@@ -689,6 +689,9 @@ protected void _addCreators(Map<String, POJOPropertyBuilder> props)
             }
         }
 
+        // Anything else left, add as possible implicit Creators
+        creators.setImplicitDelegating(constructors, factories);
+
         // And finally add logical properties for the One Properties-based
         // creator selected (if any):
         PotentialCreator primary = creators.propertiesBased;

src/main/java/com/fasterxml/jackson/databind/introspect/PotentialCreators.java

@@ -16,9 +16,7 @@ public class PotentialCreators
     private List<PotentialCreator> implicitDelegatingConstructors;
     private List<PotentialCreator> implicitDelegatingFactories;
 
-    public PotentialCreators()
-    {
-    }
+    public PotentialCreators() { }
 
     /*
     /**********************************************************************