Skip to content

AllOf : Only stop when merging schemas with multiple discriminators #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mromaszewicz merged 3 commits into from
Mar 4, 2026
Merged

AllOf : Only stop when merging schemas with multiple discriminators #667

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d83a0e
AllOf : Only stop when merging schemas with multiple discriminators
Jul 7, 2022
9438657
Merge upstream/main into pr/667, resolving conflict in merge_schemas.go
mromaszewicz Mar 4, 2026
ccd67bd
test(codegen): add tests for discriminator propagation in allOf merges
mromaszewicz Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
AllOf : Only stop when merging schemas with multiple discriminators
  • Loading branch information
Bilel
Bilel committed Jul 7, 2022
commit 0d83a0e760c356bb92fecd1fe1ceacde6758f7c4
8 changes: 7 additions & 1 deletion pkg/codegen/merge_schemas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,15 @@ func mergeOpenapiSchemas(s1, s2 openapi3.Schema) (openapi3.Schema, error) {
}

// Unhandled for now
if s1.Discriminator != nil || s2.Discriminator != nil {
if s1.Discriminator != nil && s2.Discriminator != nil {
return openapi3.Schema{}, errors.New("merging two schemas with discriminators is not supported")
}

if s1.Discriminator != nil {
result.Discriminator = s1.Discriminator
} else if s2.Discriminator != nil {
result.Discriminator = s2.Discriminator
}

return result, nil
}