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

formatting

Browse Source
This commit is contained in:
spencergibb
2021-07-27 22:15:00 -04:00
parent c6469fdf47
commit 16a29c1f2b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocator.java
View File

@@ -96,11 +96,10 @@ public class DiscoveryClientRouteDefinitionLocator implements RouteDefinitionLoc
};
}
return serviceInstances.filter(instances -> !instances.isEmpty())
.flatMap(Flux::fromIterable).filter(includePredicate).collectMap(ServiceInstance::getServiceId)
return serviceInstances.filter(instances -> !instances.isEmpty()).flatMap(Flux::fromIterable)
.filter(includePredicate).collectMap(ServiceInstance::getServiceId)
// remove duplicates
.flatMapMany(map -> Flux.fromIterable(map.values()))
.map(instance -> {
.flatMapMany(map -> Flux.fromIterable(map.values())).map(instance -> {
RouteDefinition routeDefinition = buildRouteDefinition(urlExpr, instance);
final ServiceInstance instanceForEval = new DelegatingServiceInstance(instance, properties);

5
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocatorTests.java
View File

@@ -67,8 +67,7 @@ public class DiscoveryClientRouteDefinitionLocatorTests {
public void includeExpressionWorks() {
assertThat(locator).as("DiscoveryClientRouteDefinitionLocator was null").isNotNull();
List<RouteDefinition> definitions = locator.getRouteDefinitions().collectList()
.block();
List<RouteDefinition> definitions = locator.getRouteDefinitions().collectList().block();
assertThat(definitions).hasSize(2);
RouteDefinition definition = definitions.get(0);
@@ -125,7 +124,7 @@ public class DiscoveryClientRouteDefinitionLocatorTests {
"localhost", 8001, false, metadata);
when(discoveryClient.getInstances(serviceId)).thenReturn(Flux.just(instance1));
}
else if ("service3".equalsIgnoreCase(serviceId)){
else if ("service3".equalsIgnoreCase(serviceId)) {
// given 3 instances, only one routedefinition should be created
DefaultServiceInstance instance2 = new DefaultServiceInstance(serviceId + "8002", serviceId,
"localhost", 8002, false, Collections.emptyMap());