Merge branch 'spring-cloud:main' into #2975-Suggestion-Add-Permissions-Policy-as-configurable-option-to-SecureHeaders-GatewayFilter

docs/modules/ROOT/pages/spring-cloud-gateway-server-webflux/gatewayfilter-factories/retry-factory.adoc

@@ -12,6 +12,9 @@ The `Retry` `GatewayFilter` factory supports the following parameters:
 Retries are performed after a backoff interval of `firstBackoff * (factor ^ n)`, where `n` is the iteration.
 If `maxBackoff` is configured, the maximum backoff applied is limited to `maxBackoff`.
 If `basedOnPreviousValue` is true, the backoff is calculated by using `prevBackoff * factor`.
+* `jitter`: The configured random jitter for the retries.
+Generating a backoff between `[backoff - backoff*randomFactor, backoff + backoff*randomFactor]`
+* `timeout`:  The configured timeout for the retries.
 
 The following defaults are configured for `Retry` filter, if enabled:
 
@@ -20,6 +23,8 @@ The following defaults are configured for `Retry` filter, if enabled:
 * `methods`: GET method
 * `exceptions`: `IOException` and `TimeoutException`
 * `backoff`: disabled
+* `jitter`: disabled
+* `timeout`: unlimited
 
 The following listing configures a Retry `GatewayFilter`:
 
@@ -45,6 +50,9 @@ spring:
               maxBackoff: 50ms
               factor: 2
               basedOnPreviousValue: false
+            jitter:
+              randomFactor: 0.5
+            timeout: 100ms
 ----
 
 NOTE: When using the retry filter with a `forward:` prefixed URL, the target endpoint should be written carefully so that, in case of an error, it does not do anything that could result in a response being sent to the client and committed.
@@ -79,10 +87,13 @@ spring:
               maxBackoff: 50ms
               factor: 2
               basedOnPreviousValue: false
+            jitter:
+              randomFactor: 0.5
+            timeout: 100ms
 
       - id: retryshortcut_route
         uri: https://example.org
         filters:
-        - Retry=3,INTERNAL_SERVER_ERROR,GET,10ms,50ms,2,false
+        - Retry=3,INTERNAL_SERVER_ERROR,GET,10ms,50ms,2,false,0.5,100ms
 ----
 

docs/modules/ROOT/pages/spring-cloud-gateway-server-webflux/httpheadersfilters.adoc

@@ -7,6 +7,10 @@
 == Forwarded Headers Filter
 The `Forwarded` Headers Filter creates a `Forwarded` header to send to the downstream service. It adds the `Host` header, scheme and port of the current request to any existing `Forwarded` header.
 
+The `Forwarded by` header part can be enabled by setting the following property to true (defaults to false):
+
+- `spring.cloud.gateway.forwarded.by.enabled=true`
+
 [[removehopbyhop-headers-filter]]
 == RemoveHopByHop Headers Filter
 The `RemoveHopByHop` Headers Filter removes headers from forwarded requests. The default list of headers that is removed comes from the https://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-14#section-7.1.3[IETF].

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheader.adoc

@@ -14,6 +14,8 @@ spring:
         routes:
         - id: add_request_header_route
           uri: https://example.org
+          predicates:
+          - Path=/red
           filters:
           - AddRequestHeader=X-Request-red, blue
 ----
@@ -21,6 +23,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestHeader;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -30,10 +33,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-        return route("addRequestHeader")
-                .route(GET("/red"), http("https://example.org"))
-                .before(addRequestHeader("X-Request-red", "blue"))
-                .build();
+        return route("add_request_header_route")
+            .GET("/red", http())
+            .before(uri("https://example.org"))
+            .before(addRequestHeader("X-Request-red", "blue"));
     }
 }
 ----
@@ -47,15 +50,20 @@ The following example configures an `AddRequestHeader` filter that uses a variab
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestHeader;
+import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
+import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
+
 @Configuration
 class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-        return route("addRequestHeader")
-                .route(GET("/red/{segment}"), http("https://example.org"))
-                .before(addRequestHeader("X-Request-red", "blue-{segment}"))
-                .build();
+        return route("add_request_header_route")
+            .GET("/red/{segment}", http())
+            .before(uri("https://example.org"))
+            .before(addRequestHeader("X-Request-red", "blue-{segment}"));
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheadersifnotpresent.adoc

@@ -12,8 +12,10 @@ spring:
     gateway:
       mvc:
         routes:
-        - id: add_request_headers_route
+        - id: add_request_headers_route_inp
           uri: https://example.org
+          predicates:
+          - Path=/red
           filters:
           - AddRequestHeadersIfNotPresent=X-Request-Color-1:blue,X-Request-Color-2:green
 ----
@@ -21,6 +23,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestHeadersIfNotPresent;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -29,9 +32,11 @@ import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFuncti
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-        return route(GET("/red"), http("https://example.org"))
-                .before(addRequestHeadersIfNotPresent("X-Request-Color-1:blue","X-Request-Color-2:green"));
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeaderInp() {
+        return route("add_request_headers_route_inp")
+            .GET("/red", http())
+            .before(uri("https://example.org"))
+            .before(addRequestHeadersIfNotPresent("X-Request-Color-1:blue","X-Request-Color-2:green"));
     }
 }
 ----
@@ -49,13 +54,20 @@ The following example configures an `AddRequestHeadersIfNotPresent` filter that
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestHeadersIfNotPresent;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
+import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
+import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
+
 @Configuration
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-        return route(GET("/red/{segment}"), http("https://example.org"))
-                .before(addRequestHeadersIfNotPresent("X-Request-red", "blue-{segment}"));
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeaderInp() {
+        return route("add_request_header_route_inp")
+            .GET("/red/{segment}", http())
+            .before(uri("https://example.org"))
+            .before(addRequestHeadersIfNotPresent("X-Request-red", "blue-{segment}"));
     }
 }
 ----
@@ -66,7 +78,7 @@ spring:
   cloud:
     gateway:
       routes:
-      - id: add_request_header_route
+      - id: add_request_header_route_inp
         uri: https://example.org
         predicates:
         - Path=/red/{segment}

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestparameter.adoc

