root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #43424 from vonZeppelin 

* pr/43424:
  Polish "Only set imagePlatform if it has text"
  Only set imagePlatform if it has text

Closes gh-43424
This commit is contained in:
Moritz Halbritter 2024-12-05 11:21:42 +01:00
parent 48bc3b6412 4dca6ee5d3
commit efee347604
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,7 +257,7 @@ public class Image {
if (StringUtils.hasText(this.runImage)) { if (StringUtils.hasText(this.runImage)) {
request = request.withRunImage(ImageReference.of(this.runImage)); request = request.withRunImage(ImageReference.of(this.runImage));
} }
if (this.env != null && !this.env.isEmpty()) { if (!CollectionUtils.isEmpty(this.env)) {
request = request.withEnv(this.env); request = request.withEnv(this.env);
} }
if (this.cleanCache != null) { if (this.cleanCache != null) {
@ -298,7 +298,7 @@ public class Image {
if (this.securityOptions != null) { if (this.securityOptions != null) {
request = request.withSecurityOptions(this.securityOptions); request = request.withSecurityOptions(this.securityOptions);
} }
if (this.imagePlatform != null) { if (StringUtils.hasText(this.imagePlatform)) {
request = request.withImagePlatform(this.imagePlatform); request = request.withImagePlatform(this.imagePlatform);
} }
return request; return request;

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 Scott Frederick
* @author Jeroen Meijer * @author Jeroen Meijer
* @author Rafael Ceccone * @author Rafael Ceccone
* @author Moritz Halbritter
*/ */
class ImageTests { class ImageTests {
@ -290,6 +291,14 @@ class ImageTests {
assertThat(request.getImagePlatform()).isEqualTo(ImagePlatform.of("linux/arm64")); 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() { private Artifact createArtifact() {
return new DefaultArtifact("com.example", "my-app", VersionRange.createFromVersion("0.0.1-SNAPSHOT"), "compile", return new DefaultArtifact("com.example", "my-app", VersionRange.createFromVersion("0.0.1-SNAPSHOT"), "compile",
"jar", null, new DefaultArtifactHandler()); "jar", null, new DefaultArtifactHandler());