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

[CLI] #5147: make -D work like system properties (#5191)

Browse Source 
* Issue #5147: allow empty values for properties.

* Issue #5147: Allow multiple `-D` options.

* Issue #5147: take advantage (and demonstrate) the new usage of -D.

* Issue #5147: also update windows script and security ones.
This commit is contained in:
Paŭlo Ebermann
2017-06-16 11:29:44 +02:00
committed by wing328
parent 1f1e92d964
commit ec448a6167
18 changed files with 127 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfiguratorUtils.java
View File

@@ -16,6 +16,12 @@ import java.util.*;
*/
public final class CodegenConfiguratorUtils {
public static void applySystemPropertiesKvpList(List<String> systemProperties, CodegenConfigurator configurator) {
for(String propString : systemProperties) {
applySystemPropertiesKvp(propString, configurator);
}
}
public static void applySystemPropertiesKvp(String systemProperties, CodegenConfigurator configurator) {
final Map<String, String> map = createMapFromKeyValuePairs(systemProperties);
for (Map.Entry<String, String> entry : map.entrySet()) {
@@ -81,6 +87,4 @@ public final class CodegenConfiguratorUtils {
return result;
}
}

13
modules/swagger-codegen/src/main/java/io/swagger/codegen/utils/OptionUtils.java
View File

@@ -2,28 +2,29 @@ package io.swagger.codegen.utils;
import org.apache.commons.lang3.tuple.Pair;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import joptsimple.internal.Strings;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
public class OptionUtils {
public static List<Pair<String, String>> parseCommaSeparatedTuples(String input) {
public static List<Pair<String, String>> parseCommaSeparatedTuples(final String input) {
List<Pair<String, String>> results = new ArrayList<Pair<String, String>>();
final List<Pair<String, String>> results = new ArrayList<Pair<String, String>>();
final List<String> tuples = splitCommaSeparatedList(input);
for (String tuple : tuples) {
int ix = tuple.indexOf('=');
if (ix > 0 && ix < tuple.length() - 1) {
if (ix > 0 && ix <= tuple.length() - 1) {
final Pair<String, String> pair = Pair.of(tuple.substring(0, ix), tuple.substring(ix + 1));
results.add(pair);
} else if (ix < 0){
final Pair<String, String> pair = Pair.of(tuple, "");
results.add(pair);
}
}
//Strings.isNullOrEmpty(input)
return results;
}