Merge pull request #8246 from bigtlb/issue-8218

HugoMario · web-flow · commit f536de53e644 · 2018-06-07T18:59:15.000-05:00
Fixed DefaultGenerator.getHandleBars to not use a regex string for the templateDir
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -1011,7 +1011,7 @@ private Map<String, SecurityScheme> getAuthMethods(List<SecurityRequirement> sec
 
     private com.github.jknack.handlebars.Template getHandlebars(String templateFile) throws IOException {
         if (templateFile.startsWith(config.templateDir())) {
-            templateFile = templateFile.replaceFirst(config.templateDir(), StringUtils.EMPTY);
+            templateFile = StringUtils.replaceOnce(templateFile, config.templateDir(), StringUtils.EMPTY);
         }
         TemplateLoader templateLoader = null;
         if (config.additionalProperties().get(CodegenConstants.TEMPLATE_DIR) != null) {

Original file line number	Diff line number	Diff line change
`@@ -1011,7 +1011,7 @@ private Map<String, SecurityScheme> getAuthMethods(List<SecurityRequirement> sec`
`1011`	`1011`
`1012`	`1012`	`private com.github.jknack.handlebars.Template getHandlebars(String templateFile) throws IOException {`
`1013`	`1013`	`if (templateFile.startsWith(config.templateDir())) {`
`1014`		`- templateFile = templateFile.replaceFirst(config.templateDir(), StringUtils.EMPTY);`
	`1014`	`+ templateFile = StringUtils.replaceOnce(templateFile, config.templateDir(), StringUtils.EMPTY);`
`1015`	`1015`	`}`
`1016`	`1016`	`TemplateLoader templateLoader = null;`
`1017`	`1017`	`if (config.additionalProperties().get(CodegenConstants.TEMPLATE_DIR) != null) {`