Merge pull request #710 from swagger-api/codegen-10272

create a specific var for custom template and update generators
swagger-api · Jun 26, 2020 · 245e073 · 245e073
2 parents 1c8c29b + 51a7e1f
commit 245e073
Show file tree

Hide file tree

Showing 35 changed files with 8 additions and 143 deletions.
diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
@@ -142,6 +142,7 @@ public abstract class DefaultCodegenConfig implements CodegenConfig {
     protected Map<String, String> modelDocTemplateFiles = new HashMap<String, String>();
     protected Map<String, String> reservedWordsMappings = new HashMap<String, String>();
     protected String templateDir;
+    protected String customTemplateDir;
     protected String templateVersion;
     protected String embeddedTemplateDir;
     protected String commonTemplateDir = "_common";
@@ -181,8 +182,9 @@ public List<CliOption> cliOptions() {
 
     public void processOpts() {
         if (additionalProperties.containsKey(CodegenConstants.TEMPLATE_DIR)) {
-            this.setTemplateDir((String) additionalProperties.get(CodegenConstants.TEMPLATE_DIR));
+            this.customTemplateDir = additionalProperties.get(CodegenConstants.TEMPLATE_DIR).toString();
         }
+        this.embeddedTemplateDir = this.templateDir = getTemplateDir();
 
         if (additionalProperties.get(CodegenConstants.IGNORE_IMPORT_MAPPING_OPTION) != null) {
             setIgnoreImportMapping(Boolean.parseBoolean( additionalProperties.get(CodegenConstants.IGNORE_IMPORT_MAPPING_OPTION).toString()));
@@ -587,7 +589,7 @@ public String embeddedTemplateDir() {
     }
 
     public String customTemplateDir() {
-        return "";
+        return this.customTemplateDir;
     }
 
     public String getCommonTemplateDir() {

diff --git a/src/main/java/io/swagger/codegen/v3/generators/dotnet/AbstractCSharpCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/dotnet/AbstractCSharpCodegen.java
@@ -221,10 +221,6 @@ public void useDateTimeOffset(boolean flag) {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         // {{packageVersion}}
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {
             setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION));

diff --git a/src/main/java/io/swagger/codegen/v3/generators/go/GoClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/go/GoClientCodegen.java
@@ -39,10 +39,6 @@ public String getDefaultTemplateDir() {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         if (this.additionalProperties.containsKey("packageName")) {
             this.setPackageName((String)this.additionalProperties.get("packageName"));
         } else {

diff --git a/src/main/java/io/swagger/codegen/v3/generators/go/GoServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/go/GoServerCodegen.java
@@ -73,10 +73,6 @@ public String getDefaultTemplateDir() {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
             setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
         }

diff --git a/src/main/java/io/swagger/codegen/v3/generators/html/StaticDocCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/html/StaticDocCodegen.java
@@ -80,10 +80,6 @@ public String getHelp() {
     @Override
     public void processOpts() {
         super.processOpts();
-
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
     }
 
     @Override

diff --git a/src/main/java/io/swagger/codegen/v3/generators/html/StaticHtml2Codegen.java b/src/main/java/io/swagger/codegen/v3/generators/html/StaticHtml2Codegen.java
@@ -149,14 +149,6 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         return objs;
     }
 
-    @Override
-    public void processOpts() {
-        super.processOpts();
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-    }
-
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
         super.preprocessOpenAPI(openAPI);

diff --git a/src/main/java/io/swagger/codegen/v3/generators/html/StaticHtmlCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/html/StaticHtmlCodegen.java
@@ -133,14 +133,6 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         return objs;
     }
 
-    @Override
-    public void processOpts() {
-        super.processOpts();
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-    }
-
     @Override
     public String escapeQuotationMark(String input) {
         // just return the original string

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFClientCodegen.java
@@ -67,10 +67,6 @@ public JavaCXFClientCodegen() {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         // clear model and api doc template as this codegen
         // does not support auto-generated markdown doc at the moment
         // TODO: add doc templates

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFServerCodegen.java
@@ -99,10 +99,6 @@ public JavaCXFServerCodegen() {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
 
         // clear model and api doc template as this codegen

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java
@@ -121,10 +121,6 @@ public String getHelp() {
     @Override
     public void processOpts() {
         super.processOpts();
-        if (StringUtils.isBlank(templateDir)) {
-            String templateVersion = getTemplateVersion();
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
 
         if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)) {
             LOGGER.warn("You specified both RxJava versions 1 and 2 but they are mutually exclusive. Defaulting to v2.");

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaInflectorServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaInflectorServerCodegen.java
@@ -73,9 +73,6 @@ public String getHelp() {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
         writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
         writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
         writeOptional(outputFolder, new SupportingFile("web.mustache", "src/main/webapp/WEB-INF", "web.xml"));

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSCXFCDIServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSCXFCDIServerCodegen.java
@@ -45,11 +45,6 @@ public String getName() {
 
     @Override
     public void processOpts() {
-        // Set the template dir first, before super.processOpts(), otherwise it is going to
-        // be set to /spec location.
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
 
         super.processOpts();
 
@@ -92,7 +87,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
     @Override
     public String getHelp() {
         return "[WORK IN PROGRESS: generated code depends from Swagger v2 libraries] "
-                + "Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an " 
+                + "Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an "
                 + "Apache CXF runtime and a Java EE runtime with CDI enabled.";
     }
 

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSSpecServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSSpecServerCodegen.java
@@ -76,10 +76,6 @@ public void processOpts() {
 
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         modelTemplateFiles.put("model.mustache", ".java");
         apiTemplateFiles.put("api.mustache", ".java");
 

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaJerseyServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaJerseyServerCodegen.java
@@ -87,10 +87,6 @@ public void processOpts() {
 
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         addTemplateFiles();
 
         // use default library if unset

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyEapServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyEapServerCodegen.java
@@ -59,10 +59,6 @@ public String getHelp() {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
         apiTestTemplateFiles.clear(); // TODO: add test template
 

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyServerCodegen.java
@@ -51,10 +51,6 @@ public String getHelp() {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         apiTemplateFiles.put("apiService.mustache", ".java");
         apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
         apiTestTemplateFiles.clear(); // TODO: add test template
@@ -98,7 +94,7 @@ else if (dateLibrary.startsWith("java8")) {
             supportingFiles.add(new SupportingFile("LocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateProvider.java"));
         }
     }
-    
+
 
     @Override
     public String getArgumentsLocation() {

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/MicronautCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/MicronautCodegen.java
@@ -120,10 +120,6 @@ public void processOpts() {
 
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         // clear model and api doc template as this codegen
         // does not support auto-generated markdown doc at the moment
         //TODO: add doc templates

diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/SpringCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/SpringCodegen.java
@@ -182,10 +182,6 @@ public void processOpts() {
 
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         // clear model and api doc template as this codegen
         // does not support auto-generated markdown doc at the moment
         //TODO: add doc templates

diff --git a/src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java
@@ -92,9 +92,6 @@ public JavaScriptClientCodegen() {
         modelTestTemplateFiles.put("model_test.mustache", ".js");
         apiTemplateFiles.put("api.mustache", ".js");
         apiTestTemplateFiles.put("api_test.mustache", ".js");
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
         apiPackage = "api";
         modelPackage = "model";
         modelDocTemplateFiles.put("model_doc.mustache", ".md");

diff --git a/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinClientCodegen.java
@@ -89,10 +89,6 @@ public void setDateLibrary(String library) {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         if (additionalProperties.containsKey(DATE_LIBRARY)) {
             setDateLibrary(additionalProperties.get(DATE_LIBRARY).toString());
         }

diff --git a/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/kotlin/KotlinServerCodegen.java
@@ -162,10 +162,6 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         if (!additionalProperties.containsKey(GENERATE_APIS)) {
             additionalProperties.put(GENERATE_APIS, true);
         }

diff --git a/src/main/java/io/swagger/codegen/v3/generators/nodejs/NodeJSServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/nodejs/NodeJSServerCodegen.java
@@ -284,13 +284,6 @@ private static List<Map<String, Object>> sortOperationsByPath(List<CodegenOperat
     @Override
     public void processOpts() {
         super.processOpts();
-        /*
-         * Template Location.  This is the location which templates will be read from.  The generator
-         * will use the resource stream to attempt to read the templates.
-         */
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
 
         if (additionalProperties.containsKey(GOOGLE_CLOUD_FUNCTIONS)) {
             setGoogleCloudFunctions(

diff --git a/src/main/java/io/swagger/codegen/v3/generators/openapi/OpenAPIGenerator.java b/src/main/java/io/swagger/codegen/v3/generators/openapi/OpenAPIGenerator.java
@@ -85,8 +85,6 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
     public void processOpts() {
         super.processOpts();
 
-        embeddedTemplateDir = templateDir = getTemplateDir();
-
         if (additionalProperties.containsKey(OUTPUT_NAME) && !StringUtils.isBlank((String) additionalProperties.get(OUTPUT_NAME))) {
             setOutputFile((String) additionalProperties.get(OUTPUT_NAME));
         }

diff --git a/src/main/java/io/swagger/codegen/v3/generators/php/PhpClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/php/PhpClientCodegen.java
@@ -242,11 +242,6 @@ public void processOpts() {
 
         super.processOpts();
 
-        embeddedTemplateDir = getTemplateDir();
-        if (StringUtils.isBlank(templateDir)) {
-            templateDir = embeddedTemplateDir;
-        }
-
         if (additionalProperties.containsKey(PACKAGE_PATH)) {
             this.setPackagePath((String) additionalProperties.get(PACKAGE_PATH));
         } else {

diff --git a/src/main/java/io/swagger/codegen/v3/generators/python/PythonClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/python/PythonClientCodegen.java
@@ -162,10 +162,6 @@ public void processOpts() {
         super.processOpts();
         Boolean excludeTests = false;
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         if(additionalProperties.containsKey(CodegenConstants.EXCLUDE_TESTS)) {
             excludeTests = Boolean.valueOf(additionalProperties.get(CodegenConstants.EXCLUDE_TESTS).toString());
         }

diff --git a/src/main/java/io/swagger/codegen/v3/generators/python/PythonFlaskConnexionCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/python/PythonFlaskConnexionCodegen.java
@@ -158,14 +158,6 @@ public PythonFlaskConnexionCodegen() {
     @Override
     public void processOpts() {
         super.processOpts();
-        //apiTemplateFiles.clear();
-        /*
-         * Template Location.  This is the location which templates will be read from.  The generator
-         * will use the resource stream to attempt to read the templates.
-         */
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
 
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
             setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));

diff --git a/src/main/java/io/swagger/codegen/v3/generators/r/RClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/r/RClientCodegen.java
@@ -53,8 +53,6 @@ public RClientCodegen() {
         modelDocTemplateFiles.put("model_doc.mustache", ".md");
         apiDocTemplateFiles.put("api_doc.mustache", ".md");
 
-        embeddedTemplateDir = templateDir = "r";
-
         // default HIDE_GENERATION_TIMESTAMP to true
         hideGenerationTimestamp = Boolean.TRUE;
 

diff --git a/src/main/java/io/swagger/codegen/v3/generators/scala/AkkaHttpServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/scala/AkkaHttpServerCodegen.java
@@ -55,12 +55,6 @@ public AkkaHttpServerCodegen() {
 
     }
 
-    @Override
-    public void processOpts() {
-        super.processOpts();
-        embeddedTemplateDir = templateDir = getTemplateDir();
-    }
-
     @Override
     public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         return setComplexTypes(objs);

diff --git a/src/main/java/io/swagger/codegen/v3/generators/scala/ScalaClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/scala/ScalaClientCodegen.java
@@ -119,8 +119,6 @@ public ScalaClientCodegen() {
     public void processOpts() {
         super.processOpts();
 
-        embeddedTemplateDir = templateDir = getTemplateDir();
-
         if (additionalProperties.containsKey(CodegenConstants.MODEL_PROPERTY_NAMING)) {
             setModelPropertyNaming((String) additionalProperties.get(CodegenConstants.MODEL_PROPERTY_NAMING));
         }

diff --git a/src/main/java/io/swagger/codegen/v3/generators/swift/AbstractSwiftCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/swift/AbstractSwiftCodegen.java
@@ -143,10 +143,6 @@ protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Sc
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         // Setup project name
         if (additionalProperties.containsKey(PROJECT_NAME)) {
             setProjectName((String) additionalProperties.get(PROJECT_NAME));

diff --git a/src/main/java/io/swagger/codegen/v3/generators/swift/Swift5Codegen.java b/src/main/java/io/swagger/codegen/v3/generators/swift/Swift5Codegen.java
@@ -244,8 +244,6 @@ public Swift5Codegen() {
     public void processOpts() {
         super.processOpts();
 
-        embeddedTemplateDir = templateDir = getTemplateDir();
-
         // Setup project name
         if (additionalProperties.containsKey(PROJECT_NAME)) {
             setProjectName((String) additionalProperties.get(PROJECT_NAME));

diff --git a/...main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java b/...main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java
@@ -87,10 +87,6 @@ public String getHelp() {
     public void processOpts() {
         super.processOpts();
 
-        if (StringUtils.isBlank(templateDir)) {
-            embeddedTemplateDir = templateDir = getTemplateDir();
-        }
-
         modelTemplateFiles.put("model.mustache", ".ts");
         apiTemplateFiles.put("api.service.mustache", ".ts");