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

updated to use new s-c-commons interfaces

Browse Source
This commit is contained in:
Spencer Gibb
2015-02-13 14:01:02 -07:00
parent 983b2e773f
commit 41cd0ab5a2
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
View File

@@ -40,8 +40,19 @@ public class ZookeeperDiscoveryClient implements DiscoveryClient {
throw new IllegalStateException("Unable to locate instance in zookeeper: "
+ context.getId());
}
return new DefaultServiceInstance(instance.getId(), instance.getAddress(),
instance.getPort(), instance.getSslPort()!=null);
return createServiceInstance(instance.getId(), instance);
}
private static org.springframework.cloud.client.ServiceInstance createServiceInstance(String serviceId, ServiceInstance<ZookeeperInstance> serviceInstance) {
boolean secure = serviceInstance.getSslPort() != null;
Integer port = serviceInstance.getPort();
if (secure) {
port = serviceInstance.getSslPort();
}
return new DefaultServiceInstance(serviceId, serviceInstance.getAddress(), port, secure);
}
@Override
@@ -54,14 +65,12 @@ public class ZookeeperDiscoveryClient implements DiscoveryClient {
ArrayList<org.springframework.cloud.client.ServiceInstance> instances = new ArrayList<>();
for (ServiceInstance<ZookeeperInstance> instance : zkInstances) {
instances.add(new DefaultServiceInstance(serviceId, instance.getAddress(),
instance.getPort(), instance.getSslPort()!=null));
instances.add(createServiceInstance(serviceId, instance));
}
return instances;
}
@Override
public List<String> getServices() {
ArrayList<String> services = null;