loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 22:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

stop reading custom template file from subdirectories

Browse Source
This commit is contained in:
tao 2016-06-03 16:08:07 -07:00
parent 34fed26e79
commit 83e8a2e90c
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,17 +72,13 @@ public abstract class AbstractGenerator {
* @return String Full template file path * @return String Full template file path
*/ */
public String getFullTemplateFile(CodegenConfig config, String templateFile) { public String getFullTemplateFile(CodegenConfig config, String templateFile) {
String template = config.templateDir() + File.separator + templateFile;
if (new File(template).exists()) {
return template;
} else {
String library = config.getLibrary(); String library = config.getLibrary();
if (library != null && !"".equals(library)) { if (library != null && !"".equals(library)) {
String libTemplateFile = config.templateDir() + File.separator + String libTemplateFile = config.embeddedTemplateDir() + File.separator +
"libraries" + File.separator + library + File.separator +
templateFile;
if (new File(libTemplateFile).exists()) {
return libTemplateFile;
}
libTemplateFile = config.embeddedTemplateDir() + File.separator +
"libraries" + File.separator + library + File.separator + "libraries" + File.separator + library + File.separator +
templateFile; templateFile;
if (embeddedTemplateExists(libTemplateFile)) { if (embeddedTemplateExists(libTemplateFile)) {
@ -90,10 +86,6 @@ public abstract class AbstractGenerator {
return libTemplateFile; return libTemplateFile;
} }
} }
String template = config.templateDir() + File.separator + templateFile;
if (new File(template).exists()) {
return template;
} else {
// Fall back to the template file embedded/packaged in the JAR file... // Fall back to the template file embedded/packaged in the JAR file...
return config.embeddedTemplateDir() + File.separator + templateFile; return config.embeddedTemplateDir() + File.separator + templateFile;
} }