From d72c9f0dc45619bf29d59e64b950088ed4b1fbc2 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 10 Sep 2015 12:18:31 -0600 Subject: [PATCH] make use of 'metadataMap.instanceId' consistent --- .../cloud/netflix/ribbon/eureka/DomainExtractingServerList.java | 2 +- .../netflix/ribbon/eureka/DomainExtractingServerListTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerList.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerList.java index 3c400a2c..0790a0fc 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerList.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerList.java @@ -105,7 +105,7 @@ class DomainExtractingServer extends DiscoveryEnabledServer { DiscoveryEnabledServer enabled = (DiscoveryEnabledServer) server; InstanceInfo instance = enabled.getInstanceInfo(); if (instance.getMetadata().containsKey("instanceId")) { - return instance.getMetadata().get("instanceId"); + return instance.getHostName()+":"+instance.getMetadata().get("instanceId"); } } return super.getId(); diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java index d2f9b2f1..79a0b5d5 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java @@ -98,7 +98,7 @@ public class DomainExtractingServerListTests { actualServer instanceof DomainExtractingServer); DomainExtractingServer des = DomainExtractingServer.class.cast(actualServer); assertEquals("zone was wrong", zone, des.getZone()); - assertEquals("instanceId was wrong", INSTANCE_ID, des.getId()); + assertEquals("instanceId was wrong", HOST_NAME + ":" + INSTANCE_ID, des.getId()); return des; }