fix x-kubernetes-preserve-unknown-fields mistakenly added to parent object #134
Conversation
This file contains 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
euberseder-hubspot
force-pushed
the
preserve-unknown-fields-fix
branch
from
cbdef55
to
b434dd6
Compare
nhirakawa
approved these changes
Apr 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
It seems that
x-kubernetes-preserve-unknown-fieldswas pulled up to the parent object when a containing property was annotated with@JsonAnyX, which is correct behavior. The same property-level indicators were reused when@PreserveUnknownFieldswas added as an annotation, which means that any field annotated with that annotation will containx-kubernetes-preserve-unknown-fieldsas will the parent, which isn't correct behavior.This PR disambiguates the two cases, preserving the original behavior for the
@JsonAnyannotations but breaking the parentx-kubernetes-preserve-unknown-fieldsmarking if@PreserveUnknownFieldis used. I've added a test which fails with the original code, but passes after the additions toAbstractJsonSchema.