root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of empty/null arguments 

See gh-9916
This commit is contained in:
Björn 2017-07-31 15:31:29 +02:00 committed by Stephane Nicoll
parent 0e46d0f586
commit 0867ac5777
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
View File

@ -21,6 +21,8 @@ import java.util.LinkedList;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.springframework.util.StringUtils;
/**
* Parse and expose arguments specified in a single string.
*
@ -31,14 +33,16 @@ class RunArguments {
private static final String[] NO_ARGS = {};
private final LinkedList<String> args;
private final LinkedList<String> args = new LinkedList<>();
RunArguments(String arguments) {
this(parseArgs(arguments));
}
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() {

14
spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
View File

@ -34,6 +34,20 @@ public class RunArgumentsTests {
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
public void parseEmpty() {
String[] args = parseArgs(" ");