loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix generation of oneOf interfaces for oneOf usage in properties (#5400)

Browse Source 
* Fix generation of oneOf interfaces for oneOf usage in properties

* Only generate oneOf interface models when oneOf is defined
This commit is contained in:
Slavek Kabrda 2020-03-25 01:26:08 +01:00 committed by GitHub
parent f740379cfa
commit bb38bb0626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View File

@ -744,13 +744,34 @@ public class DefaultCodegen implements CodegenConfig {
} }
} }
// also add all properties of all schemas to be checked for oneOf
Map<String, Schema> propertySchemas = new HashMap<String, Schema>();
for (Map.Entry<String, Schema> e : schemas.entrySet()) {
Schema s = e.getValue();
Map<String, Schema> props = s.getProperties();
if (props == null) {
props = new HashMap<String, Schema>();
}
for (Map.Entry<String, Schema> p : props.entrySet()) {
propertySchemas.put(e.getKey() + "/" + p.getKey(), p.getValue());
}
}
schemas.putAll(propertySchemas);
// go through all gathered schemas and add them as interfaces to be created // go through all gathered schemas and add them as interfaces to be created
for (Map.Entry<String, Schema> e : schemas.entrySet()) { for (Map.Entry<String, Schema> e : schemas.entrySet()) {
String n = toModelName(e.getKey()); String n = toModelName(e.getKey());
Schema s = e.getValue(); Schema s = e.getValue();
String nOneOf = toModelName(n + "OneOf"); String nOneOf = toModelName(n + "OneOf");
if (ModelUtils.isComposedSchema(s)) { if (ModelUtils.isComposedSchema(s)) {
addOneOfNameExtension((ComposedSchema) s, n); if (e.getKey().contains("/")) {
// if this is property schema, we also need to generate the oneOf interface model
addOneOfNameExtension((ComposedSchema) s, nOneOf);
addOneOfInterfaceModel((ComposedSchema) s, nOneOf);
} else {
// else this is a component schema, so we will just use that as the oneOf interface model
addOneOfNameExtension((ComposedSchema) s, n);
}
} else if (ModelUtils.isArraySchema(s)) { } else if (ModelUtils.isArraySchema(s)) {
Schema items = ((ArraySchema) s).getItems(); Schema items = ((ArraySchema) s).getItems();
if (ModelUtils.isComposedSchema(items)) { if (ModelUtils.isComposedSchema(items)) {
@ -5726,15 +5747,19 @@ public class DefaultCodegen implements CodegenConfig {
} }
/** /**
* Add a given ComposedSchema as an interface model to be generated * Add a given ComposedSchema as an interface model to be generated, assuming it has `oneOf` defined
* @param cs ComposedSchema object to create as interface model * @param cs ComposedSchema object to create as interface model
* @param type name to use for the generated interface model * @param type name to use for the generated interface model
*/ */
public void addOneOfInterfaceModel(ComposedSchema cs, String type) { public void addOneOfInterfaceModel(ComposedSchema cs, String type) {
if (cs.getOneOf() == null) {
return;
}
CodegenModel cm = new CodegenModel(); CodegenModel cm = new CodegenModel();
cm.discriminator = createDiscriminator("", (Schema) cs); cm.discriminator = createDiscriminator("", (Schema) cs);
for (Schema o : cs.getOneOf()) {
for (Schema o : Optional.ofNullable(cs.getOneOf()).orElse(Collections.emptyList())) {
if (o.get$ref() == null) { if (o.get$ref() == null) {
if (cm.discriminator != null && o.get$ref() == null) { if (cm.discriminator != null && o.get$ref() == null) {
// OpenAPI spec states that inline objects should not be considered when discriminator is used // OpenAPI spec states that inline objects should not be considered when discriminator is used