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

Remove deprecated netflix-core dependency.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2019-05-10 16:06:58 +02:00
parent 4008a6e34f
commit 328b0df842
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-cloudfoundry-discovery/pom.xml
View File

@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId>
<artifactId>spring-cloud-netflix-hystrix</artifactId>
<optional>true</optional>
</dependency>
<dependency>

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");
}
}