Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #4595: PropertyName.merge() not considering PropertyName.NO_NAME #4596

Merged
merged 2 commits into from
Jun 23, 2024
Merged

Fix #4595: PropertyName.merge() not considering PropertyName.NO_NAME #4596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
161dd31
Fix #4595: PropertyName.merge() not considering PropertyName.NO_NAME
cowtowncoder Jun 22, 2024
cc25c4c
Merge branch '2.17' into tatu/2.17/4595-fix-property-name-merge
cowtowncoder Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions release-notes/VERSION-2.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Project: jackson-databind
#4577: Cannot deserialize value of type `java.math.BigDecimal` from
String "3." (not a valid representation)
(reported by @dmelisso)
#4595: No way to explicitly disable wrapping in custom annotation processor
(reported by @SimonCockx)

2.17.1 (04-May-2024)

Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/fasterxml/jackson/databind/PropertyName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ protected Object readResolve() {
return NO_NAME;
}
*/
// 22-Jun-2024, tatu: This is hopeful not problematic as marker
// value should only be provided by AnnotationIntrospector etc,
// but not stored in Deserializer/Serializer instances.
}
return this;
}
Expand Down Expand Up @@ -127,6 +130,10 @@ public static PropertyName merge(PropertyName name1, PropertyName name2) {
if (name2 == null) {
return name1;
}
// 22-Jun-2024, tatu: [databind#4595] Should not merge NO_NAME
if (name1 == NO_NAME) {
return name1;
}
String ns = _nonEmpty(name1._namespace, name2._namespace);
String simple = _nonEmpty(name1._simpleName, name2._simpleName);

Expand Down