Fix FasterXML#4620: check default Creator before implicitly named (FasterXML#4622)

Author: cowtowncoder

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

@@ -674,11 +674,11 @@ protected void _addCreators(Map<String, POJOPropertyBuilder> props)
                     creators.hasPropertiesBased());
         }
 
-        // If no Explicitly annotated creators found, look
+        // If no Explicitly annotated creators (or Default one) found, look
         // for ones with explicitly-named ({@code @JsonProperty}) parameters
         if (!creators.hasPropertiesBased()) {
             // only discover constructor Creators?
-            _addCreatorsWithAnnotatedNames(creators, constructors);
+            _addCreatorsWithAnnotatedNames(creators, constructors, primary);
         }
 
         // But if no annotation-based Creators found, find/use Primary Creator
@@ -919,21 +919,40 @@ private boolean _isExplicitlyAnnotatedCreatorPropsBased(PotentialCreator ctor,
     }
 
     private void _addCreatorsWithAnnotatedNames(PotentialCreators collector,
-            List<PotentialCreator> ctors)
+            List<PotentialCreator> ctors, PotentialCreator defaultCtor)
     {
+        final List<PotentialCreator> found = _findCreatorsWithAnnotatedNames(ctors);
+        // 16-Jul-2024, tatu: [databind#4620] If Default Creator found, it
+        //    will be used to resolve candidate to use, if any
+        if (defaultCtor != null) {
+            if (found.contains(defaultCtor)) {
+                collector.setPropertiesBased(_config, defaultCtor, "implicit");
+                return;
+            }
+        }
+        for (PotentialCreator ctor : found) {
+            collector.setPropertiesBased(_config, ctor, "implicit");
+        }
+    }
+
+    private List<PotentialCreator> _findCreatorsWithAnnotatedNames(List<PotentialCreator> ctors)
+    {
+        List<PotentialCreator> found = null;
         Iterator<PotentialCreator> it = ctors.iterator();
         while (it.hasNext()) {
             PotentialCreator ctor = it.next();
-
             // Ok: existence of explicit (annotated) names infers properties-based:
             ctor.introspectParamNames(_config);
             if (!ctor.hasExplicitNames()) {
                 continue;
             }
             it.remove();
-
-            collector.setPropertiesBased(_config, ctor, "implicit");
+            if (found == null) {
+                found = new ArrayList<>(4);
+            }
+            found.add(ctor);
         }
+        return (found == null) ? Collections.emptyList() : found;
     }
 
     private boolean _addImplicitConstructor(PotentialCreators collector,

src/test-jdk17/java/com/fasterxml/jackson/databind/records/RecordCreatorWithAnySetter562Test.java

@@ -10,17 +10,16 @@
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
 // [databind#562] Allow @JsonAnySetter on Creator constructors
 public class RecordCreatorWithAnySetter562Test
         extends DatabindTestUtil
 {
     record RecordWithAnySetterCtor(int id,
-                                   Map<String, Integer> additionalProperties) {
+            Map<String, Integer> additionalProperties) {
         @JsonCreator
         public RecordWithAnySetterCtor(@JsonProperty("regular") int id,
-                                       @JsonAnySetter Map<String, Integer> additionalProperties
+                @JsonAnySetter Map<String, Integer> additionalProperties
         ) {
             this.id = id;
             this.additionalProperties = additionalProperties;
@@ -52,5 +51,4 @@ public void testRecordWithAnySetterCtor() throws Exception
         assertEquals(Integer.valueOf(-1), result.additionalProperties.get("extra"));
         assertEquals(2, result.additionalProperties.size());
     }
-
 }

src/test/java/com/fasterxml/jackson/databind/introspect/DefaultCreatorResolution4620Test.java

@@ -1,12 +1,11 @@
 package com.fasterxml.jackson.databind.introspect;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.MapperConfig;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -19,54 +18,47 @@
 // @since 2.18
 public class DefaultCreatorResolution4620Test extends DatabindTestUtil
 {
-    static class PrimaryCreatorFindingIntrospector extends ImplicitNameIntrospector
+    static class POJO4620 {
+        String value;
+
+        public POJO4620(@JsonProperty("int") int i) {
+            throw new RuntimeException("Should not get called");
+        }
+
+        public POJO4620(@JsonProperty("str") String str, @JsonProperty("int") int v) {
+            value = str + "/" + v;
+        }
+
+        public POJO4620(@JsonProperty("str") String str,
+                @JsonProperty("int") int v,
+                @JsonProperty("long") long l) {
+            throw new RuntimeException("Should not get called");
+        }
+    }
+
+    static class PrimaryConstructorFindingIntrospector extends ImplicitNameIntrospector
     {
         private static final long serialVersionUID = 1L;
 
         private final Class<?>[] _argTypes;
 
-        private JsonCreator.Mode _mode;
-
-        private final String _factoryName;
-        
-        public PrimaryCreatorFindingIntrospector(JsonCreator.Mode mode,
-                Class<?>... argTypes) {
-            _mode = mode;
-            _factoryName = null;
+        public PrimaryConstructorFindingIntrospector(Class<?>... argTypes) {
             _argTypes = argTypes;
         }
 
-        public PrimaryCreatorFindingIntrospector(JsonCreator.Mode mode,
-                String factoryName) {
-            _mode = mode;
-            _factoryName = factoryName;
-            _argTypes = new Class<?>[0];
-        }
-
         @Override
         public PotentialCreator findDefaultCreator(MapperConfig<?> config,
                 AnnotatedClass valueClass,
                 List<PotentialCreator> declaredConstructors,
                 List<PotentialCreator> declaredFactories)
         {
             // Apply to all test POJOs here but nothing else
-            if (!valueClass.getRawType().toString().contains("4584")) {
+            if (!valueClass.getRawType().toString().contains("4620")) {
                 return null;
             }
 
-            if (_factoryName != null) {
-                for (PotentialCreator ctor : declaredFactories) {
-                    if (ctor.creator().getName().equals(_factoryName)) {
-                        return ctor;
-                    }
-                }
-                return null;
-            }
-
-            List<PotentialCreator> combo = new ArrayList<>(declaredConstructors);
-            combo.addAll(declaredFactories);
             final int argCount = _argTypes.length;
-            for (PotentialCreator ctor : combo) {
+            for (PotentialCreator ctor : declaredConstructors) {
                 if (ctor.paramCount() == argCount) {
                     int i = 0;
                     for (; i < argCount; ++i) {
@@ -75,7 +67,7 @@ public PotentialCreator findDefaultCreator(MapperConfig<?> config,
                         }
                     }
                     if (i == argCount) {
-                        ctor.overrideMode(_mode);
+                        ctor.overrideMode(JsonCreator.Mode.PROPERTIES);
                         return ctor;
                     }
                 }
@@ -93,7 +85,11 @@ public PotentialCreator findDefaultCreator(MapperConfig<?> config,
     @Test
     public void testCanonicalConstructor1ArgPropertiesCreator() throws Exception
     {
-        // TODO
+        // Select the "middle one"
+        POJO4620 result = readerWith(new PrimaryConstructorFindingIntrospector(
+                String.class, Integer.TYPE))
+                .readValue(a2q("{'str':'value', 'int':42}"));
+        assertEquals("value/42", result.value);
     }
 
     /*
@@ -102,11 +98,9 @@ public void testCanonicalConstructor1ArgPropertiesCreator() throws Exception
     /**********************************************************************
      */
 
-    /*
     private ObjectReader readerWith(AnnotationIntrospector intr) {
-        return mapperWith(intr).readerFor(POJO4584.class);
+        return mapperWith(intr).readerFor(POJO4620.class);
     }
-    */
 
     private ObjectMapper mapperWith(AnnotationIntrospector intr) {
         return JsonMapper.builder()