From 459acaa04a1a3c69c5d833a7428b7c8eb86ba1cf Mon Sep 17 00:00:00 2001 From: Alexandre Estela Date: Tue, 16 Aug 2016 10:22:41 +0200 Subject: [PATCH 1/4] Enabling knowledge of inputSpec path for custom generators --- .../main/java/io/swagger/codegen/CodegenConfig.java | 4 ++++ .../java/io/swagger/codegen/DefaultCodegen.java | 13 +++++++++++-- .../swagger/codegen/config/CodegenConfigurator.java | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java index 1f3d59432bd..4b0ef89593f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java @@ -79,6 +79,10 @@ public interface CodegenConfig { List supportingFiles(); + String getInputSpec(); + + void setInputSpec(String inputSpec); + String getOutputDir(); void setOutputDir(String dir); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 9ead076eb23..240228bb377 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -73,7 +73,8 @@ public class DefaultCodegen { protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class); - + + protected String inputSpec; protected String outputFolder = ""; protected Set defaultIncludes = new HashSet(); protected Map typeMapping = new HashMap(); @@ -507,7 +508,15 @@ public String getOutputDir() { return outputFolder(); } - public void setTemplateDir(String templateDir) { + public String getInputSpec() { + return inputSpec; + } + + public void setInputSpec(String inputSpec) { + this.inputSpec = inputSpec; + } + + public void setTemplateDir(String templateDir) { this.templateDir = templateDir; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java index 4ac39d5296f..5b572645513 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java @@ -352,6 +352,7 @@ public ClientOptInput toClientOptInput() { CodegenConfig config = CodegenConfigLoader.forName(lang); + config.setInputSpec(inputSpec); config.setOutputDir(outputDir); config.setSkipOverwrite(skipOverwrite); From 74d9cf9986d715f56e0dec9557bd8f7bf962660b Mon Sep 17 00:00:00 2001 From: Alexandre Estela Date: Tue, 16 Aug 2016 10:22:41 +0200 Subject: [PATCH 2/4] Enabling knowledge of inputSpec path for custom generators --- .../main/java/io/swagger/codegen/CodegenConfig.java | 4 ++++ .../java/io/swagger/codegen/DefaultCodegen.java | 13 +++++++++++-- .../swagger/codegen/config/CodegenConfigurator.java | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java index 1f3d59432bd..4b0ef89593f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java @@ -79,6 +79,10 @@ public interface CodegenConfig { List supportingFiles(); + String getInputSpec(); + + void setInputSpec(String inputSpec); + String getOutputDir(); void setOutputDir(String dir); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 9ead076eb23..240228bb377 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -73,7 +73,8 @@ public class DefaultCodegen { protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class); - + + protected String inputSpec; protected String outputFolder = ""; protected Set defaultIncludes = new HashSet(); protected Map typeMapping = new HashMap(); @@ -507,7 +508,15 @@ public String getOutputDir() { return outputFolder(); } - public void setTemplateDir(String templateDir) { + public String getInputSpec() { + return inputSpec; + } + + public void setInputSpec(String inputSpec) { + this.inputSpec = inputSpec; + } + + public void setTemplateDir(String templateDir) { this.templateDir = templateDir; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java index 4ac39d5296f..5b572645513 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java @@ -352,6 +352,7 @@ public ClientOptInput toClientOptInput() { CodegenConfig config = CodegenConfigLoader.forName(lang); + config.setInputSpec(inputSpec); config.setOutputDir(outputDir); config.setSkipOverwrite(skipOverwrite); From 5c1c9eb0b0ba4c1f8dd88ea67202920a509d17fa Mon Sep 17 00:00:00 2001 From: Alexandre Estela Date: Tue, 16 Aug 2016 11:15:55 +0200 Subject: [PATCH 3/4] Enabling direct use of "inputSpec" property in templates --- .../src/main/java/io/swagger/codegen/DefaultGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f92caf3014c..ad23c1b2018 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 @@ -140,7 +140,8 @@ public List generate() { config.additionalProperties().put("generatedDate", DateTime.now().toString()); config.additionalProperties().put("generatorClass", config.getClass().toString()); - + config.additionalProperties().put("inputSpec", config.getInputSpec()); + if (swagger.getInfo() != null) { Info info = swagger.getInfo(); if (info.getTitle() != null) { From 5f190b86871451e84cbb75644f16d3a7861f95aa Mon Sep 17 00:00:00 2001 From: Alexandre Estela Date: Wed, 17 Aug 2016 13:59:06 +0200 Subject: [PATCH 4/4] Fixing spaces --- .../main/java/io/swagger/codegen/DefaultCodegen.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 240228bb377..f7138a8f5f8 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -509,14 +509,14 @@ public String getOutputDir() { } public String getInputSpec() { - return inputSpec; - } + return inputSpec; + } - public void setInputSpec(String inputSpec) { - this.inputSpec = inputSpec; - } + public void setInputSpec(String inputSpec) { + this.inputSpec = inputSpec; + } - public void setTemplateDir(String templateDir) { + public void setTemplateDir(String templateDir) { this.templateDir = templateDir; }