root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

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 <zhouyanming@gmail.com>
This commit is contained in:
Yanming Zhou 2025-02-17 15:53:17 +08:00 committed by Stéphane Nicoll
parent 0eeb0b61de
commit 8d27f4ee7c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java
View File

@ -47,6 +47,7 @@ import org.springframework.core.log.LogMessage;
* @author Marten Deinum * @author Marten Deinum
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Phillip Webb * @author Phillip Webb
* @author Yanming Zhou
* @since 1.3.0 * @since 1.3.0
*/ */
@AutoConfiguration(after = DataSourceAutoConfiguration.class) @AutoConfiguration(after = DataSourceAutoConfiguration.class)
@ -113,7 +114,10 @@ public class H2ConsoleAutoConfiguration {
} }
private List<String> getConnectionUrls(ObjectProvider<DataSource> dataSources) { private List<String> getConnectionUrls(ObjectProvider<DataSource> 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) { private String getConnectionUrl(DataSource dataSource) {

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java
View File

@ -57,6 +57,7 @@ import static org.mockito.Mockito.mock;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Shraddha Yeole * @author Shraddha Yeole
* @author Phillip Webb * @author Phillip Webb
* @author Yanming Zhou
*/ */
class H2ConsoleAutoConfigurationTests { class H2ConsoleAutoConfigurationTests {
@ -206,7 +207,7 @@ class H2ConsoleAutoConfigurationTests {
return mockDataSource("anotherJdbcUrl"); return mockDataSource("anotherJdbcUrl");
} }
@Bean @Bean(defaultCandidate = false)
@Order(0) @Order(0)
DataSource someDataSource() throws SQLException { DataSource someDataSource() throws SQLException {
return mockDataSource("someJdbcUrl"); return mockDataSource("someJdbcUrl");