SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove @ConditionalOnBean

Browse Source 
Doesn't make much sense, since it will be created in the parent class.

fixes gh-198
This commit is contained in:
Spencer Gibb
2016-06-14 17:45:32 -06:00
parent c091bd24e9
commit c2ff08b665
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java
View File

@@ -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);
}
}