Merge branch '3.4.x'

Closes gh-45595

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/antora/modules/api/pages/rest/actuator/metrics.adoc

@@ -3,7 +3,7 @@
 
 The `metrics` endpoint provides access to application metrics to diagnose the metrics the application has recorded.
 This endpoint should not be "scraped" or used as a metrics backend in production.
-Its purpose is to show the currently registered metrics so users can see what metrics are available, what their current values are, and if triggering certain operations cause any change in certain values.
+Its purpose is to show the currently registered metrics so users can see what metrics are available, what their current values are, and if triggering certain operations causes any change in certain values.
 If you want to diagnose your applications through the metrics they collect, you should use an xref:reference:actuator/metrics.adoc[external metrics backend].
 In this case, the `metrics` endpoint can still be useful.
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.java

@@ -43,7 +43,7 @@ private static final class NotReactiveWebApplication {
 
 	@ConditionalOnThreading(Threading.VIRTUAL)
 	@ConditionalOnBean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME)
-	private static final class VirtualThreadsEnabled {
+	private static final class VirtualThreadsExecutorEnabled {
 
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java

@@ -113,11 +113,10 @@ void whenJacksonJaxbModuleIsNotAvailableTheObjectMapperCustomizationBacksOff() {
 					.stream()
 					.filter(JakartaXmlBindAnnotationIntrospector.class::isInstance)).isEmpty();
 			});
-
 	}
 
 	@Test
