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

Merge pull request #68 from gdarmont/pr-conditional-property-fix

Browse Source 
Fix disabling Spring Cloud Zookeeper using spring.cloud.zookeeper.* properties
This commit is contained in:
Spencer Gibb
2016-03-31 10:39:54 -07:00
parent 42839e2caa 7ecb6558b1
commit 3a6af08673
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java
View File

@@ -18,6 +18,7 @@ package org.springframework.cloud.zookeeper.config;
import org.apache.curator.framework.CuratorFramework;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.zookeeper.ZookeeperAutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -31,6 +32,7 @@ import org.springframework.context.annotation.Import;
* @since 1.0.0
*/
@Configuration
@ConditionalOnProperty(value = "spring.cloud.zookeeper.enabled", matchIfMissing = true)
@Import(ZookeeperAutoConfiguration.class)
@EnableConfigurationProperties
public class ZookeeperConfigBootstrapConfiguration {