Skip to content

[CORE] Fixes composed schema discriminator map #4906

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
wing328 merged 18 commits into from
Apr 24, 2020
Merged

[CORE] Fixes composed schema discriminator map #4906

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a7a5cca
Adds addComposedMappedModels and testComposedSchemaOneOfDiscriminatorMap
spacether Jan 1, 2020
cb6c4bd
Requires that discriminators be required properties
spacether Mar 20, 2020
53ba1fa
Strengthens discriminaotr validation, adds better error messages, add…
spacether Mar 21, 2020
23c5c38
Adds oneOf and anyOf invalidDiscriminator tests
spacether Mar 22, 2020
e3b6522
Updates incorrect addOneOfInterfaceModel invocation
spacether Mar 26, 2020
7b85b2d
Runs ensure-up-to-date
spacether Mar 26, 2020
53ab46b
Adds updates from Sebastien Rosset
spacether Apr 1, 2020
7242b94
Removes newlines
spacether Apr 2, 2020
ddefbea
Uses df.isString
spacether Apr 7, 2020
831c99a
Fixes tests be correctly setting df.isString
spacether Apr 8, 2020
6ab57c8
Updates discriminatorExplicitMappingVerbose description per PR feedback
spacether Apr 10, 2020
607f638
Adds description of how mappedModels is populated
spacether Apr 10, 2020
bc23d3e
Adds the suggestion exception raising when a MappedModel mappingName …
spacether Apr 12, 2020
052bccc
Actually resolves merge conflicts
spacether Apr 16, 2020
89c8025
Switches two methods to package private because they are needed for t…
spacether Apr 23, 2020
936c0b1
Allow nulls in MappedModel.getMappingName
spacether Apr 23, 2020
5b2563f
Updates CLI flag name to legacyDiscriminatorBehavior, default=true
spacether Apr 23, 2020
f8c95d8
Merge branch 'master' into issue_4904_fix_composed_schema_discriminat…
wing328 Apr 24, 2020
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
Next Next commit
Adds description of how mappedModels is populated
  • Loading branch information
@spacether
spacether committed Apr 23, 2020
commit 607f638301fec5019b64e38d2e2faab46cdf75e6
16 changes: 16 additions & 0 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenDiscriminator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ public class CodegenDiscriminator {
private String propertyGetter;
private String propertyType;
private Map<String, String> mapping;

// mappedModels is populated differently if discriminatorExplicitMappingVerbose is
// True or False. When:
//
// discriminatorExplicitMappingVerbose == False, this contains:
// - the name to schema map info in the discriminator mapping entry in your openapi spec OR
// - child schemas that allOf inherit self schema
//
// discriminatorExplicitMappingVerbose == True, this contains:
// - the name to schema map info in the discriminator mapping entry in your openapi spec AND
// - x-discriminator-value mappings in child oneOf + anyOf schemas + descendant schemas that allOf inherit self schema AND
// - descendant schemas that allOf inherit self schema AND
// - child oneOf + anyOf schemas
//
// see the method createDiscriminator in DefaultCodegen.java

private Set<MappedModel> mappedModels = new LinkedHashSet<>();

public String getPropertyName() {
Expand Down