Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
0867ac57
Commit
0867ac57
authored
Jul 31, 2017
by
Björn
Committed by
Stephane Nicoll
Sep 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix handling of empty/null arguments
See gh-9916
parent
0e46d0f5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
RunArguments.java
...ain/java/org/springframework/boot/maven/RunArguments.java
+6
-2
RunArgumentsTests.java
...ava/org/springframework/boot/maven/RunArgumentsTests.java
+14
-0
No files found.
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
View file @
0867ac57
...
@@ -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
()
{
...
...
spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
View file @
0867ac57
...
@@ -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
(
" "
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment