Merge branch '3.0.x' into 3.1.x

Closes gh-37143

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractReactiveHealthIndicator.java

@@ -99,7 +99,7 @@ public abstract class AbstractReactiveHealthIndicator implements ReactiveHealthI
 	}
 
 	/**
-	 * Actual health check logic. If an error occurs in the pipeline it will be handled
+	 * Actual health check logic. If an error occurs in the pipeline, it will be handled
 	 * automatically.
 	 * @param builder the {@link Health.Builder} to report health status and details
 	 * @return a {@link Mono} that provides the {@link Health}

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,8 +119,7 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud
 			return false;
 		}
 		AnnotationCustomizableTypeExcludeFilter other = (AnnotationCustomizableTypeExcludeFilter) obj;
-		boolean result = true;
+		boolean result = hasAnnotation() == other.hasAnnotation();
-		result = result && hasAnnotation() == other.hasAnnotation();
 		for (FilterType filterType : FilterType.values()) {
 			result &= ObjectUtils.nullSafeEquals(getFilters(filterType), other.getFilters(filterType));
 		}

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public @interface AutoConfigureTestDatabase {
 
 	/**
 	 * The type of connection to be established when {@link #replace() replacing} the
-	 * DataSource. By default will attempt to detect the connection based on the
+	 * DataSource. By default, will attempt to detect the connection based on the
 	 * classpath.
 	 * @return the type of connection to use
 	 */

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java

@@ -163,11 +163,6 @@ public class TestDatabaseAutoConfiguration {
 			return EmbeddedDatabase.class;
 		}
 
-		@Override
-		public boolean isSingleton() {
-			return true;
-		}
-
 	}
 
 	static class EmbeddedDataSourceFactory {

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySource.java

@@ -91,7 +91,7 @@ public class AnnotationsPropertySource extends EnumerablePropertySource<Class<?>
 			return;
 		}
 		Optional<Object> value = annotation.getValue(attribute.getName());
-		if (!value.isPresent()) {
+		if (value.isEmpty()) {
 			return;
 		}
 		if (skip == SkipPropertyMapping.ON_DEFAULT_VALUE) {

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java

@@ -98,7 +98,7 @@ class PropertyMappingContextCustomizer implements ContextCustomizer {
 		private String getAnnotationsDescription(Set<Class<?>> annotations) {
 			StringBuilder result = new StringBuilder();
 			for (Class<?> annotation : annotations) {
-				if (result.length() != 0) {
+				if (!result.isEmpty()) {
 					result.append(", ");
 				}
 				result.append('@').append(ClassUtils.getShortName(annotation));

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@ public class WebDriverScope implements Scope {
 
 	/**
 	 * Register this scope with the specified context and reassign appropriate bean
-	 * definitions to used it.
+	 * definitions to use it.
 	 * @param context the application context
 	 */
 	static void registerWith(ConfigurableApplicationContext context) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

@@ -570,8 +570,8 @@ public class SpringApplication {
 	}
 
 	/**
-	 * Apply any relevant post processing the {@link ApplicationContext}. Subclasses can
+	 * Apply any relevant post-processing to the {@link ApplicationContext}. Subclasses
-	 * apply additional processing as required.
+	 * can apply additional processing as required.
 	 * @param context the application context
 	 */
 	protected void postProcessApplicationContext(ConfigurableApplicationContext context) {