spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-02 23:39:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49816 from quaff

Browse Source 
* patch-209:
  Do not use String#replaceAll() with a non-regex pattern

Closes gh-49816
This commit is contained in:
Stéphane Nicoll
2026-03-27 11:44:23 +01:00
parent 9a74fd55d3 9520eb9622
commit 72cd3b5579
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemCertificateParser.java
+1 -1
View File
@@ -92,7 +92,7 @@ final class PemCertificateParser {
}
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);
}
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PemPrivateKeyParser.java
+1 -1
View File
@@ -240,7 +240,7 @@ final class PemPrivateKeyParser {
}
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);
}
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleTests.java
+1 -1
View File
@@ -482,7 +482,7 @@ class LifecycleTests {
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));
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/PemFileWriter.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class PemFileWriter {
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;
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemCertificateParser.java
+1 -1
View File
@@ -92,7 +92,7 @@ final class PemCertificateParser {
}
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);
}
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemPrivateKeyParser.java
+1 -1
View File
@@ -240,7 +240,7 @@ final class PemPrivateKeyParser {
}
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);
}