Skip to content

Commit a2e914c

Browse files
committed
Minor tweak wrt #2990
1 parent e63a9a6 commit a2e914c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ protected void _renameProperties(Map<String, POJOPropertyBuilder> props)
10071007
old.addAll(prop);
10081008
}
10091009
// replace the creatorProperty too, if there is one
1010-
if (_updateCreatorProperty(prop, _creatorProperties)) {
1010+
if (_replaceCreatorProperty(prop, _creatorProperties)) {
10111011
// [databind#2001]: New name of property was ignored previously? Remove from ignored
10121012
// 01-May-2018, tatu: I have a feeling this will need to be revisited at some point,
10131013
// to avoid removing some types of removals, possibly. But will do for now.
@@ -1074,7 +1074,7 @@ protected void _renameUsing(Map<String, POJOPropertyBuilder> propMap,
10741074
}
10751075

10761076
// replace the creatorProperty too, if there is one
1077-
_updateCreatorProperty(prop, _creatorProperties);
1077+
_replaceCreatorProperty(prop, _creatorProperties);
10781078
}
10791079
}
10801080

@@ -1319,7 +1319,12 @@ private PropertyNamingStrategy _findNamingStrategy()
13191319
_config.canOverrideAccessModifiers());
13201320
}
13211321

1322-
protected boolean _updateCreatorProperty(POJOPropertyBuilder prop, List<POJOPropertyBuilder> creatorProperties) {
1322+
@Deprecated // since 2.12.1 (temporarily missing from 2.12.0)
1323+
protected void _updateCreatorProperty(POJOPropertyBuilder prop, List<POJOPropertyBuilder> creatorProperties) {
1324+
_replaceCreatorProperty(prop, creatorProperties);
1325+
}
1326+
1327+
protected boolean _replaceCreatorProperty(POJOPropertyBuilder prop, List<POJOPropertyBuilder> creatorProperties) {
13231328
if (creatorProperties != null) {
13241329
final String intName = prop.getInternalName();
13251330
for (int i = 0, len = creatorProperties.size(); i < len; ++i) {

0 commit comments

Comments
 (0)