diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemCertificateParser.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemCertificateParser.java index d071747e46b3..0aa7a03818e0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemCertificateParser.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemCertificateParser.java @@ -92,7 +92,7 @@ private static void readCertificates(String text, CertificateFactory factory, Co } private static byte[] decodeBase64(String content) { - byte[] bytes = content.replaceAll("\r", "").replaceAll("\n", "").getBytes(); + byte[] bytes = content.replace("\r", "").replace("\n", "").getBytes(); return Base64.getDecoder().decode(bytes); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemPrivateKeyParser.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemPrivateKeyParser.java index 8c2c5fb93d67..0811efc2880a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemPrivateKeyParser.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemPrivateKeyParser.java @@ -240,7 +240,7 @@ PrivateKey parse(String text, String password) { } private static byte[] decodeBase64(String content) { - byte[] contentBytes = content.replaceAll("\r", "").replaceAll("\n", "").getBytes(); + byte[] contentBytes = content.replace("\r", "").replace("\n", "").getBytes(); return Base64.getDecoder().decode(contentBytes); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java index c395af596f20..5474cc97ca94 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java @@ -482,7 +482,7 @@ private Answer answerWithGeneratedContainerId() { return (invocation) -> { ContainerConfig config = invocation.getArgument(0, ContainerConfig.class); ArrayNode command = getCommand(config); - String name = command.get(0).asText().substring(1).replaceAll("/", "-"); + String name = command.get(0).asText().substring(1).replace('/', '-'); this.configs.put(name, config); if (invocation.getArguments().length > 2) { this.content.put(name, invocation.getArgument(2, ContainerContent.class)); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/PemFileWriter.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/PemFileWriter.java index 44e7d99a9dc3..ea8c11ad3cda 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/PemFileWriter.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/PemFileWriter.java @@ -181,7 +181,7 @@ public PemFileWriter() throws IOException { Path writeFile(String name, String... contents) throws IOException { Path path = Paths.get(this.tempDir.toString(), name); for (String content : contents) { - Files.write(path, content.replaceAll(EXAMPLE_SECRET_QUALIFIER, "").getBytes(), StandardOpenOption.CREATE, + Files.write(path, content.replace(EXAMPLE_SECRET_QUALIFIER, "").getBytes(), StandardOpenOption.CREATE, StandardOpenOption.APPEND); } return path; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemCertificateParser.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemCertificateParser.java index ca23b8d3f018..7076d4c9c898 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemCertificateParser.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemCertificateParser.java @@ -92,7 +92,7 @@ private static void readCertificates(String text, CertificateFactory factory, Co } private static byte[] decodeBase64(String content) { - byte[] bytes = content.replaceAll("\r", "").replaceAll("\n", "").getBytes(); + byte[] bytes = content.replace("\r", "").replace("\n", "").getBytes(); return Base64.getDecoder().decode(bytes); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemPrivateKeyParser.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemPrivateKeyParser.java index 324e5c6e5edd..dcc6b7a55729 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemPrivateKeyParser.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemPrivateKeyParser.java @@ -240,7 +240,7 @@ PrivateKey parse(String text, String password) { } private static byte[] decodeBase64(String content) { - byte[] contentBytes = content.replaceAll("\r", "").replaceAll("\n", "").getBytes(); + byte[] contentBytes = content.replace("\r", "").replace("\n", "").getBytes(); return Base64.getDecoder().decode(contentBytes); }