From bb2188b4ed9bc021e646b096d56cd312214098f1 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 10 Dec 2020 12:51:06 +0100 Subject: [PATCH] Adjust to changes in commons. --- .../CloudFoundryAppServiceDiscoveryClient.java | 2 +- .../discovery/SimpleDnsBasedDiscoveryClient.java | 2 +- .../SimpleDnsBasedReactiveDiscoveryClient.java | 2 +- ...loudFoundryAppServiceDiscoveryClientTest.java | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryAppServiceDiscoveryClient.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryAppServiceDiscoveryClient.java index 7a421a7..0660d3d 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryAppServiceDiscoveryClient.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryAppServiceDiscoveryClient.java @@ -67,7 +67,7 @@ public class CloudFoundryAppServiceDiscoveryClient extends CloudFoundryDiscovery HashMap metadata = new HashMap<>(); metadata.put("applicationId", applicationId); metadata.put("instanceId", applicationIndex); - return (ServiceInstance) new DefaultServiceInstance(name, url, 8080, false, metadata); + return (ServiceInstance) new DefaultServiceInstance(null, name, url, 8080, false, metadata); }).collectList().block(); } diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/SimpleDnsBasedDiscoveryClient.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/SimpleDnsBasedDiscoveryClient.java index 10e3aba..8a4b134 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/SimpleDnsBasedDiscoveryClient.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/SimpleDnsBasedDiscoveryClient.java @@ -66,7 +66,7 @@ public class SimpleDnsBasedDiscoveryClient implements DiscoveryClient { InetAddress[] addresses = InetAddress.getAllByName(hostname); if (addresses != null) { for (InetAddress address : addresses) { - DefaultServiceInstance serviceInstance = new DefaultServiceInstance(serviceId, + DefaultServiceInstance serviceInstance = new DefaultServiceInstance(null, serviceId, address.getHostAddress(), 8080, false); serviceInstances.add(serviceInstance); } diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/SimpleDnsBasedReactiveDiscoveryClient.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/SimpleDnsBasedReactiveDiscoveryClient.java index 6b41512..8a41e70 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/SimpleDnsBasedReactiveDiscoveryClient.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/reactive/SimpleDnsBasedReactiveDiscoveryClient.java @@ -62,7 +62,7 @@ public class SimpleDnsBasedReactiveDiscoveryClient implements ReactiveDiscoveryC @Override public Flux getInstances(String serviceId) { return Mono.justOrEmpty(serviceIdToHostnameConverter.toHostname(serviceId)).flatMapMany(getInetAddresses()) - .map(address -> new DefaultServiceInstance(serviceId, address.getHostAddress(), 8080, false)); + .map(address -> new DefaultServiceInstance(null, serviceId, address.getHostAddress(), 8080, false)); } private Function> getInetAddresses() { diff --git a/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryAppServiceDiscoveryClientTest.java b/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryAppServiceDiscoveryClientTest.java index 79f0b4a..7c350b9 100644 --- a/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryAppServiceDiscoveryClientTest.java +++ b/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryAppServiceDiscoveryClientTest.java @@ -65,8 +65,8 @@ public class CloudFoundryAppServiceDiscoveryClientTest { List instances = this.discoveryClient.getInstances(serviceId); assertThat(instances).hasSize(1); - assertThat(instances.get(0)).isEqualTo(new DefaultServiceInstance(serviceId, "0.billing.apps.internal", 8080, - false, new HashMap() { + assertThat(instances.get(0)).isEqualTo(new DefaultServiceInstance(null, serviceId, "0.billing.apps.internal", + 8080, false, new HashMap() { { put("applicationId", "billing1"); put("instanceId", "0"); @@ -87,22 +87,22 @@ public class CloudFoundryAppServiceDiscoveryClientTest { List instances = this.discoveryClient.getInstances(serviceId); assertThat(instances).hasSize(3); - assertThat(instances.get(0)).isEqualTo(new DefaultServiceInstance(serviceId, "0.billing.apps.internal", 8080, - false, new HashMap() { + assertThat(instances.get(0)).isEqualTo(new DefaultServiceInstance(null, serviceId, "0.billing.apps.internal", + 8080, false, new HashMap() { { put("applicationId", "billing-id"); put("instanceId", "0"); } })); - assertThat(instances.get(1)).isEqualTo(new DefaultServiceInstance(serviceId, "1.billing.apps.internal", 8080, - false, new HashMap() { + assertThat(instances.get(1)).isEqualTo(new DefaultServiceInstance(null, serviceId, "1.billing.apps.internal", + 8080, false, new HashMap() { { put("applicationId", "billing-id"); put("instanceId", "1"); } })); - assertThat(instances.get(2)).isEqualTo(new DefaultServiceInstance(serviceId, "2.billing.apps.internal", 8080, - false, new HashMap() { + assertThat(instances.get(2)).isEqualTo(new DefaultServiceInstance(null, serviceId, "2.billing.apps.internal", + 8080, false, new HashMap() { { put("applicationId", "billing-id"); put("instanceId", "2");