Fix serialization order change after #4775 (@JsonAnyGetter respects order)
#5216
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JooHyukKim
commented
Jul 4, 2025
Comment on lines
507
to
524
| private Map<String, POJOPropertyBuilder> _putAnyGettersInTheEnd(Map<String, POJOPropertyBuilder> all, Map<String, POJOPropertyBuilder> props) { | ||
| for (POJOPropertyBuilder prop : props.values()) { | ||
| all.put(prop.getName(), prop); | ||
| } | ||
| Map<String, POJOPropertyBuilder> newAll = new LinkedHashMap<String,POJOPropertyBuilder>(props.size()+props.size()); | ||
| POJOPropertyBuilder anyGetterProp = null; | ||
| for (POJOPropertyBuilder prop : all.values()) { | ||
| if (prop.getAccessor() != null && Boolean.TRUE.equals(this._config.getAnnotationIntrospector().hasAnyGetter(prop.getAccessor()))) { | ||
| anyGetterProp = prop; | ||
| } else { | ||
| newAll.put(prop.getName(), prop); | ||
| } | ||
| } | ||
| if (anyGetterProp != null) { | ||
| newAll.put(anyGetterProp.getName(), anyGetterProp); | ||
| } | ||
| return newAll; | ||
| } |
There was a problem hiding this comment.
This puts anyGetter prop in the end by default, before we go sorting downstream in _sortProperties
JooHyukKim
commented
Jul 4, 2025
| } | ||
|
|
||
| @Test | ||
| // @Test |
There was a problem hiding this comment.
Need to figure this out first.
1 task
cowtowncoder
reviewed
Jul 9, 2025
| Map<String, POJOPropertyBuilder> newAll = new LinkedHashMap<String,POJOPropertyBuilder>(props.size()+props.size()); | ||
| POJOPropertyBuilder anyGetterProp = null; | ||
| for (POJOPropertyBuilder prop : all.values()) { | ||
| if (prop.getAccessor() != null && Boolean.TRUE.equals(this._config.getAnnotationIntrospector().hasAnyGetter(prop.getAccessor()))) { |
There was a problem hiding this comment.
No, we really should not do annotation introspector here, again...
|
Oh wow, thank you for the extra work @cowtowncoder 👍👍 almost seems like a brand new PR |
Np. I got bit carried away. But the logic remains the way it was so it's still your PR :) Will now merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5215 (caused by #4775)