From edd4d0e7592b24b4b8db518b9a8feabba00859b6 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Fri, 5 Oct 2018 17:43:00 -0400
Subject: [PATCH] Adds @ConditionalOnBean(HealthAggregator.class) to
 DiscoveryCompositeHealthIndicator bean.

see https://github.com/spring-cloud/spring-cloud-netflix/issues/3161
---
 .../cloud/client/CommonsClientAutoConfiguration.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
index 8db01ff0..e277b0c2 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
@@ -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);