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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2019-12-18 16:05:04 +00:00
parent 75338cde79
commit f25bbad456
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplier.java
View File

@@ -28,8 +28,9 @@ import org.springframework.core.env.Environment;
/**
* An implementation of {@link ServiceInstanceListSupplier} that filters instances
* retrieved by the delegate by zone. The zone is retrieved from the
* <code>spring.cloud.loadbalancer.zone</code> property. If the zone is not set or no instances are found for the
* requested zone, all instances retrieved by the delegate are returned.
* <code>spring.cloud.loadbalancer.zone</code> property. If the zone is not set or no
* instances are found for the requested zone, all instances retrieved by the delegate are
* returned.
*
* @author Olga Maciaszek-Sharma
* @since 2.2.1

3
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplierTests.java
View File

@@ -65,7 +65,8 @@ class ZonePreferenceServiceInstanceListSupplierTests {
void shouldFilterInstancesByZone() {
when(environment.getProperty("spring.cloud.loadbalancer.zone"))
.thenReturn("zone1");
when(delegate.get()).thenReturn(Flux.just(Arrays.asList(first, second, third, fourth, fifth)));
when(delegate.get()).thenReturn(
Flux.just(Arrays.asList(first, second, third, fourth, fifth)));
List<ServiceInstance> filtered = supplier.get().blockFirst();