From 4dca6ee5d3fa188a56d74c71787cd86226b75652 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Thu, 5 Dec 2024 11:03:14 +0100 Subject: [PATCH] Polish "Only set imagePlatform if it has text" See gh-43424 --- .../main/java/org/springframework/boot/maven/Image.java | 2 +- .../java/org/springframework/boot/maven/ImageTests.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java index e90d901fc47..a681b031906 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java @@ -295,7 +295,7 @@ public class Image { if (StringUtils.hasText(this.applicationDirectory)) { request = request.withApplicationDirectory(this.applicationDirectory); } - if (!CollectionUtils.isEmpty(this.securityOptions)) { + if (this.securityOptions != null) { request = request.withSecurityOptions(this.securityOptions); } if (StringUtils.hasText(this.imagePlatform)) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java index 053ec87bd8e..12b37605436 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java @@ -49,6 +49,7 @@ import static org.assertj.core.api.Assertions.entry; * @author Scott Frederick * @author Jeroen Meijer * @author Rafael Ceccone + * @author Moritz Halbritter */ class ImageTests { @@ -290,6 +291,14 @@ class ImageTests { assertThat(request.getImagePlatform()).isEqualTo(ImagePlatform.of("linux/arm64")); } + @Test + void getBuildRequestWhenImagePlatformIsEmptyDoesntSetImagePlatform() { + Image image = new Image(); + image.imagePlatform = ""; + BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent()); + assertThat(request.getImagePlatform()).isNull(); + } + private Artifact createArtifact() { return new DefaultArtifact("com.example", "my-app", VersionRange.createFromVersion("0.0.1-SNAPSHOT"), "compile", "jar", null, new DefaultArtifactHandler());