From a75ff568b78fba1c0faf5b86dc4ddf4bb99fe2c1 Mon Sep 17 00:00:00 2001 From: HugoMario Date: Fri, 10 Jul 2020 22:54:00 -0500 Subject: [PATCH] added method to verify alias models in generators. --- .../main/java/io/swagger/codegen/v3/CodegenConfig.java | 4 ++++ .../java/io/swagger/codegen/v3/DefaultGenerator.java | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConfig.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConfig.java index a26e5c9423b..0bd5daf23b4 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConfig.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConfig.java @@ -247,4 +247,8 @@ public interface CodegenConfig { boolean defaultIgnoreImportMappingOption(); ISchemaHandler getSchemaHandler(); + + default boolean checkAliasModel() { + return false; + } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java index 208165fe196..ead9d6b9195 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java @@ -413,7 +413,7 @@ public int compare(String o1, String o2) { continue; } Map modelTemplate = (Map) ((List) models.get("models")).get(0); - if (isAliasVerifierGenerator(config.getName())) { + if (config.checkAliasModel()) { // Special handling of aliases only applies to Java if (modelTemplate != null && modelTemplate.containsKey("model")) { CodegenModel codegenModel = (CodegenModel) modelTemplate.get("model"); @@ -1112,14 +1112,6 @@ private Map getAuthMethods(List sec return authMethods; } - private boolean isAliasVerifierGenerator(String name) { - return name.equalsIgnoreCase("java") - || name.equalsIgnoreCase("inflector") - || name.equalsIgnoreCase("csharp") - || name.equalsIgnoreCase("go") - || name.equalsIgnoreCase("go-server"); - } - private Boolean getCustomOptionBooleanValue(String option) { List languageArguments = config.getLanguageArguments(); if (languageArguments == null || languageArguments.isEmpty()) {