Merge pull request #45156 from quaff

philwebb · philwebb · commit a6f54ec5ea47 · 2025-04-11T09:19:10.000-07:00
* pr/45156: Polish ternary operator Closes gh-45156
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java
@@ -91,7 +91,7 @@ public List<LayerId> getLayers() {
 	 * @return the image OS
 	 */
 	public String getOs() {
-		return (!StringUtils.hasText(this.os)) ? "linux" : this.os;
+		return (StringUtils.hasText(this.os)) ? this.os : "linux";
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public List<LayerId> getLayers() {`
`91`	`91`	`* @return the image OS`
`92`	`92`	`*/`
`93`	`93`	`public String getOs() {`
`94`		`- return (!StringUtils.hasText(this.os)) ? "linux" : this.os;`
	`94`	`+ return (StringUtils.hasText(this.os)) ? this.os : "linux";`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/**`