Polish "Avoid NPE when routing DataSource has target with null key"

See gh-27698
spring-projects · Aug 23, 2021 · 24c88ab · 24c88ab
1 parent efdc196
commit 24c88ab
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/...amework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java b/...amework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Optional;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -131,8 +131,8 @@ static class RoutingDataSourceHealthContributor implements CompositeHealthContri
 		RoutingDataSourceHealthContributor(AbstractRoutingDataSource routingDataSource,
 				Function<DataSource, HealthContributor> contributorFunction) {
 			Map<String, DataSource> routedDataSources = routingDataSource.getResolvedDataSources().entrySet().stream()
-					.collect(Collectors.toMap((e) -> Optional.ofNullable(e.getKey()).map(Object::toString)
-									.orElse(UNNAMED_DATASOURCE_KEY), Map.Entry::getValue));
+					.collect(Collectors.toMap((e) -> Objects.toString(e.getKey(), UNNAMED_DATASOURCE_KEY),
+							Map.Entry::getValue));
 			this.delegate = CompositeHealthContributor.fromMap(routedDataSources, contributorFunction);
 		}
 

diff --git a/...rk/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java b/...rk/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java
@@ -103,11 +103,10 @@ void runWithOnlyRoutingDataSourceShouldIncludeRoutingDataSourceWithComposedIndic
 			assertThat(context).hasSingleBean(RoutingDataSourceHealthContributor.class);
 			RoutingDataSourceHealthContributor routingHealthContributor = context
 					.getBean(RoutingDataSourceHealthContributor.class);
-			assertThat(routingHealthContributor.getContributor("unnamed")).isInstanceOf(DataSourceHealthIndicator.class);
 			assertThat(routingHealthContributor.getContributor("one")).isInstanceOf(DataSourceHealthIndicator.class);
 			assertThat(routingHealthContributor.getContributor("two")).isInstanceOf(DataSourceHealthIndicator.class);
 			assertThat(routingHealthContributor.iterator()).toIterable().extracting("name")
-					.containsExactlyInAnyOrder("unnamed", "one", "two");
+					.containsExactlyInAnyOrder("one", "two");
 		});
 	}
 
@@ -138,6 +137,20 @@ void runWhenDisabledShouldNotCreateIndicator() {
 						.doesNotHaveBean(CompositeHealthContributor.class));
 	}
 
+	@Test
+	void runWhenDataSourceHasNullRoutingKeyShouldProduceUnnamedComposedIndicator() {
+		this.contextRunner.withUserConfiguration(NullKeyRoutingDataSourceConfig.class).run((context) -> {
+			assertThat(context).hasSingleBean(RoutingDataSourceHealthContributor.class);
+			RoutingDataSourceHealthContributor routingHealthContributor = context
+					.getBean(RoutingDataSourceHealthContributor.class);
+			assertThat(routingHealthContributor.getContributor("unnamed"))
+					.isInstanceOf(DataSourceHealthIndicator.class);
+			assertThat(routingHealthContributor.getContributor("one")).isInstanceOf(DataSourceHealthIndicator.class);
+			assertThat(routingHealthContributor.iterator()).toIterable().extracting("name")
+					.containsExactlyInAnyOrder("unnamed", "one");
+		});
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
 	static class DataSourceConfig {
@@ -157,7 +170,6 @@ static class RoutingDataSourceConfig {
 		@Bean
 		AbstractRoutingDataSource routingDataSource() {
 			Map<Object, DataSource> dataSources = new HashMap<>();
-			dataSources.put(null, mock(DataSource.class));
 			dataSources.put("one", mock(DataSource.class));
 			dataSources.put("two", mock(DataSource.class));
 			AbstractRoutingDataSource routingDataSource = mock(AbstractRoutingDataSource.class);
@@ -167,4 +179,19 @@ AbstractRoutingDataSource routingDataSource() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class NullKeyRoutingDataSourceConfig {
+
+		@Bean
+		AbstractRoutingDataSource routingDataSource() {
+			Map<Object, DataSource> dataSources = new HashMap<>();
+			dataSources.put(null, mock(DataSource.class));
+			dataSources.put("one", mock(DataSource.class));
+			AbstractRoutingDataSource routingDataSource = mock(AbstractRoutingDataSource.class);
+			given(routingDataSource.getResolvedDataSources()).willReturn(dataSources);
+			return routingDataSource;
+		}
+
+	}
+
 }