refactor: introduce DiscriminatorUtils to separate handling of discriminator discoverability#24143
Open
Mattias-Sehlstedt wants to merge 1 commit into
Open
Conversation
Contributor
There was a problem hiding this comment.
2 issues found across 2 files
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
9d56f9c to
d65af57
Compare
…minator discoverability and construction
d65af57 to
52d65ec
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.
I was working on extending the discriminator discoverability for
useOneOfInterfacesin combination with enums, but I encountered that I had to duplicate my logic in several places. To make the delta of my later change smaller and more clear, I have created a PR first where I remove this duplicated logic.Since the discriminator is a complex concept that sometimes require very specific parsing, I have also elected to move this logic into a separate
DiscriminatorUtilsclass. This is similar to theExamplesUtilsclass that already exists.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
Centralized discriminator discovery and construction in
DiscriminatorUtils, withDefaultCodegendelegating lookups and type/schema resolution. This removes duplicated logic, unifiesoneOf/anyOfhandling, and keeps behavior unchanged while preparing enum-based discriminators withuseOneOfInterfaces.org.openapitools.codegen.utils.DiscriminatorUtilswithrecursiveGetDiscriminator,getDiscriminatorSchema,getDiscriminatorPropertyType, and a shared helper foroneOf/anyOfalternatives with a single conflicting-name warning.org.openapitools.codegen.DefaultCodegenwith calls toDiscriminatorUtils; minor comment/wording fixes (e.g., “innermost”); no functional changes.Written for commit 52d65ec. Summary will update on new commits.