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

[maven] environmentVariables -> globalProperties (#7559)

Browse Source
This commit is contained in:
Jim Schubert
2020-10-01 21:33:17 -04:00
committed by GitHub
parent 206f3f7238
commit 150e24dc55
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
View File

@@ -407,12 +407,12 @@ public class CodeGenMojo extends AbstractMojo {
@Parameter(defaultValue = "false", property = "openapi.generator.maven.plugin.addTestCompileSourceRoot")
private boolean addTestCompileSourceRoot = false;
// TODO: Rename to global properties in version 5.0
// TODO: Rename to global properties in version 5.1
@Parameter
protected Map<String, String> environmentVariables = new HashMap<>();
@Parameter
protected Map<String, String> originalEnvironmentVariables = new HashMap<>();
protected Map<String, String> globalProperties = new HashMap<>();
@Parameter(property = "codegen.configHelp")
private boolean configHelp = false;
@@ -430,7 +430,6 @@ public class CodeGenMojo extends AbstractMojo {
@Override
public void execute() throws MojoExecutionException {
File inputSpecFile = new File(inputSpec);
resetEnvironmentVariables();
addCompileSourceRootIfConfigured();
try {
@@ -699,13 +698,19 @@ public class CodeGenMojo extends AbstractMojo {
applyReservedWordsMappingsKvpList(reservedWordsMappings, configurator);
}
if (environmentVariables != null) {
for (String key : environmentVariables.keySet()) {
originalEnvironmentVariables.put(key, GlobalSettings.getProperty(key));
String value = environmentVariables.get(key);
if (value != null) {
configurator.addGlobalProperty(key, value);
}
if (globalProperties == null) {
globalProperties = new HashMap<>();
}
if (environmentVariables != null && environmentVariables.size() > 0) {
globalProperties.putAll(environmentVariables);
getLog().warn("environmentVariables is deprecated and will be removed in version 5.1. Use globalProperties instead.");
}
for (String key : globalProperties.keySet()) {
String value = globalProperties.get(key);
if (value != null) {
configurator.addGlobalProperty(key, value);
}
}
@@ -857,19 +862,6 @@ public class CodeGenMojo extends AbstractMojo {
}
}
private void resetEnvironmentVariables() {
// Reset all environment variables to their original value. This prevents unexpected
// behaviour
// when running the plugin multiple consecutive times with different configurations.
for (Map.Entry<String, String> entry : originalEnvironmentVariables.entrySet()) {
if (entry.getValue() == null) {
GlobalSettings.clearProperty(entry.getKey());
} else {
GlobalSettings.setProperty(entry.getKey(), entry.getValue());
}
}
}
/**
* This method enables conversion of true/false strings in
* config.additionalProperties (configuration/configOptions) to proper booleans.