From 5c0ae7babecebc5e1cb9ba8d8008720806af4837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herve=CC=81=20Darritchon?= Date: Sun, 26 Jul 2015 12:11:29 +0200 Subject: [PATCH] Defect (PR #905) : Add code to be able to override the configPackage in the spring mvc template. --- .../languages/SpringMVCServerCodegen.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java index 62642183906..8ee34768b5e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java @@ -1,10 +1,6 @@ package io.swagger.codegen.languages; -import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenOperation; -import io.swagger.codegen.CodegenResponse; -import io.swagger.codegen.CodegenType; -import io.swagger.codegen.SupportingFile; +import io.swagger.codegen.*; import io.swagger.models.Operation; import io.swagger.models.properties.ArrayProperty; import io.swagger.models.properties.MapProperty; @@ -28,7 +24,7 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen protected String configPackage = ""; public SpringMVCServerCodegen() { - super.processOpts(); + super(); outputFolder = "generated-code/javaSpringMVC"; modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); @@ -56,6 +52,9 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen "Long", "Float") ); + + cliOptions.add(new CliOption("configPackage", "configuration package for generated code")); + } public CodegenType getTag() { @@ -74,6 +73,10 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen public void processOpts() { super.processOpts(); + if (additionalProperties.containsKey("configPackage")) { + this.setConfigPackage((String) additionalProperties.get("configPackage")); + } + supportingFiles.clear(); supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); @@ -183,5 +186,9 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen } return objs; } + + public void setConfigPackage(String configPackage) { + this.configPackage = configPackage; + } }