Merge pull request #10379 from swagger-api/issue-9897

added method to verify alias models in generators.
swagger-api · Jul 11, 2020 · 44ff4c3 · 44ff4c3
2 parents 3c955d7 + a75ff56
commit 44ff4c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -413,7 +413,7 @@ public int compare(String o1, String o2) {
                     continue;
                 }
                 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) 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<String, SecurityScheme> getAuthMethods(List<SecurityRequirement> 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<CodegenArgument> languageArguments = config.getLanguageArguments();
         if (languageArguments == null || languageArguments.isEmpty()) {