Skip to content

Commit

Permalink
Avoid NPE when routing DataSource has target with null key
Browse files Browse the repository at this point in the history
  • Loading branch information
safeeransari-gc authored and wilkinsona committed Aug 23, 2021
1 parent e409489 commit efdc196
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
Expand Up @@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -57,6 +58,7 @@
* @author Stephane Nicoll
* @author Arthur Kalimullin
* @author Julio Gomez
* @author Safeer Ansari
* @since 2.0.0
*/
@Configuration(proxyBeanMethods = false)
Expand Down Expand Up @@ -124,10 +126,13 @@ static class RoutingDataSourceHealthContributor implements CompositeHealthContri

private final CompositeHealthContributor delegate;

private static final String UNNAMED_DATASOURCE_KEY = "unnamed";

RoutingDataSourceHealthContributor(AbstractRoutingDataSource routingDataSource,
Function<DataSource, HealthContributor> contributorFunction) {
Map<String, DataSource> routedDataSources = routingDataSource.getResolvedDataSources().entrySet().stream()
.collect(Collectors.toMap((e) -> e.getKey().toString(), Map.Entry::getValue));
.collect(Collectors.toMap((e) -> Optional.ofNullable(e.getKey()).map(Object::toString)
.orElse(UNNAMED_DATASOURCE_KEY), Map.Entry::getValue));
this.delegate = CompositeHealthContributor.fromMap(routedDataSources, contributorFunction);
}

Expand Down
Expand Up @@ -49,6 +49,7 @@
*
* @author Phillip Webb
* @author Julio Gomez
* @author Safeer Ansari
*/
class DataSourceHealthContributorAutoConfigurationTests {

Expand Down Expand Up @@ -102,10 +103,11 @@ 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("one", "two");
.containsExactlyInAnyOrder("unnamed", "one", "two");
});
}

Expand Down Expand Up @@ -155,6 +157,7 @@ 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);
Expand Down

0 comments on commit efdc196

Please sign in to comment.