@@ -14,6 +14,8 @@ spring:
         routes:
         - id: add_request_parameter_route
           uri: https://example.org
+          predicates:
+          - Path=/anything/addrequestparam
           filters:
           - AddRequestParameter=red, blue
 ----
@@ -21,6 +23,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestParameter;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -29,11 +32,12 @@ import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFuncti
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-		return route("add_request_parameter_route")
-				.GET("/anything/addrequestparam", http("https://example.org"))
-					.before(addRequestParameter("red", "blue"))
-					.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqParameter() {
+        return route("add_request_parameter_route")
+            .GET("/anything/addrequestparam", http())
+            .before(uri("https://example.org"))
+            .before(addRequestParameter("red", "blue"))
+            .build();
     }
 }
 ----
@@ -47,6 +51,7 @@ The following example configures an `AddRequestParameter` filter that uses a var
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestParameter;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -56,11 +61,12 @@ import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequ
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-		return route("add_request_parameter_route")
-				.route(host("{segment}.myhost.org"), http("https://example.org"))
-				.before(addRequestParameter("foo", "bar-{segment}"))
-				.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqParameter() {
+        return route("add_request_parameter_route")
+            .route(host("{segment}.myhost.org"), http())
+            .before(uri("https://example.org"))
+            .before(addRequestParameter("foo", "bar-{segment}"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addresponseheader.adoc

@@ -14,6 +14,8 @@ spring:
         routes:
         - id: add_response_header_route
           uri: https://example.org
+          predicates:
+          - Path=/anything/addresheader
           filters:
           - AddResponseHeader=X-Response-Red, Blue
 ----
@@ -21,6 +23,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.addResponseHeader;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -30,9 +33,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsAddRespHeader() {
-        return route("addresponseheader")
-                .GET("/anything/addresheader", http("https://example.org"))
-                .after(addResponseHeader("X-Response-Red", "Blue"))
+        return route("add_response_header_route")
+            .GET("/anything/addresheader", http())
+            .before(uri("https://example.org"))
+            .after(addResponseHeader("X-Response-Red", "Blue"))
             .build();
     }
 }
@@ -47,6 +51,7 @@ The following example configures an `AddResponseHeader` filter that uses a varia
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.addResponseHeader;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -57,10 +62,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsAddRespHeader() {
-		return route("add_response_header_route")
-				.route(host("{segment}.myhost.org"), http("https://example.org"))
-				.after(addResponseHeader("foo", "bar-{segment}"))
-				.build();
+        return route("add_response_header_route")
+            .route(host("{segment}.myhost.org"), http())
+            .before(uri("https://example.org"))
+            .after(addResponseHeader("foo", "bar-{segment}"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/circuitbreaker-filter.adoc

@@ -15,14 +15,17 @@ spring:
     gateway:
       mvc:
         routes:
-        - id: circuitbreaker_route
+        - id: circuitbreakernofallback
           uri: https://example.org
+          predicates:
+          - Path=/anything/circuitbreakernofallback
           filters:
           - CircuitBreaker=myCircuitBreaker
 ----
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.CircuitBreakerFilterFunctions.circuitBreaker;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -33,9 +36,10 @@ class RouteConfiguration {
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsCircuitBreakerNoFallback() {
         return route("circuitbreakernofallback")
-                .route(path("/anything/circuitbreakernofallback"), http("https://example.org"))
-                .filter(circuitBreaker("mycb3"))
-                .build();
+            .route(path("/anything/circuitbreakernofallback"), http())
+            .before(uri("https://example.org"))
+            .filter(circuitBreaker("myCircuitBreaker"))
+            .build();
     }
 }
 ----
@@ -74,6 +78,7 @@ The following listing does the same thing in Java:
 [source,java]
 ----
 import java.net.URI;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.CircuitBreakerFilterFunctions.circuitBreaker;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -84,9 +89,10 @@ class RouteConfiguration {
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsCircuitBreakerFallback() {
         return route("circuitbreaker_route")
-                .route(path("/consumingServiceEndpoint"), http("https://example.org"))
-                .filter(circuitBreaker("myCircuitBreaker", URI.create("forward:/inCaseOfFailureUseThis")))
-                .build();
+            .route(path("/consumingServiceEndpoint"), http())
+            .before(uri("https://example.org"))
+            .filter(circuitBreaker("myCircuitBreaker", URI.create("forward:/inCaseOfFailureUseThis")))
+            .build();
     }
 }
 ----
@@ -102,6 +108,7 @@ In the example below the call `consumingServiceEndpoint/users/1` will be redirec
 [source,java]
 ----
 import java.net.URI;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.CircuitBreakerFilterFunctions.circuitBreaker;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -112,9 +119,10 @@ class RouteConfiguration {
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsCircuitBreakerFallback() {
         return route("circuitbreaker_route")
-                .route(path("/consumingServiceEndpoint/{*segments}"), http("https://example.org"))
-                .filter(circuitBreaker("myCircuitBreaker", URI.create("forward:/inCaseOfFailureUseThis/{segments}")))
-                .build();
+            .route(path("/consumingServiceEndpoint/{*segments}"), http())
+            .before(uri("https://example.org"))
+            .filter(circuitBreaker("myCircuitBreaker", URI.create("forward:/inCaseOfFailureUseThis/{segments}")))
+            .build();
     }
 }
 ----
@@ -126,6 +134,7 @@ However, you can also reroute the request to a controller or handler in an exter
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.CircuitBreakerFilterFunctions.circuitBreaker;
 import static org.springframework.cloud.gateway.server.mvc.filter.LoadBalancerFilterFunctions.lb;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
@@ -142,7 +151,8 @@ class RouteConfiguration {
                 .filter(circuitBreaker("fetchIngredients", URI.create("forward:/fallback")))
                 .build()
             .and(route("ingredients-fallback")
-                .route(path("/fallback"), http("http://localhost:9994"))
+                .route(path("/fallback"), http())
+                .before(uri("https://localhost:9994"))
                 .build());
     }
 }

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/deduperesponseheader.adoc

@@ -14,6 +14,8 @@ spring:
         routes:
         - id: dedupe_response_header_route
           uri: https://example.org
+          predicates:
+          - Path=/hello
           filters:
           - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
 ----
@@ -21,18 +23,19 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.dedupeResponseHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.web.servlet.function.RequestPredicates.path;
 
-
 @Configuration
 class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsDedupeResponseHeader() {
         return route("dedupe_response_header_route")
-                .route(path("/hello"), http("https://example.org"))
+                .route(path("/hello"), http())
+                .before(uri("https://example.org"))
                 .after(dedupeResponseHeader("Access-Control-Allow-Credentials Access-Control-Allow-Origin"))
                 .build();
     }

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/fallback-headers.adoc

@@ -14,7 +14,7 @@ spring:
         - id: ingredients
           uri: lb://ingredients
           predicates:
-          - Path=//ingredients/**
+          - Path=/ingredients/**
           filters:
           - name: CircuitBreaker
             args:
@@ -33,8 +33,9 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
-import static org.springframework.cloud.gateway.server.mvc.filter.CircuitBreakerFilterFunctions.circuitBreaker;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.fallbackHeaders;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
+import static org.springframework.cloud.gateway.server.mvc.filter.CircuitBreakerFilterFunctions.circuitBreaker;
 import static org.springframework.cloud.gateway.server.mvc.filter.LoadBalancerFilterFunctions.lb;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -50,7 +51,8 @@ class RouteConfiguration {
                 .filter(circuitBreaker("fetchIngredients", URI.create("forward:/fallback")))
                 .build()
             .and(route("ingredients-fallback")
-                .route(path("/fallback"), http("http://localhost:9994"))
+                .route(path("/fallback"), http())
+                .before(uri("http://localhost:9994"))
                 .before(fallbackHeaders())
                 .build());
     }

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/loadbalancer.adoc

@@ -43,6 +43,8 @@ spring:
           - Path=/api/**
 ----
 
+WARNING: If using the `lb()` filter, it needs to be after any filter that manipulates the path such as `setPath()` or `stripPrefix()`, otherwise the resulting url could be incorrect. The `lb:` scheme handler in configuration, automatically puts the filter in the highest precedence order.
+
 NOTE: By default, when a service instance cannot be found by the `ReactorLoadBalancer`, a `503` is returned.
 // TODO: implement use404
 // You can configure the gateway to return a `404` by setting `spring.cloud.gateway.loadbalancer.use404=true`.

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/maprequestheader.adoc

@@ -17,6 +17,8 @@ spring:
         routes:
         - id: map_request_header_route
           uri: https://example.org
+          predicates:
+          - Path=/mypath
           filters:
           - MapRequestHeader=Blue, X-Request-Red
 ----
@@ -24,7 +26,8 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
-import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestParameter;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.mapRequestHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -34,7 +37,8 @@ class RouteConfiguration {
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsMapRequestHeader() {
         return route("map_request_header_route")
-				.GET("/mypath", http("https://example.org"))
+				.GET("/mypath", http())
+                .before(uri("https://example.org"))
 				.before(mapRequestHeader("Blue", "X-Request-Red"))
 				.build();
     }

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/modifyrequestbody.adoc

@@ -11,6 +11,7 @@ The following listing shows how to modify a request body  filter:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.modifyRequestBody;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.host;
@@ -20,12 +21,13 @@ import org.springframework.http.MediaType;
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-		return route("rewrite_request_obj")
-				.route(host("*.rewriterequestobj.org"), http("https://example.org"))
-					.before(modifyRequestBody(String.class, Hello.class, MediaType.APPLICATION_JSON_VALUE,
-								(request, s) -> new Hello(s.toUpperCase())))
-					.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsModifyRequestBody() {
+        return route("modify_request_body")
+            .route(host("*.modifyrequestbody.org"), http())
+            .before(uri("https://example.org"))
+            .before(modifyRequestBody(String.class, Hello.class, MediaType.APPLICATION_JSON_VALUE,
+                    (request, s) -> new Hello(s.toUpperCase())))
+            .build();
     }
 
 	record Hello(String message) { }

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/modifyresponsebody.adoc

@@ -5,24 +5,34 @@ You can use the `ModifyResponseBody` filter to modify the response body before i
 
 NOTE: This filter can be configured only by using the Java DSL.
 
-The following listing shows how to modify a response body  filter:
+The following listing shows how to modify a response body filter:
 
+.GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.modifyResponseBody;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
+import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
+import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
+
 @Bean
 public RouterFunction<ServerResponse> gatewayRouterFunctionsModifyResponseBodySimple() {
 	return route("modify_response_body")
 			.GET("/anything/modifyresponsebody", http())
-			.before(new HttpbinUriResolver())
+            .before(uri("https://example.org"))
 			.after(modifyResponseBody(String.class, String.class, null,
 					(request, response, s) -> s.replace("fooval", "FOOVAL")))
 			.build();
 }
 ----
+
+The sample above does not change the content type or do anything dynamic. Below, the sample changes the content type and dynamically modifies the content.
+
 .GatewaySampleApplication.java
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.modifyResponseBody;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.host;
@@ -32,11 +42,13 @@ import org.springframework.http.MediaType;
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-		return route("rewrite_request_obj")
-                .route(host("*.rewriterequestobj.org"), http("https://example.org"))
-					.before(modifyResponseBody(String.class, String.class, MediaType.APPLICATION_JSON_VALUE, (request, response, s) -> s.toUpperCase()))
-					.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsModifyResponseBody() {
+        return route("modify_response_bodu")
+            .route(host("*.modifyresponsebodu.org"), http())
+            .before(uri("https://example.org"))
+            .after(modifyResponseBody(String.class, String.class, MediaType.APPLICATION_JSON_VALUE,
+                    (request, s) -> s.toUpperCase()))
+            .build();
     }
 
 }

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/prefixpath.adoc

@@ -15,6 +15,8 @@ spring:
         routes:
         - id: prefixpath_route
           uri: https://example.org
+          predicates:
+          - Path=/**
           filters:
           - PrefixPath=/mypath
 ----
@@ -22,6 +24,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.prefixPath;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -31,10 +34,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsPrefixPath() {
-		return route("prefixpath_route")
-				.GET("/**", http("https://example.org"))
-					.before("/mypath")
-					.build();
+        return route("prefixpath_route")
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .before(prefixPath("/mypath"))
+            .build();
     }
 }
 ----
@@ -42,3 +46,4 @@ class RouteConfiguration {
 This prefixes `/mypath` to the path of all matching requests.
 So a request to `/hello` is sent to `/mypath/hello`.
 
+WARNING: If using the `lb()` filter, it needs to be after the `prefixPath()` filter, otherwise the resulting url could be incorrect. The `lb:` scheme handler in configuration, automatically puts the filter in the highest precedence order.

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/preservehostheader.adoc

@@ -16,6 +16,8 @@ spring:
         routes:
         - id: preserve_host_route
           uri: https://example.org
+          predicates:
+          - Path=/**
           filters:
           - PreserveHostHeader
 ----
@@ -23,6 +25,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.preserveHostHeader;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -32,10 +35,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsPreserveHostHeader() {
-		return route("preserve_host_route")
-				.GET("/**", http("https://example.org"))
-					.before(preserveHostHeader())
-					.build();
+        return route("preserve_host_route")
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .before(preserveHostHeader())
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/ratelimiter.adoc

@@ -47,6 +47,7 @@ The following is an example of configuring a route with rate limiting:
 .RouteConfiguration.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.Bucket4jFilterFunctions.rateLimit;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -56,12 +57,13 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsRateLimited() {
-		return route("rate_limited_route")
-			.GET("/api/**", http("https://example.org"))
-				.filter(rateLimit(c -> c.setCapacity(100)
-					.setPeriod(Duration.ofMinutes(1))
-					.setKeyResolver(request -> request.servletRequest().getUserPrincipal().getName())))
-				.build();
+        return route("rate_limited_route")
+            .GET("/api/**", http())
+            .before(uri("https://example.org"))
+            .filter(rateLimit(c -> c.setCapacity(100)
+                    .setPeriod(Duration.ofMinutes(1))
+                    .setKeyResolver(request -> request.servletRequest().getUserPrincipal().getName())))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/redirectto.adoc

@@ -18,6 +18,8 @@ spring:
         routes:
         - id: redirectto_route
           uri: https://example.org
+          predicates:
+          - Path=/**
           filters:
           - RedirectTo=302, https://acme.org
 ----
@@ -25,6 +27,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.FilterFunctions.redirectTo;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -34,10 +37,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsRedirectTo() {
-		return route("redirectto_route")
-				.GET("/**", http("https://example.org"))
-					.filter(redirectTo(302, URI.create("acme.org")))
-					.build();
+        return route("redirectto_route")
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .filter(redirectTo(302, URI.create("acme.org")))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestheader.adoc

@@ -16,6 +16,8 @@ spring:
         routes:
         - id: removerequestheader_route
           uri: https://example.org
+          predicates:
+          - Path=/**
           filters:
           - RemoveRequestHeader=X-Request-Foo
 ----
@@ -23,6 +25,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.removeRequestHeader;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -31,11 +34,12 @@ import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFuncti
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsremoveRequestHeader() {
-		return route("removerequestheader_route")
-				.GET("/**", http("https://example.org"))
-					.before(removeRequestHeader("X-Request-Foo"))
-					.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsRemoveRequestHeader() {
+        return route("removerequestheader_route")
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .before(removeRequestHeader("X-Request-Foo"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestparameter.adoc

@@ -16,6 +16,8 @@ spring:
         routes:
         - id: removerequestparameter_route
           uri: https://example.org
+          predicates:
+          - Path=/**
           filters:
           - RemoveRequestParameter=red
 ----
@@ -23,7 +25,8 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
-import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestParameter;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.removeRequestParameter;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -31,11 +34,12 @@ import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFuncti
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-		return route("removerequestparameter_route")
-				.GET("/**", http("https://example.org"))
-					.before(removeRequestParameter("red"))
-					.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsRemoveRequestParameter() {
+        return route("removerequestparameter_route")
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .before(removeRequestParameter("red"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removeresponseheader.adoc

@@ -15,6 +15,8 @@ spring:
         routes:
         - id: removeresponseheader_route
           uri: https://example.org
+          predicates:
+          - Path=/anything/removeresponseheader
           filters:
           - RemoveResponseHeader=X-Response-Foo
 ----
@@ -22,6 +24,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.removeResponseHeader;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -31,9 +34,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsRemoveResponseHeader() {
-        return route("addresponseheader")
-                .GET("/anything/addresheader", http("https://example.org"))
-                .after(removeResponseHeader("X-Response-Foo"))
+        return route("removeresponseheader_route")
+            .GET("/anything/removeresponseheader", http())
+            .before(uri("https://example.org"))
+            .after(removeResponseHeader("X-Response-Foo"))
             .build();
     }
 }

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestheadersize.adoc

@@ -16,6 +16,8 @@ spring:
         routes:
         - id: requestheadersize_route
           uri: https://example.org
+          predicates:
+          - Path=/**
           filters:
           - RequestHeaderSize=1000B
 ----
@@ -23,6 +25,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.requestHeaderSize;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -32,10 +35,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsRequestHeaderSize() {
-		return route("requestheadersize_route")
-				.GET("/**", http("https://example.org"))
-					.before(requestHeaderSize("1000B"))
-					.build();
+        return route("requestheadersize_route")
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .before(requestHeaderSize("1000B"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestsize.adoc

@@ -28,6 +28,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.requestSize;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -37,10 +38,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsRequestSize() {
-		return route("request_size_route")
-				.GET("/upload", http("http://localhost:8080"))
-					.before(requestSize("5000000"))
-					.build();
+        return route("request_size_route")
+            .GET("/upload", http())
+            .before(uri("http://localhost:8080"))
+            .before(requestSize("5000000"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/retry.adoc

@@ -36,7 +36,7 @@ spring:
     gateway:
       mvc:
         routes:
-        - id: retry_test
+        - id: retry_route
           uri: http://localhost:8080/flakey
           predicates:
           - Host=*.retry.com
@@ -53,6 +53,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.FilterFunctions.adaptCachedBody;
 import static org.springframework.cloud.gateway.server.mvc.filter.RetryFilterFunctions.retry;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
@@ -63,12 +64,16 @@ import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequ
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-		return route("add_request_parameter_route")
-			.route(host("*.retry.com"), http("https://example.org"))
-				.filter(retry(config -> config.setRetries(3).setSeries(Set.of(HttpStatus.Series.SERVER_ERROR)).setMethods(Set.of(HttpMethod.GET, HttpMethod.POST)).setCacheBody(true)))
-				.filter(adaptCachedBody())
-			.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsRetry() {
+        return route("retry_route")
+            .route(host("*.retry.com"), http())
+            .before(uri("http://localhost:8080/flakey"))
+            .filter(retry(config -> config.setRetries(3)
+                    .setSeries(Set.of(HttpStatus.Series.SERVER_ERROR))
+                    .setMethods(Set.of(HttpMethod.GET, HttpMethod.POST))
+                    .setCacheBody(true)))
+            .filter(adaptCachedBody())
+            .build();
     }
 }
 ----
@@ -79,11 +84,11 @@ Instead, it should throw an `Exception` or signal an error (for example, through
 
 NOTE: When using the retry filter, it will retry all filters that come after it. Make sure the results of the filters following the retry filter are as expected when they are executed multiple times.
 
-// WARNING: When using the retry filter with any HTTP method with a body, the body will be cached and the gateway will become memory constrained. The body is cached in a request attribute defined by `ServerWebExchangeUtils.CACHED_REQUEST_BODY_ATTR`. The type of the object is `org.springframework.core.io.buffer.DataBuffer`.
+WARNING: When using the retry filter with any HTTP method with a body and `cacheBody=true`, the body will be cached and the gateway will become memory constrained. The body is cached in a request attribute defined by `MvcUtils.CACHED_REQUEST_BODY_ATT`. The type of the object is `ByteArrayInputStream`.
 
 A simplified "shortcut" notation can be added with a single `status` and `method`.
 
-The following two examples are equivalent:
+The following two example routes are equivalent:
 
 .application.yml
 [source,yaml]

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritelocationresponseheader.adoc

@@ -15,6 +15,8 @@ spring:
         routes:
         - id: rewritelocationresponseheader_route
           uri: http://example.org
+          predicates:
+          - Path=/**
           filters:
           - RewriteLocationResponseHeader=AS_IN_REQUEST, Location, ,
 ----
@@ -22,7 +24,8 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
-import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.addResponseHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
+import static org.springframework.cloud.gateway.server.mvc.filter.RewriteLocationResponseHeaderFilterFunctions.rewriteLocationResponseHeader;
 import static org.springframework.cloud.gateway.server.mvc.filter.RewriteLocationResponseHeaderFilterFunctions.StripVersion;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -33,9 +36,11 @@ class RouteConfiguration {
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsRewriteLocationResponseHeader() {
         return route("rewritelocationresponseheader_route")
-				.GET("/**", http("https://example.org"))
-					.after(rewriteLocationResponseHeader(config -> config.setLocationHeaderName("Location").setStripVersion(StripVersion.AS_IN_REQUEST)))
-					.build();
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .after(rewriteLocationResponseHeader(config -> config.setLocationHeaderName("Location")
+                    .setStripVersion(StripVersion.AS_IN_REQUEST)))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritepath.adoc

@@ -25,6 +25,7 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.rewritePath;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -33,13 +34,15 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsRewritePath() {
-		return route("rewritepath_route")
-				.GET("/red/**", http("https://example.org"))
-					.before(rewritePath("/red/(?<segment>.*)", "/${segment}"))
-					.build();
+        return route("rewritepath_route")
+            .GET("/red/**", http())
+            .before(uri("https://example.org"))
+            .before(rewritePath("/red/(?<segment>.*)", "/${segment}"))
+            .build();
     }
 }
 ----
 
 For a request path of `/red/blue`, this sets the path to `/blue` before making the downstream request. Note that in `application.yml` the `$` should be replaced with `$\` because of the YAML specification.
 
+WARNING: If using the `lb()` filter, it needs to be after the `rewritePath()` filter, otherwise the resulting url could be incorrect. The `lb:` scheme handler in configuration, automatically puts the filter in the highest precedence order.

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriterequestparameter.adoc

@@ -26,6 +26,7 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.addRequestParameter;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -33,11 +34,12 @@ import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFuncti
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-		return route("add_request_parameter_route")
-				.GET("/anything/addrequestparam", http("https://example.org"))
-					.before(addRequestParameter("red", "blue"))
-					.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsRewriteRequestParameter() {
+        return route("rewriterequestparameter_route")
+            .GET("products", http())
+            .before(uri("https://example.org"))
+            .before(addRequestParameter("red", "blue"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriteresponseheader.adoc

@@ -16,14 +16,17 @@ spring:
         routes:
         - id: rewriteresponseheader_route
           uri: https://example.org
+          predicates:
+          - Path=/**
           filters:
-          - RewriteResponseHeader=X-Response-Red, , password=[^&]+, password=***
+          - RewriteResponseHeader=X-Response-Red, password=[^&]+, password=***
 ----
 
 .GatewaySampleApplication.java
 [source,java]
 ----
-import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.addResponseHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.rewriteResponseHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -33,8 +36,9 @@ class RouteConfiguration {
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsRewriteResponseHeader() {
         return route("rewriteresponseheader_route")
-                .GET("/**", http("https://example.org"))
-                .after(rewriteResponseHeader("X-Request-Red", "password=[^&]+", "password=***"))
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .after(rewriteResponseHeader("X-Request-Red", "password=[^&]+", "password=***"))
             .build();
     }
 }

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setpath.adoc

@@ -27,6 +27,7 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.setPath;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -35,13 +36,15 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsSetPath() {
-		return route("add_request_parameter_route")
-				.GET("/red/{segment}", http("https://example.org"))
-					.before(setPath("/{segment"))
-					.build();
+        return route("setpath_route")
+            .GET("/red/{segment}", http())
+            .before(uri("https://example.org"))
+            .before(setPath("/{segment"))
+            .build();
     }
 }
 ----
 
 For a request path of `/red/blue`, this sets the path to `/blue` before making the downstream request.
 
+WARNING: If using the `lb()` filter, it needs to be after the `setPath()` filter, otherwise the resulting url could be incorrect. The `lb:` scheme handler in configuration, automatically puts the filter in the highest precedence order.

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequestheader.adoc

@@ -14,6 +14,8 @@ spring:
         routes:
         - id: setrequestheader_route
           uri: https://example.org
+          predicates:
+          - Path=/**
           filters:
           - SetRequestHeader=X-Request-Red, Blue
 ----
@@ -22,6 +24,7 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.setRequestHostHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -30,10 +33,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsSetRequestHeader() {
-		return route("add_request_parameter_route")
-				.GET("/**", http("https://example.org"))
-					.before(setRequestHostHeader("X-Request-Red", "Blue"))
-					.build();
+        return route("setrequestheader_route")
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .before(setRequestHostHeader("X-Request-Red", "Blue"))
+            .build();
     }
 }
 ----
@@ -64,19 +68,21 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.setRequestHostHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
-import static import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.host;
+import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.host;
 
 @Configuration
 class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsSetRequestHeader() {
-		return route("add_request_parameter_route")
-				.route(host("{segment}.myhost.org"), http("https://example.org"))
-					.before(setRequestHostHeader("X-Request-Red", "Blue-{segment}"))
-					.build();
+        return route("setrequestheader_route")
+            .route(host("{segment}.myhost.org"), http())
+            .before(uri("https://example.org"))
+            .before(setRequestHostHeader("X-Request-Red", "Blue-{segment}"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequesthostheader.adoc

@@ -26,6 +26,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.setRequestHostHeader;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -35,10 +36,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsSetRequestHostHeader() {
-		return route("set_request_host_header_route")
-				.GET("/headers", http("http://localhost:8080"))
-					.before(setRequestHostHeader("example.org"))
-					.build();
+        return route("set_request_host_header_route")
+            .GET("/headers", http())
+            .before(uri("http://localhost:8080"))
+            .before(setRequestHostHeader("example.org"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setresponseheader.adoc

@@ -14,6 +14,8 @@ spring:
         routes:
         - id: setresponseheader_route
           uri: https://example.org
+          predicates:
+          - Path=/anything/setresponseheader
           filters:
           - SetResponseHeader=X-Response-Red, Blue
 ----
@@ -22,6 +24,7 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.setResponseHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -30,9 +33,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsSetResponseHeader() {
-        return route("addresponseheader")
-                .GET("/anything/addresheader", http("https://example.org"))
-                .after(setResponseHeader("X-Response-Red", "Blue"))
+        return route("setresponseheader_route")
+            .GET("/anything/setresponseheader", http())
+            .before(uri("https://example.org"))
+            .after(setResponseHeader("X-Response-Red", "Blue"))
             .build();
     }
 }
@@ -64,6 +68,7 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.setResponseHeader;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.host;
@@ -73,10 +78,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsSetResponseHeader() {
-		return route("add_response_header_route")
-				.route(host("{segment}.myhost.org"), http("https://example.org"))
-				.after(setResponseHeader("foo", "bar-{segment}"))
-				.build();
+        return route("setresponseheader_route")
+            .route(host("{segment}.myhost.org"), http())
+            .before(uri("https://example.org"))
+            .after(setResponseHeader("foo", "bar-{segment}"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setstatus.adoc

@@ -16,10 +16,14 @@ spring:
         routes:
         - id: setstatusstring_route
           uri: https://example.org
+          predicates:
+          - Path=/path1
           filters:
           - SetStatus=UNAUTHORIZED
         - id: setstatusint_route
           uri: https://example.org
+          predicates:
+          - Path=/path2
           filters:
           - SetStatus=401
 ----
@@ -28,6 +32,7 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.AfterFilterFunctions.setStatus;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -37,13 +42,15 @@ class RouteConfiguration {
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsSetStatus() {
         return route("setstatus_route")
-                .GET("/path1", http("https://example.org"))
+                .GET("/path1", http())
+                .before(uri("https://example.org"))
                 // setStatus("UNAUTHORIZED") works as well
                 .after(setStatus(HttpStatus.UNAUTHORIZED))
             .build().and(route("setstatusint_route")
-                .GET("/path2", http("https://example.org"))
+                .before(uri("https://example.org"))
+                .GET("/path2", http())
                 .after(setStatus("401"))
-            .build());
+                .build());
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/stripprefix.adoc

@@ -13,8 +13,8 @@ spring:
     gateway:
       mvc:
         routes:
-        - id: nameRoot
-          uri: https://nameservice
+        - id: strip_prefix_route
+          uri: https://example.org
           predicates:
           - Path=/name/**
           filters:
@@ -25,6 +25,7 @@ spring:
 [source,java]
 ----
 import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.stripPrefix;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -33,13 +34,15 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsStripPrefix() {
-		return route("nameRoot")
-				.GET("/name/**", http("https://example.org"))
-					.before(stripPrefix(2))
-					.build();
+        return route("strip_prefix_route")
+            .GET("/name/**", http())
+            .before(uri("https://example.org"))
+            .before(stripPrefix(2))
+            .build();
     }
 }
 ----
 
-When a request is made through the gateway to `/name/blue/red`, the request made to `nameservice` looks like `https://nameservice/red`.
+When a request is made through the gateway to `/name/blue/red`, the full request url looks like `https://example.org/red`.
 
+WARNING: If using the `lb()` filter, it needs to be after the `stripPrefix()` filter, otherwise the resulting url could be incorrect. The `lb:` scheme handler in configuration, automatically puts the filter in the highest precedence order.

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/tokenrelay.adoc

@@ -54,6 +54,7 @@ Spring Cloud Gateway Server MVC can forward the OAuth2 access token of the curre
 .RouteConfiguration.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.filter.TokenRelayFilterFunctions.tokenRelay;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
@@ -62,11 +63,12 @@ import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFuncti
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsAddReqHeader() {
-		return route("resource")
-			.GET("/resource", http("http://localhost:9000"))
-				.filter(tokenRelay())
-				.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsTokenRelay() {
+        return route("resource")
+            .GET("/resource", http())
+            .before(uri("https://localhost:9000"))
+            .filter(tokenRelay())
+            .build();
     }
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/gateway-request-predicates.adoc

@@ -31,6 +31,7 @@ spring:
 [source,java]
 ----
 import java.time.ZonedDateTime;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.after;
@@ -40,9 +41,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsAfter() {
-		return route("after_route")
-			.route(after(ZonedDateTime.parse("2017-01-20T17:42:47.789-07:00[America/Denver]")), http("https://example.org"))
-			.build();
+        return route("after_route")
+            .route(after(ZonedDateTime.parse("2017-01-20T17:42:47.789-07:00[America/Denver]")), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -74,6 +76,7 @@ spring:
 [source,java]
 ----
 import java.time.ZonedDateTime;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.before;
@@ -83,9 +86,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsBefore() {
-		return route("before_route")
-			.route(before(ZonedDateTime.parse("2017-01-20T17:42:47.789-07:00[America/Denver]")), http("https://example.org"))
-			.build();
+        return route("before_route")
+            .route(before(ZonedDateTime.parse("2017-01-20T17:42:47.789-07:00[America/Denver]")), http()
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -119,6 +123,7 @@ spring:
 [source,java]
 ----
 import java.time.ZonedDateTime;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.between;
@@ -128,9 +133,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsBetween() {
-		return route("between_route")
-			.route(between(ZonedDateTime.parse("2017-01-20T17:42:47.789-07:00[America/Denver]"), ZonedDateTime.parse("2017-01-21T17:42:47.789-07:00[America/Denver]")), http("https://example.org"))
-			.build();
+        return route("between_route")
+            .route(between(ZonedDateTime.parse("2017-01-20T17:42:47.789-07:00[America/Denver]"),
+                ZonedDateTime.parse("2017-01-21T17:42:47.789-07:00[America/Denver]")), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -162,18 +169,20 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
-import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.between;
+import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.cookie;
 
 @Configuration
 class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsCookie() {
-		return route("cookie_route")
-			.route(cookie("chocolate", "ch.p"), http("https://example.org"))
-			.build();
+        return route("cookie_route")
+            .route(cookie("chocolate", "ch.p"), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -204,6 +213,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.header;
@@ -212,10 +222,11 @@ import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequ
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsCookie() {
-		return route("cookie_route")
-			.route(header("X-Request-Id", "\\d+"), http("https://example.org"))
-			.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsHeader() {
+        return route("header_route")
+            .route(header("X-Request-Id", "\\d+"), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -247,6 +258,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.host;
@@ -256,9 +268,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsHost() {
-		return route("host_route")
-			.route(host("**.somehost.org", "**.anotherhost.org"), http("https://example.org"))
-			.build();
+        return route("host_route")
+            .route(host("**.somehost.org", "**.anotherhost.org"), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -296,6 +309,7 @@ spring:
 [source,java]
 ----
 import org.springframework.http.HttpMethod;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.method;
@@ -305,9 +319,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsMethod() {
-		return route("method_route")
-			.route(method(HttpMethod.GET, HttpMethod.POST), http("https://example.org"))
-			.build();
+        return route("method_route")
+            .route(method(HttpMethod.GET, HttpMethod.POST), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -319,19 +334,19 @@ This route matches if the request method was a `GET` or a `POST`.
 .GatewaySampleApplication.java
 [source,java]
 ----
-import org.springframework.http.HttpMethod;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
-import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.methods;
 
 @Configuration
 class RouteConfiguration {
 
     @Bean
-    public RouterFunction<ServerResponse> gatewayRouterFunctionsMethod() {
-		return route("method_route")
-			.GET("/mypath", http("https://example.org"))
-			.build();
+    public RouterFunction<ServerResponse> gatewayRouterFunctionsMethodAndPath() {
+        return route("method_and_path_route")
+            .GET("/mypath", http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -363,19 +378,20 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
-import org.springframework.http.HttpMethod;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
-import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.method;
+import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.path;
 
 @Configuration
 class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsPath() {
-		return route("path_route")
-			.route(path("/red/{segment}", "/blue/{segment}"), http("https://example.org"))
-			.build();
+        return route("path_route")
+            .route(path("/red/{segment}", "/blue/{segment}"), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -421,7 +437,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
-import org.springframework.http.HttpMethod;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.query;
@@ -431,9 +447,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsQuery() {
-		return route("query_route")
-			.route(query("green"), http("https://example.org"))
-			.build();
+        return route("query_route")
+            .route(query("green"), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -457,7 +474,7 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
-import org.springframework.http.HttpMethod;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.query;
@@ -467,9 +484,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> gatewayRouterFunctionsQuery() {
-		return route("query_route")
-			.route(query("red", "gree."), http("https://example.org"))
-			.build();
+        return route("query_route")
+            .route(query("red", "gree."), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -585,22 +603,25 @@ spring:
 .GatewaySampleApplication.java
 [source,java]
 ----
-import org.springframework.http.HttpMethod;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
-import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.method;
+import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.path;
+import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.weight;
 
 @Configuration
 class RouteConfiguration {
 
 	@Bean
 	public RouterFunction<ServerResponse> gatewayRouterFunctionsWeights() {
-		return route("weight_high")
-				.route(weight("group1", 8).and(path("/**")), http("https://weighthigh.org"))
-				.build().and(
-			route("weight_low")
-				.route(weight("group1", 2).and(path("/**")), http("https://weightlow.org"))
-				.build());
+        return route("weight_high")
+                .route(weight("group1", 8).and(path("/**")), http())
+                .before(uri("https://weighthigh.org"))
+                .build().and(
+            route("weight_low")
+                .route(weight("group1", 2).and(path("/**")), http())
+                .before(uri("https://weightlow.org"))
+                .build());
 	}
 }
 ----

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/java-routes-api.adoc

@@ -9,12 +9,15 @@ A https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springfra
 [source,java]
 ----
 import static org.springframework.web.servlet.function.RouterFunctions.route;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
 class SimpleGateway {
     @Bean
     public RouterFunction<ServerResponse> getRoute() {
-        return route().GET("/get", http("https://httpbin.org")).build();
+        return route().GET("/get", http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -29,13 +32,16 @@ Some advanced filters require some metadata to be added to request attributes. T
 .GatewaySampleApplication.java
 [source,java]
 ----
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
 class SimpleGateway {
     @Bean
     public RouterFunction<ServerResponse> getRoute() {
-        return route("simple_route").GET("/get", http("https://httpbin.org")).build();
+        return route("simple_route").GET("/get", http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -43,4 +49,6 @@ class SimpleGateway {
 [[gateway-handlerfunctions]]
 == Gateway MVC Handler Functions
 
-Various `RouterFunctions.Builder` methods require a `HandlerFunction<ServerResponse>`. To create a route that is proxied by the MVC Gateway, `HandlerFunction` implementations are supplied in `org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions`. The most basic is the `http()` `HandlerFunction`. If a `URI` is supplied as a parameter, that is the `URI` used as the downstream target for sending the HTTP requests (as seen in the example above). If no parameter is passed, the function looks for a `URI` in the `org.springframework.cloud.gateway.server.mvc.common.MvcUtils.GATEWAY_REQUEST_URL_ATTR` request attribute. This allows for dynamic targets such as load balancing to set the `URI`.
+Various `RouterFunctions.Builder` methods require a `HandlerFunction<ServerResponse>`. To create a route that is proxied by the MVC Gateway, `HandlerFunction` implementations are supplied in `org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions`. The most basic is the `http()` `HandlerFunction`. The function looks for a `URI` in the `org.springframework.cloud.gateway.server.mvc.common.MvcUtils.GATEWAY_REQUEST_URL_ATTR` request attribute. This allows for dynamic targets such as load balancing to set the `URI`.
+
+WARNING: As of version 4.1.7, `HandlerFunctions.http(String)` and `HandlerFunctions.http(URI)` are now deprecated. Please use `HandlerFunctions.http()` in combination with the `BeforeFilterFunctions.uri()` filter instead. This fixes inconsistencies in dealing with the route url request attribute.

docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/writing-custom-predicates-and-filters.adoc

@@ -48,6 +48,7 @@ To use our new `headerExists` `RequestPredicate`, we need to plug it in to an ap
 [source,java]
 ----
 import static SampleRequestPredicates.headerExists;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -56,9 +57,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> headerExistsRoute() {
-		return route("header_exists_route")
-				.route(headerExists("X-Green"), http("https://example.org"))
-					.build();
+        return route("header_exists_route")
+            .route(headerExists("X-Green"), http())
+            .before(uri("https://example.org"))
+            .build();
     }
 }
 ----
@@ -111,6 +113,7 @@ First, a new `ServerRequest` is created from the existing request. This allows u
 [source,java]
 ----
 import static SampleHandlerFilterFunctions.instrument;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -120,9 +123,10 @@ class RouteConfiguration {
     @Bean
     public RouterFunction<ServerResponse> instrumentRoute() {
 		return route("instrument_route")
-				.GET("/**", http("https://example.org"))
-					.filter(instrument("X-Request-Id", "X-Response-Id"))
-					.build();
+                .GET("/**", http())
+				.filter(instrument("X-Request-Id", "X-Response-Id"))
+                .before(uri("https://example.org"))
+                .build();
     }
 }
 ----
@@ -160,6 +164,7 @@ A new `ServerRequest` is created from the existing request. This allows us to ad
 [source,java]
 ----
 import static SampleBeforeFilterFunctions.instrument;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -168,10 +173,10 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> instrumentRoute() {
-		return route("instrument_route")
-				.GET("/**", http("https://example.org"))
-					.before(instrument("X-Request-Id"))
-					.build();
+        return route("instrument_route").GET("/**", http())
+            .before(uri("https://example.org"))
+            .before(instrument("X-Request-Id"))
+            .build();
     }
 }
 ----
@@ -213,6 +218,7 @@ In this case we simply add the header to the response and return it.
 [source,java]
 ----
 import static SampleAfterFilterFunctions.instrument;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.uri;
 import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
 import static org.springframework.cloud.gateway.server.mvc.handler.HandlerFunctions.http;
 
@@ -221,10 +227,11 @@ class RouteConfiguration {
 
     @Bean
     public RouterFunction<ServerResponse> instrumentRoute() {
-		return route("instrument_route")
-				.GET("/**", http("https://example.org"))
-					.after(instrument("X-Response-Id"))
-					.build();
+        return route("instrument_route")
+            .GET("/**", http())
+            .before(uri("https://example.org"))
+            .after(instrument("X-Response-Id"))
+            .build();
     }
 }
 ----

docs/modules/ROOT/partials/_configprops.adoc

@@ -63,6 +63,7 @@
 |spring.cloud.gateway.filter.set-response-header.enabled | `+++true+++` | Enables the set-response-header filter.
 |spring.cloud.gateway.filter.set-status.enabled | `+++true+++` | Enables the set-status filter.
 |spring.cloud.gateway.filter.strip-prefix.enabled | `+++true+++` | Enables the strip-prefix filter.
+|spring.cloud.gateway.forwarded.by.enabled | `+++false+++` | Enables the Forwarded: by header part.
 |spring.cloud.gateway.forwarded.enabled | `+++true+++` | Enables the ForwardedHeadersFilter.
 |spring.cloud.gateway.global-filter.adapt-cached-body.enabled | `+++true+++` | Enables the adapt-cached-body global filter.
 |spring.cloud.gateway.global-filter.forward-path.enabled | `+++true+++` | Enables the forward-path global filter.