From 31a198dd453f9aa16940199ded4be7c72675d3d8 Mon Sep 17 00:00:00 2001 From: YiXuan Ding <1328032567@qq.com> Date: Mon, 28 Oct 2024 23:21:22 +0800 Subject: [PATCH 1/3] : add '@JsonIgnore' to avoid authHeader be serialization. --- .../configuration/JsonEncodedDockerRegistryAuthentication.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java index 6567cdec43b3..8f46104beb25 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java @@ -22,6 +22,7 @@ import org.springframework.boot.buildpack.platform.json.SharedObjectMapper; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * {@link DockerRegistryAuthentication} that uses a Base64 encoded auth header value based * on the JSON created from the instance. @@ -30,6 +31,7 @@ */ class JsonEncodedDockerRegistryAuthentication implements DockerRegistryAuthentication { + @JsonIgnore private String authHeader; @Override From d124abff2d0da2105cf5bc8d9957f4265d02c4d9 Mon Sep 17 00:00:00 2001 From: YiXuan Ding <1328032567@qq.com> Date: Tue, 29 Oct 2024 00:26:57 +0800 Subject: [PATCH 2/3] : run command `./gradlew format --warning-mode all` to fix format error. --- .../configuration/JsonEncodedDockerRegistryAuthentication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java index 8f46104beb25..555992e03b8a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java @@ -23,6 +23,7 @@ import org.springframework.boot.buildpack.platform.json.SharedObjectMapper; import com.fasterxml.jackson.annotation.JsonIgnore; + /** * {@link DockerRegistryAuthentication} that uses a Base64 encoded auth header value based * on the JSON created from the instance. From 36684756db6fd394000ee5a96e8bbcd898d5f88e Mon Sep 17 00:00:00 2001 From: YiXuan Ding <1328032567@qq.com> Date: Tue, 29 Oct 2024 01:18:39 +0800 Subject: [PATCH 3/3] : run `./gradlew checkstyleMain` command to fix package import order error. --- .../configuration/JsonEncodedDockerRegistryAuthentication.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java index 555992e03b8a..515b05afa797 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/JsonEncodedDockerRegistryAuthentication.java @@ -18,12 +18,11 @@ import java.util.Base64; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonProcessingException; import org.springframework.boot.buildpack.platform.json.SharedObjectMapper; -import com.fasterxml.jackson.annotation.JsonIgnore; - /** * {@link DockerRegistryAuthentication} that uses a Base64 encoded auth header value based * on the JSON created from the instance.