Skip to content

Commit 5752e5c

Browse files
authored
Merge pull request #8284 from thomas-worm-datev/3.0.0
Fixed template path resolvement to work also on Windows OS.
2 parents f536de5 + 7fdf209 commit 5752e5c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,6 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
565565
} else {
566566
templateFile = getFullTemplateFile(config, support.templateFile);
567567
}
568-
templateFile = templateFile.replace("\\", "/");
569568

570569
boolean shouldGenerate = true;
571570
if(supportingFilesToGenerate != null && !supportingFilesToGenerate.isEmpty()) {
@@ -576,6 +575,7 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
576575
}
577576

578577
if(ignoreProcessor.allowsFile(new File(outputFilename))) {
578+
templateFile = templateFile.replaceAll("//", "/").replace('/', File.separatorChar);
579579
if (templateFile.endsWith("mustache")) {
580580
String templateName = templateFile;
581581
final com.github.jknack.handlebars.Template hTemplate = getHandlebars(templateName.replace(config.templateDir(), StringUtils.EMPTY));
@@ -585,6 +585,7 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
585585
// writeToFile(outputFilename, tmpl.execute(bundle));
586586
files.add(new File(outputFilename));
587587
} else {
588+
templateFile = templateFile.replace("\\", "/");
588589
InputStream in = null;
589590

590591
try {

0 commit comments

Comments
 (0)