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 850af17f5902..800b2a5f077b 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 @@ * @author Marten Deinum * @author Stephane Nicoll * @author Phillip Webb + * @author Yanming Zhou * @since 1.3.0 */ @AutoConfiguration(after = DataSourceAutoConfiguration.class) @@ -113,7 +114,10 @@ private void withThreadContextClassLoader(ClassLoader classLoader, Runnable acti } 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 d577b59baed9..8232f58930c6 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 @@ * @author Stephane Nicoll * @author Shraddha Yeole * @author Phillip Webb + * @author Yanming Zhou */ class H2ConsoleAutoConfigurationTests { @@ -206,7 +207,7 @@ DataSource anotherDataSource() throws SQLException { return mockDataSource("anotherJdbcUrl"); } - @Bean + @Bean(defaultCandidate = false) @Order(0) DataSource someDataSource() throws SQLException { return mockDataSource("someJdbcUrl");