Commit 0867ac57 authored by Björn's avatar Björn Committed by Stephane Nicoll

Fix handling of empty/null arguments

See gh-9916
parent 0e46d0f5
...@@ -21,6 +21,8 @@ import java.util.LinkedList; ...@@ -21,6 +21,8 @@ import java.util.LinkedList;
import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.springframework.util.StringUtils;
/** /**
* Parse and expose arguments specified in a single string. * Parse and expose arguments specified in a single string.
* *
...@@ -31,14 +33,16 @@ class RunArguments { ...@@ -31,14 +33,16 @@ class RunArguments {
private static final String[] NO_ARGS = {}; private static final String[] NO_ARGS = {};
private final LinkedList<String> args; private final LinkedList<String> args = new LinkedList<>();
RunArguments(String arguments) { RunArguments(String arguments) {
this(parseArgs(arguments)); this(parseArgs(arguments));
} }
RunArguments(String[] args) { RunArguments(String[] args) {
this.args = new LinkedList<>(Arrays.asList(args)); if (args != null) {
Arrays.stream(args).filter(StringUtils::hasLength).forEach(this.args::add);
}
} }
public LinkedList<String> getArgs() { public LinkedList<String> getArgs() {
......
...@@ -34,6 +34,20 @@ public class RunArgumentsTests { ...@@ -34,6 +34,20 @@ public class RunArgumentsTests {
assertThat(args.length).isEqualTo(0); assertThat(args.length).isEqualTo(0);
} }
@Test
public void parseNullArray() {
String[] args = new RunArguments((String[]) null).asArray();
assertThat(args).isNotNull();
assertThat(args.length).isEqualTo(0);
}
@Test
public void parseArrayContainingNullValue() {
String[] args = new RunArguments(new String[]{null}).asArray();
assertThat(args).isNotNull();
assertThat(args.length).isEqualTo(0);
}
@Test @Test
public void parseEmpty() { public void parseEmpty() {
String[] args = parseArgs(" "); String[] args = parseArgs(" ");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment