diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java index 8e062a6aff..9b17e56394 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java @@ -19,9 +19,9 @@ package org.springframework.boot.context.embedded; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import org.junit.jupiter.api.TestTemplate; @@ -72,13 +72,8 @@ public class EmbeddedServletContainerWarDevelopmentIntegrationTests { if (input == null) { return Collections.emptyList(); } - List lines = new ArrayList<>(); try (BufferedReader reader = new BufferedReader(new StringReader(input))) { - String line; - while ((line = reader.readLine()) != null) { - lines.add(line); - } - return lines; + return reader.lines().collect(Collectors.toList()); } catch (IOException ex) { throw new RuntimeException("Failed to read lines from input '" + input + "'"); diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java index 2b2f8cd312..f700c4305a 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java @@ -19,9 +19,9 @@ package org.springframework.boot.context.embedded; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import org.junit.jupiter.api.TestTemplate; @@ -94,13 +94,8 @@ public class EmbeddedServletContainerWarPackagingIntegrationTests { if (input == null) { return Collections.emptyList(); } - List lines = new ArrayList<>(); try (BufferedReader reader = new BufferedReader(new StringReader(input))) { - String line; - while ((line = reader.readLine()) != null) { - lines.add(line); - } - return lines; + return reader.lines().collect(Collectors.toList()); } catch (IOException ex) { throw new RuntimeException("Failed to read lines from input '" + input + "'");