Merge branch '3.1.x' into 3.2.x

mhalbritter · mhalbritter · commit 364af04377fc · 2024-05-13T11:30:42.000+02:00
Closes gh-40700
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthProperties.java
@@ -25,6 +25,7 @@
 
 import org.springframework.boot.actuate.endpoint.Show;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Properties used to configure the health endpoint and endpoint groups.
@@ -92,7 +93,7 @@ public List<String> getOrder() {
 		}
 
 		public void setOrder(List<String> statusOrder) {
-			if (statusOrder != null && !statusOrder.isEmpty()) {
+			if (!CollectionUtils.isEmpty(statusOrder)) {
 				this.order = statusOrder;
 			}
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
@@ -25,6 +25,7 @@
 
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -388,7 +389,7 @@ public ConditionMessage items(Style style, Collection<?> items) {
 			else if (StringUtils.hasLength(this.plural)) {
 				message.append(" ").append(this.plural);
 			}
-			if (items != null && !items.isEmpty()) {
+			if (!CollectionUtils.isEmpty(items)) {
 				message.append(" ").append(StringUtils.collectionToDelimitedString(items, ", "));
 			}
 			return this.condition.because(message.toString());
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuilderException.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuilderException.java
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.buildpack.platform.build;
 
+import org.springframework.util.StringUtils;
+
 /**
  * Exception thrown to indicate a Builder error.
  *
@@ -52,7 +54,7 @@ public int getStatusCode() {
 
 	private static String buildMessage(String operation, int statusCode) {
 		StringBuilder message = new StringBuilder("Builder");
-		if (operation != null && !operation.isEmpty()) {
+		if (StringUtils.hasLength(operation)) {
 			message.append(" lifecycle '").append(operation).append("'");
 		}
 		message.append(" failed with status code ").append(statusCode);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilder.java
@@ -25,6 +25,7 @@
 import org.springframework.boot.buildpack.platform.docker.type.Layer;
 import org.springframework.boot.buildpack.platform.io.Content;
 import org.springframework.boot.buildpack.platform.io.Owner;
+import org.springframework.util.CollectionUtils;
 
 /**
  * A short-lived builder that is created for each {@link Lifecycle} run.
@@ -66,7 +67,7 @@ class EphemeralBuilder {
 			update.withUpdatedConfig(this.builderMetadata::attachTo);
 			update.withUpdatedConfig((config) -> config.withLabel(BUILDER_FOR_LABEL_NAME, targetImage.toString()));
 			update.withTag(name);
-			if (env != null && !env.isEmpty()) {
+			if (!CollectionUtils.isEmpty(env)) {
 				update.withNewLayer(getEnvLayer(env));
 			}
 			if (buildpacks != null) {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBar.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBar.java
@@ -19,6 +19,8 @@
 import java.io.PrintStream;
 import java.util.function.Consumer;
 
+import org.springframework.util.StringUtils;
+
 /**
  * Utility to render a simple progress bar based on consumed {@link TotalProgressEvent}
  * objects.
@@ -63,7 +65,7 @@ public TotalProgressBar(String prefix, PrintStream out) {
 	public TotalProgressBar(String prefix, char progressChar, boolean bookend, PrintStream out) {
 		this.progressChar = progressChar;
 		this.bookend = bookend;
-		if (prefix != null && !prefix.isEmpty()) {
+		if (StringUtils.hasLength(prefix)) {
 			out.print(prefix);
 			out.print(" ");
 		}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ContainerConfig.java
@@ -32,6 +32,7 @@
 
 import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StreamUtils;
 import org.springframework.util.StringUtils;
 
@@ -71,7 +72,7 @@ public class ContainerConfig {
 		}
 		ArrayNode bindsNode = hostConfigNode.putArray("Binds");
 		bindings.forEach((binding) -> bindsNode.add(binding.toString()));
-		if (securityOptions != null && !securityOptions.isEmpty()) {
+		if (!CollectionUtils.isEmpty(securityOptions)) {
 			ArrayNode securityOptsNode = hostConfigNode.putArray("SecurityOpt");
 			securityOptions.forEach(securityOptsNode::add);
 		}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java
@@ -49,6 +49,7 @@
 import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
 import org.springframework.boot.buildpack.platform.io.ZipFileTarArchive;
 import org.springframework.boot.gradle.util.VersionExtractor;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -382,7 +383,7 @@ private BuildRequest customizeRunImage(BuildRequest request) {
 
 	private BuildRequest customizeEnvironment(BuildRequest request) {
 		Map<String, String> environment = getEnvironment().getOrNull();
-		if (environment != null && !environment.isEmpty()) {
+		if (!CollectionUtils.isEmpty(environment)) {
 			request = request.withEnv(environment);
 		}
 		return request;
@@ -411,23 +412,23 @@ private BuildRequest customizePublish(BuildRequest request) {
 
 	private BuildRequest customizeBuildpacks(BuildRequest request) {
 		List<String> buildpacks = getBuildpacks().getOrNull();
-		if (buildpacks != null && !buildpacks.isEmpty()) {
+		if (!CollectionUtils.isEmpty(buildpacks)) {
 			return request.withBuildpacks(buildpacks.stream().map(BuildpackReference::of).toList());
 		}
 		return request;
 	}
 
 	private BuildRequest customizeBindings(BuildRequest request) {
 		List<String> bindings = getBindings().getOrNull();
-		if (bindings != null && !bindings.isEmpty()) {
+		if (!CollectionUtils.isEmpty(bindings)) {
 			return request.withBindings(bindings.stream().map(Binding::of).toList());
 		}
 		return request;
 	}
 
 	private BuildRequest customizeTags(BuildRequest request) {
 		List<String> tags = getTags().getOrNull();
-		if (tags != null && !tags.isEmpty()) {
+		if (!CollectionUtils.isEmpty(tags)) {
 			return request.withTags(tags.stream().map(ImageReference::of).toList());
 		}
 		return request;
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LaunchScriptConfiguration.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LaunchScriptConfiguration.java
@@ -30,6 +30,8 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.bundling.AbstractArchiveTask;
 
+import org.springframework.util.StringUtils;
+
 /**
  * Encapsulates the configuration of the launch script for an executable jar or war.
  *
@@ -111,7 +113,7 @@ private String augmentLineBreaks(String string) {
 	private void putIfMissing(Map<String, String> properties, String key, String... valueCandidates) {
 		if (!properties.containsKey(key)) {
 			for (String candidate : valueCandidates) {
-				if (candidate != null && !candidate.isEmpty()) {
+				if (StringUtils.hasLength(candidate)) {
 					properties.put(key, candidate);
 					return;
 				}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
@@ -38,6 +38,7 @@
 import org.springframework.boot.loader.tools.Libraries;
 import org.springframework.boot.loader.tools.LoaderImplementation;
 import org.springframework.boot.loader.tools.Repackager;
+import org.springframework.util.StringUtils;
 
 /**
  * Repackage existing JAR and WAR archives so that they can be executed from the command
@@ -271,7 +272,7 @@ private String removeLineBreaks(String description) {
 	private void putIfMissing(Properties properties, String key, String... valueCandidates) {
 		if (!properties.containsKey(key)) {
 			for (String candidate : valueCandidates) {
-				if (candidate != null && !candidate.isEmpty()) {
+				if (StringUtils.hasLength(candidate)) {
 					properties.put(key, candidate);
 					return;
 				}

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`
`26`	`26`	`import org.springframework.boot.actuate.endpoint.Show;`
`27`	`27`	`import org.springframework.boot.context.properties.NestedConfigurationProperty;`
	`28`	`+import org.springframework.util.CollectionUtils;`
`28`	`29`
`29`	`30`	`/**`
`30`	`31`	`* Properties used to configure the health endpoint and endpoint groups.`
`@@ -92,7 +93,7 @@ public List<String> getOrder() {`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`public void setOrder(List<String> statusOrder) {`
`95`		`- if (statusOrder != null && !statusOrder.isEmpty()) {`
	`96`	`+ if (!CollectionUtils.isEmpty(statusOrder)) {`
`96`	`97`	`this.order = statusOrder;`
`97`	`98`	`}`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`package org.springframework.boot.buildpack.platform.build;`
`18`	`18`
	`19`	`+import org.springframework.util.StringUtils;`
	`20`	`+`
`19`	`21`	`/**`
`20`	`22`	`* Exception thrown to indicate a Builder error.`
`21`	`23`	`*`
`@@ -52,7 +54,7 @@ public int getStatusCode() {`
`52`	`54`
`53`	`55`	`private static String buildMessage(String operation, int statusCode) {`
`54`	`56`	`StringBuilder message = new StringBuilder("Builder");`
`55`		`- if (operation != null && !operation.isEmpty()) {`
	`57`	`+ if (StringUtils.hasLength(operation)) {`
`56`	`58`	`message.append(" lifecycle '").append(operation).append("'");`
`57`	`59`	`}`
`58`	`60`	`message.append(" failed with status code ").append(statusCode);`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`
`33`	`33`	`import org.springframework.boot.buildpack.platform.json.SharedObjectMapper;`
`34`	`34`	`import org.springframework.util.Assert;`
	`35`	`+import org.springframework.util.CollectionUtils;`
`35`	`36`	`import org.springframework.util.StreamUtils;`
`36`	`37`	`import org.springframework.util.StringUtils;`
`37`	`38`
`@@ -71,7 +72,7 @@ public class ContainerConfig {`
`71`	`72`	`}`
`72`	`73`	`ArrayNode bindsNode = hostConfigNode.putArray("Binds");`
`73`	`74`	`bindings.forEach((binding) -> bindsNode.add(binding.toString()));`
`74`		`- if (securityOptions != null && !securityOptions.isEmpty()) {`
	`75`	`+ if (!CollectionUtils.isEmpty(securityOptions)) {`
`75`	`76`	`ArrayNode securityOptsNode = hostConfigNode.putArray("SecurityOpt");`
`76`	`77`	`securityOptions.forEach(securityOptsNode::add);`
`77`	`78`	`}`