From a5dd483248b4913477a87ff24b047e2945279c33 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Wed, 21 Aug 2024 16:18:11 -0500 Subject: [PATCH] Trim PEM-encoded text in PemContent.of --- .../java/org/springframework/boot/ssl/pem/PemContent.java | 4 +--- .../org/springframework/boot/ssl/pem/PemContentTests.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java index d91aee276b32..a0811d1b4e7c 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java @@ -54,9 +54,7 @@ public final class PemContent { private final String text; private PemContent(String text) { - this.text = Arrays.stream(StringUtils.tokenizeToStringArray(text, "\r\n")) - .map(String::trim) - .collect(Collectors.joining("\n")); + this.text = text.lines().map(String::trim).collect(Collectors.joining("\n")); } /** diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java index 68adbaac30a6..b022bd8f4910 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java @@ -211,7 +211,7 @@ void ofReturnsContent() { } private static String contentFromClasspath(String path) throws IOException { - return new ClassPathResource(path).getContentAsString(StandardCharsets.UTF_8).stripTrailing(); + return new ClassPathResource(path).getContentAsString(StandardCharsets.UTF_8).indent(0).stripTrailing(); } }