Trim PEM-encoded text in PemContent.of

scottfrederick · Aug 21, 2024 · a5dd483 · a5dd483
1 parent a5d13d2
commit a5dd483
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...g-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java b/...g-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/...t-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java b/...t-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();
 	}
 
 }