Skip to content

Commit 4dca6ee

Browse files
committed
Polish "Only set imagePlatform if it has text"
See gh-43424
1 parent fe1f9b3 commit 4dca6ee

File tree

2 files changed

+10
-1
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src

2 files changed

+10
-1
lines changed

Diff for: spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ private BuildRequest customize(BuildRequest request) {
295295
if (StringUtils.hasText(this.applicationDirectory)) {
296296
request = request.withApplicationDirectory(this.applicationDirectory);
297297
}
298-
if (!CollectionUtils.isEmpty(this.securityOptions)) {
298+
if (this.securityOptions != null) {
299299
request = request.withSecurityOptions(this.securityOptions);
300300
}
301301
if (StringUtils.hasText(this.imagePlatform)) {

Diff for: spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java

+9
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
* @author Scott Frederick
5050
* @author Jeroen Meijer
5151
* @author Rafael Ceccone
52+
* @author Moritz Halbritter
5253
*/
5354
class ImageTests {
5455

@@ -290,6 +291,14 @@ void getBuildRequestWhenHasImagePlatformUsesImagePlatform() {
290291
assertThat(request.getImagePlatform()).isEqualTo(ImagePlatform.of("linux/arm64"));
291292
}
292293

294+
@Test
295+
void getBuildRequestWhenImagePlatformIsEmptyDoesntSetImagePlatform() {
296+
Image image = new Image();
297+
image.imagePlatform = "";
298+
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
299+
assertThat(request.getImagePlatform()).isNull();
300+
}
301+
293302
private Artifact createArtifact() {
294303
return new DefaultArtifact("com.example", "my-app", VersionRange.createFromVersion("0.0.1-SNAPSHOT"), "compile",
295304
"jar", null, new DefaultArtifactHandler());

0 commit comments

Comments
 (0)