From 7a560865a0b1ea957d9a56c2830346cd1b12cf31 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 14 Jun 2015 00:59:40 +0800 Subject: [PATCH 1/2] fix jar path in windows --- .../src/main/java/io/swagger/codegen/AbstractGenerator.java | 4 ++-- .../src/main/java/io/swagger/codegen/DefaultGenerator.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java index 54a2f7efae0..ac377153625 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java @@ -60,10 +60,10 @@ public abstract class AbstractGenerator { throw new RuntimeException("can't load template " + name); } - private String getCPResourcePath(String name) { + public String getCPResourcePath(String name) { if (!"/".equals(File.separator)) { return name.replaceAll(Pattern.quote(File.separator), "/"); } return name; } -} \ No newline at end of file +} 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 index a04e517bee5..27e10db125f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -268,7 +268,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { // continue } 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); OutputStream out = new FileOutputStream(outputFile, false); From 24b110be9d18d7dd78fc6dd4c98dd6028c5b415d Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 14 Jun 2015 01:27:47 +0800 Subject: [PATCH 2/2] show writing file for non-template file --- .../src/main/java/io/swagger/codegen/DefaultGenerator.java | 1 + 1 file changed, 1 insertion(+) 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 index 27e10db125f..0ad05b0762b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -273,6 +273,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { File outputFile = new File(outputFilename); OutputStream out = new FileOutputStream(outputFile, false); if (in != null && out != null) { + System.out.println("writing file " + outputFile); IOUtils.copy(in, out); } else { if (in == null) {