loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

Browse Source
This commit is contained in:
wing328 2017-05-24 15:56:00 +08:00
commit 296e0288ea
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
View File

@ -26,6 +26,7 @@ import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
@ -180,6 +181,9 @@ public class CodeGenMojo extends AbstractMojo {
@Parameter(name = "configOptions") @Parameter(name = "configOptions")
private Map<?, ?> configOptions; private Map<?, ?> configOptions;
@Parameter(name = "importMappings")
private List<String> importMappings;
/** /**
* Generate the apis * Generate the apis
*/ */
@ -387,7 +391,7 @@ public class CodeGenMojo extends AbstractMojo {
applyInstantiationTypesKvp(configOptions.get("instantiation-types").toString(), configurator); 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); applyImportMappingsKvp(configOptions.get("import-mappings").toString(), configurator);
} }
@ -408,6 +412,11 @@ public class CodeGenMojo extends AbstractMojo {
} }
} }
if (importMappings != null && !configOptions.containsKey("import-mappings")) {
String importMappingsAsString = importMappings.toString();
applyImportMappingsKvp(importMappingsAsString.substring(0, importMappingsAsString.length() - 1), configurator);
}
if (environmentVariables != null) { if (environmentVariables != null) {
for(String key : environmentVariables.keySet()) { for(String key : environmentVariables.keySet()) {