fix: preserve parent description when simplifying nullable anyOf/oneOf#23361
Merged
wing328 merged 1 commit intoOpenAPITools:masterfrom Apr 1, 2026
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
This PR fixes a schema simplification edge case in
ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(...).When
anyOf/oneOfcontains one non-null schema and onenullschema, the logic collapses to the non-null child.Before this change, parent-level description could be lost during collapse.
Now, parent description is preserved when the child has no description, while still preserving child description precedence if already set.
Changes
descriptionwhen simplifying nullableanyOf/oneOfto a single child schema.anyOfoneOfValidation
ModelUtilsTest.PR checklist
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*.IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
master(upcoming7.x.0minor release - breaking changes with fallbacks),8.0.x(breaking changes without fallbacks)"fixes #123"present in the PR description)Summary by cubic
Fixes loss of parent description when simplifying nullable
anyOf/oneOfunions to a single schema. The parent description is copied only if the child has none; nullable propagation remains unchanged.ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(...)to preserve parentdescriptionwhile keeping child description precedence.anyOf,oneOf, and child-overrides-parent cases inModelUtilsTest.Written for commit 751ab5c. Summary will update on new commits.