#2990 Restores unintentional API changes (#2991)

Co-authored-by: Faron Dutton <[email protected]>

Author: fdutton

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

@@ -174,6 +174,16 @@ public BasicBeanDescription forDirectClassAnnotations(MapperConfig<?> config,
     /**********************************************************
      */
 
+    @Deprecated
+    protected POJOPropertiesCollector collectProperties(MapperConfig<?> config,
+            JavaType type, MixInResolver r, boolean forSerialization,
+            String mutatorPrefix)
+    {
+        final AnnotatedClass classDef = _resolveAnnotatedClass(config, type, r);
+        final AccessorNamingStrategy accNaming = new DefaultAccessorNamingStrategy.Provider().withSetterPrefix(mutatorPrefix).forPOJO(config, classDef);
+        return constructPropertyCollector(config, classDef, type, forSerialization, accNaming);
+    }
+
     protected POJOPropertiesCollector collectProperties(MapperConfig<?> config,
             JavaType type, MixInResolver r, boolean forSerialization)
     {
@@ -184,6 +194,13 @@ protected POJOPropertiesCollector collectProperties(MapperConfig<?> config,
         return constructPropertyCollector(config, classDef, type, forSerialization, accNaming);
     }
 
+    @Deprecated
+    protected POJOPropertiesCollector collectPropertiesWithBuilder(MapperConfig<?> config,
+            JavaType type, MixInResolver r, boolean forSerialization)
+    {
+        return collectPropertiesWithBuilder(config, type, r, null, forSerialization);
+    }
+
     protected POJOPropertiesCollector collectPropertiesWithBuilder(MapperConfig<?> config,
             JavaType type, MixInResolver r, BeanDescription valueTypeDesc,
             boolean forSerialization)
@@ -194,6 +211,17 @@ protected POJOPropertiesCollector collectPropertiesWithBuilder(MapperConfig<?> c
         return constructPropertyCollector(config, builderClassDef, type, forSerialization, accNaming);
     }
 
+    /**
+     * Overridable method called for creating {@link POJOPropertiesCollector} instance
+     * to use; override is needed if a custom sub-class is to be used.
+     */
+    @Deprecated
+    protected POJOPropertiesCollector constructPropertyCollector(MapperConfig<?> config,
+            AnnotatedClass ac, JavaType type, boolean forSerialization, String mutatorPrefix)
+    {
+        return new POJOPropertiesCollector(config, forSerialization, type, ac, mutatorPrefix);
+    }
+
     // @since 2.12
     protected POJOPropertiesCollector constructPropertyCollector(MapperConfig<?> config,
             AnnotatedClass classDef, JavaType type, boolean forSerialization,

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

@@ -41,6 +41,12 @@ public class POJOPropertiesCollector
      */
     protected final boolean _forSerialization;
 
+    /**
+     * @since 2.5
+     */
+    @Deprecated
+    protected final boolean _stdBeanNaming;
+
     /**
      * Type of POJO for which properties are being collected.
      */
@@ -60,6 +66,13 @@ public class POJOPropertiesCollector
      */
     protected final boolean _useAnnotations;
 
+    /**
+     * Prefix used by auto-detected mutators ("setters"): usually "set",
+     * but differs for builder objects ("with" by default).
+     */
+    @Deprecated
+    protected final String _mutatorPrefix;
+    
     /*
     /**********************************************************
     /* Collected property information
@@ -144,13 +157,28 @@ public class POJOPropertiesCollector
     /**********************************************************
      */
 
+    @Deprecated
+    protected POJOPropertiesCollector(MapperConfig<?> config, boolean forSerialization,
+            JavaType type, AnnotatedClass classDef, String mutatorPrefix)
+    {
+        this(config, forSerialization, type, classDef, null, mutatorPrefix);
+    }
+
     protected POJOPropertiesCollector(MapperConfig<?> config, boolean forSerialization,
             JavaType type, AnnotatedClass classDef, AccessorNamingStrategy accessorNaming)
+    {
+        this(config, forSerialization, type, classDef, accessorNaming, null);
+    }
+
+    private POJOPropertiesCollector(MapperConfig<?> config, boolean forSerialization,
+            JavaType type, AnnotatedClass classDef, AccessorNamingStrategy accessorNaming, String mutatorPrefix)
     {
         _config = config;
+        _stdBeanNaming = config.isEnabled(MapperFeature.USE_STD_BEAN_NAMING);
         _forSerialization = forSerialization;
         _type = type;
         _classDef = classDef;
+        _mutatorPrefix = (mutatorPrefix == null) ? "set" : mutatorPrefix;
         if (config.isAnnotationProcessingEnabled()) {
             _useAnnotations = true;
             _annotationIntrospector = _config.getAnnotationIntrospector();
@@ -160,7 +188,8 @@ protected POJOPropertiesCollector(MapperConfig<?> config, boolean forSerializati
         }
         _visibilityChecker = _config.getDefaultVisibilityChecker(type.getRawClass(),
                 classDef);
-        _accessorNaming = accessorNaming;
+        _accessorNaming = (null != accessorNaming) ? accessorNaming :
+            new DefaultAccessorNamingStrategy.Provider().withSetterPrefix(mutatorPrefix).forPOJO(config, classDef);
     }
 
     /*
@@ -964,7 +993,9 @@ protected void _renameProperties(Map<String, POJOPropertyBuilder> props)
                     old.addAll(prop);
                 }
                 // replace the creatorProperty too, if there is one
-                if (_updateCreatorProperty(prop, _creatorProperties)) {
+                MonitoredList<POJOPropertyBuilder> monitored = MonitoredList.monitor(_creatorProperties);
+                _updateCreatorProperty(prop, monitored);
+                if (null != monitored && monitored.isModified()) {
                     // [databind#2001]: New name of property was ignored previously? Remove from ignored
                     // 01-May-2018, tatu: I have a feeling this will need to be revisited at some point,
                     //   to avoid removing some types of removals, possibly. But will do for now.
@@ -1276,17 +1307,59 @@ private PropertyNamingStrategy _findNamingStrategy()
                     _config.canOverrideAccessModifiers());
     }
 
-    protected boolean _updateCreatorProperty(POJOPropertyBuilder prop, List<POJOPropertyBuilder> creatorProperties) {
+    protected void _updateCreatorProperty(POJOPropertyBuilder prop, List<POJOPropertyBuilder> creatorProperties) {
 
         if (creatorProperties != null) {
             final String intName = prop.getInternalName();
             for (int i = 0, len = creatorProperties.size(); i < len; ++i) {
                 if (creatorProperties.get(i).getInternalName().equals(intName)) {
                     creatorProperties.set(i, prop);
-                    return true;
+                    break;
                 }
             }
         }
-        return false;
+    }
+
+    private static class MonitoredList<T> extends AbstractList<T> {
+        private final List<T> delegate;
+        private boolean modified;
+
+        public MonitoredList(List<T> delegate) {
+            this.delegate = delegate;
+            this.modified = false;
+        }
+
+        @Override
+        public T get(int index) {
+            return this.delegate.get(index);
+        }
+
+        @Override
+        public int size() {
+            return this.delegate.size();
+        }
+
+        public T set(int index, T element) {
+            this.modified = true;
+            return this.delegate.set(index, element);
+        }
+
+        public void add(int index, T element) {
+            this.modified = true;
+            this.delegate.add(index, element);
+        }
+
+        public T remove(int index) {
+            this.modified = true;
+            return this.delegate.remove(index);
+        }
+
+        public boolean isModified() {
+            return this.modified;
+        }
+
+        public static <T> MonitoredList<T> monitor(List<T> source) {
+            return null == source ? null : new MonitoredList<>(source);
+        }
     }
 }