refactor: decouple schema naming from discriminator mapping introspection#24327
Open
Mattias-Sehlstedt wants to merge 1 commit into
Conversation
Contributor
There was a problem hiding this comment.
All reported issues were addressed across 2 files
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
Mattias-Sehlstedt
force-pushed
the
decouple-schema-naming-from-discriminator-mapping-introspection
branch
from
July 16, 2026 18:58
1a12bf7 to
a4d71b3
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.
Decouples the
toModelName(e.g., adding a prefix or a suffix)Codegenfunctionality from thegetAllOfDescendantsandgetOneOfAnyOfDescendantsdiscriminator introspection methods. This is in preparation for these methods being moved to theDiscriminatorUtilsclass.This is done so that the discriminator logic can later be clarified and optimized, since as of current there are several passes over the entire specification when searching for the discriminator mappings. A single walk along the path for each discriminator schema should be enough to gather all the necessary information for building the typing and the mapping for the discrimination.
There is also the rather crude implementation of the specification analysis, where it should be preferable to utilize the
visitedSchemasapproach (walk the path recursively and keep a log of what schemas that have been visited to terminate loops).This PR also breaks out the building of a larger error message when failing to interpret a discriminator, and it also creates a helper for repeated vendor extension introspection.
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
Decouples schema naming from discriminator mapping introspection so mappings use raw schema names, with
toModelNameapplied once during discriminator creation. Centralizesx-discriminator-valuelookup and discriminator error building inDiscriminatorUtils; no behavior change expected.getAllOfDescendantsandgetOneOfAnyOfDescendantsnow return schema-name-basedMappedModel; newadjustModelNames()inDefaultCodegenappliestoModelNameduringcreateDiscriminator.DiscriminatorUtils.discriminatorVendorExtensionValue(...)andDiscriminatorUtils.getDiscriminatorSchemaError(...); replaced inline vendor extension access and error message assembly.Written for commit a4d71b3. Summary will update on new commits.