Change property renaming logic a bit to avoid too-early conflict detection

Author: cowtowncoder

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

@@ -1043,15 +1043,15 @@ protected void _renameUsing(Map<String, POJOPropertyBuilder> propMap,
                     }
                 } else {
                     if (prop.hasSetter()) {
-                        rename = naming.nameForSetterMethod(_config, prop.getSetter(), fullName.getSimpleName());
+                        rename = naming.nameForSetterMethod(_config, prop.getSetterUnchecked(), fullName.getSimpleName());
                     } else if (prop.hasConstructorParameter()) {
                         rename = naming.nameForConstructorParameter(_config, prop.getConstructorParameter(), fullName.getSimpleName());
                     } else if (prop.hasField()) {
-                        rename = naming.nameForField(_config, prop.getField(), fullName.getSimpleName());
+                        rename = naming.nameForField(_config, prop.getFieldUnchecked(), fullName.getSimpleName());
                     } else if (prop.hasGetter()) {
                         // Plus, when getter-as-setter is used, need to convert that too..
                         // (should we verify that's enabled? For now, assume it's ok always)
-                        rename = naming.nameForGetterMethod(_config, prop.getGetter(), fullName.getSimpleName());
+                        rename = naming.nameForGetterMethod(_config, prop.getGetterUnchecked(), fullName.getSimpleName());
                     }
                 }
             }

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

@@ -452,7 +452,20 @@ public AnnotatedMethod getGetter()
         _getters = curr.withoutNext();
         return curr.value;
     }
-    
+
+    /**
+     * Variant of {@link #getGetter} that does NOT trigger pruning of
+     * getter candidates.
+     */
+    protected AnnotatedMethod getGetterUnchecked()
+    {
+        Linked<AnnotatedMethod> curr = _getters;
+        if (curr == null) {
+            return null;
+        }
+        return curr.value;
+    }
+
     @Override
     public AnnotatedMethod getSetter()
     {
@@ -484,6 +497,19 @@ public AnnotatedMethod getSetter()
         return curr.value;
     }
 
+    /**
+     * Variant of {@link #getSetter} that does NOT trigger pruning of
+     * setter candidates.
+     */
+    protected AnnotatedMethod getSetterUnchecked()
+    {
+        Linked<AnnotatedMethod> curr = _setters;
+        if (curr == null) {
+            return null;
+        }
+        return curr.value;
+    }
+
     /**
      * Helper method called in cases where we have encountered two setter methods
      * that have same precedence and cannot be resolved. This does not yet necessarily
@@ -603,6 +629,19 @@ public AnnotatedField getField()
         return field;
     }
 
+    /**
+     * Variant of {@link #getField} that does NOT trigger pruning of
+     * Field candidates.
+     */
+    protected AnnotatedField getFieldUnchecked()
+    {
+        Linked<AnnotatedField> curr = _fields;
+        if (curr == null) {
+            return null;
+        }
+        return curr.value;
+    }
+
     @Override
     public AnnotatedParameter getConstructorParameter()
     {