Fix discriminator model lookup when used together with model name suffix#23363
Merged
wing328 merged 1 commit intoOpenAPITools:masterfrom Apr 1, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
No issues found across 3 files
Since this is your first cubic review, here's how it works:
- cubic automatically reviews your code and comments on bugs and improvements
- Teach cubic by replying to its comments. cubic learns from your replies and gets better over time
- Add one-off context when rerunning by tagging
@cubic-dev-aiwith guidance or docs links (includingllms.txt) - Ask questions if you need clarification on any suggestion
Contributor
Author
|
Hi @wing328, I saw you reviewed similar things around the discriminator. Could you please review this one? :) thx. |
Member
|
thanks for the fix let's give it a try |
Contributor
Author
|
thank you :) |
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.
When
modelNamePrefixormodelNameSuffixis configured,MappedModel.modelNamestores the transformed name (e.g.AppleReqDiscDto), while theallProcessedModelsmap inpostProcessAllModelsis keyed by the raw OAS schema name (e.g.AppleReqDisc). This mismatch causedModelUtils.getModelByNameto return null, leavingMappedModel.modelunresolved — breaking discriminator-based serialization in generated code.The fix adds a
schemaNamefield toCodegenDiscriminator.MappedModelthat preserves the original OAS schema name before any prefix/suffix transformation. DuringpostProcessAllModels, the lookup now usesschemaName(falling back tomodelNamefor backward compatibility), enabling a direct O(1) map key hit instead ofrequiring a linear scan.
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) (It is not, or more specifically, I'm not sure. Some seem related, though.)