diff --git a/pom.xml b/pom.xml index 0cc4dc1d..14761aca 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT @@ -197,8 +197,8 @@ 2.17 - 1.3.2.BUILD-SNAPSHOT - 1.2.1.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT 1.3.1.BUILD-SNAPSHOT diff --git a/spring-cloud-zookeeper-config/src/test/resources/application.yml b/spring-cloud-zookeeper-config/src/test/resources/application.yml new file mode 100644 index 00000000..7a74dfbd --- /dev/null +++ b/spring-cloud-zookeeper-config/src/test/resources/application.yml @@ -0,0 +1,3 @@ +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR \ No newline at end of file diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index cb81e0c4..572e4573 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT spring-cloud-zookeeper-dependencies diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoRegistrationFalseTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoRegistrationFalseTests.java index bd1afe93..943f25d9 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoRegistrationFalseTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoRegistrationFalseTests.java @@ -27,6 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClient; import org.springframework.cloud.zookeeper.discovery.test.CommonTestConfig; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -55,7 +56,11 @@ public class ZookeeperDiscoveryAutoRegistrationFalseTests { @Test public void discovery_client_is_zookeeper() { //given: this.discoveryClient //expect: - then(discoveryClient).isInstanceOf(ZookeeperDiscoveryClient.class); + then(discoveryClient).isInstanceOf(CompositeDiscoveryClient.class); + CompositeDiscoveryClient composite = (CompositeDiscoveryClient) discoveryClient; + List discoveryClients = composite.getDiscoveryClients(); + DiscoveryClient first = discoveryClients.get(0); + then(first).isInstanceOf(ZookeeperDiscoveryClient.class); } @Test public void application_should_not_have_been_registered() { @@ -65,11 +70,11 @@ public class ZookeeperDiscoveryAutoRegistrationFalseTests { then(instances).isEmpty(); } - @Test public void should_not_find_local_instance() { + @Test public void should_find_local_instance() { //given ServiceInstance serviceInstance = this.discoveryClient.getLocalServiceInstance(); //expect: - then(serviceInstance).isNull(); + then(serviceInstance).isNotNull(); } @Configuration diff --git a/spring-cloud-zookeeper-discovery/src/test/resources/application-client.yml b/spring-cloud-zookeeper-discovery/src/test/resources/application-client.yml index 85c4d170..ea2cdc33 100644 --- a/spring-cloud-zookeeper-discovery/src/test/resources/application-client.yml +++ b/spring-cloud-zookeeper-discovery/src/test/resources/application-client.yml @@ -3,4 +3,7 @@ spring.application.name: client spring.cloud.zookeeper: dependencies: testInstance: - path: /server \ No newline at end of file + path: /server +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR \ No newline at end of file diff --git a/spring-cloud-zookeeper-discovery/src/test/resources/application-dependencies.yml b/spring-cloud-zookeeper-discovery/src/test/resources/application-dependencies.yml index 0d7a0f8d..3e2dee9e 100644 --- a/spring-cloud-zookeeper-discovery/src/test/resources/application-dependencies.yml +++ b/spring-cloud-zookeeper-discovery/src/test/resources/application-dependencies.yml @@ -24,3 +24,6 @@ spring.cloud.zookeeper: management: security: enabled: false +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR diff --git a/spring-cloud-zookeeper-discovery/src/test/resources/application-loadbalancerclient.yml b/spring-cloud-zookeeper-discovery/src/test/resources/application-loadbalancerclient.yml index c35ce31e..e260fca9 100644 --- a/spring-cloud-zookeeper-discovery/src/test/resources/application-loadbalancerclient.yml +++ b/spring-cloud-zookeeper-discovery/src/test/resources/application-loadbalancerclient.yml @@ -4,3 +4,6 @@ spring.cloud.zookeeper: someAlias: path: testInstance loadBalancerType: STICKY +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR diff --git a/spring-cloud-zookeeper-discovery/src/test/resources/application-nestedstructure.yml b/spring-cloud-zookeeper-discovery/src/test/resources/application-nestedstructure.yml index 8bb12f6b..32edee40 100644 --- a/spring-cloud-zookeeper-discovery/src/test/resources/application-nestedstructure.yml +++ b/spring-cloud-zookeeper-discovery/src/test/resources/application-nestedstructure.yml @@ -3,3 +3,6 @@ spring.application.name: me management: security: enabled: false +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR diff --git a/spring-cloud-zookeeper-discovery/src/test/resources/application-ribbon.yml b/spring-cloud-zookeeper-discovery/src/test/resources/application-ribbon.yml index cee42c71..39618c4f 100644 --- a/spring-cloud-zookeeper-discovery/src/test/resources/application-ribbon.yml +++ b/spring-cloud-zookeeper-discovery/src/test/resources/application-ribbon.yml @@ -9,3 +9,6 @@ spring: management: security: enabled: false +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR diff --git a/spring-cloud-zookeeper-discovery/src/test/resources/application-server.yml b/spring-cloud-zookeeper-discovery/src/test/resources/application-server.yml index ba230fe2..efff89e4 100644 --- a/spring-cloud-zookeeper-discovery/src/test/resources/application-server.yml +++ b/spring-cloud-zookeeper-discovery/src/test/resources/application-server.yml @@ -1,2 +1,5 @@ server.port: 0 -spring.application.name: server \ No newline at end of file +spring.application.name: server +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR \ No newline at end of file diff --git a/spring-cloud-zookeeper-discovery/src/test/resources/application-watcher.yml b/spring-cloud-zookeeper-discovery/src/test/resources/application-watcher.yml index c8ad567a..25c998fd 100644 --- a/spring-cloud-zookeeper-discovery/src/test/resources/application-watcher.yml +++ b/spring-cloud-zookeeper-discovery/src/test/resources/application-watcher.yml @@ -18,3 +18,6 @@ spring.cloud.zookeeper: contentTypeTemplate: application/vnd.newsletter.$version+json2 version: v1 required: false +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR \ No newline at end of file diff --git a/spring-cloud-zookeeper-discovery/src/test/resources/application.yml b/spring-cloud-zookeeper-discovery/src/test/resources/application.yml index a17ae042..57500c52 100644 --- a/spring-cloud-zookeeper-discovery/src/test/resources/application.yml +++ b/spring-cloud-zookeeper-discovery/src/test/resources/application.yml @@ -1 +1,4 @@ -testInstance.ribbon.ServerListRefreshInterval: 100 \ No newline at end of file +testInstance.ribbon.ServerListRefreshInterval: 100 +logging: + level: + org.apache.zookeeper.ClientCnxn: ERROR \ No newline at end of file diff --git a/spring-cloud-zookeeper-sample/src/main/resources/application.yml b/spring-cloud-zookeeper-sample/src/main/resources/application.yml index 74dfbf44..21ce589d 100644 --- a/spring-cloud-zookeeper-sample/src/main/resources/application.yml +++ b/spring-cloud-zookeeper-sample/src/main/resources/application.yml @@ -10,7 +10,7 @@ endpoints: sensitive: false logging.level: - org.apache.zookeeper.ClientCnxn: WARN + org.apache.zookeeper.ClientCnxn: ERROR management: security: