fix(normalizer): restore behavior of clearing a oneOf if the schema content cannot currently be used by the generator - #24585
Open
Mattias-Sehlstedt wants to merge 1 commit into
Conversation
Mattias-Sehlstedt
force-pushed
the
only-retain-const-for-simplify-one-of
branch
3 times, most recently
from
August 3, 2026 19:07
87bd29c to
cf098f6
Compare
JPPortier
reviewed
Aug 5, 2026
| * @return true if the schema is OAS 3.1 and all {@code oneOf} branches contains a {@code const}. | ||
| */ | ||
| public static boolean isOneOfOfConsts(Schema<?> schema) { | ||
| if (hasOneOf(schema) && schema.getSpecVersion().equals(SpecVersion.V31)) { |
Contributor
There was a problem hiding this comment.
We can imagine a V32 will be created/supported at some point in the future.
And then onto V32, due to the logic, we will have same behavior as in V30 but different from V31 if no one remember this logic and update this source.
What do you about testing against not V30 ?
Then ready for next V32 without having to update this file.
(and thank you for the PR)
…ontent cannot currently be used by the generator
Mattias-Sehlstedt
force-pushed
the
only-retain-const-for-simplify-one-of
branch
from
August 5, 2026 09:53
cf098f6 to
565c78b
Compare
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.
Restores behavior of clearing a
oneOfwhen running normalizationnormalizeOneOfas part of theSIMPLIFY_ONEOF_ANYOFrule.The only case that currently is kept is when the
oneOfonly hasconstbranches. Note that this case is not really relevant as of current, with the introduction of const parsing with #23869 (being part of ruleSIMPLIFY_ONEOF_ANYOF_ENUM), which is processed beforeSIMPLIFY_ONEOF_ANYOF.Would be good to get feedback from the original author, since it could be that #22571 looks to forward meta annotations from a
oneOfthat is not tied toconst.Fixes #24574
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.
Summary by cubic
Restores the normalizer to clear
oneOfunderSIMPLIFY_ONEOF_ANYOFwhen the generator can’t use its content, keeping it only when all branches are OAS 3.1constfor potential enum handling. Fixes #24574.clearOneOf()inOpenAPINormalizerto droponeOfon integer/number/string schemas unlessModelUtils.isOneOfOfConsts()is true.ModelUtils.isOneOfOfConsts()(OAS 3.1 only; all branches must haveconst).StringPatternsWithOneOf); preserve const-onlyoneOfwhenSIMPLIFY_ONEOF_ANYOF_ENUMis disabled; extracted option keys to constants.StringPatternsWithOneOf.Written for commit 565c78b. Summary will update on new commits.