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

Update SNAPSHOT to 2.1.1.RELEASE

Browse Source
This commit is contained in:
buildmaster
2019-03-05 17:33:19 +00:00
parent 8c15fc073e
commit 15f7144a12
11 changed files with 156 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java
View File

@@ -81,8 +81,8 @@ public class CloudFoundryDiscoveryClient implements DiscoveryClient {
metadata.put("applicationId", applicationId);
metadata.put("instanceId", applicationIndex);
return (ServiceInstance) new DefaultServiceInstance(instanceId, name, url, 80, secure,
metadata);
return (ServiceInstance) new DefaultServiceInstance(instanceId, name, url, 80,
secure, metadata);
}).collectList().blockOptional().orElse(new ArrayList<>());
}

3
spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java
View File

@@ -92,7 +92,8 @@ public class CloudFoundryDiscoveryClientTest {
List<ServiceInstance> instances = this.cloudFoundryDiscoveryClient
.getInstances(this.hiServiceServiceId);
assertThat(instances.size()).as("Wrong instances: " + instances).isEqualTo(1);
assertThat(instances.get(0).getInstanceId()).as("Wrong instance ID").isEqualTo("id.0");
assertThat(instances.get(0).getInstanceId()).as("Wrong instance ID")
.isEqualTo("id.0");
}
}