Post-merge clean up for #4615 (#4584)

FasterXML · Jul 11, 2024 · 721e159 · 721e159
1 parent 2d7c850
commit 721e159
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java b/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java
@@ -1398,14 +1398,18 @@ public JsonCreator.Mode findCreatorAnnotation(MapperConfig<?> config, Annotated
     }
 
     /**
-     * Method called to check if introspector is able to detect so-called Primary
-     * Creator: Creator to select for use when no explicit annotation is found
-     * (via {@link #findCreatorAnnotation}).
-     * This is the case for example for Java Record types which have so-called
-     * canonical constructor; but it is also true for various "Data" classes by frameworks
-     * like Lombok and JVM languages like Kotlin and Scala (case classes).
+     * Method called to check if introspector can find a Creator it considers
+     * the "Default Creator": Creator to use as the primary, when no Creator has
+     * explicit annotation ({@link #findCreatorAnnotation} returns {@code null}).
+     * Examples of default creators include the canonical constructor defined by
+     * Java Records; "Data" classes by frameworks
+     * like Lombok and JVM languages like Kotlin and Scala (case classes) also have
+     * similar concepts.
      * If introspector can determine that one of given {@link PotentialCreator}s should
-     * be considered Primary, it should return it; if not, should return {@code null}.
+     * be considered the default, it should return it; if not, should return {@code null}.
+     * Note that core databind functionality may call this method even in the presence of
+     * explicitly annotated creators; and may or may not use Creator returned depending
+     * on other criteria.
      *<p>
      * NOTE: when returning chosen Creator, it may be necessary to mark its "mode"
      * with {@link PotentialCreator#overrideMode} (especially for "delegating" creators).
@@ -1414,16 +1418,16 @@ public JsonCreator.Mode findCreatorAnnotation(MapperConfig<?> config, Annotated
      * as the Primary creator is handled directly by {@link POJOPropertiesCollector}
      *
      * @param config Configuration settings in effect (for deserialization)
-     * @param valueClass Class being instantiated and defines Creators passed
+     * @param valueClass Class being instantiated; defines Creators passed
      * @param declaredConstructors Constructors value class declares
      * @param declaredFactories Factory methods value class declares
      *
-     * @return The one Canonical Creator to use for {@code valueClass}, if it can be
+     * @return Default Creator to possibly use for {@code valueClass}, if one can be
      *    determined; {@code null} if not.
      *
      * @since 2.18
      */
-    public PotentialCreator findPrimaryCreator(MapperConfig<?> config,
+    public PotentialCreator findDefaultCreator(MapperConfig<?> config,
             AnnotatedClass valueClass,
             List<PotentialCreator> declaredConstructors,
             List<PotentialCreator> declaredFactories) {

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
@@ -736,17 +736,17 @@ public JsonCreator.Mode findCreatorAnnotation(MapperConfig<?> config, Annotated
     }
 
     @Override
-    public PotentialCreator findPrimaryCreator(MapperConfig<?> config,
+    public PotentialCreator findDefaultCreator(MapperConfig<?> config,
             AnnotatedClass valueClass,
             List<PotentialCreator> declaredConstructors,
             List<PotentialCreator> declaredFactories) {
-        PotentialCreator primary = _primary.findPrimaryCreator(config,
+        PotentialCreator defCtor = _primary.findDefaultCreator(config,
                 valueClass, declaredConstructors, declaredFactories);
-        if (primary == null) {
-            primary = _secondary.findPrimaryCreator(config,
+        if (defCtor == null) {
+            defCtor = _secondary.findDefaultCreator(config,
                     valueClass, declaredConstructors, declaredFactories);
         }
-        return primary;
+        return defCtor;
     }
 
     /*

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java b/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java
@@ -655,7 +655,7 @@ protected void _addCreators(Map<String, POJOPropertyBuilder> props)
         if (_isRecordType) {
             primary = JDK14Util.findCanonicalRecordConstructor(_config, _classDef, constructors);
         } else {
-            primary = _annotationIntrospector.findPrimaryCreator(_config, _classDef,
+            primary = _annotationIntrospector.findDefaultCreator(_config, _classDef,
                     constructors, factories);
         }
         // Next: remove creators marked as explicitly disabled

diff --git a/src/test/java/com/fasterxml/jackson/databind/introspect/PrimaryCreatorDetection4584Test.java b/src/test/java/com/fasterxml/jackson/databind/introspect/PrimaryCreatorDetection4584Test.java
@@ -113,7 +113,7 @@ public PrimaryCreatorFindingIntrospector(JsonCreator.Mode mode,
         }
 
         @Override
-        public PotentialCreator findPrimaryCreator(MapperConfig<?> config,
+        public PotentialCreator findDefaultCreator(MapperConfig<?> config,
                 AnnotatedClass valueClass,
                 List<PotentialCreator> declaredConstructors,
                 List<PotentialCreator> declaredFactories)