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
77a262c5
Commit
77a262c5
authored
Jul 29, 2019
by
Johnny Lim
Committed by
Madhura Bhave
Jul 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
See gh-17691
parent
73efce63
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
14 deletions
+4
-14
EmbeddedServletContainerWarDevelopmentIntegrationTests.java
...beddedServletContainerWarDevelopmentIntegrationTests.java
+2
-7
EmbeddedServletContainerWarPackagingIntegrationTests.java
...EmbeddedServletContainerWarPackagingIntegrationTests.java
+2
-7
No files found.
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java
View file @
77a262c5
...
@@ -19,10 +19,10 @@ package org.springframework.boot.context.embedded;
...
@@ -19,10 +19,10 @@ package org.springframework.boot.context.embedded;
import
java.io.BufferedReader
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.StringReader
;
import
java.io.StringReader
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
@@ -85,13 +85,8 @@ public class EmbeddedServletContainerWarDevelopmentIntegrationTests
...
@@ -85,13 +85,8 @@ public class EmbeddedServletContainerWarDevelopmentIntegrationTests
if
(
input
==
null
)
{
if
(
input
==
null
)
{
return
Collections
.
emptyList
();
return
Collections
.
emptyList
();
}
}
List
<
String
>
lines
=
new
ArrayList
<>();
try
(
BufferedReader
reader
=
new
BufferedReader
(
new
StringReader
(
input
)))
{
try
(
BufferedReader
reader
=
new
BufferedReader
(
new
StringReader
(
input
)))
{
String
line
;
return
reader
.
lines
().
collect
(
Collectors
.
toList
());
while
((
line
=
reader
.
readLine
())
!=
null
)
{
lines
.
add
(
line
);
}
return
lines
;
}
}
catch
(
IOException
ex
)
{
catch
(
IOException
ex
)
{
throw
new
RuntimeException
(
"Failed to read lines from input '"
+
input
+
"'"
);
throw
new
RuntimeException
(
"Failed to read lines from input '"
+
input
+
"'"
);
...
...
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java
View file @
77a262c5
...
@@ -19,10 +19,10 @@ package org.springframework.boot.context.embedded;
...
@@ -19,10 +19,10 @@ package org.springframework.boot.context.embedded;
import
java.io.BufferedReader
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.StringReader
;
import
java.io.StringReader
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
@@ -108,13 +108,8 @@ public class EmbeddedServletContainerWarPackagingIntegrationTests
...
@@ -108,13 +108,8 @@ public class EmbeddedServletContainerWarPackagingIntegrationTests
if
(
input
==
null
)
{
if
(
input
==
null
)
{
return
Collections
.
emptyList
();
return
Collections
.
emptyList
();
}
}
List
<
String
>
lines
=
new
ArrayList
<>();
try
(
BufferedReader
reader
=
new
BufferedReader
(
new
StringReader
(
input
)))
{
try
(
BufferedReader
reader
=
new
BufferedReader
(
new
StringReader
(
input
)))
{
String
line
;
return
reader
.
lines
().
collect
(
Collectors
.
toList
());
while
((
line
=
reader
.
readLine
())
!=
null
)
{
lines
.
add
(
line
);
}
return
lines
;
}
}
catch
(
IOException
ex
)
{
catch
(
IOException
ex
)
{
throw
new
RuntimeException
(
"Failed to read lines from input '"
+
input
+
"'"
);
throw
new
RuntimeException
(
"Failed to read lines from input '"
+
input
+
"'"
);
...
...
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