Skip to content

Commit 1807ac5

Browse files
committed
added composed schema extension for composed models founds
1 parent 305249e commit 1807ac5

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,14 @@ public int compare(String o1, String o2) {
394394

395395
if (composedModels != null && !composedModels.isEmpty()) {
396396
for (CodegenModel composedModel : composedModels) {
397+
if (allProcessedModels.get(composedModel.name) != null) {
398+
final Map<String, Object> models = (Map<String, Object>) allProcessedModels.get(composedModel.name);
399+
models.put("x-is-composed-model", composedModel.isComposedModel);
400+
continue;
401+
}
397402
final Map<String, Object> models = processModel(composedModel, config, schemas);
398403
models.put("classname", config.toModelName(composedModel.name));
404+
models.put("x-is-composed-model", composedModel.isComposedModel);
399405
models.putAll(config.additionalProperties());
400406
allProcessedModels.put(composedModel.name, models);
401407
}
@@ -1061,8 +1067,6 @@ private Map<String, Object> processModel(CodegenModel codegenModel, CodegenConfi
10611067
objs.put("package", config.modelPackage());
10621068
List<Object> models = new ArrayList<>();
10631069

1064-
objs.put("x-is-composed-model", codegenModel.isComposedModel);
1065-
10661070
Map<String, Object> modelObject = new HashMap<>();
10671071
modelObject.put("model", codegenModel);
10681072
modelObject.put("importPath", config.toModelImport(codegenModel.classname));

0 commit comments

Comments
 (0)