Skip to content

[Python] Adds allOf/oneOf/anyOf composed models #4446

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
jimschubert merged 3 commits into from
Dec 15, 2019
Merged

[Python] Adds allOf/oneOf/anyOf composed models #4446

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dfe18e
Adds composed model support for allOf oneOf anyOf
spacether Sep 23, 2019
f5fec62
Moves discriminator into discriminator() class method, adds test_dese…
spacether Dec 8, 2019
bb66bd3
Fixes typo in error message
spacether Dec 8, 2019
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
Prev Previous commit
Fixes typo in error message
  • Loading branch information
@spacether
spacether committed Dec 8, 2019
commit bb66bd3532d2ee40c5afa96f2ba93ca70466bb04
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,7 @@ public CodegenModel fromModel(String name, Schema schema) {
m.xmlName = innerSchema.getXml().getName();
}
if (modelDiscriminators > 1) {
LOGGER.error("Allof composed schema is inherriting >1 descriminator. Only use one discriminator: {}", composed);
LOGGER.error("Allof composed schema is inheriting >1 discriminator. Only use one discriminator: {}", composed);
}
Copy link
Contributor Author

@spacether spacether Dec 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should error out if the user tries to define multiple discriminators in one schema.


if (modelImplCnt++ > 1) {
Expand Down