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

Merge pull request #7 from zachmarshall/disable-consul

Browse Source 
Make consul auto configuration conditional
This commit is contained in:
Spencer Gibb
2015-05-22 11:51:49 -04:00
parent 6e1701b01a d5d900555c
commit ff9c4ada5b
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java
View File

@@ -17,6 +17,7 @@
package org.springframework.cloud.consul.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.consul.ConsulAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -28,6 +29,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
*/
@Configuration
@Import(ConsulAutoConfiguration.class)
@ConditionalOnProperty(name = "spring.cloud.consul.enabled", matchIfMissing = true)
public class ConsulConfigBootstrapConfiguration {
@Autowired

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

@@ -17,6 +17,7 @@
package org.springframework.cloud.consul;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -28,6 +29,7 @@ import com.ecwid.consul.v1.ConsulClient;
*/
@Configuration
@EnableConfigurationProperties
@ConditionalOnProperty(name = "spring.cloud.consul.enabled", matchIfMissing = true)
public class ConsulAutoConfiguration {
@Bean