Skip to content

Commit b0557fc

Browse files
committed
avoid creation of user-defined classes for aliases on java codegen languages.
1 parent 3d2574c commit b0557fc

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,17 +374,15 @@ public int compare(String o1, String o2) {
374374
continue;
375375
}
376376
Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
377-
/**
378-
if (config instanceof AbstractJavaCodegen) {
377+
if (isJavaCodegen(config.getName())) {
379378
// Special handling of aliases only applies to Java
380379
if (modelTemplate != null && modelTemplate.containsKey("model")) {
381-
CodegenModel m = (CodegenModel) modelTemplate.get("model");
382-
if (m.isAlias) {
380+
CodegenModel codegenModel = (CodegenModel) modelTemplate.get("model");
381+
if (ExtensionHelper.getBooleanValue(codegenModel, CodegenConstants.IS_ALIAS_EXT_NAME)) {
383382
continue; // Don't create user-defined classes for aliases
384383
}
385384
}
386385
}
387-
*/
388386
allModels.add(modelTemplate);
389387
for (String templateName : config.modelTemplateFiles().keySet()) {
390388
String suffix = config.modelTemplateFiles().get(templateName);
@@ -1014,4 +1012,9 @@ private com.github.jknack.handlebars.Template getHandlebars(String templateFile)
10141012

10151013
return handlebars.compile(templateFile.replace(".mustache", StringUtils.EMPTY));
10161014
}
1015+
1016+
private boolean isJavaCodegen(String name) {
1017+
return name.equalsIgnoreCase("java")
1018+
|| name.equalsIgnoreCase("inflector");
1019+
}
10171020
}

0 commit comments

Comments
 (0)