Merge branch 'spring-cloud:main' into setrequesturi

Author: stepancar

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

@@ -10,7 +10,7 @@ The following headers (shown with their default values) are added:
 * `X-Frame-Options (DENY)`
 * `X-Content-Type-Options (nosniff)`
 * `Referrer-Policy (no-referrer)`
-* `Content-Security-Policy (default-src 'self' https:; font-src 'self' https: data:; img-src 'self' https: data:; object-src 'none'; script-src https:; style-src 'self' https: 'unsafe-inline)'`
+* `Content-Security-Policy (default-src 'self' https:; font-src 'self' https: data:; img-src 'self' https: data:; object-src 'none'; script-src https:; style-src 'self' https: 'unsafe-inline')`
 * `X-Download-Options (noopen)`
 * `X-Permitted-Cross-Domain-Policies (none)`
 

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

@@ -192,6 +192,8 @@ This route matches if the request path was, for example: `/red/1` or `/red/1/` o
 
 If `matchTrailingSlash` is set to `false`, then request path `/red/1/` will not be matched.
 
+If you have set `spring.webflux.base-path` property, this will influence the path matching. The property value will be automatically prepended to the path patterns. For example, with `spring.webflux.base-path=/app` and a path pattern of `/red/\{segment\}`, the full pattern used for matching would be `/app/red/\{segment\}`.
+
 This predicate extracts the URI template variables (such as `segment`, defined in the preceding example) as a map of names and values and places it in the `ServerWebExchange.getAttributes()` with a key defined in `ServerWebExchangeUtils.URI_TEMPLATE_VARIABLES_ATTRIBUTE`.
 Those values are then available for use by <<gateway-route-filters,`GatewayFilter` factories>>
 

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

@@ -240,21 +240,19 @@ The above route will add a `X-Response-Id` header to the response. Note the use
 
 == How To Register Custom Predicates and Filters for Configuration
 
-To use custom Predicates and Filters in external configuration you need to create a special Supplier class and register it in `META-INF/spring.factories`.
+To use custom Predicates and Filters in external configuration you need to create a special Supplier class and register it a bean in the application context.
 
 === Registering Custom Predicates
 
 To register custom predicates you need to implement `PredicateSupplier`. The `PredicateDiscoverer` looks for static methods that return `RequestPredicates` to register.
 
-
 SampleFilterSupplier.java
 [source,java]
 ----
 package com.example;
 
 import org.springframework.cloud.gateway.server.mvc.predicate.PredicateSupplier;
 
-@Configuration
 class SamplePredicateSupplier implements PredicateSupplier {
 
 	@Override
@@ -265,7 +263,24 @@ class SamplePredicateSupplier implements PredicateSupplier {
 }
 ----
 
-You then need to add the class in `META-INF/spring.factories`.
+To register the `PredicateSupplier` for use in config files, you then need to add the class as a bean as in the example below:
+
+.PredicateConfiguration.java
+[source,java]
+----
+package com.example;
+
+@Configuration
+class PredicateConfiguration {
+
+    @Bean
+    public SamplePredicateSupplier samplePredicateSupplier() {
+        return new SamplePredicateSupplier();
+    }
+}
+----
+
+The requirement to add the class to `META-INF/spring.factories` is deprecated and will be removed in the next major release.
 
 .META-INF/spring.factories
 [source]
@@ -285,7 +300,6 @@ package com.example;
 
 import org.springframework.cloud.gateway.server.mvc.filter.SimpleFilterSupplier;
 
-@Configuration
 class SampleFilterSupplier extends SimpleFilterSupplier {
 
     public SampleFilterSupplier() {
@@ -294,7 +308,24 @@ class SampleFilterSupplier extends SimpleFilterSupplier {
 }
 ----
 
-You then need to add the class in `META-INF/spring.factories`.
+To register the `FilterSupplier` for use in config files, you then need to add the class as a bean as in the example below:
+
+.FilterConfiguration.java
+[source,java]
+----
+package com.example;
+
+@Configuration
+class FilterConfiguration {
+
+    @Bean
+    public SampleFilterSupplier sampleFilterSupplier() {
+        return new SampleFilterSupplier();
+    }
+}
+----
+
+The requirement to add the class to `META-INF/spring.factories` is deprecated and will be removed in the next major release.
 
 .META-INF/spring.factories
 [source]

docs/modules/ROOT/partials/_configprops.adoc

@@ -5,6 +5,6 @@
     "@antora/collector-extension": "1.0.1",
     "@asciidoctor/tabs": "1.0.0-beta.6",
     "@springio/antora-extensions": "1.14.4",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.16"
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.17"
   }
 }

docs/package.json

@@ -12,7 +12,7 @@
 
 	<properties>
 		<protoc.version>3.25.1</protoc.version>
-		<grpc.version>1.71.0</grpc.version>
+		<grpc.version>1.72.0</grpc.version>
 	</properties>
 
 	<parent>

spring-cloud-gateway-integration-tests/grpc/pom.xml

@@ -20,7 +20,7 @@ management:
 
 spring:
   cloud:
-    gateway:
+    gateway.server.webflux:
       httpserver:
         wiretap: true
       httpclient:

spring-cloud-gateway-integration-tests/grpc/src/test/resources/application.yml

@@ -13,7 +13,7 @@ server:
 
 spring:
   cloud:
-    gateway:
+    gateway.server.webflux:
 #      httpserver:
 #        wiretap: true
       httpclient:

spring-cloud-gateway-integration-tests/http2/src/main/resources/application.yml

@@ -9,5 +9,5 @@ server:
 
 spring:
   cloud:
-    gateway:
+    gateway.server.webflux:
       enabled: false

spring-cloud-gateway-integration-tests/http2/src/test/resources/application-nossl.yml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>httpclient</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Spring Cloud Gateway HttpClient Integration Test</name>
+	<description>Spring Cloud Gateway HttpClient Integration Test</description>
+
+	<properties>
+	</properties>
+
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-gateway-integration-tests</artifactId>
+		<version>4.3.0-SNAPSHOT</version>
+		<relativePath>..</relativePath> <!-- lookup parent from repository -->
+	</parent>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-gateway-mvc</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.retry</groupId>
+			<artifactId>spring-retry</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-loadbalancer</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>