loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-09 22:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CORE] Fixes composed schema discriminator map (#4906)

Browse Source 
* Adds addComposedMappedModels and testComposedSchemaOneOfDiscriminatorMap

* Requires that discriminators be required properties

* Strengthens discriminaotr validation, adds better error messages, adds schema oneof samples

* Adds oneOf and anyOf invalidDiscriminator tests

* Updates incorrect addOneOfInterfaceModel invocation

* Runs ensure-up-to-date

* Adds updates from Sebastien Rosset

* Removes newlines

* Uses df.isString

* Fixes tests be correctly setting df.isString

* Updates discriminatorExplicitMappingVerbose description per PR feedback

* Adds description of how mappedModels is populated

* Adds the suggestion exception raising when a MappedModel mappingName is null

* Actually resolves merge conflicts

* Switches two methods to package private because they are needed for testing

* Allow nulls in MappedModel.getMappingName

* Updates CLI flag name to legacyDiscriminatorBehavior, default=true

Co-authored-by: William Cheng <wing328hk@gmail.com>
This commit is contained in:
Justin Black
2020-04-24 09:01:02 -07:00
committed by GitHub
parent 45bbe4922b
commit 8e8471c1fd
171 changed files with 2907 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
View File

@@ -48,7 +48,7 @@ import javax.xml.bind.annotation.*;
public class Animal {
public static final String JSON_PROPERTY_CLASS_NAME = "className";
@XmlElement(name = "className")
private String className;
protected String className;
public static final String JSON_PROPERTY_COLOR = "color";
@XmlElement(name = "color")