Merge branch '4.2.x' into 4.3.x

Author: spencergibb

docs/src/main/asciidoc/sagan-index.adoc

@@ -1,19 +1,31 @@
-This project provides a library for building an API Gateway on top of Spring WebFlux. Spring Cloud Gateway aims to provide a simple, yet effective way to route to APIs and provide cross cutting concerns to them such as: security, monitoring/metrics, and resiliency.
+---
+title: Spring Cloud Gateway
+status: ACTIVE
+stackOverflow: https://stackoverflow.com/questions/tagged/spring-cloud
+github: https://github.com/spring-cloud/spring-cloud-gateway
+site: https://spring.io/projects/spring-cloud-gateway
+order: 255
+supportPolicy: DOWNSTREAM
+parent: spring-cloud
+---
+
+This project provides a library for building an API Gateway on top of Spring. Spring Cloud Gateway aims to provide a simple, yet effective way to route to APIs and provide cross-cutting concerns to them such as: security, monitoring/metrics, and resiliency.
 
 ## Features
 
 Spring Cloud Gateway features:
 
-* Built on Spring Framework 5, Project Reactor and Spring Boot 2.0
+* Built on Spring Framework and Spring Boot
+* Compatible with both Spring WebFlux and Spring Web MVC
 * Able to match routes on any request attribute.
 * Predicates and filters are specific to routes.
-* Hystrix Circuit Breaker integration.
+* Spring Cloud Circuit Breaker integration.
 * Spring Cloud DiscoveryClient integration
 * Easy to write Predicates and Filters
 * Request Rate Limiting
 * Path Rewriting
 
-## Getting Started
+## Getting Started with Spring Cloud Gateway Server WebFlux
 
 ```java
 @SpringBootApplication
@@ -22,25 +34,70 @@ public class DemogatewayApplication {
 	public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
 		return builder.routes()
 			.route("path_route", r -> r.path("/get")
-				.uri("http://httpbin.org"))
+				.uri("https://httpbin.org"))
 			.route("host_route", r -> r.host("*.myhost.org")
-				.uri("http://httpbin.org"))
+				.uri("https://httpbin.org"))
 			.route("rewrite_route", r -> r.host("*.rewrite.org")
 				.filters(f -> f.rewritePath("/foo/(?<segment>.*)", "/${segment}"))
-				.uri("http://httpbin.org"))
-			.route("hystrix_route", r -> r.host("*.hystrix.org")
-				.filters(f -> f.hystrix(c -> c.setName("slowcmd")))
-				.uri("http://httpbin.org"))
-			.route("hystrix_fallback_route", r -> r.host("*.hystrixfallback.org")
-				.filters(f -> f.hystrix(c -> c.setName("slowcmd").setFallbackUri("forward:/hystrixfallback")))
-				.uri("http://httpbin.org"))
+				.uri("https://httpbin.org"))
+			.route("circuit_breaker_route", r -> r.host("*.circuitbreaker.org")
+				.filters(f -> f.circuitBreaker(c -> c.setName("slowcmd")))
+				.uri("https://httpbin.org"))
+			.route("circuit_breaker_fallback_route", r -> r.host("*.circuitbreakerfallback.org")
+				.filters(f -> f.circuitBreaker(c -> c.setName("slowcmd").setFallbackUri("forward:/circuitbrekerfallback")))
+				.uri("https://httpbin.org"))
 			.route("limit_route", r -> r
 				.host("*.limited.org").and().path("/anything/**")
 				.filters(f -> f.requestRateLimiter(c -> c.setRateLimiter(redisRateLimiter())))
-				.uri("http://httpbin.org"))
+				.uri("https://httpbin.org"))
 			.build();
 	}
 }
 ```
 
