Skip to content

Fixed template path resolvement to work also on Windows OS. #8284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 8, 2018
Merged

Fixed template path resolvement to work also on Windows OS. #8284

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fad1fc
Fixed template path resolvement to work also on Windows OS.
thomas-worm-datev Jun 5, 2018
b729c4c
Merge pull request #1 from thomas-worm-datev/thomas-worm-datev-patch-1
thomas-worm-datev Jun 5, 2018
7fdf209
fixed 'file not found exception' for custom templates issue on window…
HugoMario Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,6 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
} else {
templateFile = getFullTemplateFile(config, support.templateFile);
}
templateFile = templateFile.replace("\\", "/");

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

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

try {
Expand Down Expand Up @@ -1011,7 +1012,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) {
Expand Down