apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2026-01-13 07:04:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make Environment methods related to command line options more homogeneous

Browse Source
This commit is contained in:
Guillaume Nodet
2020-12-09 23:31:08 +01:00
parent 68a363c696
commit 8b9ba24713
5 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
View File

@@ -322,7 +322,7 @@ public enum Environment {
return property + "=" + type.normalize(value);
}
public void appendAsCommandLineOption(List<String> args, String value) {
public void addCommandLineOption(Collection<String> args, String value) {
if (!options.isEmpty()) {
args.add(options.get(0));
args.add(type.normalize(value));
@@ -331,26 +331,12 @@ public enum Environment {
}
}
public boolean hasCommandOption(Collection<String> args) {
public boolean hasCommandLineOption(Collection<String> args) {
final String[] prefixes = getPrefixes();
return args.stream().anyMatch(arg -> Stream.of(prefixes).anyMatch(arg::startsWith));
}
private String[] getPrefixes() {
final String[] prefixes;
if (options.isEmpty()) {
prefixes = new String[] { "-D" + property + "=" };
} else if (property != null) {
prefixes = new String[options.size() + 1];
options.toArray(prefixes);
prefixes[options.size()] = "-D" + property + "=";
} else {
prefixes = options.toArray(new String[0]);
}
return prefixes;
}
public String removeCommandLineOption(List<String> args) {
public String removeCommandLineOption(Collection<String> args) {
final String[] prefixes = getPrefixes();
String value = null;
for (Iterator<String> it = args.iterator(); it.hasNext();) {
@@ -378,6 +364,20 @@ public enum Environment {
return value;
}
private String[] getPrefixes() {
final String[] prefixes;
if (options.isEmpty()) {
prefixes = new String[] { "-D" + property + "=" };
} else if (property != null) {
prefixes = new String[options.size() + 1];
options.toArray(prefixes);
prefixes[options.size()] = "-D" + property + "=";
} else {
prefixes = options.toArray(new String[0]);
}
return prefixes;
}
public static String cygpath(String result) {
String path = result.replace('/', '\\');
if (path.matches("\\\\cygdrive\\\\[a-z]\\\\.*")) {