Merge pull request #4033 from ryanjbaxter/fix-mvc-docs-properties

Updated mvc docs with new properties

Author: ryanjbaxter

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

@@ -10,14 +10,15 @@ The following example configures an `AddRequestHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: add_request_header_route
-          uri: https://example.org
-          predicates:
-          - Path=/red
-          filters:
-          - AddRequestHeader=X-Request-red, blue
+      server:
+        webmvc:
+          routes:
+            - id: add_request_header_route
+              uri: https://example.org
+              predicates:
+              - Path=/red
+              filters:
+              - AddRequestHeader=X-Request-red, blue
 ----
 
 .GatewaySampleApplication.java

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

@@ -10,14 +10,15 @@ The following example configures an `AddRequestHeadersIfNotPresent` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - 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
+      server:
+        webmvc:
+          routes:
+            - 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
 ----
 
 .GatewaySampleApplication.java

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

@@ -10,14 +10,15 @@ application.yml
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: add_request_parameter_route
-          uri: https://example.org
-          predicates:
-          - Path=/anything/addrequestparam
-          filters:
-          - AddRequestParameter=red, blue
+      server:
+        webmvc:
+          routes:
+            - id: add_request_parameter_route
+              uri: https://example.org
+              predicates:
+              - Path=/anything/addrequestparam
+              filters:
+              - AddRequestParameter=red, blue
 ----
 
 .GatewaySampleApplication.java

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

@@ -10,14 +10,15 @@ The following example configures an `AddResponseHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: add_response_header_route
-          uri: https://example.org
-          predicates:
-          - Path=/anything/addresheader
-          filters:
-          - AddResponseHeader=X-Response-Red, Blue
+      server:
+        webmvc:
+          routes:
+            - id: add_response_header_route
+              uri: https://example.org
+              predicates:
+              - Path=/anything/addresheader
+              filters:
+              - AddResponseHeader=X-Response-Red, Blue
 ----
 
 .GatewaySampleApplication.java

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

@@ -13,14 +13,15 @@ The following example configures a Spring Cloud CircuitBreaker  filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: circuitbreakernofallback
-          uri: https://example.org
-          predicates:
-          - Path=/anything/circuitbreakernofallback
-          filters:
-          - CircuitBreaker=myCircuitBreaker
+      server:
+        webmvc:
+          routes:
+            - id: circuitbreakernofallback
+              uri: https://example.org
+              predicates:
+              - Path=/anything/circuitbreakernofallback
+              filters:
+              - CircuitBreaker=myCircuitBreaker
 ----
 .GatewaySampleApplication.java
 [source,java]
@@ -59,17 +60,18 @@ The following example configures such a fallback:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: circuitbreaker_route
-          uri: https://example.org
-          predicates:
-          - Path=/consumingServiceEndpoint
-          filters:
-          - name: CircuitBreaker
-            args:
-              name: myCircuitBreaker
-              fallbackUri: forward:/inCaseOfFailureUseThis
+      server:
+        webmvc:
+          routes:
+            - id: circuitbreaker_route
+              uri: https://example.org
+              predicates:
+              - Path=/consumingServiceEndpoint
+              filters:
+              - name: CircuitBreaker
+                args:
+                  name: myCircuitBreaker
+                  fallbackUri: forward:/inCaseOfFailureUseThis
 ----
 
 The following listing does the same thing in Java:
@@ -182,20 +184,21 @@ value or the String representation of the `HttpStatus` enumeration.
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: circuitbreaker_route
-          uri: lb://backing-service:8088
-          predicates:
-          - Path=/consumingServiceEndpoint
-          filters:
-          - name: CircuitBreaker
-            args:
-              name: myCircuitBreaker
-              fallbackUri: forward:/inCaseOfFailureUseThis
-              statusCodes:
-                - 500
-                - "NOT_FOUND"
+      server:
+        webmvc:
+          routes:
+            - id: circuitbreaker_route
+              uri: lb://backing-service:8088
+              predicates:
+              - Path=/consumingServiceEndpoint
+              filters:
+              - name: CircuitBreaker
+                args:
+                  name: myCircuitBreaker
+                  fallbackUri: forward:/inCaseOfFailureUseThis
+                  statusCodes:
+                    - 500
+                    - "NOT_FOUND"
 ----
 
 .GatewaySampleApplication.java

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

@@ -10,14 +10,15 @@ The following example configures a `DedupeResponseHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: dedupe_response_header_route
-          uri: https://example.org
-          predicates:
-          - Path=/hello
-          filters:
-          - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
+      server:
+        webmvc:
+          routes:
+            - id: dedupe_response_header_route
+              uri: https://example.org
+              predicates:
+              - Path=/hello
+              filters:
+              - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
 ----
 .GatewaySampleApplication.java
 [source,java]

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

@@ -9,25 +9,26 @@ The `FallbackHeaders` factory lets you add Spring Cloud CircuitBreaker execution
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: ingredients
-          uri: lb://ingredients
-          predicates:
-          - Path=/ingredients/**
-          filters:
-          - name: CircuitBreaker
-            args:
-              name: fetchIngredients
-              fallbackUri: forward:/fallback
-        - id: ingredients-fallback
-          uri: http://localhost:9994
-          predicates:
-          - Path=/fallback
-          filters:
-          - name: FallbackHeaders
-            args:
-              executionExceptionTypeHeaderName: Test-Header
+      server:
+        webmvc:
+          routes:
+            - id: ingredients
+              uri: lb://ingredients
+              predicates:
+              - Path=/ingredients/**
+              filters:
+              - name: CircuitBreaker
+                args:
+                  name: fetchIngredients
+                  fallbackUri: forward:/fallback
+            - id: ingredients-fallback
+              uri: http://localhost:9994
+              predicates:
+              - Path=/fallback
+              filters:
+              - name: FallbackHeaders
+                args:
+                  executionExceptionTypeHeaderName: Test-Header
 ----
 
 .GatewaySampleApplication.java

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

@@ -35,12 +35,13 @@ The following listing configures a LoadBalancer Filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: api_route
-          uri: lb://apiservice
-          predicates:
-          - Path=/api/**
+      server:
+        webmvc:
+          routes:
+            - id: api_route
+              uri: lb://apiservice
+              predicates:
+              - 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.

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

@@ -13,14 +13,15 @@ The following example configures a `MapRequestHeader`:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: map_request_header_route
-          uri: https://example.org
-          predicates:
-          - Path=/mypath
-          filters:
-          - MapRequestHeader=Blue, X-Request-Red
+      server:
+        webmvc:
+          routes:
+            - id: map_request_header_route
+              uri: https://example.org
+              predicates:
+              - Path=/mypath
+              filters:
+              - MapRequestHeader=Blue, X-Request-Red
 ----
 
 .GatewaySampleApplication.java

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

@@ -11,14 +11,15 @@ The following example configures a `PrefixPath` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: prefixpath_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - PrefixPath=/mypath
+      server:
+        webmvc:
+          routes:
+            - id: prefixpath_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - PrefixPath=/mypath
 ----
 
 .GatewaySampleApplication.java