Merge pull request #9959 from swagger-api/issue-9957

allow skip model alias for generators.

Author: HugoMario

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java

@@ -172,6 +172,9 @@ public class Generate implements Runnable {
             description = CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DESC)
     private Boolean removeOperationIdPrefix;
 
+    @Option(name = {"--skip-alias-generation"}, title = "skip alias generation.", description = "skip code generation for models identified as alias.")
+    private Boolean skipAliasGeneration;
+
     @Override
     public void run() {
 
@@ -273,6 +276,10 @@ public void run() {
             configurator.setRemoveOperationIdPrefix(removeOperationIdPrefix);
         }
 
+        if (skipAliasGeneration != null) {
+            configurator.setSkipAliasGeneration(removeOperationIdPrefix);
+        }
+
         applySystemPropertiesKvpList(systemProperties, configurator);
         applyInstantiationTypesKvpList(instantiationTypes, configurator);
         applyImportMappingsKvpList(importMappings, configurator);

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

@@ -222,4 +222,8 @@ public interface CodegenConfig {
 
     String sanitizeName(String name);
 
+    void setSkipAliasGeneration(Boolean skipAliasGeneration);
+
+    Boolean getSkipAliasGeneration();
+
 }

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

@@ -103,6 +103,7 @@ public class DefaultCodegen {
     protected String gitUserId, gitRepoId, releaseNote;
     protected String httpUserAgent;
     protected Boolean hideGenerationTimestamp = true;
+    protected Boolean skipAliasGeneration;
     // How to encode special characters like $
     // They are translated to words like "Dollar" and prefixed with '
     // Then translated back during JSON encoding and decoding
@@ -3449,6 +3450,14 @@ public void setSkipOverwrite(boolean skipOverwrite) {
         this.skipOverwrite = skipOverwrite;
     }
 
+    public void setSkipAliasGeneration(Boolean skipAliasGeneration) {
+        this.skipAliasGeneration = skipAliasGeneration;
+    }
+
+    public Boolean getSkipAliasGeneration() {
+        return this.skipAliasGeneration;
+    }
+
     public boolean isRemoveOperationIdPrefix() {
         return removeOperationIdPrefix;
     }

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

@@ -401,6 +401,8 @@ private Model getParent(Model model) {
         // post process all processed models
         allProcessedModels = config.postProcessAllModels(allProcessedModels);
 
+        final boolean skipAlias = config.getSkipAliasGeneration() != null && config.getSkipAliasGeneration();
+
         // generate files based on processed models
         for (String modelName : allProcessedModels.keySet()) {
             Map<String, Object> models = (Map<String, Object>) allProcessedModels.get(modelName);
@@ -411,7 +413,7 @@ private Model getParent(Model model) {
                     continue;
                 }
                 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
-                if (config instanceof AbstractJavaCodegen) {
+                if (skipAlias) {
                     // Special handling of aliases only applies to Java
                     if (modelTemplate != null && modelTemplate.containsKey("model")) {
                         CodegenModel m = (CodegenModel) modelTemplate.get("model");

modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java

@@ -44,6 +44,7 @@ public class CodegenConfigurator implements Serializable {
     private String outputDir;
     private boolean verbose;
     private boolean skipOverwrite;
+    private Boolean skipAliasGeneration;
     private boolean removeOperationIdPrefix;
     private String templateDir;
     private String auth;
@@ -126,6 +127,10 @@ public CodegenConfigurator setRemoveOperationIdPrefix(boolean removeOperationIdP
         return this;
     }
 
+    public void setSkipAliasGeneration(Boolean skipAliasGeneration) {
+        this.skipAliasGeneration = skipAliasGeneration;
+    }
+
     public String getModelNameSuffix() {
         return modelNameSuffix;
     }
@@ -392,6 +397,7 @@ public ClientOptInput toClientOptInput() {
         config.setInputSpec(inputSpec);
         config.setOutputDir(outputDir);
         config.setSkipOverwrite(skipOverwrite);
+        config.setSkipAliasGeneration(skipAliasGeneration);
         config.setIgnoreFilePathOverride(ignoreFileOverride);
         config.setRemoveOperationIdPrefix(removeOperationIdPrefix);
 

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

@@ -459,6 +459,10 @@ public void processOpts() {
         } else if (dateLibrary.equals("legacy")) {
             additionalProperties.put("legacyDates", true);
         }
+
+        if (this.skipAliasGeneration == null) {
+            this.skipAliasGeneration = Boolean.TRUE;
+        }
     }
 
     private void sanitizeConfig() {