From 412f857afdae076000a51f37a32dba2d77da0bfe Mon Sep 17 00:00:00 2001 From: Mitsuo Takaki Date: Wed, 12 Apr 2017 23:14:55 -0700 Subject: [PATCH 1/2] Moving import-mappings out of configOptions and converting it into a list, rather than being a comma-separated string. #5383 --- .../io/swagger/codegen/plugin/CodeGenMojo.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java index dd8c08dfb68..e37374d9817 100644 --- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java +++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java @@ -26,6 +26,7 @@ import java.io.File; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.apache.maven.plugin.AbstractMojo; @@ -174,6 +175,9 @@ public class CodeGenMojo extends AbstractMojo { @Parameter(name = "configOptions") private Map configOptions; + @Parameter(name = "importMappings") + private List importMappings; + /** * Generate the apis */ @@ -377,10 +381,6 @@ public void execute() throws MojoExecutionException { applyInstantiationTypesKvp(configOptions.get("instantiation-types").toString(), configurator); } - if(configOptions.containsKey("import-mappings")) { - applyImportMappingsKvp(configOptions.get("import-mappings").toString(), configurator); - } - if(configOptions.containsKey("type-mappings")) { applyTypeMappingsKvp(configOptions.get("type-mappings").toString(), configurator); } @@ -392,12 +392,17 @@ public void execute() throws MojoExecutionException { if(configOptions.containsKey("additional-properties")) { applyAdditionalPropertiesKvp(configOptions.get("additional-properties").toString(), configurator); } - + if(configOptions.containsKey("reserved-words-mappings")) { applyReservedWordsMappingsKvp(configOptions.get("reserved-words-mappings").toString(), configurator); } } + if (importMappings != null) { + String importMappingsAsString = importMappings.toString(); + applyImportMappingsKvp(importMappingsAsString.substring(0, importMappingsAsString.length() - 1), configurator); + } + if (environmentVariables != null) { for(String key : environmentVariables.keySet()) { From 65fa408618b3b10594a808556fdb50e77e6d9a56 Mon Sep 17 00:00:00 2001 From: Mitsuo Takaki Date: Wed, 12 Apr 2017 23:44:47 -0700 Subject: [PATCH 2/2] Making the change to importMappings backwards compatible --- .../main/java/io/swagger/codegen/plugin/CodeGenMojo.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java index e37374d9817..6a83deb0261 100644 --- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java +++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java @@ -381,6 +381,10 @@ public void execute() throws MojoExecutionException { applyInstantiationTypesKvp(configOptions.get("instantiation-types").toString(), configurator); } + if(importMappings == null && configOptions.containsKey("import-mappings")) { + applyImportMappingsKvp(configOptions.get("import-mappings").toString(), configurator); + } + if(configOptions.containsKey("type-mappings")) { applyTypeMappingsKvp(configOptions.get("type-mappings").toString(), configurator); } @@ -398,7 +402,7 @@ public void execute() throws MojoExecutionException { } } - if (importMappings != null) { + if (importMappings != null && !configOptions.containsKey("import-mappings")) { String importMappingsAsString = importMappings.toString(); applyImportMappingsKvp(importMappingsAsString.substring(0, importMappingsAsString.length() - 1), configurator); }