loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2026-03-18 23:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve "allOf" support (#1169)

Browse Source 
* Add test case which reproduces issue340

* Take the first $ref we find in the allOf-List
This commit is contained in:
Akihito Nakano
2018-10-06 00:28:35 +09:00
committed by William Cheng
parent aa31e42ce7
commit a1d242595e
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4215,12 +4215,12 @@ public class DefaultCodegen implements CodegenConfig {
protected String getParentName(ComposedSchema composedSchema, Map<String, Schema> allSchemas) {
if (composedSchema.getAllOf() != null && !composedSchema.getAllOf().isEmpty()) {
Schema schema = composedSchema.getAllOf().get(0);
String ref = schema.get$ref();
if (StringUtils.isBlank(ref)) {
return null;
for (Schema schema : composedSchema.getAllOf()) {
String ref = schema.get$ref();
if (!StringUtils.isBlank(ref)) {
return ModelUtils.getSimpleRef(ref);
}
}
return ModelUtils.getSimpleRef(ref);
}
return null;
}