diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstance.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstance.java index 470cf00c..d43008a6 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstance.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstance.java @@ -26,6 +26,7 @@ import org.springframework.cloud.client.ServiceInstance; * A specific {@link ServiceInstance} describing a zookeeper service instance * * @author Reda.Housni-Alaoui + * @author Tim Ysewyn * @since 1.1.0 */ public class ZookeeperServiceInstance implements ServiceInstance { @@ -60,6 +61,11 @@ public class ZookeeperServiceInstance implements ServiceInstance { } } + @Override + public String getInstanceId() { + return this.serviceInstance.getId(); + } + @Override public String getServiceId() { return this.serviceId; diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryTests.java index 8f9d5572..9fa0dce1 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryTests.java @@ -39,6 +39,7 @@ import static org.springframework.cloud.zookeeper.discovery.test.TestRibbonClien /** * @author Marcin Grzejszczak + * @author Tim Ysewyn */ @RunWith(SpringRunner.class) @SpringBootTest(classes = ZookeeperDiscoveryTests.Config.class, @@ -70,6 +71,7 @@ public class ZookeeperDiscoveryTests { ServiceInstance instance = instances.get(0); //expect: then(registeredServiceStatus(instance)).isEqualTo("UP"); + then(instance.getInstanceId()).isEqualTo("ribbon-instance-id-123"); then(instance.getMetadata().get("testMetadataKey")).isEqualTo("testMetadataValue"); then(instance).isInstanceOf(ZookeeperServiceInstance.class); ZookeeperServiceInstance zkInstance = (ZookeeperServiceInstance) instance;