Handle $ref sibling descriptions#1821
Open
theswim wants to merge 1 commit into
Open
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
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.
Summary
Fix property-level annotation handling for schemas that define sibling keywords alongside
$ref.In Draft 2020-12,
$refis an applicator and sibling keywords in the same schema object are evaluated independently. Previously, jsonschema2pojo resolved$refby replacing the property schema with the referenced schema, so a siblingdescriptionon the property was ignored and the referenced schema description was used instead.This change preserves the referenced schema for type generation while merging sibling keywords back into the resolved property schema for property annotations. Local sibling keywords override the referenced schema keyword of the same name.
Changes
$refsibling keywords into the resolved property schema inPropertyRule$refitself excluded from the merged annotation schemaschema/ref/address.jsonfixturedescriptionbecomes the generated@JsonPropertyDescriptionVerification
./mvnw clean verifygit diff --check