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

create a specific var for custom template and update generators

Author: HugoMario

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() {

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));

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 {

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));
         }

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

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);

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

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

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

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.");