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

Uses new ServiceInstanceRegistration.RegistrationBuilder

Browse Source
This commit is contained in:
Spencer Gibb
2017-01-11 20:33:10 -07:00
parent 4bba522622
commit 7529258b52
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java
View File

@@ -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<ZookeeperInstance> builder = ServiceInstance.<ZookeeperInstance>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);
}

3
spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRuleTests.java
View File

@@ -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);
}

12
spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcherSpringTests.java
View File

@@ -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<ZookeeperInstance> builder = ServiceInstance.<ZookeeperInstance>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")