Adds @ConditionalOnBean(HealthAggregator.class) to DiscoveryCompositeHealthIndicator bean.

see https://github.com/spring-cloud/spring-cloud-netflix/issues/3161
This commit is contained in:
Spencer Gibb
2018-10-05 17:43:00 -04:00
parent b91313d913
commit edd4d0e759

View File

@@ -65,7 +65,7 @@ public class CommonsClientAutoConfiguration {
@Bean
@ConditionalOnProperty(value = "spring.cloud.discovery.client.composite-indicator.enabled", matchIfMissing = true)
@ConditionalOnBean(DiscoveryHealthIndicator.class)
@ConditionalOnBean({ DiscoveryHealthIndicator.class, HealthAggregator.class })
public DiscoveryCompositeHealthIndicator discoveryCompositeHealthIndicator(
HealthAggregator aggregator, List<DiscoveryHealthIndicator> indicators) {
return new DiscoveryCompositeHealthIndicator(aggregator, indicators);