Merge pull request #7982 from swagger-api/issue-7721

Issue 7721

Author: HugoMario

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

@@ -1013,7 +1013,12 @@ private com.github.jknack.handlebars.Template getHandlebars(String templateFile)
         if (templateFile.startsWith(config.templateDir())) {
             templateFile = templateFile.replaceFirst(config.templateDir(), StringUtils.EMPTY);
         }
-        final TemplateLoader templateLoader = new ClassPathTemplateLoader("/" + config.templateDir(), ".mustache");
+        TemplateLoader templateLoader = null;
+        if (config.additionalProperties().get(CodegenConstants.TEMPLATE_DIR) != null) {
+            templateLoader = new FileTemplateLoader(config.templateDir(), ".mustache");
+        } else {
+            templateLoader = new ClassPathTemplateLoader("/" + config.templateDir(), ".mustache");
+        }
         final Handlebars handlebars = new Handlebars(templateLoader);
         config.addHandlebarHelpers(handlebars);