Merge pull request #10348 from swagger-api/issue-10272

override specific templates

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/AbstractGenerator.java

@@ -86,13 +86,25 @@ public String getFullTemplateFile(CodegenConfig config, String templateFile) {
         final String library = config.getLibrary();
         if (StringUtils.isNotEmpty(library)) {
             //look for the file in the library subfolder of the supplied template
+            if (StringUtils.isNotBlank(config.customTemplateDir())) {
+                final String libTemplateFile = buildLibraryFilePath(config.customTemplateDir(), library, templateFile);
+                if (new File(libTemplateFile).exists()) {
+                    return libTemplateFile;
+                }
+            }
             final String libTemplateFile = buildLibraryFilePath(config.templateDir(), library, templateFile);
             if (new File(libTemplateFile).exists()) {
                 return libTemplateFile;
             }
         }
 
         //check the supplied template main folder for the file
+        if (StringUtils.isNotBlank(config.customTemplateDir())) {
+            final String template = config.customTemplateDir() + File.separator + templateFile;
+            if (new File(template).exists()) {
+                return template;
+            }
+        }
         final String template = config.templateDir() + File.separator + templateFile;
         if (new File(template).exists()) {
             return template;

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

@@ -41,6 +41,8 @@ public interface CodegenConfig {
 
     String embeddedTemplateDir();
 
+    String customTemplateDir();
+
     String getTemplateVersion();
 
     String modelFileFolder();

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/templates/HandlebarTemplateEngine.java

@@ -8,6 +8,7 @@
 import io.swagger.codegen.v3.CodegenConstants;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
@@ -31,20 +32,30 @@ public String getName() {
     }
 
     private com.github.jknack.handlebars.Template getHandlebars(String templateFile) throws IOException {
+        final boolean needFileTemplateLoader = StringUtils.isNotBlank(config.customTemplateDir());
+        final boolean fileExist = new File(templateFile).exists();
         templateFile = templateFile.replace(".mustache", StringUtils.EMPTY).replace("\\", "/");
-        String templateDir = config.templateDir().replace(".mustache", StringUtils.EMPTY).replace("\\", "/");
-        if (templateFile.startsWith(templateDir)) {
-            templateFile = StringUtils.replaceOnce(templateFile, templateDir, StringUtils.EMPTY);
-        }
+        final String templateDir;
         TemplateLoader templateLoader = null;
-        if (config.additionalProperties().get(CodegenConstants.TEMPLATE_DIR) != null) {
+        if (needFileTemplateLoader && fileExist) {
+            templateDir = config.customTemplateDir().replace("\\", "/");
+            templateFile = resolveTemplateFile(templateDir, templateFile);
             templateLoader = new FileTemplateLoader(templateDir, ".mustache");
         } else {
+            templateDir = config.templateDir().replace("\\", "/");
+            templateFile = resolveTemplateFile(templateDir, templateFile);
             templateLoader = new ClassPathTemplateLoader("/" + templateDir, ".mustache");
         }
         final Handlebars handlebars = new Handlebars(templateLoader);
         handlebars.prettyPrint(true);
         config.addHandlebarHelpers(handlebars);
         return handlebars.compile(templateFile);
     }
+
+    private String resolveTemplateFile(String templateDir, String templateFile) {
+        if (templateFile.startsWith(templateDir)) {
+            templateFile = StringUtils.replaceOnce(templateFile, templateDir, StringUtils.EMPTY);
+        }
+        return templateFile;
+    }
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/templates/MustacheTemplateEngine.java

@@ -87,7 +87,7 @@ public Reader getTemplateReader(String name) {
 
     public String getFullTemplateFile(CodegenConfig config, String templateFile) {
         final String library = config.getLibrary();
-        final String libTemplateFile = new StringBuilder(config.templateDir())
+        final String libTemplateFile = new StringBuilder(config.customTemplateDir())
                 .append(File.separator)
                 .append("libraries")
                 .append(File.separator)
@@ -98,7 +98,7 @@ public String getFullTemplateFile(CodegenConfig config, String templateFile) {
                 return libTemplateFile;
             }
         }
-        final String template = config.templateDir() + File.separator + templateFile;
+        final String template = config.customTemplateDir() + File.separator + templateFile;
         if (new File(template).exists()) {
             return template;
         }