Merge pull request #37340 from izeye

* pr/37340:
  Polish

Closes gh-37340

Author: mhalbritter

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -73,8 +73,8 @@ dependencies {
 	optional("io.opentelemetry:opentelemetry-exporter-otlp")
 	optional("io.projectreactor.netty:reactor-netty-http")
 	optional("io.r2dbc:r2dbc-pool")
-	optional("io.r2dbc:r2dbc-spi")
 	optional("io.r2dbc:r2dbc-proxy")
+	optional("io.r2dbc:r2dbc-spi")
 	optional("jakarta.jms:jakarta.jms-api")
 	optional("jakarta.persistence:jakarta.persistence-api")
 	optional("jakarta.servlet:jakarta.servlet-api")

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesConfigAdapterTests.java

@@ -68,15 +68,15 @@ void whenPropertiesSourceIsSetAdapterSourceReturnsIt() {
 	}
 
 	@Test
-	void whenPropertiesPublishHistogramTypeIsCumulativePublishCumulativeHistogramReturnsIt() {
+	void whenPropertiesPublishHistogramTypeIsCumulativeAdapterPublishCumulativeHistogramReturnsIt() {
 		SignalFxProperties properties = createProperties();
 		properties.setPublishedHistogramType(HistogramType.CUMULATIVE);
 		assertThat(createConfigAdapter(properties).publishCumulativeHistogram()).isTrue();
 		assertThat(createConfigAdapter(properties).publishDeltaHistogram()).isFalse();
 	}
 
 	@Test
-	void whenPropertiesPublishHistogramTypeIsDeltaPublishDeltaHistogramReturnsIt() {
+	void whenPropertiesPublishHistogramTypeIsDeltaAdapterPublishDeltaHistogramReturnsIt() {
 		SignalFxProperties properties = createProperties();
 		properties.setPublishedHistogramType(HistogramType.DELTA);
 		assertThat(createConfigAdapter(properties).publishDeltaHistogram()).isTrue();

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationHandlerGroupingTests.java

@@ -38,7 +38,7 @@
 class ObservationHandlerGroupingTests {
 
 	@Test
-	void shouldGroupCategoriesIntoFirstMatchingHandlerAndRespectsCategoryOrder() {
+	void shouldGroupCategoriesIntoFirstMatchingHandlerAndRespectCategoryOrder() {
 		ObservationHandlerGrouping grouping = new ObservationHandlerGrouping(
 				List.of(ObservationHandlerA.class, ObservationHandlerB.class));
 		ObservationConfig config = new ObservationConfig();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java

@@ -541,8 +541,7 @@ void shouldConfigureVirtualThreads() {
 		this.contextRunner.withPropertyValues("spring.threads.virtual.enabled=true").run((context) -> {
 			SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory = context
 				.getBean("rabbitListenerContainerFactory", SimpleRabbitListenerContainerFactory.class);
-			Object executor = ReflectionTestUtils.getField(rabbitListenerContainerFactory, "taskExecutor");
-			assertThat(executor).as("rabbitListenerContainerFactory.taskExecutor")
+			assertThat(rabbitListenerContainerFactory).extracting("taskExecutor")
 				.isInstanceOf(VirtualThreadTaskExecutor.class);
 		});
 	}

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

@@ -43,7 +43,9 @@ class JdbcClientAutoConfigurationTests {
 
 	@Test
 	void jdbcClientWhenNoAvailableJdbcTemplateIsNotCreated() {
-		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
+		new ApplicationContextRunner()
+			.withConfiguration(
+					AutoConfigurations.of(DataSourceAutoConfiguration.class, JdbcClientAutoConfiguration.class))
 			.run((context) -> assertThat(context).doesNotHaveBean(JdbcClient.class));
 	}
 
@@ -79,7 +81,7 @@ void jdbcClientIsOrderedAfterFlywayMigration() {
 	@Test
 	void jdbcClientIsOrderedAfterLiquibaseMigration() {
 		this.contextRunner.withUserConfiguration(JdbcClientDataSourceMigrationValidator.class)
-			.withPropertyValues("spring.liquibase.changeLog:classpath:db/changelog/db.changelog-city.yaml")
+			.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-city.yaml")
 			.withConfiguration(AutoConfigurations.of(LiquibaseAutoConfiguration.class))
 			.run((context) -> {
 				assertThat(context).hasNotFailed().hasSingleBean(JdbcClient.class);

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

@@ -184,7 +184,7 @@ void testDependencyToFlywayWithJdbcTemplateMixed() {
 	@Test
 	void testDependencyToLiquibase() {
 		this.contextRunner.withUserConfiguration(DataSourceMigrationValidator.class)
-			.withPropertyValues("spring.liquibase.changeLog:classpath:db/changelog/db.changelog-city.yaml")
+			.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-city.yaml")
 			.withConfiguration(AutoConfigurations.of(LiquibaseAutoConfiguration.class))
 			.run((context) -> {
 				assertThat(context).hasNotFailed();
@@ -195,7 +195,7 @@ void testDependencyToLiquibase() {
 	@Test
 	void testDependencyToLiquibaseWithJdbcTemplateMixed() {
 		this.contextRunner.withUserConfiguration(NamedParameterDataSourceMigrationValidator.class)
-			.withPropertyValues("spring.liquibase.changeLog:classpath:db/changelog/db.changelog-city.yaml")
+			.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-city.yaml")
 			.withConfiguration(AutoConfigurations.of(LiquibaseAutoConfiguration.class))
 			.run((context) -> {
 				assertThat(context).hasNotFailed();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java

@@ -396,7 +396,7 @@ void testOverrideParameters() {
 	void rollbackFile(@TempDir Path temp) throws IOException {
 		File file = Files.createTempFile(temp, "rollback-file", "sql").toFile();
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
-			.withPropertyValues("spring.liquibase.rollbackFile:" + file.getAbsolutePath())
+			.withPropertyValues("spring.liquibase.rollback-file:" + file.getAbsolutePath())
 			.run((context) -> {
 				SpringLiquibase liquibase = context.getBean(SpringLiquibase.class);
 				File actualFile = (File) ReflectionTestUtils.getField(liquibase, "rollbackFile");

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

@@ -153,7 +153,7 @@ void testFlywayPlusValidation() {
 	@Test
 	void testLiquibasePlusValidation() {
 		contextRunner()
-			.withPropertyValues("spring.liquibase.changeLog:classpath:db/changelog/db.changelog-city.yaml",
+			.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-city.yaml",
 					"spring.jpa.hibernate.ddl-auto:validate")
 			.withConfiguration(AutoConfigurations.of(LiquibaseAutoConfiguration.class))
 			.run((context) -> assertThat(context).hasNotFailed());

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java

@@ -1032,8 +1032,7 @@ static class CustomExceptionHandler extends ResponseEntityExceptionHandler {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import({ OrderedControllerAdviceBeansConfiguration.LowestOrderedControllerAdvice.class,
-			OrderedControllerAdviceBeansConfiguration.HighestOrderedControllerAdvice.class })
+	@Import({ LowestOrderedControllerAdvice.class, HighestOrderedControllerAdvice.class })
 	static class OrderedControllerAdviceBeansConfiguration {
 
 		@ControllerAdvice

spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc

@@ -183,7 +183,7 @@ You can inject it directly in your own beans as well, as shown in the following
 
 include::code:MyBean[]
 
-If you rely on auto-configuration to create the underlying `JdbcTemplate`, any customization using `spring.jdbc.template.*` properties are taken into account in the client as well.
+If you rely on auto-configuration to create the underlying `JdbcTemplate`, any customization using `spring.jdbc.template.*` properties is taken into account in the client as well.