loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge pull request #867 from wing328/fix_jar_path

Browse Source 
[Bug fix] Fix path inside JAR for non-template files
This commit is contained in:
Tony Tam 2015-06-17 08:28:30 -07:00
commit f66b5cf65b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
View File

@ -60,10 +60,10 @@ public abstract class AbstractGenerator {
throw new RuntimeException("can't load template " + name); throw new RuntimeException("can't load template " + name);
} }
private String getCPResourcePath(String name) { public String getCPResourcePath(String name) {
if (!"/".equals(File.separator)) { if (!"/".equals(File.separator)) {
return name.replaceAll(Pattern.quote(File.separator), "/"); return name.replaceAll(Pattern.quote(File.separator), "/");
} }
return name; return name;
} }
} }

3
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
View File

@ -268,11 +268,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
// continue // continue
} }
if (in == null) { if (in == null) {
in = this.getClass().getClassLoader().getResourceAsStream(config.templateDir() + File.separator + support.templateFile); in = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(config.templateDir() + File.separator + support.templateFile));
} }
File outputFile = new File(outputFilename); File outputFile = new File(outputFilename);
OutputStream out = new FileOutputStream(outputFile, false); OutputStream out = new FileOutputStream(outputFile, false);
if (in != null && out != null) { if (in != null && out != null) {
System.out.println("writing file " + outputFile);
IOUtils.copy(in, out); IOUtils.copy(in, out);
} else { } else {
if (in == null) { if (in == null) {