refactor: simplify discriminatorFound logic and move it to the DiscriminatorUtils#24199
Open
Mattias-Sehlstedt wants to merge 1 commit into
Open
Conversation
Contributor
There was a problem hiding this comment.
1 issue found across 2 files
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
37b3ffa to
ce50154
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.
This PR simplifies the logic in the
discriminatorFoundmethod within classDefaultCodegen. It also moves the method toDiscriminatorUtilsin order to reduce the overall size ofDefaultCodegenand to centralize discriminator introspection into a single place.Protected method
getDiscriminatorSchemahas also been removed fromDefaultCodegenand made private inDiscriminatorUtils. This is technically a breaking change, but I would argue that it can be safely ignored since the method was very recently introduced by me. Its presence also no longer serves any purpose since it cannot act as a extension point for anything with the moving ofdiscriminatorFound.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
Simplified discriminator detection and moved it from
DefaultCodegentoDiscriminatorUtilsto centralize logic and reduceDefaultCodegensize. No functional changes expected for generators.Refactors
discriminatorFoundintoDiscriminatorUtilsasdiscriminatorFound(OpenAPI, ...)and updated call sites inDefaultCodegen.DefaultCodegen#getDiscriminatorSchema; equivalent logic now lives as a private helper inDiscriminatorUtils.Migration
DefaultCodegenand usedgetDiscriminatorSchema, switch toDiscriminatorUtils.discriminatorFound(...)orDiscriminatorUtils.getDiscriminatorPropertyType(...)as needed.Written for commit ce50154. Summary will update on new commits.