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

Preserves the order of route definitions.

Browse Source 
This preserves the order in which route definitions are composited together and likewise for routes this would ensure that route definitions from properties do not lose their relative ordering.

Fixes gh-1660
This commit is contained in:
ukayani
2020-04-07 23:52:03 -04:00
committed by Spencer Gibb
parent 429a44f942
commit 73b01f81e6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CompositeRouteDefinitionLocator.java
View File

@@ -49,7 +49,8 @@ public class CompositeRouteDefinitionLocator implements RouteDefinitionLocator {
@Override
public Flux<RouteDefinition> getRouteDefinitions() {
return this.delegates.flatMap(RouteDefinitionLocator::getRouteDefinitions)
return this.delegates
.flatMapSequential(RouteDefinitionLocator::getRouteDefinitions)
.flatMap(routeDefinition -> {
if (routeDefinition.getId() == null) {
return randomId().map(id -> {

2
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CompositeRouteLocator.java
View File

@@ -31,7 +31,7 @@ public class CompositeRouteLocator implements RouteLocator {
@Override
public Flux<Route> getRoutes() {
return this.delegates.flatMap(RouteLocator::getRoutes);
return this.delegates.flatMapSequential(RouteLocator::getRoutes);
}
}