From 8d27f4ee7cc029cfc6eec48144eb0bd77bd42a98 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Mon, 17 Feb 2025 15:53:17 +0800 Subject: [PATCH] Include non-default DataSource candidates This commit updates H2ConsoleAutoConfiguration to consider non-default data sources when logging connection URLs. See gh-44293 Signed-off-by: Yanming Zhou --- .../boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java | 6 +++++- .../autoconfigure/h2/H2ConsoleAutoConfigurationTests.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java index 78d7395dae..278b5166bf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java @@ -47,6 +47,7 @@ import org.springframework.core.log.LogMessage; * @author Marten Deinum * @author Stephane Nicoll * @author Phillip Webb + * @author Yanming Zhou * @since 1.3.0 */ @AutoConfiguration(after = DataSourceAutoConfiguration.class) @@ -113,7 +114,10 @@ public class H2ConsoleAutoConfiguration { } private List getConnectionUrls(ObjectProvider dataSources) { - return dataSources.orderedStream().map(this::getConnectionUrl).filter(Objects::nonNull).toList(); + return dataSources.orderedStream(ObjectProvider.UNFILTERED) + .map(this::getConnectionUrl) + .filter(Objects::nonNull) + .toList(); } private String getConnectionUrl(DataSource dataSource) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java index d577b59bae..8232f58930 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java @@ -57,6 +57,7 @@ import static org.mockito.Mockito.mock; * @author Stephane Nicoll * @author Shraddha Yeole * @author Phillip Webb + * @author Yanming Zhou */ class H2ConsoleAutoConfigurationTests { @@ -206,7 +207,7 @@ class H2ConsoleAutoConfigurationTests { return mockDataSource("anotherJdbcUrl"); } - @Bean + @Bean(defaultCandidate = false) @Order(0) DataSource someDataSource() throws SQLException { return mockDataSource("someJdbcUrl");