From 8f23cebcdb76b213f7d149b74a5ffac2a0d23b74 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 17:02:05 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 2.2.1.RELEASE --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c8fc900d..13a03d9f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE spring-cloud-zookeeper-docs pom diff --git a/pom.xml b/pom.xml index 51622c5d..32702f12 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE @@ -177,11 +177,11 @@ - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.2.RELEASE + 2.2.2.RELEASE + 2.2.2.RELEASE + 2.2.2.RELEASE diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 13a75176..e80ae8a7 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 11ee679c..48709c30 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 120b468d..8cb8e930 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index bf66fa1a..079a23db 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 731614d8..e7ee0966 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 2fa02a06..20146007 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 6a913bba..9ae89b4f 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.1.RELEASE + 2.2.3.RELEASE spring-cloud-zookeeper-dependencies - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index ac2c167b..02e3c3cc 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 2cf65330..4e3dcc01 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.1.RELEASE .. From 874282232ac3bb0183c9a9e6bfbf9cffc5d4d482 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 17:05:50 +0000 Subject: [PATCH 2/5] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 13a03d9f..c8fc900d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT spring-cloud-zookeeper-docs pom diff --git a/pom.xml b/pom.xml index 32702f12..51622c5d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.2.3.RELEASE + 2.2.2.BUILD-SNAPSHOT @@ -177,11 +177,11 @@ - 2.2.3.RELEASE - 2.2.2.RELEASE - 2.2.2.RELEASE - 2.2.2.RELEASE - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index e80ae8a7..13a75176 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 48709c30..11ee679c 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 8cb8e930..120b468d 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 079a23db..bf66fa1a 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index e7ee0966..731614d8 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 20146007..2fa02a06 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 9ae89b4f..6a913bba 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.3.RELEASE + 2.2.1.RELEASE spring-cloud-zookeeper-dependencies - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index 02e3c3cc..ac2c167b 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 4e3dcc01..2cf65330 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.RELEASE + 2.2.1.BUILD-SNAPSHOT .. From cad51b35f283d80e8f61719a2deab5dff538d343 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 17:05:50 +0000 Subject: [PATCH 3/5] Bumping versions to 2.2.2.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c8fc900d..5adf2b96 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT spring-cloud-zookeeper-docs pom diff --git a/pom.xml b/pom.xml index 51622c5d..d7659077 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE @@ -177,11 +177,11 @@ - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 13a75176..0f8e910b 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 11ee679c..a1238b17 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 120b468d..a5608b65 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index bf66fa1a..f67fb5dd 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 731614d8..a311e6c6 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 2fa02a06..cfc1d91c 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 6a913bba..22bc184f 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.1.RELEASE + 2.2.4.BUILD-SNAPSHOT spring-cloud-zookeeper-dependencies - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index ac2c167b..e1b3b65d 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 2cf65330..15beed74 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.1.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT .. From fbf5b54d07ce32034d60a9986ec111328eb9e27e Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 6 Mar 2020 12:59:33 -0500 Subject: [PATCH 4/5] Updates docs branches. --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index 5adf2b96..56354294 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,7 +15,7 @@ spring-cloud-zookeeper ${basedir}/.. - 1.0.x,1.1.x,1.2.x,2.1.x + 2.1.x,2.2.x spring.cloud.zookeeper.*| From 7b9463a6d510eae6220358919be1e76808646d95 Mon Sep 17 00:00:00 2001 From: Bernardo Gomez Palacio Date: Fri, 13 Mar 2020 16:28:10 -0700 Subject: [PATCH 5/5] Adds the option to define a TraceDriver for the CuratorFramework This commits adds the option to define a Curator `TracerDriver`, which if available, will be used in the CuratorZookeeperClient wrapped inside the CuratorFramework. Fixes gh-241 Fixes gh-242 --- .../zookeeper/ZookeeperAutoConfiguration.java | 24 ++++-- ...perAutoConfigurationTracerDriverTests.java | 76 +++++++++++++++++++ 2 files changed, 92 insertions(+), 8 deletions(-) create mode 100644 spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfigurationTracerDriverTests.java diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java index 407fa3d5..d81b3f34 100644 --- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java +++ b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java @@ -19,12 +19,13 @@ package org.springframework.cloud.zookeeper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.curator.RetryPolicy; +import org.apache.curator.drivers.TracerDriver; import org.apache.curator.ensemble.EnsembleProvider; 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.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -44,9 +45,6 @@ public class ZookeeperAutoConfiguration { private static final Log log = LogFactory.getLog(ZookeeperAutoConfiguration.class); - @Autowired(required = false) - private EnsembleProvider ensembleProvider; - @Bean @ConditionalOnMissingBean public ZookeeperProperties zookeeperProperties() { @@ -55,16 +53,26 @@ public class ZookeeperAutoConfiguration { @Bean(destroyMethod = "close") @ConditionalOnMissingBean - public CuratorFramework curatorFramework(RetryPolicy retryPolicy, - ZookeeperProperties properties) throws Exception { + public CuratorFramework curatorFramework( + RetryPolicy retryPolicy, + ZookeeperProperties properties, + ObjectProvider optionalEnsembleProvider, + ObjectProvider optionalTracerDriverProvider) + throws Exception { CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder(); - if (this.ensembleProvider != null) { - builder.ensembleProvider(this.ensembleProvider); + EnsembleProvider ensembleProvider = optionalEnsembleProvider.getIfAvailable(); + if (ensembleProvider != null) { + builder.ensembleProvider(ensembleProvider); } else { builder.connectString(properties.getConnectString()); } CuratorFramework curator = builder.retryPolicy(retryPolicy).build(); + TracerDriver tracerDriver = optionalTracerDriverProvider.getIfAvailable(); + if (curator.getZookeeperClient() != null && tracerDriver != null) { + curator.getZookeeperClient().setTracerDriver(tracerDriver); + } + curator.start(); log.trace("blocking until connected to zookeeper for " + properties.getBlockUntilConnectedWait() diff --git a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfigurationTracerDriverTests.java b/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfigurationTracerDriverTests.java new file mode 100644 index 00000000..b1aa7bec --- /dev/null +++ b/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfigurationTracerDriverTests.java @@ -0,0 +1,76 @@ +/* + * Copyright 2015-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.zookeeper; + +import org.apache.curator.drivers.TracerDriver; +import org.apache.curator.framework.CuratorFramework; +import org.apache.curator.test.TestingServer; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + +/** + * @author Bernardo Gomez Palacio + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { + ZookeeperAutoConfigurationTracerDriverTests.TestConfig.class, + ZookeeperAutoConfiguration.class }) +public class ZookeeperAutoConfigurationTracerDriverTests { + + @Autowired(required = false) + TracerDriver tracerDriver; + + @Autowired(required = false) + CuratorFramework curator; + + @Autowired + TestingServer testingServer; + + @Test + public void should_successfully_inject_Curators_TracerDriver() { + assertThat(curator.getZookeeperClient().getTracerDriver()).isEqualTo(tracerDriver); + } + + static class TestConfig { + + @Bean + ZookeeperProperties zookeeperProperties(TestingServer testingServer) { + ZookeeperProperties properties = new ZookeeperProperties(); + properties.setConnectString(testingServer.getConnectString()); + return properties; + } + + @Bean(destroyMethod = "close") + TestingServer testingServer() throws Exception { + return new TestingServer(); + } + + @Bean + TracerDriver mockedTracerDriver() { + return mock(TracerDriver.class); + } + } + +}