-To run your own gateway use the `spring-cloud-starter-gateway` dependency.
+To run your own Gateway Server WebFlux use the `spring-cloud-starter-gateway` dependency.
+
+## Getting Started with Spring Cloud Gateway Server Web MVC
+
+```java
+import static org.springframework.cloud.gateway.server.mvc.handler.GatewayRouterFunctions.route;
+import static org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions.*;
+import static org.springframework.cloud.gateway.server.mvc.predicate.GatewayRequestPredicates.*;
+
+//...
+
+@SpringBootApplication
+public class DemogatewayApplication {
+    @Bean
+    public RouterFunction<ServerResponse> customRoutes() {
+        // @formatter:off
+        return route("path_route")
+                .GET("/get", http())
+                .before(uri("https://httpbin.orb"))
+            .build().and(route("host_route")
+                .route(host("*.myhost.org"), http())
+                .before(uri("https://httpbin.orb"))
+            .build().and(route("rewrite_route")
+                .route(host("*.rewrite.org"), http())
+                .before(uri("https://httpbin.orb"))
+                .before(rewritePath("/foo/(?<segment>.*)", "/${segment}"))
+            .build().and(route("circuitbreaker_route")
+                .route(host("*.circuitbreaker.org"), http())
+                .before(uri("https://httpbin.orb"))
+                .filter(circuitBreaker("slowcmd"))
+            .build().and(route("circuitbreaker_fallback_route")
+                .route(host("*.circuitbreakerfallback.org"), http())
+                .before(uri("https://httpbin.orb"))
+                .filter(circuitBreaker(c -> c.setId("slowcmd").setFallbackUri("forward:/fallback")))
+            .build().and(route("limit_route")
+                .route(host("*.limited.org").and(path("/anything/**")), http())
+                .before(uri("https://httpbin.orb"))
+                .filter(rateLimit(c -> c.setCapacity(10).setPeriod(Duration.ofSeconds(1)).setKeyResolver(request ->
+                        request.headers().firstHeader("X-TokenId"))))
+            .build())))));
+        // @formatter:on
+    }
+}
+```
+
+To run your own Gateway Server WebMVC use the `spring-cloud-starter-gateway-mvc` dependency.

pom.xml

@@ -11,6 +11,7 @@
 
 	<name>Spring Cloud Gateway</name>
 	<description>Spring Cloud Gateway</description>
+	<url>https://github.com/spring-cloud/spring-cloud-gateway</url>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
@@ -39,11 +40,21 @@
 		<developer>
 			<id>sgibb</id>
 			<name>Spencer Gibb</name>
-			<email>sgibb at pivotal.io</email>
-			<organization>Pivotal Software, Inc.</organization>
+			<email>spencer.gibb at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
 			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
-				<role>Project lead</role>
+				<role>lead</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>rbaxter</id>
+			<name>Ryan Baxter</name>
+			<email>ryan.baxter at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
+			<organizationUrl>https://www.spring.io</organizationUrl>
+			<roles>
+				<role>developer</role>
 			</roles>
 		</developer>
 	</developers>
@@ -184,6 +195,23 @@
 	</build>
 
 	<profiles>
+		<profile>
+			<id>central</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<configuration>
+							<excludeArtifacts>
+								<artifact>spring-cloud-gateway-integration-tests</artifact>
+								<artifact>spring-cloud-gateway-sample</artifact>
+							</excludeArtifacts>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>spring</id>
 			<repositories>

spring-cloud-gateway-integration-tests/grpc/src/test/java/org/springframework/cloud/gateway/tests/grpc/JsonToGrpcApplicationTests.java

@@ -36,7 +36,6 @@
 import org.apache.hc.core5.ssl.TrustStrategy;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -50,7 +49,6 @@
  * @author Alberto C. Ríos
  * @author Abel Salgado Romero
  */
-@Disabled
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class JsonToGrpcApplicationTests {
 

spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/gateway/mvc/ProductionConfigurationTests.java

@@ -24,6 +24,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -260,6 +261,10 @@ public void deleteWithoutBody() {
 		assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
+	@Disabled
+	// TODO This is broken due to a regression in Spring Framework 6.2.8,
+	// It will be fixed in 6.2.9 and boot 3.4.8
+	// See https://github.com/spring-projects/spring-framework/issues/35068
 	@Test
 	public void deleteWithBody() {
 		Foo foo = new Foo("to-be-deleted");