From c2ff08b6651f5eb125c6bb384c7067d80f19d610 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 14 Jun 2016 17:45:32 -0600 Subject: [PATCH] Remove @ConditionalOnBean Doesn't make much sense, since it will be created in the parent class. fixes gh-198 --- .../cloud/consul/ConsulAutoConfiguration.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java index d65e1b13..334f1d7e 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java @@ -56,21 +56,17 @@ public class ConsulAutoConfiguration { @Configuration @ConditionalOnClass(Endpoint.class) - @ConditionalOnBean(ConsulClient.class) protected static class ConsulHealthConfig { - @Autowired - private ConsulClient consulClient; - @Bean @ConditionalOnMissingBean - public ConsulEndpoint consulEndpoint() { + public ConsulEndpoint consulEndpoint(ConsulClient consulClient) { return new ConsulEndpoint(consulClient); } @Bean @ConditionalOnMissingBean - public ConsulHealthIndicator consulHealthIndicator() { + public ConsulHealthIndicator consulHealthIndicator(ConsulClient consulClient) { return new ConsulHealthIndicator(consulClient); } }