-	void webApplicationIntializerDisablesJerseysWebApplicationInitializer() throws ServletException {
+	void webApplicationInitializerDisablesJerseyWebApplicationInitializer() throws ServletException {
 		ServletContext context = new MockServletContext();
 		new JerseyWebApplicationInitializer().onStartup(context);
 		assertThat(context.getInitParameter("contextConfigLocation")).isEqualTo("<NONE>");

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliInspectResponse.java

@@ -53,7 +53,7 @@ record ExposedPort() {
 	}
 
 	/**
-	 * A container's resources (cgroups config, ulimits, etc).
+	 * A container's resources (cgroups config, ulimits, etc.).
 	 *
 	 * @param networkMode the network mode to use for this container
 	 */

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/core/DockerComposeFileTests.java

@@ -51,7 +51,7 @@ void hashCodeAndEquals() throws Exception {
 		DockerComposeFile c2 = DockerComposeFile.of(f1);
 		DockerComposeFile c3 = DockerComposeFile.find(f1.getParentFile());
 		DockerComposeFile c4 = DockerComposeFile.of(f2);
-		assertThat(c1.hashCode()).isEqualTo(c2.hashCode()).isEqualTo(c3.hashCode());
+		assertThat(c1).hasSameHashCodeAs(c2).hasSameHashCodeAs(c3);
 		assertThat(c1).isEqualTo(c1).isEqualTo(c2).isEqualTo(c3).isNotEqualTo(c4);
 	}
 

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/external-config.adoc

@@ -305,15 +305,15 @@ Imports may be specified as _fixed_ or _import relative_ locations.
 A fixed location always resolves to the same underlying resource, regardless of where the configprop:spring.config.import[] property is declared.
 An import relative location resolves relative to the file that declares the configprop:spring.config.import[] property.
 
-A location starting with a forward slash (`/`) or a URL style prefix (`file:`, `classpath:`, etc) is considered fixed.
+A location starting with a forward slash (`/`) or a URL style prefix (`file:`, `classpath:`, etc.) is considered fixed.
 All other locations are considered import relative.
 
 NOTE: `optional:` prefixes are not considered when determining if a location is fixed or import relative.
 
 As an example, say we have a `/demo` directory containing our `application.jar` file.
 We might add a `/demo/application.properties` file with the following content:
 
-[,properties]
+[source,properties]
 ----
 spring.config.import=optional:core/core.properties
 ----
@@ -322,7 +322,7 @@ This is an import relative location and so will attempt to load the file `/demo/
 
 If `/demo/core/core.properties` has the following content:
 
-[,properties]
+[source,properties]
 ----
 spring.config.import=optional:extra/extra.properties
 ----

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/task-execution-and-scheduling.adoc

@@ -13,7 +13,7 @@ The auto-configured javadoc:org.springframework.core.task.AsyncTaskExecutor[] is
 - Support for blocking execution in Spring WebFlux.
 - Utilized for inbound and outbound message channels in Spring WebSocket.
 - Bootstrap executor for JPA, based on the bootstrap mode of JPA repositories.
-- Bootstrap Executor for {url-spring-framework-docs}/core/beans/java/composing-configuration-classes.html#beans-java-startup-background[background initialization] of beans in the `ApplicationContext`.
+- Bootstrap executor for {url-spring-framework-docs}/core/beans/java/composing-configuration-classes.html#beans-java-startup-background[background initialization] of beans in the `ApplicationContext`.
 
 While this approach works in most scenarios, Spring Boot allows you to override the auto-configured javadoc:org.springframework.core.task.AsyncTaskExecutor[].
 By default, when a custom javadoc:java.util.concurrent.Executor[] bean is registered, the auto-configured javadoc:org.springframework.core.task.AsyncTaskExecutor[] backs off, and the custom javadoc:java.util.concurrent.Executor[] is used for regular task execution (via javadoc:org.springframework.scheduling.annotation.EnableAsync[format=annotation]).
@@ -83,7 +83,7 @@ These integrations include:
 - Spring WebFlux's blocking execution support.
 - Utilized for inbound and outbound message channels in Spring WebSocket.
 - Bootstrap executor for JPA, based on the bootstrap mode of JPA repositories.
-- Bootstrap Executor for {url-spring-framework-docs}/core/beans/java/composing-configuration-classes.html#beans-java-startup-background[background initialization] of beans in the `ApplicationContext`, unless a bean named `bootstrapExecutor` is defined.
+- Bootstrap executor for {url-spring-framework-docs}/core/beans/java/composing-configuration-classes.html#beans-java-startup-background[background initialization] of beans in the `ApplicationContext`, unless a bean named `bootstrapExecutor` is defined.
 
 [TIP]
 ====

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/introducing-graalvm-native-images.adoc

@@ -55,7 +55,7 @@ When these restrictions are in place, it becomes possible for Spring to perform
 A Spring AOT processed application will typically generate:
 
 * Java source code
-* Bytecode (for dynamic proxies etc)
+* Bytecode (for dynamic proxies, etc.)
 * GraalVM JSON hint files in `+META-INF/native-image/{groupId}/{artifactId}/+`:
  - Resource hints (`resource-config.json`)
  - Reflection hints (`reflect-config.json`)

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java

@@ -83,10 +83,10 @@ void contextCustomizerEqualsAndHashCodeConsidersComponentScan() {
 			.createContextCustomizer(TestWithImportAndComponentScanOfSomePackage.class, null);
 		ContextCustomizer customizer3 = this.factory
 			.createContextCustomizer(TestWithImportAndComponentScanOfAnotherPackage.class, null);
-		assertThat(customizer1.hashCode()).isEqualTo(customizer2.hashCode());
 		assertThat(customizer1).isEqualTo(customizer2);
-		assertThat(customizer3.hashCode()).isNotEqualTo(customizer2.hashCode()).isNotEqualTo(customizer1.hashCode());
+		assertThat(customizer1).hasSameHashCodeAs(customizer2);
 		assertThat(customizer3).isNotEqualTo(customizer2).isNotEqualTo(customizer1);
+		assertThat(customizer3).doesNotHaveSameHashCodeAs(customizer2).doesNotHaveSameHashCodeAs(customizer1);
 	}
 
 	@Test

spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/FieldOriginTests.java

@@ -45,7 +45,7 @@ void equalsAndHashCode() {
 		Origin o2 = new FieldOrigin(ReflectionUtils.findField(Fields.class, "one"));
 		Origin o3 = new FieldOrigin(ReflectionUtils.findField(Fields.class, "two"));
 		assertThat(o1).isEqualTo(o1).isEqualTo(o2).isNotEqualTo(o3);
-		assertThat(o1.hashCode()).isEqualTo(o2.hashCode());
+		assertThat(o1).hasSameHashCodeAs(o2);
 	}
 
 	@Test