From 165c11666162381992fe743ad5278243502ec9a2 Mon Sep 17 00:00:00 2001 From: mtakaki Date: Tue, 23 May 2017 06:46:27 -0700 Subject: [PATCH] Moving import-mappings out of configOptions and converting it into a list, rather than being a comma-separated string. (#5384) * Moving import-mappings out of configOptions and converting it into a list, rather than being a comma-separated string. #5383 * Making the change to importMappings backwards compatible --- .../java/io/swagger/codegen/plugin/CodeGenMojo.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 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 510326cb365..0688b866697 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 static org.apache.commons.lang3.StringUtils.isNotEmpty; import java.io.File; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.apache.maven.plugin.AbstractMojo; @@ -180,6 +181,9 @@ public class CodeGenMojo extends AbstractMojo { @Parameter(name = "configOptions") private Map configOptions; + @Parameter(name = "importMappings") + private List importMappings; + /** * Generate the apis */ @@ -387,7 +391,7 @@ public class CodeGenMojo extends AbstractMojo { applyInstantiationTypesKvp(configOptions.get("instantiation-types").toString(), configurator); } - if(configOptions.containsKey("import-mappings")) { + if(importMappings == null && configOptions.containsKey("import-mappings")) { applyImportMappingsKvp(configOptions.get("import-mappings").toString(), configurator); } @@ -402,12 +406,17 @@ public class CodeGenMojo extends AbstractMojo { 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 && !configOptions.containsKey("import-mappings")) { + String importMappingsAsString = importMappings.toString(); + applyImportMappingsKvp(importMappingsAsString.substring(0, importMappingsAsString.length() - 1), configurator); + } + if (environmentVariables != null) { for(String key : environmentVariables.keySet()) {