From 7529258b5253edb7437f145a36f16ef302bfd145 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 11 Jan 2017 20:33:10 -0700 Subject: [PATCH] Uses new ServiceInstanceRegistration.RegistrationBuilder --- ...eperAutoServiceRegistrationAutoConfiguration.java | 8 +++----- .../discovery/dependency/StickyRuleTests.java | 3 ++- .../watcher/DefaultDependencyWatcherSpringTests.java | 12 +++++------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java index 28600ee8..669cc9ad 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java @@ -20,8 +20,6 @@ package org.springframework.cloud.zookeeper.serviceregistry; * @author Spencer Gibb */ -import org.apache.curator.x.discovery.ServiceInstance; -import org.apache.curator.x.discovery.ServiceInstanceBuilder; import org.apache.curator.x.discovery.UriSpec; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -68,12 +66,12 @@ public class ZookeeperAutoServiceRegistrationAutoConfiguration { String appName = resolver.getProperty("spring.application.name", "application"); try { - ServiceInstanceBuilder builder = ServiceInstance.builder() + return ServiceInstanceRegistration.builder() .name(appName) .payload(new ZookeeperInstance(context.getId(), appName, properties.getMetadata())) .address(host) - .uriSpec(uriSpec); - return new ZookeeperBuilderRegistration(builder); + .uriSpec(uriSpec) + .build(); } catch (Exception e) { throw new RuntimeException("Error building ZookeeperRegistration", e); } diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRuleTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRuleTests.java index bd9d3bca..71e20fbb 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRuleTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRuleTests.java @@ -101,7 +101,8 @@ public class StickyRuleTests { return new TestServiceRegistrar(SocketUtils.findAvailableTcpPort(), curatorFramework); } - @Bean(initMethod = "start", destroyMethod = "stop") TestServiceRegistrar serviceTwo(CuratorFramework curatorFramework) { + @Bean(initMethod = "start", destroyMethod = "stop") + TestServiceRegistrar serviceTwo(CuratorFramework curatorFramework) { return new TestServiceRegistrar(SocketUtils.findAvailableTcpPort(), curatorFramework); } diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcherSpringTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcherSpringTests.java index fe0f22c6..4f652f1d 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcherSpringTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcherSpringTests.java @@ -8,9 +8,6 @@ import org.apache.curator.retry.ExponentialBackoffRetry; import org.apache.curator.test.TestingServer; import org.apache.curator.x.discovery.ServiceCache; import org.apache.curator.x.discovery.ServiceDiscovery; -import org.apache.curator.x.discovery.ServiceInstance; -import org.apache.curator.x.discovery.ServiceInstanceBuilder; -import org.apache.curator.x.discovery.UriSpec; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +18,7 @@ import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance; import org.springframework.cloud.zookeeper.discovery.watcher.presence.DependencyPresenceOnStartupVerifier; import org.springframework.cloud.zookeeper.discovery.watcher.presence.LogMissingDependencyChecker; -import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperBuilderRegistration; +import org.springframework.cloud.zookeeper.serviceregistry.ServiceInstanceRegistration; import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperRegistration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -90,11 +87,12 @@ public class DefaultDependencyWatcherSpringTests { @Bean public ZookeeperRegistration zookeeperRegistration() throws Exception { - ServiceInstanceBuilder builder = ServiceInstance.builder().uriSpec(new UriSpec("{scheme}://{address}:{port}/")) + return ServiceInstanceRegistration.builder() + .defaultUriSpec() .address("anyUrl") .port(10) - .name("testInstance"); - return new ZookeeperBuilderRegistration(builder); + .name("testInstance") + .build(); } @Bean(initMethod = "start", destroyMethod = "close")