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

Avoid NPE when routing DataSource has target with null key 

See gh-27698
This commit is contained in:
Safeer A 2021-08-17 01:49:43 +04:00 committed by Andy Wilkinson
parent e409489859
commit efdc19647c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java
View File

@ -19,6 +19,7 @@ package org.springframework.boot.actuate.autoconfigure.jdbc;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -57,6 +58,7 @@ import org.springframework.util.Assert;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Arthur Kalimullin * @author Arthur Kalimullin
* @author Julio Gomez * @author Julio Gomez
* @author Safeer Ansari
* @since 2.0.0 * @since 2.0.0
*/ */
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ -124,10 +126,13 @@ public class DataSourceHealthContributorAutoConfiguration implements Initializin
private final CompositeHealthContributor delegate; private final CompositeHealthContributor delegate;
private static final String UNNAMED_DATASOURCE_KEY = "unnamed";
RoutingDataSourceHealthContributor(AbstractRoutingDataSource routingDataSource, RoutingDataSourceHealthContributor(AbstractRoutingDataSource routingDataSource,
Function<DataSource, HealthContributor> contributorFunction) { Function<DataSource, HealthContributor> contributorFunction) {
Map<String, DataSource> routedDataSources = routingDataSource.getResolvedDataSources().entrySet().stream() 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); this.delegate = CompositeHealthContributor.fromMap(routedDataSources, contributorFunction);
} }

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java
View File

@ -49,6 +49,7 @@ import static org.mockito.Mockito.mock;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Julio Gomez * @author Julio Gomez
* @author Safeer Ansari
*/ */
class DataSourceHealthContributorAutoConfigurationTests { class DataSourceHealthContributorAutoConfigurationTests {
@ -102,10 +103,11 @@ class DataSourceHealthContributorAutoConfigurationTests {
assertThat(context).hasSingleBean(RoutingDataSourceHealthContributor.class); assertThat(context).hasSingleBean(RoutingDataSourceHealthContributor.class);
RoutingDataSourceHealthContributor routingHealthContributor = context RoutingDataSourceHealthContributor routingHealthContributor = context
.getBean(RoutingDataSourceHealthContributor.class); .getBean(RoutingDataSourceHealthContributor.class);
assertThat(routingHealthContributor.getContributor("unnamed")).isInstanceOf(DataSourceHealthIndicator.class);
assertThat(routingHealthContributor.getContributor("one")).isInstanceOf(DataSourceHealthIndicator.class); assertThat(routingHealthContributor.getContributor("one")).isInstanceOf(DataSourceHealthIndicator.class);
assertThat(routingHealthContributor.getContributor("two")).isInstanceOf(DataSourceHealthIndicator.class); assertThat(routingHealthContributor.getContributor("two")).isInstanceOf(DataSourceHealthIndicator.class);
assertThat(routingHealthContributor.iterator()).toIterable().extracting("name") assertThat(routingHealthContributor.iterator()).toIterable().extracting("name")
.containsExactlyInAnyOrder("one", "two"); .containsExactlyInAnyOrder("unnamed", "one", "two");
}); });
} }
@ -155,6 +157,7 @@ class DataSourceHealthContributorAutoConfigurationTests {
@Bean @Bean
AbstractRoutingDataSource routingDataSource() { AbstractRoutingDataSource routingDataSource() {
Map<Object, DataSource> dataSources = new HashMap<>(); Map<Object, DataSource> dataSources = new HashMap<>();
dataSources.put(null, mock(DataSource.class));
dataSources.put("one", mock(DataSource.class)); dataSources.put("one", mock(DataSource.class));
dataSources.put("two", mock(DataSource.class)); dataSources.put("two", mock(DataSource.class));
AbstractRoutingDataSource routingDataSource = mock(AbstractRoutingDataSource.class); AbstractRoutingDataSource routingDataSource = mock(AbstractRoutingDataSource.class);