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

WIP on further 4financeIT migration - properties required for gradual rollout

Browse Source
This commit is contained in:
Marcin Grzejszczak
2015-07-29 00:16:00 +02:00
parent d6bcdd92f9
commit 3e48eb298b
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java
View File

@@ -4,32 +4,29 @@ import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.springframework.beans.factory.annotation.Autowired;
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;
import javax.annotation.PreDestroy;
/**
* @author Spencer Gibb
*/
@Configuration
@ConditionalOnProperty(value = "zookeeper.enabled", matchIfMissing = true)
@EnableConfigurationProperties
public class ZookeeperAutoConfiguration {
private @Autowired RetryPolicy retryPolicy;
@Bean
@ConditionalOnMissingBean
public ZookeeperProperties zookeeperProperties() {
return new ZookeeperProperties();
}
@Bean
@Bean(destroyMethod = "close")
@ConditionalOnMissingBean
public CuratorFramework curatorFramework() {
public CuratorFramework curatorFramework(RetryPolicy retryPolicy) {
CuratorFramework curator = CuratorFrameworkFactory.builder()
.retryPolicy(retryPolicy)
// TODO: support ensembleProvider via ExhibitorEnsembleProvider
@@ -39,11 +36,6 @@ public class ZookeeperAutoConfiguration {
return curator;
}
@PreDestroy
public void shutdown() {
curatorFramework().close();
}
@Bean
@ConditionalOnMissingBean
public RetryPolicy exponentialBackoffRetry() {

2
spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java
View File

@@ -5,6 +5,7 @@ import org.apache.curator.x.discovery.details.InstanceSerializer;
import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
import org.springframework.beans.factory.annotation.Autowired;
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.discovery.dependency.ZookeeperDependencies;
import org.springframework.context.annotation.Bean;
@@ -14,6 +15,7 @@ import org.springframework.context.annotation.Configuration;
* @author Spencer Gibb
*/
@Configuration
@ConditionalOnProperty(value = "zookeeper.discovery.enabled", matchIfMissing = true)
@EnableConfigurationProperties
public class ZookeeperDiscoveryClientConfiguration {