Polish "Log URLs for all DataSources"

See gh-28204

Author: snicoll

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

@@ -69,26 +69,24 @@ public ServletRegistrationBean<WebServlet> h2Console(H2ConsoleProperties propert
 		if (logger.isInfoEnabled()) {
 			logDataSources(dataSource, path);
 		}
-
 		return registration;
 	}
 
 	private void logDataSources(ObjectProvider<DataSource> dataSource, String path) {
-		List<String> urls = dataSource.orderedStream()
-				.map((available) -> {
-					String url = null;
-					try (Connection connection = available.getConnection()) {
-						url = connection.getMetaData().getURL();
-					} catch (Exception ex) {
-
-					}
-					return url;
-				}).filter(Objects::nonNull)
-				.collect(Collectors.toList());
+		List<String> urls = dataSource.orderedStream().map((available) -> {
+			try (Connection connection = available.getConnection()) {
+				return "'" + connection.getMetaData().getURL() + "'";
+			}
+			catch (Exception ex) {
+				return null;
+			}
+		}).filter(Objects::nonNull).collect(Collectors.toList());
 		if (!urls.isEmpty()) {
-			String log = urls.stream().collect(Collectors.joining("', '",
-					"H2 console available at '" + path + "'. Database(s) available at '", "'."));
-			logger.info(log);
+			StringBuilder sb = new StringBuilder("H2 console available at '").append(path).append("'. ");
+			String tmp = (urls.size() > 1) ? "Databases" : "Database";
+			sb.append(tmp).append(" available at ");
+			sb.append(String.join(", ", urls));
+			logger.info(sb.toString());
 		}
 	}
 

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

@@ -34,7 +34,7 @@
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
+import org.springframework.core.annotation.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
@@ -120,30 +120,30 @@ void singleDataSourceUrlIsLoggedWhenOnlyOneAvailable(CapturedOutput output) {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
 				.withPropertyValues("spring.h2.console.enabled=true").run((context) -> {
 					try (Connection connection = context.getBean(DataSource.class).getConnection()) {
-						assertThat(output)
-								.contains("H2 console available at '/h2-console'. Database(s) available at '" + connection.getMetaData().getURL() + "'");
+						assertThat(output).contains("H2 console available at '/h2-console'. Database available at '"
+								+ connection.getMetaData().getURL() + "'");
 					}
 				});
 	}
 
-	@Test
-	@ExtendWith(OutputCaptureExtension.class)
-	void allDataSourceUrlsAreLoggedWhenMultipleAvailable(CapturedOutput output) {
-		this.contextRunner.withUserConfiguration(MultiDataSourceConfiguration.class)
-				.withPropertyValues("spring.h2.console.enabled=true").run((context) ->
-						assertThat(output).contains("H2 console available at '/h2-console'. Database(s) available at 'primaryUrl', 'secondaryUrl'"));
-	}
-
 	@Test
 	@ExtendWith(OutputCaptureExtension.class)
 	void noDataSourceIsLoggedWhenNoneAvailable(CapturedOutput output) {
 		this.contextRunner.withUserConfiguration(FailingDataSourceConfiguration.class)
 				.withPropertyValues("spring.h2.console.enabled=true")
-				.run((context) -> assertThat(output).isEmpty());
+				.run((context) -> assertThat(output).doesNotContain("H2 console available"));
 	}
 
+	@Test
+	@ExtendWith(OutputCaptureExtension.class)
+	void allDataSourceUrlsAreLoggedWhenMultipleAvailable(CapturedOutput output) {
+		this.contextRunner
+				.withUserConfiguration(FailingDataSourceConfiguration.class, MultiDataSourceConfiguration.class)
+				.withPropertyValues("spring.h2.console.enabled=true").run((context) -> assertThat(output).contains(
+						"H2 console available at '/h2-console'. Databases available at 'someJdbcUrl', 'anotherJdbcUrl'"));
+	}
 
-		@Test
+	@Test
 	void h2ConsoleShouldNotFailIfDatabaseConnectionFails() {
 		this.contextRunner.withUserConfiguration(FailingDataSourceConfiguration.class)
 				.withPropertyValues("spring.h2.console.enabled=true")
@@ -163,20 +163,21 @@ DataSource dataSource() throws SQLException {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	static class MultiDataSourceConfiguration extends FailingDataSourceConfiguration {
+	static class MultiDataSourceConfiguration {
 
 		@Bean
-		@Primary
-		DataSource primaryDataSource() throws SQLException {
-			return getDataSource("primaryUrl");
+		@Order(5)
+		DataSource anotherDataSource() throws SQLException {
+			return mockDataSource("anotherJdbcUrl");
 		}
 
 		@Bean
-		DataSource anotherDataSource() throws SQLException {
-			return getDataSource("secondaryUrl");
+		@Order(0)
+		DataSource someDataSource() throws SQLException {
+			return mockDataSource("someJdbcUrl");
 		}
 
-		private DataSource getDataSource(String url) throws SQLException {
+		private DataSource mockDataSource(String url) throws SQLException {
 			DataSource dataSource = mock(DataSource.class);
 			given(dataSource.getConnection()).willReturn(mock(Connection.class));
 			given(dataSource.getConnection().getMetaData()).willReturn(mock(DatabaseMetaData.class));