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

Merge branch '2.1.x'

This commit is contained in:
Madhura Bhave 2019-07-29 11:08:38 -07:00
parent cee9e0f605 0420ee912c
commit 1b10ecbe1b
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java
View File

@ -19,9 +19,9 @@ 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.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
@ -72,13 +72,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 + "'");

9
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java
View File

@ -19,9 +19,9 @@ 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.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
@ -94,13 +94,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 + "'");