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

Guard actuator beans with @ConditionalOnClass.

Browse Source 
fixes gh-78
This commit is contained in:
Spencer Gibb
2015-09-08 14:15:50 -06:00
parent 38402cd123
commit 71a5c8b093
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@
package org.springframework.cloud.consul;
import org.springframework.boot.actuate.endpoint.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -45,15 +47,19 @@ public class ConsulAutoConfiguration {
.getPort());
}
@Bean
@ConditionalOnMissingBean
public ConsulEndpoint consulEndpoint() {
return new ConsulEndpoint();
}
@Configuration
@ConditionalOnClass(Endpoint.class)
protected static class ConsulHealthConfig {
@Bean
@ConditionalOnMissingBean
public ConsulEndpoint consulEndpoint() {
return new ConsulEndpoint();
}
@Bean
@ConditionalOnMissingBean
public ConsulHealthIndicator consulHealthIndicator() {
return new ConsulHealthIndicator();
@Bean
@ConditionalOnMissingBean
public ConsulHealthIndicator consulHealthIndicator() {
return new ConsulHealthIndicator();
}
}
}