Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Only set imagePlatform if it has text"

Browse Source 
See gh-43424
This commit is contained in:
Moritz Halbritter
2024-12-05 11:03:14 +01:00
parent fe1f9b3002
commit 4dca6ee5d3
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/Image.java
View File

@@ -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)) {

9
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java
View File

@@ -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());