Release v7.0.3

See gh-36044

.github/actions/prepare-gradle-build/action.yml

@@ -24,7 +24,7 @@ runs:
   using: composite
   steps:
     - name: Set Up Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || (inputs.java-distribution || 'liberica') }}
         java-version: |
@@ -32,7 +32,7 @@ runs:
           ${{ inputs.java-toolchain == 'true' && '17' || '' }}
           25
     - name: Set Up Gradle
-      uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
       with:
         cache-read-only: false
         develocity-access-key: ${{ inputs.develocity-access-key }}

.github/actions/sync-to-maven-central/action.yml

@@ -17,14 +17,14 @@ runs:
   using: composite
   steps:
     - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@f748a0599171a192a2668afee8d0497f7c1069df # v4.5.6
+      uses: jfrog/setup-jfrog-cli@5b06f730cc5a6f55d78b30753f8583454b08c0aa # v4.8.1
       env:
         JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
     - name: Download Release Artifacts
       shell: bash
       run: jf rt download --spec ${{ format('{0}/artifacts.spec', github.action_path) }} --spec-vars 'buildName=${{ format('spring-framework-{0}', inputs.spring-framework-version) }};buildNumber=${{ github.run_number }}'
     - name: Sync
-      uses: spring-io/central-publish-action@0cdd90d12e6876341e82860d951e1bcddc1e51b6 # v0.2.0
+      uses: spring-io/central-publish-action@0c03960e9b16fdfe70e2443e1d5393cbc3a35622 # v0.3.0
       with:
         token: ${{ inputs.central-token-password }}
         token-name: ${{ inputs.central-token-username }}

.github/workflows/backport-bot.yml

@@ -18,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'liberica'
           java-version: 17

.github/workflows/build-and-deploy-snapshot.yml

@@ -13,7 +13,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Build and Publish
         id: build-and-publish
         uses: ./.github/actions/build
@@ -21,7 +21,7 @@ jobs:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           publish: true
       - name: Deploy
-        uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
+        uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
         with:
           artifact-properties: |
             /**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false

.github/workflows/build-pull-request.yml

@@ -10,7 +10,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Build
         id: build
         uses: ./.github/actions/build
@@ -19,7 +19,7 @@ jobs:
         uses: ./.github/actions/print-jvm-thread-dumps
       - name: Upload Build Reports
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: build-reports
           path: '**/build/reports/'

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
           git config --global core.longPaths true
           Stop-Service -name Docker
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Build
         id: build
         uses: ./.github/actions/build

.github/workflows/deploy-docs.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 1
         ref: docs-build

.github/workflows/release-milestone.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Build and Publish
         id: build-and-publish
         uses: ./.github/actions/build
@@ -21,7 +21,7 @@ jobs:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           publish: true
       - name: Stage Release
-        uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
+        uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
         with:
           artifact-properties: |
             /**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v6
       - name: Sync to Maven Central
         uses: ./.github/actions/sync-to-maven-central
         with:
@@ -73,7 +73,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JFrog CLI
-        uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
+        uses: jfrog/setup-jfrog-cli@5b06f730cc5a6f55d78b30753f8583454b08c0aa # v4.8.1
         env:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Promote build
@@ -86,7 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v6
       - name: Create GitHub Release
         uses: ./.github/actions/create-github-release
         with:

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Build and Publish
         id: build-and-publish
         uses: ./.github/actions/build
@@ -20,7 +20,7 @@ jobs:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           publish: true
       - name: Stage Release
-        uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
+        uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
         with:
           artifact-properties: |
             /**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false
@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v6
       - name: Sync to Maven Central
         uses: ./.github/actions/sync-to-maven-central
         with:
@@ -72,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JFrog CLI
-        uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
+        uses: jfrog/setup-jfrog-cli@5b06f730cc5a6f55d78b30753f8583454b08c0aa # v4.8.1
         env:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Promote build
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v6
       - name: Create GitHub Release
         uses: ./.github/actions/create-github-release
         with:

.github/workflows/verify.yml

@@ -30,23 +30,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Release Verification Tests
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: 'v0.0.2'
           repository: spring-projects/spring-framework-release-verification
           token: ${{ secrets.token }}
       - name: Check Out Send Notification Action
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: send-notification
           sparse-checkout: .github/actions/send-notification
       - name: Set Up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'liberica'
           java-version: 17
       - name: Set Up Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
         with:
           cache-read-only: false
       - name: Configure Gradle Properties
@@ -64,7 +64,7 @@ jobs:
         run: ./gradlew spring-framework-release-verification-tests:test
       - name: Upload Build Reports on Failure
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: build-reports
           path: '**/build/reports/'

build.gradle

@@ -6,7 +6,7 @@ plugins {
 	id 'com.github.bjornvester.xjc' version '1.8.2' apply false
 	id 'com.gradleup.shadow' version "9.2.2" apply false
 	id 'me.champeau.jmh' version '0.7.2' apply false
-	id 'io.spring.nullability' version '0.0.8' apply false
+	id 'io.spring.nullability' version '0.0.9' apply false
 }
 
 ext {
@@ -70,13 +70,14 @@ configure([rootProject] + javaProjects) { project ->
 	ext.javadocLinks = [
 			"https://docs.oracle.com/en/java/javase/17/docs/api/",
 			//"https://jakarta.ee/specifications/platform/11/apidocs/",
-			"https://docs.hibernate.org/orm/5.6/javadocs/",
+			"https://docs.hibernate.org/orm/7.2/javadocs/",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
-			"https://hc.apache.org/httpcomponents-client-5.5.x/current/httpclient5/apidocs/",
+			"https://hc.apache.org/httpcomponents-client-5.6.x/current/httpclient5/apidocs/",
+			"https://projectreactor.io/docs/core/release/api/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://docs.junit.org/6.0.1/api/",
-			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
+			"https://docs.junit.org/6.0.2/api/",
+			"https://www.reactive-streams.org/reactive-streams-1.0.4-javadoc/",
 			"https://r2dbc.io/spec/1.0.0.RELEASE/api/",
 			"https://jspecify.dev/docs/api/"
 	] as String[]

buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java

@@ -50,7 +50,7 @@ public class CheckstyleConventions {
 			project.getPlugins().apply(CheckstylePlugin.class);
 			project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g"));
 			CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
-			checkstyle.setToolVersion("12.2.0");
+			checkstyle.setToolVersion("13.0.0");
 			checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 			String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 			DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

buildSrc/src/main/java/org/springframework/build/architecture/ArchitectureCheck.java

@@ -49,7 +49,6 @@ import static org.springframework.build.architecture.ArchitectureRules.classesSh
 import static org.springframework.build.architecture.ArchitectureRules.javaClassesShouldNotImportKotlinAnnotations;
 import static org.springframework.build.architecture.ArchitectureRules.noClassesShouldCallStringToLowerCaseWithoutLocale;
 import static org.springframework.build.architecture.ArchitectureRules.noClassesShouldCallStringToUpperCaseWithoutLocale;
-import static org.springframework.build.architecture.ArchitectureRules.packageInfoShouldBeNullMarked;
 
 /**
  * {@link Task} that checks for architecture problems.
@@ -64,8 +63,7 @@ public abstract class ArchitectureCheck extends DefaultTask {
 	public ArchitectureCheck() {
 		getOutputDirectory().convention(getProject().getLayout().getBuildDirectory().dir(getName()));
 		getProhibitObjectsRequireNonNull().convention(true);
-		getRules().addAll(packageInfoShouldBeNullMarked(),
-				classesShouldNotImportForbiddenTypes(),
+		getRules().addAll(classesShouldNotImportForbiddenTypes(),
 				javaClassesShouldNotImportKotlinAnnotations(),
 				allPackagesShouldBeFreeOfTangles(),
 				noClassesShouldCallStringToLowerCaseWithoutLocale(),

buildSrc/src/main/java/org/springframework/build/architecture/ArchitectureRules.java

@@ -46,13 +46,6 @@ abstract class ArchitectureRules {
 				.because("String.toUpperCase(Locale.ROOT) should be used instead");
 	}
 
-	static ArchRule packageInfoShouldBeNullMarked() {
-		return ArchRuleDefinition.classes()
-				.that().haveSimpleName("package-info")
-				.should().beAnnotatedWith("org.jspecify.annotations.NullMarked")
-				.allowEmptyShould(true);
-	}
-
 	static ArchRule classesShouldNotImportForbiddenTypes() {
 		return ArchRuleDefinition.noClasses()
 				.should().dependOnClassesThat()

buildSrc/src/main/java/org/springframework/build/shadow/ShadowSource.java

@@ -78,7 +78,7 @@ public class ShadowSource extends DefaultTask {
 	}
 
 	@OutputDirectory
-	DirectoryProperty getOutputDirectory() {
+	public DirectoryProperty getOutputDirectory() {
 		return this.outputDirectory;
 	}
 

framework-api/framework-api.gradle

@@ -20,6 +20,7 @@ dependencies {
 	}
 }
 
+def springAspectsOutput = project(":spring-aspects").sourceSets.main.output
 javadoc {
 	javadocTool.set(javaToolchains.javadocToolFor({
 		languageVersion = JavaLanguageVersion.of(25)
@@ -49,7 +50,7 @@ javadoc {
 	doFirst {
 		classpath += files(
 				// ensure the javadoc process can resolve types compiled from .aj sources
-				project(":spring-aspects").sourceSets.main.output
+                springAspectsOutput
 		)
 		classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
 	}

framework-docs/framework-docs.gradle

@@ -70,7 +70,7 @@ dependencies {
 	implementation("com.github.ben-manes.caffeine:caffeine")
 	implementation("com.mchange:c3p0:0.9.5.5")
 	implementation("com.oracle.database.jdbc:ojdbc11")
-    implementation("io.micrometer:context-propagation")
+	implementation("io.micrometer:context-propagation")
 	implementation("io.projectreactor.netty:reactor-netty-http")
 	implementation("jakarta.jms:jakarta.jms-api")
 	implementation("jakarta.servlet:jakarta.servlet-api")
@@ -80,12 +80,14 @@ dependencies {
 	implementation("javax.cache:cache-api")
 	implementation("org.apache.activemq:activemq-ra:6.1.2")
 	implementation("org.apache.commons:commons-dbcp2:2.11.0")
+	implementation("org.apache.groovy:groovy-templates")
 	implementation("org.aspectj:aspectjweaver")
 	implementation("org.assertj:assertj-core")
 	implementation("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
+	implementation("org.freemarker:freemarker")
 	implementation("org.jetbrains.kotlin:kotlin-stdlib")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
+	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	implementation("org.junit.jupiter:junit-jupiter-api")
 	implementation("tools.jackson.core:jackson-databind")
 	implementation("tools.jackson.dataformat:jackson-dataformat-xml")

framework-docs/modules/ROOT/nav.adoc

@@ -261,7 +261,6 @@
 **** xref:web/websocket/stomp/configuration-performance.adoc[]
 **** xref:web/websocket/stomp/stats.adoc[]
 **** xref:web/websocket/stomp/testing.adoc[]
-** xref:web/integration.adoc[]
 * xref:web-reactive.adoc[]
 ** xref:web/webflux.adoc[]
 *** xref:web/webflux/new-framework.adoc[]
@@ -344,6 +343,7 @@
 **** xref:testing/testcontext-framework/ctx-management/web.adoc[]
 **** xref:testing/testcontext-framework/ctx-management/web-mocks.adoc[]
 **** xref:testing/testcontext-framework/ctx-management/caching.adoc[]
+**** xref:testing/testcontext-framework/ctx-management/context-pausing.adoc[]
 **** xref:testing/testcontext-framework/ctx-management/failure-threshold.adoc[]
 **** xref:testing/testcontext-framework/ctx-management/hierarchies.adoc[]
 *** xref:testing/testcontext-framework/fixture-di.adoc[]

framework-docs/modules/ROOT/pages/appendix.adoc

@@ -124,6 +124,10 @@ on a test class. See xref:testing/annotations/integration-junit-jupiter.adoc#int
 | The maximum size of the context cache in the _Spring TestContext Framework_. See
 xref:testing/testcontext-framework/ctx-management/caching.adoc[Context Caching].
 
+| `spring.test.context.cache.pause`
+| The pause mode for the context cache in the _Spring TestContext Framework_. See
+xref:testing/testcontext-framework/ctx-management/context-pausing.adoc[Context Pausing].
+
 | `spring.test.context.failure.threshold`
 | The failure threshold for errors encountered while attempting to load an `ApplicationContext`
 in the _Spring TestContext Framework_. See

framework-docs/modules/ROOT/pages/core/aop/ataspectj/pointcuts.adoc

@@ -104,7 +104,7 @@ Note that pointcut definitions are generally matched against any intercepted met
 If a pointcut is strictly meant to be public-only, even in a CGLIB proxy scenario with
 potential non-public interactions through proxies, it needs to be defined accordingly.
 
-If your interception needs include method calls or even constructors within the target
+If your interception needs to include method calls or even constructors within the target
 class, consider the use of Spring-driven xref:core/aop/using-aspectj.adoc#aop-aj-ltw[native AspectJ weaving] instead
 of Spring's proxy-based AOP framework. This constitutes a different mode of AOP usage
 with different characteristics, so be sure to make yourself familiar with weaving

framework-docs/modules/ROOT/pages/core/expressions/language-ref/variables.adoc

@@ -6,7 +6,7 @@ are set by using the `setVariable()` method in `EvaluationContext` implementatio
 
 [NOTE]
 ====
-Variable names must be begin with a letter (as defined below), an underscore, or a dollar
+Variable names must begin with a letter (as defined below), an underscore, or a dollar
 sign.
 
 Variable names must be composed of one or more of the following supported types of

framework-docs/modules/ROOT/pages/data-access/jdbc/simple.adoc

@@ -15,7 +15,7 @@ configuration options. You should instantiate the `SimpleJdbcInsert` in the data
 layer's initialization method. For this example, the initializing method is the
 `setDataSource` method. You do not need to subclass the `SimpleJdbcInsert` class. Instead,
 you can create a new instance and set the table name by using the `withTableName` method.
-Configuration methods for this class follow the `fluid` style that returns the instance
+Configuration methods for this class follow the `fluent` style that returns the instance
 of the `SimpleJdbcInsert`, which lets you chain all configuration methods. The following
 example uses only one configuration method (we show examples of multiple methods later):
 
@@ -349,11 +349,11 @@ parameters return the data read from the table.
 
 You can declare `SimpleJdbcCall` in a manner similar to declaring `SimpleJdbcInsert`. You
 should instantiate and configure the class in the initialization method of your data-access
-layer. Compared to the `StoredProcedure` class, you need not create a subclass
-and you need not to declare parameters that can be looked up in the database metadata.
-The following example of a `SimpleJdbcCall` configuration uses the preceding stored
-procedure (the only configuration option, in addition to the `DataSource`, is the name
-of the stored procedure):
+layer. In contrast to the `StoredProcedure` class, you do not need to create a subclass,
+and you do not need to declare parameters that can be looked up in the database metadata.
+The following `SimpleJdbcCall` configuration example uses the preceding stored procedure.
+The only configuration option (other than the `DataSource`) is the name of the stored
+procedure.
 
 [tabs]
 ======

framework-docs/modules/ROOT/pages/integration/aot-cache.adoc

@@ -3,21 +3,22 @@
 :page-aliases: integration/class-data-sharing.adoc
 :page-aliases: integration/cds.adoc
 
-The ahead-of-time cache is a JVM feature introduced in Java 24 via the
+The ahead-of-time cache is a JVM feature introduced in Java 24 via
 https://openjdk.org/jeps/483[JEP 483] that can help reduce the startup time and memory
-footprint of Java applications. AOT cache is a natural evolution of https://docs.oracle.com/en/java/javase/17/vm/class-data-sharing.html[Class Data Sharing (CDS)].
+footprint of Java applications. AOT cache is a natural evolution of
+https://docs.oracle.com/en/java/javase/17/vm/class-data-sharing.html[Class Data Sharing (CDS)].
 Spring Framework supports both CDS and AOT cache, and it is recommended that you use the
-later if available in the JVM version your are using (Java 24+).
+latter if available in the JVM version you are using (Java 24+).
 
 To use this feature, an AOT cache should be created for the particular classpath of the
 application. It is possible to create this cache on the deployed instance, or during a
-training run performed for example when packaging the application thanks to an hook-point
+training run performed for example when packaging the application thanks to a hook-point
 provided by the Spring Framework to ease such use case. Once the cache is available, users
 should opt in to use it via a JVM flag.
 
 NOTE: If you are using Spring Boot, it is highly recommended to leverage its
 {spring-boot-docs-ref}/packaging/efficient.html#packaging.efficient.unpacking[executable JAR unpacking support]
-which is designed to fulfill the class loading requirements of both AOT cache and CDS.
+which is designed to fulfill the class loading requirements of both the AOT cache and CDS.
 
 == Creating the cache
 
@@ -29,14 +30,22 @@ invoked; but the lifecycle has not started, and the `ContextRefreshedEvent` has
 been published.
 
 To create the cache during the training run, it is possible to specify the `-Dspring.context.exit=onRefresh`
-JVM flag to start then exit your Spring application once the
+JVM flag to start and then exit your Spring application once the
 `ApplicationContext` has refreshed:
 
 
 --
 [tabs]
 ======
-AOT cache::
+
+AOT cache (Java 25+)::
++
+[source,bash,subs="verbatim,quotes"]
+----
+java -XX:AOTCacheOutput=app.aot -Dspring.context.exit=onRefresh -jar application.jar ...
+----
+
+AOT cache (Java 24)::
 +
 [source,bash,subs="verbatim,quotes"]
 ----
@@ -55,6 +64,12 @@ java -XX:ArchiveClassesAtExit=app.jsa -Dspring.context.exit=onRefresh ...
 ======
 --
 
+NOTE: With Java 25+, AOT cache stores, among other things, the
+https://openjdk.org/jeps/515[method profiling information]. Therefore, to benefit of this capability,
+it is recommended to create an AOT cache for an application that experienced a portion of a
+production-like workflow instead of using the `-Dspring.context.exit=onRefresh` flag which designed to
+optimize only the startup of your application.
+
 == Using the cache
 
 Once the cache file has been created, you can use it to start your application faster:
@@ -82,7 +97,7 @@ java -XX:SharedArchiveFile=app.jsa ...
 
 Pay attention to the logs and the startup time to check if the AOT cache is used successfully.
 To figure out how effective the cache is, you can enable class loading logs by adding
-an extra attribute: `-Xlog:class+load:file=aot-cache.log`. This creates a `aot-cache.log` with
+an extra attribute: `-Xlog:class+load:file=aot-cache.log`. This creates an `aot-cache.log` with
 every attempt to load a class and its source. Classes that are loaded from the cache should have
 a "shared objects file" source, as shown in the following example:
 
@@ -95,11 +110,11 @@ a "shared objects file" source, as shown in the following example:
 [0.151s][info][class,load] org.springframework.context.MessageSource source: shared objects file
 ----
 
-If the AOT cache can't be enabled or if you have a large number of classes that are not loaded from
+If the AOT cache cannot be enabled or if you have a large number of classes that are not loaded from
 the cache, make sure that the following conditions are fulfilled when creating and using the cache:
 
  - The very same JVM must be used.
  - The classpath must be specified as a JAR or a list of JARs, and avoid the usage of directories and `*` wildcard characters.
  - The timestamps of the JARs must be preserved.
- - When using the cache, the classpath must be the same than the one used to create it, in the same order.
-Additional JARs or directories can be specified *at the end* (but won't be cached).
+ - When using the cache, the classpath must be the same as the one used to create it, in the same order.
+Additional JARs or directories can be specified *at the end* (but will not be cached).

framework-docs/modules/ROOT/pages/integration/appendix.adoc

@@ -1,16 +1,11 @@
 [[appendix]]
 = Appendix
 
-
-
-
 [[appendix.xsd-schemas]]
 == XML Schemas
 
 This part of the appendix lists XML schemas related to integration technologies.
 
-
-
 [[appendix.xsd-schemas-jee]]
 === The `jee` Schema
 
@@ -172,7 +167,7 @@ different properties with `jee`:
 
 The `<jee:local-slsb/>` element configures a reference to a local EJB Stateless Session Bean.
 
-The following example shows how to configures a reference to a local EJB Stateless Session Bean
+The following example shows how to configure a reference to a local EJB Stateless Session Bean
 without `jee`:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -184,7 +179,7 @@ without `jee`:
 	</bean>
 ----
 
-The following example shows how to configures a reference to a local EJB Stateless Session Bean
+The following example shows how to configure a reference to a local EJB Stateless Session Bean
 with `jee`:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -200,7 +195,7 @@ with `jee`:
 
 The `<jee:local-slsb/>` element configures a reference to a local EJB Stateless Session Bean.
 
-The following example shows how to configures a reference to a local EJB Stateless Session Bean
+The following example shows how to configure a reference to a local EJB Stateless Session Bean
 and a number of properties without `jee`:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -215,7 +210,7 @@ and a number of properties without `jee`:
 	</bean>
 ----
 
-The following example shows how to configures a reference to a local EJB Stateless Session Bean
+The following example shows how to configure a reference to a local EJB Stateless Session Bean
 and a number of properties with `jee`:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -234,7 +229,7 @@ and a number of properties with `jee`:
 
 The `<jee:remote-slsb/>` element configures a reference to a `remote` EJB Stateless Session Bean.
 
-The following example shows how to configures a reference to a remote EJB Stateless Session Bean
+The following example shows how to configure a reference to a remote EJB Stateless Session Bean
 without `jee`:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -251,7 +246,7 @@ without `jee`:
 	</bean>
 ----
 
-The following example shows how to configures a reference to a remote EJB Stateless Session Bean
+The following example shows how to configure a reference to a remote EJB Stateless Session Bean
 with `jee`:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -313,7 +308,7 @@ xref:integration/jmx/naming.adoc#jmx-context-mbeanexport[Configuring Annotation-
 === The `cache` Schema
 
 You can use the `cache` elements to enable support for Spring's `@CacheEvict`, `@CachePut`,
-and `@Caching` annotations. It it also supports declarative XML-based caching. See
+and `@Caching` annotations. The `cache` schema also supports declarative XML-based caching. See
 xref:integration/cache/annotations.adoc#cache-annotation-enable[Enabling Caching Annotations] and
 xref:integration/cache/declarative-xml.adoc[Declarative XML-based Caching] for details.
 

framework-docs/modules/ROOT/pages/languages/kotlin/classes-interfaces.adoc

@@ -13,4 +13,4 @@ running the Kotlin compiler with its `-java-parameters` flag for standard Java p
 
 You can declare configuration classes as
 {kotlin-docs}/nested-classes.html[top level or nested but not inner],
-since the later requires a reference to the outer class.
+since the latter requires a reference to the outer class.

framework-docs/modules/ROOT/pages/testing/resttestclient.adoc

@@ -10,7 +10,7 @@ applications without a running server via MockMvc.
 
 
 
-[[resttestclient-setup]]
+[[resttestclient.setup]]
 == Setup
 
 To set up a `RestTestClient` you need to choose a server setup to bind to. This can be one
@@ -18,7 +18,7 @@ of several MockMvc setup choices, or a connection to a live server.
 
 
 
-[[resttestclient-controller-config]]
+[[resttestclient.controller-config]]
 === Bind to Controller
 
 This setup allows you to test specific controller(s) via mock request and response objects,
@@ -42,55 +42,17 @@ Kotlin::
 ----
 ======
 
-[[resttestclient-context-config]]
+[[resttestclient.context-config]]
 === Bind to `ApplicationContext`
 
 This setup allows you to load Spring configuration with Spring MVC
 infrastructure and controller declarations and use it to handle requests via mock request
 and response objects, without a running server.
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@SpringJUnitConfig(WebConfig.class) // <1>
-	class MyTests {
+include-code::./RestClientContextTests[indent=0]
 
-		RestTestClient client;
 
-		@BeforeEach
-		void setUp(ApplicationContext context) {  // <2>
-			client = RestTestClient.bindToApplicationContext(context).build(); // <3>
-		}
-	}
-----
-<1> Specify the configuration to load
-<2> Inject the configuration
-<3> Create the `RestTestClient`
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@SpringJUnitConfig(WebConfig::class) // <1>
-	class MyTests {
-
-		lateinit var client: RestTestClient
-
-		@BeforeEach
-		fun setUp(context: ApplicationContext) { // <2>
-			client = RestTestClient.bindToApplicationContext(context).build() // <3>
-		}
-	}
-----
-<1> Specify the configuration to load
-<2> Inject the configuration
-<3> Create the `RestTestClient`
-======
-
-[[resttestclient-fn-config]]
+[[resttestclient.fn-config]]
 === Bind to Router Function
 
 This setup allows you to test xref:web/webmvc-functional.adoc[functional endpoints] via
@@ -115,7 +77,7 @@ Kotlin::
 ----
 ======
 
-[[resttestclient-server-config]]
+[[resttestclient.server-config]]
 === Bind to Server
 
 This setup connects to a running server to perform full, end-to-end HTTP tests:
@@ -139,7 +101,7 @@ Kotlin::
 
 
 
-[[resttestclient-client-config]]
+[[resttestclient.client-config]]
 === Client Config
 
 In addition to the server setup options described earlier, you can also configure client
@@ -170,7 +132,7 @@ Kotlin::
 
 
 
-[[resttestclient-tests]]
+[[resttestclient.tests]]
 == Writing Tests
 
 xref:integration/rest-clients.adoc#rest-restclient[`RestClient`] and `RestTestClient` have
@@ -182,70 +144,22 @@ provides two alternative ways to verify the response:
 
 
 
-[[resttestclient-workflow]]
+[[resttestclient.workflow]]
 === Built-in Assertions
 
 To use the built-in assertions, remain in the workflow after the call to `exchange()`, and
 use one of the expectation methods. For example:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/1")
-		.accept(MediaType.APPLICATION_JSON)
-		.exchange()
-		.expectStatus().isOk()
-		.expectHeader().contentType(MediaType.APPLICATION_JSON);
-----
+include-code::./RestClientWorkflowTests[tag=test,indent=0]
 
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/1")
-		.accept(MediaType.APPLICATION_JSON)
-		.exchange()
-		.expectStatus().isOk()
-		.expectHeader().contentType(MediaType.APPLICATION_JSON)
-----
-======
 
 If you would like for all expectations to be asserted even if one of them fails, you can
 use `expectAll(..)` instead of multiple chained `expect*(..)` calls. This feature is
 similar to the _soft assertions_ support in AssertJ and the `assertAll()` support in
 JUnit Jupiter.
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/1")
-		.accept(MediaType.APPLICATION_JSON)
-		.exchange()
-		.expectAll(
-			spec -> spec.expectStatus().isOk(),
-			spec -> spec.expectHeader().contentType(MediaType.APPLICATION_JSON)
-		);
-----
+include-code::./RestClientWorkflowTests[tag=soft-assertions,indent=0]
 
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/1")
-		.accept(MediaType.APPLICATION_JSON)
-		.exchange()
-		.expectAll(
-			{ spec -> spec.expectStatus().isOk() },
-			{ spec -> spec.expectHeader().contentType(MediaType.APPLICATION_JSON) }
-		)
-----
-======
 
 You can then choose to decode the response body through one of the following:
 
@@ -256,124 +170,34 @@ You can then choose to decode the response body through one of the following:
 If the built-in assertions are insufficient, you can consume the object instead and
 perform any other assertions:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-    client.get().uri("/persons/1")
-            .exchange()
-            .expectStatus().isOk()
-            .expectBody(Person.class)
-            .consumeWith(result -> {
-                // custom assertions (for example, AssertJ)...
-            });
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/1")
-			.exchange()
-			.expectStatus().isOk()
-			.expectBody<Person>()
-			.consumeWith {
-				// custom assertions (for example, AssertJ)...
-			}
-----
-======
+include-code::./RestClientWorkflowTests[tag=consume,indent=0]
 
 Or you can exit the workflow and obtain a `EntityExchangeResult`:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	EntityExchangeResult<Person> result = client.get().uri("/persons/1")
-			.exchange()
-			.expectStatus().isOk()
-			.expectBody(Person.class)
-			.returnResult();
-----
+include-code::./RestClientWorkflowTests[tag=result,indent=0]
 
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	val result = client.get().uri("/persons/1")
-			.exchange()
-			.expectStatus().isOk
-			.expectBody<Person>()
-			.returnResult()
-----
-======
 
 TIP: When you need to decode to a target type with generics, look for the overloaded methods
 that accept {spring-framework-api}/core/ParameterizedTypeReference.html[`ParameterizedTypeReference`]
 instead of `Class<T>`.
 
 
-[[resttestclient-no-content]]
+[[resttestclient.no-content]]
 ==== No Content
 
 If the response is not expected to have content, you can assert that as follows:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	client.post().uri("/persons")
-			.body(person)
-			.exchange()
-			.expectStatus().isCreated()
-			.expectBody().isEmpty();
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	client.post().uri("/persons")
-			.body(person)
-			.exchange()
-			.expectStatus().isCreated()
-			.expectBody().isEmpty()
-----
-======
+include-code::./NoContentTests[tag=emptyBody,indent=0]
 
 If you want to ignore the response content, the following releases the content without any assertions:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/123")
-			.exchange()
-			.expectStatus().isNotFound()
-			.expectBody(Void.class);
-----
+include-code::./NoContentTests[tag=ignoreBody,indent=0]
 
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/123")
-			.exchange()
-			.expectStatus().isNotFound
-			.expectBody<Unit>()
-----
-======
+NOTE: Consuming the response body (for example, with `expectBody`) is required if your tests are running with
+leak detection for pooled buffers. Without that, the tool will report buffers being leaked.
 
 
-[[resttestclient-json]]
+[[resttestclient.json]]
 ==== JSON Content
 
 You can use `expectBody()` without a target type to perform assertions on the raw
@@ -381,126 +205,25 @@ content rather than through higher level Object(s).
 
 To verify the full JSON content with https://jsonassert.skyscreamer.org[JSONAssert]:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/1")
-			.exchange()
-			.expectStatus().isOk()
-			.expectBody()
-			.json("{\"name\":\"Jane\"}")
-----
+include-code::./JsonTests[tag=jsonBody,indent=0]
 
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons/1")
-			.exchange()
-			.expectStatus().isOk()
-			.expectBody()
-			.json("{\"name\":\"Jane\"}")
-----
-======
 
 To verify JSON content with https://github.com/jayway/JsonPath[JSONPath]:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons")
-			.exchange()
-			.expectStatus().isOk()
-			.expectBody()
-			.jsonPath("$[0].name").isEqualTo("Jane")
-			.jsonPath("$[1].name").isEqualTo("Jason");
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	client.get().uri("/persons")
-			.exchange()
-			.expectStatus().isOk()
-			.expectBody()
-			.jsonPath("$[0].name").isEqualTo("Jane")
-			.jsonPath("$[1].name").isEqualTo("Jason")
-----
-======
+include-code::./JsonTests[tag=jsonPath,indent=0]
 
 
-
-[[resttestclient-assertj]]
+[[resttestclient.assertj]]
 === AssertJ Integration
 
 `RestTestClientResponse` is the main entry point for the AssertJ integration.
 It is an `AssertProvider` that wraps the `ResponseSpec` of an exchange in order to enable
 use of `assertThat()` statements. For example:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	ResponseSpec spec = client.get().uri("/persons").exchange();
+include-code::./AssertJTests[tag=withSpec,indent=0]
 
-	RestTestClientResponse response = RestTestClientResponse.from(spec);
-	assertThat(response).hasStatusOk();
-	assertThat(response).hasContentTypeCompatibleWith(MediaType.TEXT_PLAIN);
-	// ...
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	val spec = client.get().uri("/persons").exchange()
-
-	val response = RestTestClientResponse.from(spec)
-	assertThat(response).hasStatusOk()
-	assertThat(response).hasContentTypeCompatibleWith(MediaType.TEXT_PLAIN)
-	// ...
-----
-======
 
 You can also use the built-in workflow first, and then obtain an `ExchangeResult` to wrap
 and continue with AssertJ. For example:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	ExchangeResult result = client.get().uri("/persons").exchange()
-			. // ...
-			.returnResult();
-
-	RestTestClientResponse response = RestTestClientResponse.from(result);
-	assertThat(response).hasStatusOk();
-	assertThat(response).hasContentTypeCompatibleWith(MediaType.TEXT_PLAIN);
-	// ...
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	val result = client.get().uri("/persons").exchange()
-			. // ...
-			.returnResult()
-
-	val response = RestTestClientResponse.from(spec)
-	assertThat(response).hasStatusOk()
-	assertThat(response).hasContentTypeCompatibleWith(MediaType.TEXT_PLAIN)
-	// ...
-----
-======
+include-code::./AssertJTests[tag=withResult,indent=0]

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/caching.adoc

@@ -62,17 +62,6 @@ script by setting a JVM system property named `spring.test.context.cache.maxSize
 alternative, you can set the same property via the
 xref:appendix.adoc#appendix-spring-properties[`SpringProperties`] mechanism.
 
-As of Spring Framework 7.0, an application context stored in the context cache will be
-_paused_ when it is no longer actively in use and automatically _restarted_ the next time
-the context is retrieved from the cache. Specifically, the latter will restart all
-auto-startup beans in the application context, effectively restoring the lifecycle state.
-This ensures that background processes within the context are not actively running while
-the context is not used by tests. For example, JMS listener containers, scheduled tasks,
-and any other components in the context that implement `Lifecycle` or `SmartLifecycle`
-will be in a "stopped" state until the context is used again by a test. Note, however,
-that `SmartLifecycle` components can opt out of pausing by returning `false` from
-`SmartLifecycle#isPauseable()`.
-
 Since having a large number of application contexts loaded within a given test suite can
 cause the suite to take an unnecessarily long time to run, it is often beneficial to
 know exactly how many contexts have been loaded and cached. To view the statistics for

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/context-pausing.adoc

@@ -0,0 +1,45 @@
+[[testcontext-ctx-management-pausing]]
+= Context Pausing
+
+As of Spring Framework 7.0, an `ApplicationContext` stored in the context cache (see
+xref:testing/testcontext-framework/ctx-management/caching.adoc[Context Caching]) may be
+_paused_ when it is no longer actively in use and automatically _restarted_ the next time
+the context is retrieved from the cache. Specifically, the latter will restart all
+auto-startup beans in the application context, effectively restoring the lifecycle state.
+This ensures that background processes within the context are not actively running while
+the context is not used by tests. For example, JMS listener containers, scheduled tasks,
+and any other components in the context that implement `Lifecycle` or `SmartLifecycle`
+will be in a "stopped" state until the context is used again by a test. Note, however,
+that `SmartLifecycle` components can opt out of pausing by returning `false` from
+`SmartLifecycle#isPauseable()`.
+
+You can control whether inactive application contexts should be paused by setting the
+`PauseMode` to one of the following supported values.
+
+`ALWAYS` :: Always pause inactive application contexts.
+`ON_CONTEXT_SWITCH` :: Only pause inactive application contexts if the next context
+  retrieved from the context cache is a different context.
+`NEVER` :: Never pause inactive application contexts, effectively disabling the pausing
+  feature of the context cache.
+
+The `PauseMode` defaults to `ON_CONTEXT_SWITCH`, but it can be changed from the command
+line or a build script by setting a JVM system property named
+`spring.test.context.cache.pause` to one of the supported values (case insensitive). As
+an alternative, you can set the property via the
+xref:appendix.adoc#appendix-spring-properties[`SpringProperties`] mechanism.
+
+For example, if you want inactive application contexts to always be paused, you can
+switch from the default `ON_CONTEXT_SWITCH` mode to `ALWAYS` by setting the
+`spring.test.context.cache.pause` system property to `always`.
+
+```shell
+-Dspring.test.context.cache.pause=always
+```
+Similarly, if you encounter issues with `Lifecycle` components that cannot or should not
+opt out of pausing, or if you discover that your test suite runs more slowly due to the
+pausing and restarting of application contexts, you can disable the pausing feature by
+setting the `spring.test.context.cache.pause` system property to `never`.
+
+```shell
+-Dspring.test.context.cache.pause=never
+```

framework-docs/modules/ROOT/pages/web/integration.adoc

@@ -1,186 +0,0 @@
-[[web-integration]]
-= Other Web Frameworks
-
-This chapter details Spring's integration with third-party web frameworks.
-
-One of the core value propositions of the Spring Framework is that of enabling
-_choice_. In a general sense, Spring does not force you to use or buy into any
-particular architecture, technology, or methodology (although it certainly recommends
-some over others). This freedom to pick and choose the architecture, technology, or
-methodology that is most relevant to a developer and their development team is
-arguably most evident in the web area, where Spring provides its own web frameworks
-(xref:web/webmvc.adoc#mvc[Spring MVC] and xref:web/webflux.adoc#webflux[Spring WebFlux])
-while, at the same time, supporting integration with a number of popular third-party
-web frameworks.
-
-
-[[web-integration-common]]
-== Common Configuration
-
-Before diving into the integration specifics of each supported web framework, let us
-first take a look at common Spring configuration that is not specific to any one web
-framework. (This section is equally applicable to Spring's own web framework variants.)
-
-One of the concepts (for want of a better word) espoused by Spring's lightweight
-application model is that of a layered architecture. Remember that in a "classic"
-layered architecture, the web layer is but one of many layers. It serves as one of the
-entry points into a server-side application, and it delegates to service objects
-(facades) that are defined in a service layer to satisfy business-specific (and
-presentation-technology agnostic) use cases. In Spring, these service objects, any other
-business-specific objects, data-access objects, and others exist in a distinct "business
-context", which contains no web or presentation layer objects (presentation objects,
-such as Spring MVC controllers, are typically configured in a distinct "presentation
-context"). This section details how you can configure a Spring container (a
-`WebApplicationContext`) that contains all of the 'business beans' in your application.
-
-Moving on to specifics, all you need to do is declare a
-{spring-framework-api}/web/context/ContextLoaderListener.html[`ContextLoaderListener`]
-in the standard Jakarta EE servlet `web.xml` file of your web application and add a
-`contextConfigLocation` `<context-param/>` section (in the same file) that defines which
-set of Spring XML configuration files to load.
-
-Consider the following `<listener/>` configuration:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-----
-
-Further consider the following `<context-param/>` configuration:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext*.xml</param-value>
-	</context-param>
-----
-
-If you do not specify the `contextConfigLocation` context parameter, the
-`ContextLoaderListener` looks for a file called `/WEB-INF/applicationContext.xml` to
-load. Once the context files are loaded, Spring creates a
-{spring-framework-api}/web/context/WebApplicationContext.html[`WebApplicationContext`]
-object based on the bean definitions and stores it in the `ServletContext` of the web
-application.
-
-All Java web frameworks are built on top of the Servlet API, so you can use the
-following code snippet to get access to this "business context" `ApplicationContext`
-created by the `ContextLoaderListener`.
-
-The following example shows how to get the `WebApplicationContext`:
-
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(servletContext);
-----
-
-The
-{spring-framework-api}/web/context/support/WebApplicationContextUtils.html[`WebApplicationContextUtils`]
-class is for convenience, so you need not remember the name of the `ServletContext`
-attribute. Its `getWebApplicationContext()` method returns `null` if an object
-does not exist under the `WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE`
-key. Rather than risk getting `NullPointerExceptions` in your application, it is better
-to use the `getRequiredWebApplicationContext()` method. This method throws an exception
-when the `ApplicationContext` is missing.
-
-Once you have a reference to the `WebApplicationContext`, you can retrieve beans by their
-name or type. Most developers retrieve beans by name and then cast them to one of their
-implemented interfaces.
-
-Fortunately, most of the frameworks in this section have simpler ways of looking up beans.
-Not only do they make it easy to get beans from a Spring container, but they also let you
-use dependency injection on their controllers. Each web framework section has more detail
-on its specific integration strategies.
-
-
-[[jsf]]
-== JSF
-
-JavaServer Faces (JSF) is the JCP's standard component-based, event-driven web
-user interface framework. It is an official part of the Jakarta EE umbrella but also
-individually usable, for example, through embedding Mojarra or MyFaces within Tomcat.
-
-Please note that recent versions of JSF became closely tied to CDI infrastructure
-in application servers, with some new JSF functionality only working in such an
-environment. Spring's JSF support is not actively evolved anymore and primarily
-exists for migration purposes when modernizing older JSF-based applications.
-
-The key element in Spring's JSF integration is the JSF `ELResolver` mechanism.
-
-[[jsf-springbeanfaceselresolver]]
-=== Spring Bean Resolver
-
-`SpringBeanFacesELResolver` is a JSF compliant `ELResolver` implementation,
-integrating with the standard Unified EL as used by JSF and JSP. It delegates to
-Spring's "business context" `WebApplicationContext` first and then to the
-default resolver of the underlying JSF implementation.
-
-Configuration-wise, you can define `SpringBeanFacesELResolver` in your JSF
-`faces-context.xml` file, as the following example shows:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<faces-config>
-		<application>
-			<el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
-			...
-		</application>
-	</faces-config>
-----
-
-[[jsf-facescontextutils]]
-=== Using `FacesContextUtils`
-
-A custom `ELResolver` works well when mapping your properties to beans in
-`faces-config.xml`, but, at times, you may need to explicitly grab a bean.
-The {spring-framework-api}/web/jsf/FacesContextUtils.html[`FacesContextUtils`]
-class makes this easy. It is similar to `WebApplicationContextUtils`, except that
-it takes a `FacesContext` parameter rather than a `ServletContext` parameter.
-
-The following example shows how to use `FacesContextUtils`:
-
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	ApplicationContext ctx = FacesContextUtils.getWebApplicationContext(FacesContext.getCurrentInstance());
-----
-
-
-[[struts]]
-== Apache Struts
-
-Invented by Craig McClanahan, https://struts.apache.org[Struts] is an open-source project
-hosted by the Apache Software Foundation. Struts 1.x greatly simplified the
-JSP/Servlet programming paradigm and won over many developers who were using proprietary
-frameworks. It simplified the programming model; it was open source; and it had a large
-community, which let the project grow and become popular among Java web developers.
-
-As a successor to the original Struts 1.x, check out Struts 2.x or more recent versions
-as well as the Struts-provided
-https://struts.apache.org/plugins/spring/[Spring Plugin] for built-in Spring integration.
-
-
-[[tapestry]]
-== Apache Tapestry
-
-https://tapestry.apache.org/[Tapestry] is a "Component oriented framework for creating
-dynamic, robust, highly scalable web applications in Java."
-
-While Spring has its own xref:web/webmvc.adoc#mvc[powerful web layer], there are a number of unique
-advantages to building an enterprise Java application by using a combination of Tapestry
-for the web user interface and the Spring container for the lower layers.
-
-For more information, see Tapestry's dedicated
-https://tapestry.apache.org/integrating-with-spring-framework.html[integration module for Spring].
-
-
-[[web-integration-resources]]
-== Further Resources
-
-The following links go to further resources about the various web frameworks described in
-this chapter.
-
-* The https://www.oracle.com/java/technologies/javaserverfaces.html[JSF] homepage
-* The https://struts.apache.org/[Struts] homepage
-* The https://tapestry.apache.org/[Tapestry] homepage

framework-docs/modules/ROOT/pages/web/webflux-cors.adoc

@@ -305,7 +305,6 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
 	public class WebConfig implements WebFluxConfigurer {
 
 		@Override
@@ -328,7 +327,6 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
 	class WebConfig : WebFluxConfigurer {
 
 		override fun addCorsMappings(registry: CorsRegistry) {

framework-docs/modules/ROOT/pages/web/webflux-functional.adoc

@@ -235,88 +235,14 @@ val map = request.awaitMultipartData()
 
 The following example shows how to access multipart data, one at a time, in streaming fashion:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-Flux<PartEvent> allPartEvents = request.bodyToFlux(PartEvent.class);
-allPartsEvents.windowUntil(PartEvent::isLast)
-      .concatMap(p -> p.switchOnFirst((signal, partEvents) -> {
-          if (signal.hasValue()) {
-              PartEvent event = signal.get();
-              if (event instanceof FormPartEvent formEvent) {
-                  String value = formEvent.value();
-                  // handle form field
-              }
-              else if (event instanceof FilePartEvent fileEvent) {
-                  String filename = fileEvent.filename();
-                  Flux<DataBuffer> contents = partEvents.map(PartEvent::content);
-                  // handle file upload
-              }
-              else {
-                  return Mono.error(new RuntimeException("Unexpected event: " + event));
-              }
-          }
-          else {
-              return partEvents; // either complete or error signal
-          }
-      }));
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-val parts = request.bodyToFlux<PartEvent>()
-allPartsEvents.windowUntil(PartEvent::isLast)
-    .concatMap {
-        it.switchOnFirst { signal, partEvents ->
-            if (signal.hasValue()) {
-                val event = signal.get()
-                if (event is FormPartEvent) {
-                    val value: String = event.value();
-                    // handle form field
-                } else if (event is FilePartEvent) {
-                    val filename: String = event.filename();
-                    val contents: Flux<DataBuffer> = partEvents.map(PartEvent::content);
-                    // handle file upload
-                } else {
-                    return Mono.error(RuntimeException("Unexpected event: " + event));
-                }
-            } else {
-                return partEvents; // either complete or error signal
-            }
-        }
-    }
-}
-----
-======
+include-code::./PartEventHandler[tag=snippet,indent=0]
 
 NOTE: The body contents of the `PartEvent` objects must be completely consumed, relayed, or released to avoid memory leaks.
 
 The following shows how to bind request parameters, URI variables, or headers via `DataBinder`,
 and also shows how to customize the `DataBinder`:
 
-[tabs]
-======
-Java::
-+
-[source,java]
-----
-Pet pet = request.bind(Pet.class, dataBinder -> dataBinder.setAllowedFields("name"));
-----
-
-Kotlin::
-+
-[source,kotlin]
-----
-val pet = request.bind(Pet::class.java, {dataBinder -> dataBinder.setAllowedFields("name")})
-----
-======
-
-
+include-code::./RequestHandler[tag=snippet,indent=0]
 
 [[webflux-fn-response]]
 === ServerResponse
@@ -326,24 +252,7 @@ a `build` method to create it. You can use the builder to set the response statu
 headers, or to provide a body. The following example creates a 200 (OK) response with JSON
 content:
 
-[tabs]
-======
-Java::
-+
-[source,java]
-----
-Mono<Person> person = ...
-ServerResponse.ok().contentType(MediaType.APPLICATION_JSON).body(person, Person.class);
-----
-
-Kotlin::
-+
-[source,kotlin]
-----
-val person: Person = ...
-ServerResponse.ok().contentType(MediaType.APPLICATION_JSON).bodyValue(person)
-----
-======
+include-code::./ResponseHandler[tag=snippet,indent=0]
 
 The following example shows how to build a 201 (CREATED) response with a `Location` header and no body:
 
@@ -354,7 +263,7 @@ Java::
 [source,java]
 ----
 URI location = ...
-ServerResponse.created(location).build();
+return ServerResponse.created(location).build();
 ----
 
 Kotlin::
@@ -362,7 +271,7 @@ Kotlin::
 [source,kotlin]
 ----
 val location: URI = ...
-ServerResponse.created(location).build()
+return ServerResponse.created(location).build()
 ----
 ======
 
@@ -375,14 +284,14 @@ Java::
 +
 [source,java]
 ----
-ServerResponse.ok().hint(JacksonCodecSupport.JSON_VIEW_HINT, MyJacksonView.class).body(...);
+return ServerResponse.ok().hint(JacksonCodecSupport.JSON_VIEW_HINT, MyJacksonView.class).body(...);
 ----
 
 Kotlin::
 +
 [source,kotlin]
 ----
-ServerResponse.ok().hint(JacksonCodecSupport.JSON_VIEW_HINT, MyJacksonView::class.java).body(...)
+return ServerResponse.ok().hint(JacksonCodecSupport.JSON_VIEW_HINT, MyJacksonView::class.java).body(...)
 ----
 ======
 
@@ -417,87 +326,7 @@ Therefore, it is useful to group related handler functions together into a handl
 has a similar role as  `@Controller` in an annotation-based application.
 For example, the following class exposes a reactive `Person` repository:
 
---
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.web.reactive.function.server.ServerResponse.ok;
-
-public class PersonHandler {
-
-	private final PersonRepository repository;
-
-	public PersonHandler(PersonRepository repository) {
-		this.repository = repository;
-	}
-
-	public Mono<ServerResponse> listPeople(ServerRequest request) { // <1>
-		Flux<Person> people = repository.allPeople();
-		return ok().contentType(APPLICATION_JSON).body(people, Person.class);
-	}
-
-	public Mono<ServerResponse> createPerson(ServerRequest request) { // <2>
-		Mono<Person> person = request.bodyToMono(Person.class);
-		return ok().build(repository.savePerson(person));
-	}
-
-	public Mono<ServerResponse> getPerson(ServerRequest request) { // <3>
-		int personId = Integer.valueOf(request.pathVariable("id"));
-		return repository.getPerson(personId)
-			.flatMap(person -> ok().contentType(APPLICATION_JSON).bodyValue(person))
-			.switchIfEmpty(ServerResponse.notFound().build());
-	}
-}
-----
-<1> `listPeople` is a handler function that returns all `Person` objects found in the repository as
-JSON.
-<2> `createPerson` is a handler function that stores a new `Person` contained in the request body.
-Note that `PersonRepository.savePerson(Person)` returns `Mono<Void>`: an empty `Mono` that emits
-a completion signal when the person has been read from the request and stored. So we use the
-`build(Publisher<Void>)` method to send a response when that completion signal is received (that is,
-when the `Person` has been saved).
-<3> `getPerson` is a handler function that returns a single person, identified by the `id` path
-variable. We retrieve that `Person` from the repository and create a JSON response, if it is
-found. If it is not found, we use `switchIfEmpty(Mono<T>)` to return a 404 Not Found response.
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	class PersonHandler(private val repository: PersonRepository) {
-
-		suspend fun listPeople(request: ServerRequest): ServerResponse { // <1>
-			val people: Flow<Person> = repository.allPeople()
-			return ok().contentType(APPLICATION_JSON).bodyAndAwait(people);
-		}
-
-		suspend fun createPerson(request: ServerRequest): ServerResponse { // <2>
-			val person = request.awaitBody<Person>()
-			repository.savePerson(person)
-			return ok().buildAndAwait()
-		}
-
-		suspend fun getPerson(request: ServerRequest): ServerResponse { // <3>
-			val personId = request.pathVariable("id").toInt()
-			return repository.getPerson(personId)?.let { ok().contentType(APPLICATION_JSON).bodyValueAndAwait(it) }
-					?: ServerResponse.notFound().buildAndAwait()
-
-		}
-	}
-----
-<1> `listPeople` is a handler function that returns all `Person` objects found in the repository as
-JSON.
-<2> `createPerson` is a handler function that stores a new `Person` contained in the request body.
-Note that `PersonRepository.savePerson(Person)` is a suspending function with no return type.
-<3> `getPerson` is a handler function that returns a single person, identified by the `id` path
-variable. We retrieve that `Person` from the repository and create a JSON response, if it is
-found. If it is not found, we return a 404 Not Found response.
-======
---
+include-code::./PersonHandler[tag=snippet,indent=0]
 
 [[webflux-fn-handler-validation]]
 === Validation
@@ -506,66 +335,7 @@ A functional endpoint can use Spring's xref:web/webmvc/mvc-config/validation.ado
 apply validation to the request body. For example, given a custom Spring
 xref:web/webmvc/mvc-config/validation.adoc[Validator] implementation for a `Person`:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	public class PersonHandler {
-
-		private final Validator validator = new PersonValidator(); // <1>
-
-		// ...
-
-		public Mono<ServerResponse> createPerson(ServerRequest request) {
-			Mono<Person> person = request.bodyToMono(Person.class).doOnNext(this::validate); // <2>
-			return ok().build(repository.savePerson(person));
-		}
-
-		private void validate(Person person) {
-			Errors errors = new BeanPropertyBindingResult(person, "person");
-			validator.validate(person, errors);
-			if (errors.hasErrors()) {
-				throw new ServerWebInputException(errors.toString()); // <3>
-			}
-		}
-	}
-----
-<1> Create `Validator` instance.
-<2> Apply validation.
-<3> Raise exception for a 400 response.
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	class PersonHandler(private val repository: PersonRepository) {
-
-		private val validator = PersonValidator() // <1>
-
-		// ...
-
-		suspend fun createPerson(request: ServerRequest): ServerResponse {
-			val person = request.awaitBody<Person>()
-			validate(person) // <2>
-			repository.savePerson(person)
-			return ok().buildAndAwait()
-		}
-
-		private fun validate(person: Person) {
-			val errors: Errors = BeanPropertyBindingResult(person, "person");
-			validator.validate(person, errors);
-			if (errors.hasErrors()) {
-				throw ServerWebInputException(errors.toString()) // <3>
-			}
-		}
-	}
-----
-<1> Create `Validator` instance.
-<2> Apply validation.
-<3> Raise exception for a 400 response.
-======
+include-code::./PersonHandler[tag=snippet,indent=0]
 
 Handlers can also use the standard bean validation API (JSR-303) by creating and injecting
 a global `Validator` instance based on `LocalValidatorFactoryBean`.
@@ -603,28 +373,7 @@ path, headers, xref:#api-version[API version], and more.
 
 The following example uses an `Accept` header, request predicate:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	RouterFunction<ServerResponse> route = RouterFunctions.route()
-		.GET("/hello-world", accept(MediaType.TEXT_PLAIN),
-			request -> ServerResponse.ok().bodyValue("Hello World")).build();
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	val route = coRouter {
-		GET("/hello-world", accept(TEXT_PLAIN)) {
-			ServerResponse.ok().bodyValueAndAwait("Hello World")
-		}
-	}
-----
-======
+include-code::./RouterConfiguration[tag=snippet,indent=0]
 
 You can compose multiple request predicates together by using:
 
@@ -659,61 +408,7 @@ There are also other ways to compose multiple router functions together:
 
 The following example shows the composition of four routes:
 
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.web.reactive.function.server.RequestPredicates.*;
-
-PersonRepository repository = ...
-PersonHandler handler = new PersonHandler(repository);
-
-RouterFunction<ServerResponse> otherRoute = ...
-
-RouterFunction<ServerResponse> route = route()
-	.GET("/person/{id}", accept(APPLICATION_JSON), handler::getPerson) // <1>
-	.GET("/person", accept(APPLICATION_JSON), handler::listPeople) // <2>
-	.POST("/person", handler::createPerson) // <3>
-	.add(otherRoute) // <4>
-	.build();
-----
-<1> pass:q[`GET /person/{id}`] with an `Accept` header that matches JSON is routed to
-`PersonHandler.getPerson`
-<2> `GET /person` with an `Accept` header that matches JSON is routed to
-`PersonHandler.listPeople`
-<3> `POST /person` with no additional predicates is mapped to
-`PersonHandler.createPerson`, and
-<4> `otherRoute` is a router function that is created elsewhere, and added to the route built.
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	import org.springframework.http.MediaType.APPLICATION_JSON
-
-	val repository: PersonRepository = ...
-	val handler = PersonHandler(repository);
-
-	val otherRoute: RouterFunction<ServerResponse> = coRouter {  }
-
-	val route = coRouter {
-		GET("/person/{id}", accept(APPLICATION_JSON), handler::getPerson) // <1>
-		GET("/person", accept(APPLICATION_JSON), handler::listPeople) // <2>
-		POST("/person", handler::createPerson) // <3>
-	}.and(otherRoute) // <4>
-----
-<1> pass:q[`GET /person/{id}`] with an `Accept` header that matches JSON is routed to
-`PersonHandler.getPerson`
-<2> `GET /person` with an `Accept` header that matches JSON is routed to
-`PersonHandler.listPeople`
-<3> `POST /person` with no additional predicates is mapped to
-`PersonHandler.createPerson`, and
-<4> `otherRoute` is a router function that is created elsewhere, and added to the route built.
-======
+include-code::./RouterConfiguration[tag=snippet,indent=0]
 
 [[nested-routes]]
 === Nested Routes
@@ -811,7 +506,7 @@ Java::
 ----
 	RouterFunction<ServerResponse> route = RouterFunctions.route()
 		.GET("/hello-world", version("1.2"),
-			request -> ServerResponse.ok().body("Hello World")).build();
+			request -> ServerResponse.ok().bodyValue("Hello World")).build();
 ----
 
 Kotlin::
@@ -944,7 +639,6 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
 	public class WebConfig implements WebFluxConfigurer {
 
 		@Bean
@@ -981,7 +675,6 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
 	class WebConfig : WebFluxConfigurer {
 
 		@Bean
@@ -1049,9 +742,9 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	val route = router {
-		"/person".nest {
+		("/person" and accept(APPLICATION_JSON)).nest {
 			GET("/{id}", handler::getPerson)
-			GET("", handler::listPeople)
+			GET(handler::listPeople)
 			before { // <1>
 				ServerRequest.from(it)
 						.header("X-RequestHeader", "Value").build()
@@ -1078,54 +771,7 @@ Now we can add a simple security filter to our route, assuming that we have a `S
 can determine whether a particular path is allowed.
 The following example shows how to do so:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	SecurityManager securityManager = ...
-
-	RouterFunction<ServerResponse> route = route()
-		.path("/person", b1 -> b1
-			.nest(accept(APPLICATION_JSON), b2 -> b2
-				.GET("/{id}", handler::getPerson)
-				.GET(handler::listPeople))
-			.POST(handler::createPerson))
-		.filter((request, next) -> {
-			if (securityManager.allowAccessTo(request.path())) {
-				return next.handle(request);
-			}
-			else {
-				return ServerResponse.status(UNAUTHORIZED).build();
-			}
-		})
-		.build();
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	val securityManager: SecurityManager = ...
-
-	val route = router {
-			("/person" and accept(APPLICATION_JSON)).nest {
-				GET("/{id}", handler::getPerson)
-				GET("", handler::listPeople)
-				POST(handler::createPerson)
-				filter { request, next ->
-					if (securityManager.allowAccessTo(request.path())) {
-						next(request)
-					}
-					else {
-						status(UNAUTHORIZED).build();
-					}
-				}
-			}
-		}
-----
-======
+include-code::./RouterConfiguration[tag=snippet,indent=0]
 
 The preceding example demonstrates that invoking the `next.handle(ServerRequest)` is optional.
 We only let the handler function be run when access is allowed.

framework-docs/modules/ROOT/pages/web/webflux-view.adoc

@@ -56,8 +56,7 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
-	public class WebConfig implements WebFluxConfigurer {
+	public class WebConfiguration implements WebFluxConfigurer {
 
 		@Override
 		public void configureViewResolvers(ViewResolverRegistry registry) {
@@ -80,8 +79,7 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
-	class WebConfig : WebFluxConfigurer {
+	class WebConfiguration : WebFluxConfigurer {
 
 		override fun configureViewResolvers(registry: ViewResolverRegistry) {
 			registry.freeMarker()
@@ -119,8 +117,7 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
-	public class WebConfig implements WebFluxConfigurer {
+	public class WebConfiguration implements WebFluxConfigurer {
 
 		// ...
 
@@ -142,8 +139,7 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
-	class WebConfig : WebFluxConfigurer {
+	class WebConfiguration : WebFluxConfigurer {
 
 		// ...
 
@@ -210,13 +206,8 @@ The following table shows the templating libraries that we have tested on differ
 [%header]
 |===
 |Scripting Library |Scripting Engine
-|https://handlebarsjs.com/[Handlebars] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://mustache.github.io/[Mustache] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://react.dev/[React] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://ejs.co/[EJS] |https://openjdk.java.net/projects/nashorn/[Nashorn]
 |https://docs.ruby-lang.org/en/master/ERB.html[ERB] |https://www.jruby.org[JRuby]
 |https://docs.python.org/2/library/string.html#template-strings[String templates] |https://www.jython.org/[Jython]
-|https://github.com/sdeleuze/kotlin-script-templating[Kotlin Script templating] |{kotlin-site}[Kotlin]
 |===
 
 TIP: The basic rule for integrating any other script engine is that it must implement the
@@ -228,17 +219,8 @@ TIP: The basic rule for integrating any other script engine is that it must impl
 
 You need to have the script engine on your classpath, the details of which vary by script engine:
 
-* The https://openjdk.java.net/projects/nashorn/[Nashorn] JavaScript engine is provided with
-Java 8+. Using the latest update release available is highly recommended.
 * https://www.jruby.org[JRuby] should be added as a dependency for Ruby support.
 * https://www.jython.org[Jython] should be added as a dependency for Python support.
-* `org.jetbrains.kotlin:kotlin-script-util` dependency and a `META-INF/services/javax.script.ScriptEngineFactory`
- file containing a `org.jetbrains.kotlin.script.jsr223.KotlinJsr223JvmLocalScriptEngineFactory`
- line should be added for Kotlin script support. See
- https://github.com/sdeleuze/kotlin-script-templating[this example] for more detail.
-
-You need to have the script templating library. One way to do that for JavaScript is
-through https://www.webjars.org/[WebJars].
 
 [[webflux-view-script-integrate]]
 === Script Templates
@@ -246,7 +228,7 @@ through https://www.webjars.org/[WebJars].
 
 You can declare a `ScriptTemplateConfigurer` bean to specify the script engine to use,
 the script files to load, what function to call to render templates, and so on.
-The following example uses Mustache templates and the Nashorn JavaScript engine:
+The following example uses the Jython Python engine:
 
 [tabs]
 ======
@@ -255,8 +237,7 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
-	public class WebConfig implements WebFluxConfigurer {
+	public class WebConfiguration implements WebFluxConfigurer {
 
 		@Override
 		public void configureViewResolvers(ViewResolverRegistry registry) {
@@ -266,9 +247,8 @@ Java::
 		@Bean
 		public ScriptTemplateConfigurer configurer() {
 			ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer();
-			configurer.setEngineName("nashorn");
-			configurer.setScripts("mustache.js");
-			configurer.setRenderObject("Mustache");
+			configurer.setEngineName("jython");
+			configurer.setScripts("render.py");
 			configurer.setRenderFunction("render");
 			return configurer;
 		}
@@ -280,8 +260,7 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
-	class WebConfig : WebFluxConfigurer {
+	class WebConfiguration : WebFluxConfigurer {
 
 		override fun configureViewResolvers(registry: ViewResolverRegistry) {
 			registry.scriptTemplate()
@@ -289,9 +268,8 @@ Kotlin::
 
 		@Bean
 		fun configurer() = ScriptTemplateConfigurer().apply {
-			engineName = "nashorn"
-			setScripts("mustache.js")
-			renderObject = "Mustache"
+			engineName = "jython"
+			setScripts("render.py")
 			renderFunction = "render"
 		}
 	}
@@ -305,94 +283,7 @@ The `render` function is called with the following parameters:
 * `RenderingContext renderingContext`: The
   {spring-framework-api}/web/servlet/view/script/RenderingContext.html[`RenderingContext`]
   that gives access to the application context, the locale, the template loader, and the
-  URL (since 5.0)
-
-`Mustache.render()` is natively compatible with this signature, so you can call it directly.
-
-If your templating technology requires some customization, you can provide a script that
-implements a custom render function. For example, https://handlebarsjs.com[Handlerbars]
-needs to compile templates before using them and requires a
-https://en.wikipedia.org/wiki/Polyfill[polyfill] in order to emulate some
-browser facilities not available in the server-side script engine.
-The following example shows how to set a custom render function:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebFlux
-	public class WebConfig implements WebFluxConfigurer {
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			registry.scriptTemplate();
-		}
-
-		@Bean
-		public ScriptTemplateConfigurer configurer() {
-			ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer();
-			configurer.setEngineName("nashorn");
-			configurer.setScripts("polyfill.js", "handlebars.js", "render.js");
-			configurer.setRenderFunction("render");
-			configurer.setSharedEngine(false);
-			return configurer;
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebFlux
-	class WebConfig : WebFluxConfigurer {
-
-		override fun configureViewResolvers(registry: ViewResolverRegistry) {
-			registry.scriptTemplate()
-		}
-
-		@Bean
-		fun configurer() = ScriptTemplateConfigurer().apply {
-			engineName = "nashorn"
-			setScripts("polyfill.js", "handlebars.js", "render.js")
-			renderFunction = "render"
-			isSharedEngine = false
-		}
-	}
-----
-======
-
-NOTE: Setting the `sharedEngine` property to `false` is required when using non-thread-safe
-script engines with templating libraries not designed for concurrency, such as Handlebars or
-React running on Nashorn. In that case, Java SE 8 update 60 is required, due to
-https://bugs.openjdk.java.net/browse/JDK-8076099[this bug], but it is generally
-recommended to use a recent Java SE patch release in any case.
-
-`polyfill.js` defines only the `window` object needed by Handlebars to run properly,
-as the following snippet shows:
-
-[source,javascript,indent=0,subs="verbatim,quotes"]
-----
-	var window = {};
-----
-
-This basic `render.js` implementation compiles the template before using it. A production
-ready implementation should also store and reused cached templates or pre-compiled templates.
-This can be done on the script side, as well as any customization you need (managing
-template engine configuration for example).
-The following example shows how compile a template:
-
-[source,javascript,indent=0,subs="verbatim,quotes"]
-----
-	function render(template, model) {
-		var compiledTemplate = Handlebars.compile(template);
-		return compiledTemplate(model);
-	}
-----
+  URL
 
 Check out the Spring Framework unit tests,
 {spring-framework-code}/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script[Java], and

framework-docs/modules/ROOT/pages/web/webflux-webclient/client-builder.adoc

@@ -18,8 +18,8 @@ You can also use `WebClient.builder()` with further options:
 * `exchangeStrategies`: HTTP message reader/writer customizations.
 * `clientConnector`: HTTP client library settings.
 * `apiVersionInserter`: to insert API version values in the request
-* `observationRegistry`: the registry to use for enabling xref:integration/observability.adoc#http-client.webclient[Observability support].
-* `observationConvention`: xref:integration/observability.adoc#config[an optional, custom convention to extract metadata] for recorded observations.
+* `observationRegistry`: the registry to use for enabling xref:integration/observability.adoc#observability.http-client.webclient[Observability support].
+* `observationConvention`: xref:integration/observability.adoc#observability.config[an optional, custom convention to extract metadata] for recorded observations.
 
 For example:
 

framework-docs/modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc

@@ -66,6 +66,13 @@ from an existing `ProblemDetail`. This could be done centrally, for example, fro
 `@ControllerAdvice` such as `ResponseEntityExceptionHandler` that re-creates the
 `ProblemDetail` of an exception into a subclass with the additional non-standard fields.
 
+TIP: In Spring Boot, the `spring.webflux.problemdetails.enabled` property autoconfigures
+a `ResponseEntityExceptionHandler` that handles built-in exceptions with problem details.
+In that case, you may prefer to create another `@ControllerAdvice` instead of extending
+`ResponseEntityExceptionHandler` if you want to take over the handling of a specific
+built-in exception. You'll need to ensure your handler is ordered ahead of the one
+configured by Spring Boot whose order is 0.
+
 
 [[webflux-ann-rest-exceptions-i18n]]
 == Customization and i18n

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-methods/multipart-forms.adoc

@@ -41,8 +41,8 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	class MyForm(
-			val name: String,
-			val file: FilePart)
+			private val name: String,
+			private val file: FilePart)
 
 	@Controller
 	class FileUploadController {
@@ -103,8 +103,8 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@PostMapping("/")
-	fun handle(@RequestPart("meta-data") Part metadata, // <1>
-			@RequestPart("file-data") FilePart file): String { // <2>
+	fun handle(@RequestPart("meta-data") metadata: Part, // <1>
+			@RequestPart("file-data") file: FilePart): String { // <2>
 		// ...
 	}
 ----
@@ -169,8 +169,8 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@PostMapping("/")
-	fun handle(@Valid @RequestPart("meta-data") metadata: MetaData): String {
-		// ...
+	fun handle(@Valid @RequestPart("meta-data") metadata: Mono<MetaData>): String {
+		// use one of the onError* operators...
 	}
 ----
 ======
@@ -202,7 +202,7 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@PostMapping("/")
-	fun handle(@RequestBody parts: MultiValueMap<String, Part>): String { // <1>
+	fun handle(@RequestBody parts: Mono<MultiValueMap<String, Part>>): String { // <1>
 		// ...
 	}
 ----
@@ -227,87 +227,7 @@ when uploading. If the file is large enough to be split across multiple buffers,
 
 For example:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-  @PostMapping("/")
-  public void handle(@RequestBody Flux<PartEvent> allPartsEvents) { <1>
-      allPartsEvents.windowUntil(PartEvent::isLast) <2>
-              .concatMap(p -> p.switchOnFirst((signal, partEvents) -> { <3>
-                  if (signal.hasValue()) {
-                      PartEvent event = signal.get();
-                      if (event instanceof FormPartEvent formEvent) { <4>
-                          String value = formEvent.value();
-                          // handle form field
-                      }
-                      else if (event instanceof FilePartEvent fileEvent) { <5>
-                          String filename = fileEvent.filename();
-                          Flux<DataBuffer> contents = partEvents.map(PartEvent::content); <6>
-                          // handle file upload
-                      }
-                      else {
-                          return Mono.error(new RuntimeException("Unexpected event: " + event));
-                      }
-                  }
-                  else {
-                      return partEvents; // either complete or error signal
-                  }
-              }));
-  }
-----
-<1> Using `@RequestBody`.
-<2> The final `PartEvent` for a particular part will have `isLast()` set to `true`, and can be
-followed by additional events belonging to subsequent parts.
-This makes the `isLast` property suitable as a predicate for the `Flux::windowUntil` operator, to
-split events from all parts into windows that each belong to a single part.
-<3> The `Flux::switchOnFirst` operator allows you to see whether you are handling a form field or
-file upload.
-<4> Handling the form field.
-<5> Handling the file upload.
-<6> The body contents must be completely consumed, relayed, or released to avoid memory leaks.
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@PostMapping("/")
-	fun handle(@RequestBody allPartsEvents: Flux<PartEvent>) = { // <1>
-      allPartsEvents.windowUntil(PartEvent::isLast) <2>
-          .concatMap {
-              it.switchOnFirst { signal, partEvents -> <3>
-                  if (signal.hasValue()) {
-                      val event = signal.get()
-                      if (event is FormPartEvent) { <4>
-                          val value: String = event.value();
-                          // handle form field
-                      } else if (event is FilePartEvent) { <5>
-                          val filename: String = event.filename();
-                          val contents: Flux<DataBuffer> = partEvents.map(PartEvent::content); <6>
-                          // handle file upload
-                      } else {
-                          return Mono.error(RuntimeException("Unexpected event: " + event));
-                      }
-                  } else {
-                      return partEvents; // either complete or error signal
-                  }
-              }
-          }
-}
-----
-<1> Using `@RequestBody`.
-<2> The final `PartEvent` for a particular part will have `isLast()` set to `true`, and can be
-followed by additional events belonging to subsequent parts.
-This makes the `isLast` property suitable as a predicate for the `Flux::windowUntil` operator, to
-split events from all parts into windows that each belong to a single part.
-<3> The `Flux::switchOnFirst` operator allows you to see whether you are handling a form field or
-file upload.
-<4> Handling the form field.
-<5> Handling the file upload.
-<6> The body contents must be completely consumed, relayed, or released to avoid memory leaks.
-======
+include-code::./PartEventController[tag=snippet,indent=0]
 
 Received part events can also be relayed to another service by using the `WebClient`.
 See xref:web/webflux-webclient/client-body.adoc#webflux-client-body-multipart[Multipart Data].

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-requestmapping.adoc

@@ -393,9 +393,9 @@ is used to map requests.
 Once API versioning is enabled, you can begin to map requests with versions.
 The `@RequestMapping` `version` attribute supports the following:
 
-- No value -- matches any version
 - Fixed version ("1.2") -- matches the given version only
 - Baseline version ("1.2+") -- matches the given version and above
+- No value -- matches any version, but is superseded by a more specific version match
 
 If multiple controller methods have a version less than or equal to the request version,
 the highest of those, and closest to the request version, is the one considered,
@@ -454,6 +454,11 @@ A request with version `"1.6"` does not have a match. (1) and (3) do match, but
 superseded by (4), which allows only a strict match, and therefore does not match.
 In this scenario, a `NotAcceptableApiVersionException` results in a 400 response.
 
+Controller methods without a version are intended to support clients created before a
+versioned alternative was introduced. Therefore, even though an unversioned controller
+method is considered a match for any version, it is in fact given the lowest priority,
+and is effectively superseded by any alternative controller method with a version.
+
 NOTE: The above assumes the request version is a
 xref:web/webflux/config.adoc#webflux-config-api-version["supported" version],
 or otherwise it would fail.

framework-docs/modules/ROOT/pages/web/webflux/reactive-spring.adoc

@@ -658,7 +658,6 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
 	class MyConfig implements WebFluxConfigurer {
 
 		@Override
@@ -673,7 +672,6 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	@Configuration
-	@EnableWebFlux
 	class MyConfig : WebFluxConfigurer {
 
 		override fun configureHttpMessageCodecs(configurer: ServerCodecConfigurer) {

framework-docs/modules/ROOT/pages/web/webmvc-cors.adoc

@@ -208,6 +208,7 @@ Kotlin::
 		fun remove(@PathVariable id: Long) {
 			// ...
 		}
+	}
 ----
 ======
 
@@ -286,84 +287,9 @@ the `allowOriginPatterns` property may be used to match to a dynamic set of orig
 
 `maxAge` is set to 30 minutes.
 
-[[mvc-cors-global-java]]
-=== Java Configuration
-[.small]#xref:web/webflux-cors.adoc#webflux-cors-global[See equivalent in the Reactive stack]#
-
-To enable CORS in the MVC Java config, you can use the `CorsRegistry` callback,
-as the following example shows:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	public class WebConfig implements WebMvcConfigurer {
-
-		@Override
-		public void addCorsMappings(CorsRegistry registry) {
-
-			registry.addMapping("/api/**")
-				.allowedOrigins("https://domain2.com")
-				.allowedMethods("PUT", "DELETE")
-				.allowedHeaders("header1", "header2", "header3")
-				.exposedHeaders("header1", "header2")
-				.allowCredentials(true).maxAge(3600);
-
-			// Add more mappings...
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	class WebConfig : WebMvcConfigurer {
-
-		override fun addCorsMappings(registry: CorsRegistry) {
-
-			registry.addMapping("/api/**")
-					.allowedOrigins("https://domain2.com")
-					.allowedMethods("PUT", "DELETE")
-					.allowedHeaders("header1", "header2", "header3")
-					.exposedHeaders("header1", "header2")
-					.allowCredentials(true).maxAge(3600)
-
-			// Add more mappings...
-		}
-	}
-----
-======
-
-[[mvc-cors-global-xml]]
-=== XML Configuration
-
-To enable CORS in the XML namespace, you can use the `<mvc:cors>` element,
-as the following example shows:
-
-[source,xml,indent=0,subs="verbatim"]
-----
-<mvc:cors>
-
-	<mvc:mapping path="/api/**"
-		allowed-origins="https://domain1.com, https://domain2.com"
-		allowed-methods="GET, PUT"
-		allowed-headers="header1, header2, header3"
-		exposed-headers="header1, header2" allow-credentials="true"
-		max-age="123" />
-
-	<mvc:mapping path="/resources/**"
-		allowed-origins="https://domain1.com" />
-
-</mvc:cors>
-----
+You can enable CORS in the Spring MVC configuration as the following example shows:
 
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 [[mvc-cors-filter]]
 == CORS Filter

framework-docs/modules/ROOT/pages/web/webmvc-functional.adoc

@@ -900,81 +900,9 @@ processing lifecycle and also (potentially) run side by side with annotated cont
 any are declared. It is also how functional endpoints are enabled by the Spring Boot Web
 starter.
 
-The following example shows a WebMvc Java configuration:
+The following example shows a related Spring MVC configuration:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableMvc
-	public class WebConfig implements WebMvcConfigurer {
-
-		@Bean
-		public RouterFunction<?> routerFunctionA() {
-			// ...
-		}
-
-		@Bean
-		public RouterFunction<?> routerFunctionB() {
-			// ...
-		}
-
-		// ...
-
-		@Override
-		public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-			// configure message conversion...
-		}
-
-		@Override
-		public void addCorsMappings(CorsRegistry registry) {
-			// configure CORS...
-		}
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			// configure view resolution for HTML rendering...
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableMvc
-	class WebConfig : WebMvcConfigurer {
-
-		@Bean
-		fun routerFunctionA(): RouterFunction<*> {
-			// ...
-		}
-
-		@Bean
-		fun routerFunctionB(): RouterFunction<*> {
-			// ...
-		}
-
-		// ...
-
-		override fun configureMessageConverters(converters: List<HttpMessageConverter<*>>) {
-			// configure message conversion...
-		}
-
-		override fun addCorsMappings(registry: CorsRegistry) {
-			// configure CORS...
-		}
-
-		override fun configureViewResolvers(registry: ViewResolverRegistry) {
-			// configure view resolution for HTML rendering...
-		}
-	}
-----
-======
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 
 [[webmvc-fn-handler-filter-function]]

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-freemarker.adoc

@@ -14,82 +14,7 @@ integration for using Spring MVC with FreeMarker templates.
 
 The following example shows how to configure FreeMarker as a view technology:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-		@Configuration
-		@EnableWebMvc
-		public class WebConfig implements WebMvcConfigurer {
-
-			@Override
-			public void configureViewResolvers(ViewResolverRegistry registry) {
-				registry.freeMarker();
-			}
-
-			// Configure FreeMarker...
-
-			@Bean
-			public FreeMarkerConfigurer freeMarkerConfigurer() {
-				FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
-				configurer.setTemplateLoaderPath("/WEB-INF/freemarker");
-				configurer.setDefaultCharset(StandardCharsets.UTF_8);
-				return configurer;
-			}
-		}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	class WebConfig : WebMvcConfigurer {
-
-		override fun configureViewResolvers(registry: ViewResolverRegistry) {
-			registry.freeMarker()
-		}
-
-		// Configure FreeMarker...
-
-		@Bean
-		fun freeMarkerConfigurer() = FreeMarkerConfigurer().apply {
-			setTemplateLoaderPath("/WEB-INF/freemarker")
-			setDefaultCharset(StandardCharsets.UTF_8)
-		}
-	}
-----
-======
-
-The following example shows how to configure the same in XML:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<mvc:annotation-driven/>
-
-	<mvc:view-resolvers>
-		<mvc:freemarker/>
-	</mvc:view-resolvers>
-
-	<!-- Configure FreeMarker... -->
-	<mvc:freemarker-configurer>
-		<mvc:template-loader-path location="/WEB-INF/freemarker"/>
-	</mvc:freemarker-configurer>
-----
-
-Alternatively, you can also declare the `FreeMarkerConfigurer` bean for full control over all
-properties, as the following example shows:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
-		<property name="templateLoaderPath" value="/WEB-INF/freemarker/"/>
-		<property name="defaultEncoding" value="UTF-8"/>
-	</bean>
-----
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 Your templates need to be stored in the directory specified by the `FreeMarkerConfigurer`
 shown in the preceding example. Given the preceding configuration, if your controller
@@ -107,19 +32,7 @@ properties on the `FreeMarkerConfigurer` bean. The `freemarkerSettings` property
 a `java.util.Properties` object, and the `freemarkerVariables` property requires a
 `java.util.Map`. The following example shows how to use a `FreeMarkerConfigurer`:
 
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
-		<property name="templateLoaderPath" value="/WEB-INF/freemarker/"/>
-		<property name="freemarkerVariables">
-			<map>
-				<entry key="xml_escape" value-ref="fmXmlEscape"/>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="fmXmlEscape" class="freemarker.template.utility.XmlEscape"/>
-----
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 See the FreeMarker documentation for details of settings and variables as they apply to
 the `Configuration` object.

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-groovymarkup.adoc

@@ -14,68 +14,7 @@ NOTE: The Groovy Markup Template engine requires Groovy 2.3.1+.
 
 The following example shows how to configure the Groovy Markup Template Engine:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	public class WebConfig implements WebMvcConfigurer {
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			registry.groovy();
-		}
-
-		// Configure the Groovy Markup Template Engine...
-
-		@Bean
-		public GroovyMarkupConfigurer groovyMarkupConfigurer() {
-			GroovyMarkupConfigurer configurer = new GroovyMarkupConfigurer();
-			configurer.setResourceLoaderPath("/WEB-INF/");
-			return configurer;
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	class WebConfig : WebMvcConfigurer {
-
-		override fun configureViewResolvers(registry: ViewResolverRegistry) {
-			registry.groovy()
-		}
-
-		// Configure the Groovy Markup Template Engine...
-
-		@Bean
-		fun groovyMarkupConfigurer() = GroovyMarkupConfigurer().apply {
-			resourceLoaderPath = "/WEB-INF/"
-		}
-	}
-----
-======
-
-The following example shows how to configure the same in XML:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<mvc:annotation-driven/>
-
-	<mvc:view-resolvers>
-		<mvc:groovy/>
-	</mvc:view-resolvers>
-
-	<!-- Configure the Groovy Markup Template Engine... -->
-	<mvc:groovy-configurer resource-loader-path="/WEB-INF/"/>
-----
-
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 [[mvc-view-groovymarkup-example]]
 == Example

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc

@@ -16,39 +16,11 @@ a directory under the `WEB-INF` directory so there can be no direct access by cl
 This is what is done by the configuration below which registers a JSP view resolver using
 a default view name prefix of `"/WEB-INF/"` and a default suffix of `".jsp"`.
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-@EnableWebMvc
-@Configuration
-public class WebConfig implements WebMvcConfigurer {
-
-    @Override
-    public void configureViewResolvers(ViewResolverRegistry registry) {
-        registry.jsp();
-    }
-}
-----
-
-XML::
-+
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-    <mvc:annotation-driven/>
-
-    <mvc:view-resolvers>
-        <mvc:jsp/>
-    </mvc:view-resolvers>
-----
-======
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 [NOTE]
 You can specify custom prefix and suffix.
 
-
 [[mvc-view-jsp-jstl]]
 == JSPs versus JSTL
 

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-script.adoc

@@ -11,13 +11,8 @@ templating libraries on different script engines:
 [%header]
 |===
 |Scripting Library |Scripting Engine
-|https://handlebarsjs.com/[Handlebars] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://mustache.github.io/[Mustache] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://react.dev/[React] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://ejs.co/[EJS] |https://openjdk.java.net/projects/nashorn/[Nashorn]
 |https://docs.ruby-lang.org/en/master/ERB.html[ERB] |https://www.jruby.org[JRuby]
 |https://docs.python.org/2/library/string.html#template-strings[String templates] |https://www.jython.org/[Jython]
-|https://github.com/sdeleuze/kotlin-script-templating[Kotlin Script templating] |{kotlin-site}[Kotlin]
 |===
 
 TIP: The basic rule for integrating any other script engine is that it must implement the
@@ -30,18 +25,8 @@ TIP: The basic rule for integrating any other script engine is that it must impl
 
 You need to have the script engine on your classpath, the details of which vary by script engine:
 
-* The https://openjdk.java.net/projects/nashorn/[Nashorn] JavaScript engine is provided with
-Java 8+. Using the latest update release available is highly recommended.
 * https://www.jruby.org[JRuby] should be added as a dependency for Ruby support.
 * https://www.jython.org[Jython] should be added as a dependency for Python support.
-* `org.jetbrains.kotlin:kotlin-script-util` dependency and a `META-INF/services/javax.script.ScriptEngineFactory`
- file containing a `org.jetbrains.kotlin.script.jsr223.KotlinJsr223JvmLocalScriptEngineFactory`
- line should be added for Kotlin script support. See
- https://github.com/sdeleuze/kotlin-script-templating[this example] for more details.
-
-You need to have the script templating library. One way to do that for JavaScript is
-through https://www.webjars.org/[WebJars].
-
 
 [[mvc-view-script-integrate]]
 == Script Templates
@@ -49,74 +34,20 @@ through https://www.webjars.org/[WebJars].
 
 You can declare a `ScriptTemplateConfigurer` bean to specify the script engine to use,
 the script files to load, what function to call to render templates, and so on.
-The following example uses Mustache templates and the Nashorn JavaScript engine:
+The following example uses the Jython Python engine:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	public class WebConfig implements WebMvcConfigurer {
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			registry.scriptTemplate();
-		}
+The render function is called with the following parameters:
 
-		@Bean
-		public ScriptTemplateConfigurer configurer() {
-			ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer();
-			configurer.setEngineName("nashorn");
-			configurer.setScripts("mustache.js");
-			configurer.setRenderObject("Mustache");
-			configurer.setRenderFunction("render");
-			return configurer;
-		}
-	}
-----
+* `String template`: The template content
+* `Map model`: The view model
+* `RenderingContext renderingContext`: The
+{spring-framework-api}/web/servlet/view/script/RenderingContext.html[`RenderingContext`]
+that gives access to the application context, the locale, the template loader, and the
+URL
 
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	class WebConfig : WebMvcConfigurer {
-
-		override fun configureViewResolvers(registry: ViewResolverRegistry) {
-			registry.scriptTemplate()
-		}
-
-		@Bean
-		fun configurer() = ScriptTemplateConfigurer().apply {
-			engineName = "nashorn"
-			setScripts("mustache.js")
-			renderObject = "Mustache"
-			renderFunction = "render"
-		}
-	}
-----
-======
-
-The following example shows the same arrangement in XML:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<mvc:annotation-driven/>
-
-	<mvc:view-resolvers>
-		<mvc:script-template/>
-	</mvc:view-resolvers>
-
-	<mvc:script-template-configurer engine-name="nashorn" render-object="Mustache" render-function="render">
-		<mvc:script location="mustache.js"/>
-	</mvc:script-template-configurer>
-----
-
-The controller would look no different for the Java and XML configurations, as the following example shows:
+The controller is used to populate the model attributes and specify the view name, as the following example shows:
 
 [tabs]
 ======
@@ -153,115 +84,6 @@ Kotlin::
 ----
 ======
 
-The following example shows the Mustache template:
-
-[source,html,indent=0,subs="verbatim,quotes"]
-----
-	<html>
-		<head>
-			<title>{{title}}</title>
-		</head>
-		<body>
-			<p>{{body}}</p>
-		</body>
-	</html>
-----
-
-The render function is called with the following parameters:
-
-* `String template`: The template content
-* `Map model`: The view model
-* `RenderingContext renderingContext`: The
-  {spring-framework-api}/web/servlet/view/script/RenderingContext.html[`RenderingContext`]
-  that gives access to the application context, the locale, the template loader, and the
-  URL (since 5.0)
-
-`Mustache.render()` is natively compatible with this signature, so you can call it directly.
-
-If your templating technology requires some customization, you can provide a script that
-implements a custom render function. For example, https://handlebarsjs.com[Handlerbars]
-needs to compile templates before using them and requires a
-https://en.wikipedia.org/wiki/Polyfill[polyfill] to emulate some
-browser facilities that are not available in the server-side script engine.
-
-The following example shows how to do so:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	public class WebConfig implements WebMvcConfigurer {
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			registry.scriptTemplate();
-		}
-
-		@Bean
-		public ScriptTemplateConfigurer configurer() {
-			ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer();
-			configurer.setEngineName("nashorn");
-			configurer.setScripts("polyfill.js", "handlebars.js", "render.js");
-			configurer.setRenderFunction("render");
-			configurer.setSharedEngine(false);
-			return configurer;
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	class WebConfig : WebMvcConfigurer {
-
-		override fun configureViewResolvers(registry: ViewResolverRegistry) {
-			registry.scriptTemplate()
-		}
-
-		@Bean
-		fun configurer() = ScriptTemplateConfigurer().apply {
-			engineName = "nashorn"
-			setScripts("polyfill.js", "handlebars.js", "render.js")
-			renderFunction = "render"
-			isSharedEngine = false	
-		}
-	}
-----
-======
-
-NOTE: Setting the `sharedEngine` property to `false` is required when using non-thread-safe
-script engines with templating libraries not designed for concurrency, such as Handlebars or
-React running on Nashorn. In that case, Java SE 8 update 60 is required, due to
-https://bugs.openjdk.java.net/browse/JDK-8076099[this bug], but it is generally
-recommended to use a recent Java SE patch release in any case.
-
-`polyfill.js` defines only the `window` object needed by Handlebars to run properly, as follows:
-
-[source,javascript,indent=0,subs="verbatim,quotes"]
-----
-	var window = {};
-----
-
-This basic `render.js` implementation compiles the template before using it. A production-ready
-implementation should also store any reused cached templates or pre-compiled templates.
-You can do so on the script side (and handle any customization you need -- managing
-template engine configuration, for example). The following example shows how to do so:
-
-[source,javascript,indent=0,subs="verbatim,quotes"]
-----
-	function render(template, model) {
-		var compiledTemplate = Handlebars.compile(template);
-		return compiledTemplate(model);
-	}
-----
-
 Check out the Spring Framework unit tests,
 {spring-framework-code}/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script[Java], and
 {spring-framework-code}/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script[resources],

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-xslt.adoc

@@ -21,45 +21,7 @@ Configuration is standard for a simple Spring web application: The MVC configura
 has to define an `XsltViewResolver` bean and regular MVC annotation configuration.
 The following example shows how to do so:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@EnableWebMvc
-	@ComponentScan
-	@Configuration
-	public class WebConfig implements WebMvcConfigurer {
-
-		@Bean
-		public XsltViewResolver xsltViewResolver() {
-			XsltViewResolver viewResolver = new XsltViewResolver();
-			viewResolver.setPrefix("/WEB-INF/xsl/");
-			viewResolver.setSuffix(".xslt");
-			return viewResolver;
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@EnableWebMvc
-	@ComponentScan
-	@Configuration
-	class WebConfig : WebMvcConfigurer {
-
-		@Bean
-		fun xsltViewResolver() = XsltViewResolver().apply {
-			setPrefix("/WEB-INF/xsl/")
-			setSuffix(".xslt")	
-		}
-	}
-----
-======
-
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 [[mvc-view-xslt-controllercode]]
 == Controller

framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc

@@ -66,6 +66,13 @@ from an existing `ProblemDetail`. This could be done centrally, for example, fro
 `@ControllerAdvice` such as `ResponseEntityExceptionHandler` that re-creates the
 `ProblemDetail` of an exception into a subclass with the additional non-standard fields.
 
+TIP: In Spring Boot, the `spring.mvc.problemdetails.enabled` property autoconfigures
+a `ResponseEntityExceptionHandler` that handles built-in exceptions with problem details.
+In that case, you may prefer to create another `@ControllerAdvice` instead of extending
+`ResponseEntityExceptionHandler` if you want to take over the handling of a specific
+built-in exception. You'll need to ensure your handler is ordered ahead of the one
+configured by Spring Boot whose order is 0.
+
 
 [[mvc-ann-rest-exceptions-i18n]]
 == Customization and i18n
@@ -184,7 +191,7 @@ Message codes and arguments for each error are also resolved via `MessageSource`
 |===
 
 NOTE: Unlike other exceptions, the message arguments for
-`MethodArgumentValidException` and `HandlerMethodValidationException` are based on a list of
+`MethodArgumentNotValidException` and `HandlerMethodValidationException` are based on a list of
 `MessageSourceResolvable` errors that can also be customized through a
 xref:core/beans/context-introduction.adoc#context-functionality-messagesource[MessageSource]
 resource bundle. See

framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-requestmapping.adoc

@@ -424,9 +424,9 @@ is used to map requests.
 Once API versioning is enabled, you can begin to map requests with versions.
 The `@RequestMapping` `version` attribute supports the following:
 
-- No value -- matches any version
 - Fixed version ("1.2") -- matches the given version only
 - Baseline version ("1.2+") -- matches the given version and above
+- No value -- matches any version, but is superseded by a more specific version match
 
 If multiple controller methods have a version less than or equal to the request version,
 the highest of those, and closest to the request version, is the one considered,
@@ -485,6 +485,11 @@ A request with version `"1.6"` does not have a match. (1) and (3) do match, but
 superseded by (4), which allows only a strict match, and therefore does not match.
 In this scenario, a `NotAcceptableApiVersionException` results in a 400 response.
 
+Controller methods without a version are intended to support clients created before a
+versioned alternative was introduced. Therefore, even though an unversioned controller
+method is considered a match for any version, it is in fact given the lowest priority,
+and is effectively superseded by any alternative controller method with a version.
+
 NOTE: The above assumes the request version is a
 xref:web/webmvc/mvc-config/api-version.adoc["supported" version], or otherwise it
 would fail.
@@ -550,53 +555,7 @@ You can programmatically register handler methods, which you can use for dynamic
 registrations or for advanced cases, such as different instances of the same handler
 under different URLs. The following example registers a handler method:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	public class MyConfig {
-
-		@Autowired
-		public void setHandlerMapping(RequestMappingHandlerMapping mapping, UserHandler handler) // <1>
-				throws NoSuchMethodException {
-
-			RequestMappingInfo info = RequestMappingInfo
-					.paths("/user/{id}").methods(RequestMethod.GET).build(); // <2>
-
-			Method method = UserHandler.class.getMethod("getUser", Long.class); // <3>
-
-			mapping.registerMapping(info, handler, method); // <4>
-		}
-	}
-----
-<1> Inject the target handler and the handler mapping for controllers.
-<2> Prepare the request mapping meta data.
-<3> Get the handler method.
-<4> Add the registration.
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	class MyConfig {
-
-		@Autowired
-		fun setHandlerMapping(mapping: RequestMappingHandlerMapping, handler: UserHandler) { // <1>
-			val info = RequestMappingInfo.paths("/user/{id}").methods(RequestMethod.GET).build() // <2>
-			val method = UserHandler::class.java.getMethod("getUser", Long::class.java) // <3>
-			mapping.registerMapping(info, handler, method) // <4>
-		}
-	}
-----
-<1> Inject the target handler and the handler mapping for controllers.
-<2> Prepare the request mapping meta data.
-<3> Get the handler method.
-<4> Add the registration.
-======
+include-code::./MyConfiguration[tag=snippet,indent=0]
 
 
 

framework-docs/modules/ROOT/pages/web/webmvc/mvc-servlet/localeresolver.adoc

@@ -54,44 +54,9 @@ information.
 This locale resolver inspects a `Cookie` that might exist on the client to see if a
 `Locale` or `TimeZone` is specified. If so, it uses the specified details. By using the
 properties of this locale resolver, you can specify the name of the cookie as well as the
-maximum age. The following example defines a `CookieLocaleResolver`:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<bean id="localeResolver" class="org.springframework.web.servlet.i18n.CookieLocaleResolver">
-
-		<property name="cookieName" value="clientlanguage"/>
-
-		<!-- in seconds. If set to -1, the cookie is not persisted (deleted when browser shuts down) -->
-		<property name="cookieMaxAge" value="100000"/>
-
-	</bean>
-----
-
-The following table describes the properties `CookieLocaleResolver`:
-
-[[mvc-cookie-locale-resolver-props-tbl]]
-.CookieLocaleResolver properties
-[cols="1,1,4"]
-|===
-| Property | Default | Description
-
-| `cookieName`
-| class name + LOCALE
-| The name of the cookie
-
-| `cookieMaxAge`
-| Servlet container default
-| The maximum time a cookie persists on the client. If `-1` is specified, the
-  cookie will not be persisted. It is available only until the client shuts down
-  the browser.
-
-| `cookiePath`
-| /
-| Limits the visibility of the cookie to a certain part of your site. When `cookiePath` is
-  specified, the cookie is visible only to that path and the paths below it.
-|===
+maximum age. The following example defines a `CookieLocaleResolver` bean:
 
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 [[mvc-localeresolver-session]]
 == Session Resolver
@@ -115,31 +80,7 @@ You can enable changing of locales by adding the `LocaleChangeInterceptor` to on
 accordingly, calling the `setLocale` method on the `LocaleResolver` in the dispatcher's
 application context. The next example shows that calls to all `{asterisk}.view` resources
 that contain a parameter named `siteLanguage` now changes the locale. So, for example,
-a request for the URL, `https://www.sf.net/home.view?siteLanguage=nl`, changes the site
+a request for the URL `https://domain.com/home.view?siteLanguage=nl` changes the site
 language to Dutch. The following example shows how to intercept the locale:
 
-[source,xml,indent=0,subs="verbatim"]
-----
-	<bean id="localeChangeInterceptor"
-			class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
-		<property name="paramName" value="siteLanguage"/>
-	</bean>
-
-	<bean id="localeResolver"
-			class="org.springframework.web.servlet.i18n.CookieLocaleResolver"/>
-
-	<bean id="urlMapping"
-			class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="interceptors">
-			<list>
-				<ref bean="localeChangeInterceptor"/>
-			</list>
-		</property>
-		<property name="mappings">
-			<value>/**/*.view=someController</value>
-		</property>
-	</bean>
-----
-
-
-
+include-code::./WebConfiguration[tag=snippet,indent=0,chomp=-tags]

framework-docs/modules/ROOT/pages/web/websocket/fallback.adoc

@@ -152,26 +152,9 @@ from the iframe. By default, the iframe is set to download the SockJS client
 from a CDN location. It is a good idea to configure this option to use
 a URL from the same origin as the application.
 
-The following example shows how to do so in Java configuration:
+The following example shows how to configure it:
 
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebSocketMessageBroker
-	public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
-
-		@Override
-		public void registerStompEndpoints(StompEndpointRegistry registry) {
-			registry.addEndpoint("/portfolio").withSockJS()
-					.setClientLibraryUrl("http://localhost:8080/myapp/js/sockjs-client.js");
-		}
-
-		// ...
-
-	}
-----
-
-The XML namespace provides a similar option through the `<websocket:sockjs>` element.
+include-code::./WebSocketConfiguration[tag=snippet,indent=0]
 
 NOTE: During initial development, do enable the SockJS client `devel` mode that prevents
 the browser from caching SockJS requests (like the iframe) that would otherwise
@@ -307,23 +290,4 @@ jettyHttpClient.setExecutor(new QueuedThreadPool(1000));
 The following example shows the server-side SockJS-related properties (see javadoc for details)
 that you should also consider customizing:
 
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	public class WebSocketConfig extends WebSocketMessageBrokerConfigurationSupport {
-
-		@Override
-		public void registerStompEndpoints(StompEndpointRegistry registry) {
-			registry.addEndpoint("/sockjs").withSockJS()
-				.setStreamBytesLimit(512 * 1024) <1>
-				.setHttpMessageCacheSize(1000) <2>
-				.setDisconnectDelay(30 * 1000); <3>
-		}
-
-		// ...
-	}
-----
-<1> Set the `streamBytesLimit` property to 512KB (the default is 128KB -- `128 * 1024`).
-<2> Set the `httpMessageCacheSize` property to 1,000 (the default is `100`).
-<3> Set the `disconnectDelay` property to 30 property seconds (the default is five seconds
--- `5 * 1000`).
+include-code::./WebSocketConfiguration[tag=snippet,indent=0]

framework-docs/modules/ROOT/partials/web/web-uris.adoc

@@ -268,9 +268,9 @@ response to a browser.
 
 `UriComponentsBuilder` exposes encoding options at two levels:
 
-* {spring-framework-api}/web/util/UriComponentsBuilder.html#encode--[UriComponentsBuilder#encode()]:
+* {spring-framework-api}/web/util/UriComponentsBuilder.html#encode()[UriComponentsBuilder#encode()]:
 Pre-encodes the URI template first and then strictly encodes URI variables when expanded.
-* {spring-framework-api}/web/util/UriComponents.html#encode--[UriComponents#encode()]:
+* {spring-framework-api}/web/util/UriComponents.html#encode()[UriComponents#encode()]:
 Encodes URI components _after_ URI variables are expanded.
 
 Both options replace non-ASCII and illegal characters with escaped octets. However, the first option

framework-docs/package.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "antora": "3.2.0-alpha.4",
-    "@antora/atlas-extension": "1.0.0-alpha.2",
-    "@antora/collector-extension": "1.0.0-alpha.3",
+    "antora": "3.2.0-alpha.11",
+    "@antora/atlas-extension": "1.0.0-alpha.5",
+    "@antora/collector-extension": "1.0.2",
     "@asciidoctor/tabs": "1.0.0-beta.6",
     "@springio/antora-extensions": "1.14.7",
     "fast-xml-parser": "4.5.2",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.10"
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.17"
   }
 }

framework-docs/src/main/java/org/springframework/docs/testing/resttestclient/assertj/AssertJTests.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.assertj;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.client.ExchangeResult;
+import org.springframework.test.web.servlet.client.RestTestClient;
+import org.springframework.test.web.servlet.client.assertj.RestTestClientResponse;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AssertJTests {
+
+	RestTestClient client;
+
+	@Test
+	void withSpec() {
+		// tag::withSpec[]
+		RestTestClient.ResponseSpec spec = client.get().uri("/persons").exchange();
+
+		RestTestClientResponse response = RestTestClientResponse.from(spec);
+		assertThat(response).hasStatusOk();
+		assertThat(response).hasContentTypeCompatibleWith(MediaType.TEXT_PLAIN);
+		// end::withSpec[]
+	}
+
+	@Test
+	void withResult() {
+		// tag::withResult[]
+		ExchangeResult result = client.get().uri("/persons").exchange().returnResult();
+
+		RestTestClientResponse response = RestTestClientResponse.from(result);
+		assertThat(response).hasStatusOk();
+		assertThat(response).hasContentTypeCompatibleWith(MediaType.TEXT_PLAIN);
+		// end::withResult[]
+	}
+
+}

framework-docs/src/main/java/org/springframework/docs/testing/resttestclient/contextconfig/RestClientContextTests.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.contextconfig;
+
+import org.junit.jupiter.api.BeforeEach;
+
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.web.servlet.client.RestTestClient;
+import org.springframework.web.context.WebApplicationContext;
+
+
+@SpringJUnitConfig(WebConfig.class) // Specify the configuration to load
+public class RestClientContextTests {
+
+	RestTestClient client;
+
+	@BeforeEach
+	void setUp(WebApplicationContext context) {  // Inject the configuration
+		// Create the `RestTestClient`
+		client = RestTestClient.bindToApplicationContext(context).build();
+	}
+
+}

framework-docs/src/main/java/org/springframework/docs/testing/resttestclient/contextconfig/WebConfig.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.contextconfig;
+
+public class WebConfig {
+}

framework-docs/src/main/java/org/springframework/docs/testing/resttestclient/json/JsonTests.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.json;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.web.servlet.client.RestTestClient;
+
+public class JsonTests {
+
+	RestTestClient client;
+
+	@Test
+	void jsonBody() {
+		// tag::jsonBody[]
+		client.get().uri("/persons/1")
+				.exchange()
+				.expectStatus().isOk()
+				.expectBody()
+				.json("{\"name\":\"Jane\"}");
+		// end::jsonBody[]
+	}
+
+	@Test
+	void jsonPath() {
+		// tag::jsonPath[]
+		client.get().uri("/persons")
+				.exchange()
+				.expectStatus().isOk()
+				.expectBody()
+				.jsonPath("$[0].name").isEqualTo("Jane")
+				.jsonPath("$[1].name").isEqualTo("Jason");
+		// end::jsonPath[]
+	}
+
+}

framework-docs/src/main/java/org/springframework/docs/testing/resttestclient/nocontent/NoContentTests.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.nocontent;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.web.servlet.client.RestTestClient;
+
+public class NoContentTests {
+
+
+	RestTestClient client;
+
+	@Test
+	void emptyBody() {
+		Person person = new Person("Jane");
+		// tag::emptyBody[]
+		client.post().uri("/persons")
+				.body(person)
+				.exchange()
+				.expectStatus().isCreated()
+				.expectBody().isEmpty();
+		// end::emptyBody[]
+	}
+
+	@Test
+	void ignoreBody() {
+		Person person = new Person("Jane");
+		// tag::ignoreBody[]
+		client.post().uri("/persons")
+				.body(person)
+				.exchange()
+				.expectStatus().isCreated()
+				.expectBody(Void.class);
+		// end::ignoreBody[]
+	}
+
+	record Person(String name) {
+
+	}
+
+}

framework-docs/src/main/java/org/springframework/docs/testing/resttestclient/workflow/RestClientWorkflowTests.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.workflow;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.client.EntityExchangeResult;
+import org.springframework.test.web.servlet.client.RestTestClient;
+
+public class RestClientWorkflowTests {
+
+	RestTestClient client;
+
+	@Test
+	void workflowTest() {
+		// tag::test[]
+		client.get().uri("/persons/1")
+				.accept(MediaType.APPLICATION_JSON)
+				.exchange()
+				.expectStatus().isOk()
+				.expectHeader().contentType(MediaType.APPLICATION_JSON)
+				.expectBody();
+		// end::test[]
+	}
+
+	@Test
+	void softAssertions() {
+		// tag::soft-assertions[]
+		client.get().uri("/persons/1")
+				.accept(MediaType.APPLICATION_JSON)
+				.exchange()
+				.expectAll(
+						spec -> spec.expectStatus().isOk(),
+						spec -> spec.expectHeader().contentType(MediaType.APPLICATION_JSON)
+				);
+		// end::soft-assertions[]
+	}
+
+	@Test
+	void consumeWith() {
+		// tag::consume[]
+		client.get().uri("/persons/1")
+				.exchange()
+				.expectStatus().isOk()
+				.expectBody(Person.class)
+				.consumeWith(result -> {
+					// custom assertions (for example, AssertJ)...
+				});
+		// end::consume[]
+	}
+
+	@Test
+	void returnResult() {
+		// tag::result[]
+		EntityExchangeResult<Person> result = client.get().uri("/persons/1")
+				.exchange()
+				.expectStatus().isOk()
+				.expectBody(Person.class)
+				.returnResult();
+
+		Person person = result.getResponseBody();
+		HttpHeaders requestHeaders = result.getRequestHeaders();
+		// end::result[]
+	}
+
+	record Person(String name) {
+
+	}
+}

framework-docs/src/main/java/org/springframework/docs/web/mvccorsglobal/WebConfiguration.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.mvccorsglobal;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		registry.addMapping("/api/**")
+			.allowedOrigins("https://domain1.com", "https://domain2.com")
+			.allowedMethods("GET", "PUT")
+			.allowedHeaders("header1", "header2", "header3")
+			.exposedHeaders("header1", "header2")
+			.allowCredentials(true)
+			.maxAge(3600);
+
+		// Add more mappings...
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/webflux/controller/annmethods/partevent/PartEventController.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2026-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.web.webflux.controller.annmethods.partevent;
+
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.codec.multipart.FilePartEvent;
+import org.springframework.http.codec.multipart.FormPartEvent;
+import org.springframework.http.codec.multipart.PartEvent;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+public class PartEventController {
+
+	// tag::snippet[]
+	@PostMapping("/")
+	public void handle(@RequestBody Flux<PartEvent> allPartEvents) {
+
+		//	The final PartEvent for a particular part will have isLast() set to true, and can be
+		//	followed by additional events belonging to subsequent parts.
+		//	This makes the isLast property suitable as a predicate for the Flux::windowUntil operator, to
+		//	split events from all parts into windows that each belong to a single part.
+		allPartEvents.windowUntil(PartEvent::isLast)
+				//	The Flux::switchOnFirst operator allows you to see whether you are handling
+				//	a form field or file upload
+				.concatMap(p -> p.switchOnFirst((signal, partEvents) -> {
+						if (signal.hasValue()) {
+								PartEvent event = signal.get();
+								if (event instanceof FormPartEvent formEvent) {
+										String value = formEvent.value();
+										// Handling of the form field
+								}
+								else if (event instanceof FilePartEvent fileEvent) {
+										String filename = fileEvent.filename();
+
+										// The body contents must be completely consumed, relayed, or released to avoid memory leaks
+										Flux<DataBuffer> contents = partEvents.map(PartEvent::content);
+										// Handling of the file upload
+						}
+						else {
+							return Mono.error(new RuntimeException("Unexpected event: " + event));
+						}
+					}
+					else {
+						return partEvents; // either complete or error signal
+					}
+					return Mono.empty();
+				}));
+	}
+	// end::snippet[]
+
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnhandlerclasses/Person.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerclasses;
+
+public record Person(String name) { }

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnhandlerclasses/PersonHandler.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerclasses;
+
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.web.reactive.function.server.ServerResponse.ok;
+
+// tag::snippet[]
+public class PersonHandler {
+
+	private final PersonRepository repository;
+
+	public PersonHandler(PersonRepository repository) {
+		this.repository = repository;
+	}
+
+	// listPeople is a handler function that returns all Person objects found
+	// in the repository as JSON
+	public Mono<ServerResponse> listPeople(ServerRequest request) {
+		Flux<Person> people = repository.allPeople();
+		return ok().contentType(APPLICATION_JSON).body(people, Person.class);
+	}
+
+	// createPerson is a handler function that stores a new Person contained
+	// in the request body.
+	// Note that PersonRepository.savePerson(Person) returns Mono<Void>: an empty
+	// Mono that emits a completion signal when the person has been read from the
+	// request and stored. So we use the build(Publisher<Void>) method to send a
+	// response when that completion signal is received (that is, when the Person
+	// has been saved)
+	public Mono<ServerResponse> createPerson(ServerRequest request) {
+		Mono<Person> person = request.bodyToMono(Person.class);
+		return ok().build(repository.savePerson(person));
+	}
+
+	// getPerson is a handler function that returns a single person, identified by
+	// the id path variable. We retrieve that Person from the repository and create
+	// a JSON response, if it is found. If it is not found, we use switchIfEmpty(Mono<T>)
+	// to return a 404 Not Found response.
+	public Mono<ServerResponse> getPerson(ServerRequest request) {
+		int personId = Integer.valueOf(request.pathVariable("id"));
+		return repository.getPerson(personId)
+			.flatMap(person -> ok().contentType(APPLICATION_JSON).bodyValue(person))
+			.switchIfEmpty(ServerResponse.notFound().build());
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnhandlerclasses/PersonRepository.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerclasses;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface PersonRepository {
+
+	Flux<Person> allPeople();
+
+	Mono<Void> savePerson(Mono<Person> person);
+
+	Mono<Person> getPerson(int id);
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnhandlerfilterfunction/RouterConfiguration.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerfilterfunction;
+
+import org.springframework.docs.web.webfluxfnhandlerclasses.PersonHandler;
+import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.RouterFunctions;
+import org.springframework.web.reactive.function.server.ServerResponse;
+
+import static org.springframework.http.HttpStatus.UNAUTHORIZED;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
+
+public class RouterConfiguration {
+
+	public RouterFunction<ServerResponse> route(PersonHandler handler) {
+		// tag::snippet[]
+		SecurityManager securityManager = getSecurityManager();
+
+		RouterFunction<ServerResponse> route = RouterFunctions.route()
+			.path("/person", b1 -> b1
+				.nest(accept(APPLICATION_JSON), b2 -> b2
+					.GET("/{id}", handler::getPerson)
+					.GET(handler::listPeople))
+				.POST(handler::createPerson))
+			.filter((request, next) -> {
+				if (securityManager.allowAccessTo(request.path())) {
+					return next.handle(request);
+				}
+				else {
+					return ServerResponse.status(UNAUTHORIZED).build();
+				}
+			}).build();
+		// end::snippet[]
+		return route;
+	}
+
+	SecurityManager getSecurityManager() {
+		return path -> false;
+	}
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnhandlerfilterfunction/SecurityManager.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerfilterfunction;
+
+public interface SecurityManager {
+
+	boolean allowAccessTo(String path);
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnhandlervalidation/PersonHandler.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlervalidation;
+
+import org.springframework.docs.web.webfluxfnhandlerclasses.Person;
+import org.springframework.docs.web.webfluxfnhandlerclasses.PersonRepository;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import org.springframework.web.server.ServerWebInputException;
+import reactor.core.publisher.Mono;
+
+import static org.springframework.web.reactive.function.server.ServerResponse.ok;
+
+// tag::snippet[]
+public class PersonHandler {
+
+	// Create Validator instance
+	private final Validator validator = new PersonValidator();
+
+	private final PersonRepository repository;
+
+	public PersonHandler(PersonRepository repository) {
+		this.repository = repository;
+	}
+
+	public Mono<ServerResponse> createPerson(ServerRequest request) {
+		// Apply validation
+		Mono<Person> person = request.bodyToMono(Person.class).doOnNext(this::validate);
+		return ok().build(repository.savePerson(person));
+	}
+
+	private void validate(Person person) {
+		Errors errors = new BeanPropertyBindingResult(person, "person");
+		validator.validate(person, errors);
+		if (errors.hasErrors()) {
+			// Raise exception for a 400 response
+			throw new ServerWebInputException(errors.toString());
+		}
+	}
+}
+// end::snippet[]

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnhandlervalidation/PersonValidator.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlervalidation;
+
+import org.springframework.docs.web.webfluxfnhandlerclasses.Person;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+public class PersonValidator implements Validator {
+
+	@Override
+	public boolean supports(Class<?> clazz) {
+		return Person.class.isAssignableFrom(clazz);
+	}
+
+	@Override
+	public void validate(Object target, Errors errors) {
+		// Validation logic
+	}
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnpredicates/RouterConfiguration.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnpredicates;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.RouterFunctions;
+import org.springframework.web.reactive.function.server.ServerResponse;
+
+import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
+
+public class RouterConfiguration {
+
+	public RouterFunction<ServerResponse> route() {
+		// tag::snippet[]
+		RouterFunction<ServerResponse> route = RouterFunctions.route()
+			.GET("/hello-world", accept(MediaType.TEXT_PLAIN),
+				request -> ServerResponse.ok().bodyValue("Hello World")).build();
+		// end::snippet[]
+		return route;
+	}
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnrequest/PartEventHandler.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnrequest;
+
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.codec.multipart.FilePartEvent;
+import org.springframework.http.codec.multipart.FormPartEvent;
+import org.springframework.http.codec.multipart.PartEvent;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public class PartEventHandler {
+
+	public void handle(ServerRequest request) {
+		// tag::snippet[]
+		request.bodyToFlux(PartEvent.class).windowUntil(PartEvent::isLast)
+				.concatMap(p -> p.switchOnFirst((signal, partEvents) -> {
+					if (signal.hasValue()) {
+						PartEvent event = signal.get();
+						if (event instanceof FormPartEvent formEvent) {
+							String value = formEvent.value();
+							// handle form field
+						}
+						else if (event instanceof FilePartEvent fileEvent) {
+							String filename = fileEvent.filename();
+							Flux<DataBuffer> contents = partEvents.map(PartEvent::content);
+							// handle file upload
+						}
+						else {
+							return Mono.error(new RuntimeException("Unexpected event: " + event));
+						}
+					}
+					else {
+						return partEvents; // either complete or error signal
+					}
+					return Mono.empty();
+				}));
+		// end::snippet[]
+	}
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnrequest/RequestHandler.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnrequest;
+
+import reactor.core.publisher.Mono;
+
+import org.springframework.web.reactive.function.server.ServerRequest;
+
+public class RequestHandler {
+
+	public void bind(ServerRequest request) {
+		// tag::snippet[]
+		Mono<Pet> pet = request.bind(Pet.class, dataBinder -> dataBinder.setAllowedFields("name"));
+		// end::snippet[]
+	}
+
+	record Pet(String name) { }
+
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnresponse/ResponseHandler.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnresponse;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+public class ResponseHandler {
+
+	public Mono<ServerResponse> createResponse() {
+		// tag::snippet[]
+		Mono<Person> person = getPerson();
+		return ServerResponse.ok().contentType(MediaType.APPLICATION_JSON).body(person, Person.class);
+		// end::snippet[]
+	}
+
+	private Mono<Person> getPerson() {
+		return Mono.just(new Person("foo"));
+	}
+
+	record Person(String name) { }
+}

framework-docs/src/main/java/org/springframework/docs/web/webfluxfnroutes/RouterConfiguration.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnroutes;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import org.springframework.docs.web.webfluxfnhandlerclasses.Person;
+import org.springframework.docs.web.webfluxfnhandlerclasses.PersonHandler;
+import org.springframework.docs.web.webfluxfnhandlerclasses.PersonRepository;
+import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.RouterFunctions;
+import org.springframework.web.reactive.function.server.ServerResponse;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
+import static org.springframework.web.reactive.function.server.RouterFunctions.route;
+
+public class RouterConfiguration {
+
+	public RouterFunction<ServerResponse> routes() {
+		// tag::snippet[]
+		PersonRepository repository = getPersonRepository();
+		PersonHandler handler = new PersonHandler(repository);
+
+		RouterFunction<ServerResponse> otherRoute = getOtherRoute();
+
+		RouterFunction<ServerResponse> route = route()
+			// GET /person/{id} with an Accept header that matches JSON is routed to PersonHandler.getPerson
+			.GET("/person/{id}", accept(APPLICATION_JSON), handler::getPerson)
+			// GET /person with an Accept header that matches JSON is routed to PersonHandler.listPeople
+			.GET("/person", accept(APPLICATION_JSON), handler::listPeople)
+			// POST /person with no additional predicates is mapped to PersonHandler.createPerson
+			.POST("/person", handler::createPerson)
+			// otherRoute is a router function that is created elsewhere and added to the route built
+			.add(otherRoute)
+			.build();
+		// end::snippet[]
+		return route;
+	}
+
+	PersonRepository getPersonRepository() {
+		return new PersonRepository() {
+			@Override
+			public Flux<Person> allPeople() {
+				return null;
+			}
+
+			@Override
+			public Mono<Void> savePerson(Mono<Person> person) {
+				return null;
+			}
+
+			@Override
+			public Mono<Person> getPerson(int id) {
+				return null;
+			}
+		};
+	}
+
+	RouterFunction<ServerResponse> getOtherRoute() {
+		return RouterFunctions.route().build();
+	}
+}

framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvcconfig/mvcconfiginterceptors/WebConfiguration.java

@@ -19,6 +19,7 @@ package org.springframework.docs.web.webmvc.mvcconfig.mvcconfiginterceptors;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.handler.UserRoleAuthorizationInterceptor;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 
 // tag::snippet[]
@@ -28,6 +29,7 @@ public class WebConfiguration implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(new LocaleChangeInterceptor());
+		registry.addInterceptor(new UserRoleAuthorizationInterceptor()).addPathPatterns("/**").excludePathPatterns("/admin/**");
 	}
 }
 // end::snippet[]

framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvccontroller/mvcannrequestmappingregistration/MyConfiguration.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvc.mvccontroller.mvcannrequestmappingregistration;
+
+import java.lang.reflect.Method;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+// tag::snippet[]
+@Configuration
+public class MyConfiguration {
+
+	// Inject the target handler and the handler mapping for controllers
+	@Autowired
+	public void setHandlerMapping(RequestMappingHandlerMapping mapping, UserHandler handler)
+			throws NoSuchMethodException {
+
+		// Prepare the request mapping meta data
+		RequestMappingInfo info = RequestMappingInfo
+				.paths("/user/{id}").methods(RequestMethod.GET).build();
+
+		// Get the handler method
+		Method method = UserHandler.class.getMethod("getUser", Long.class);
+
+		// Add the registration
+		mapping.registerMapping(info, handler, method);
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvccontroller/mvcannrequestmappingregistration/UserHandler.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvc.mvccontroller.mvcannrequestmappingregistration;
+
+public class UserHandler {
+
+	public void getUser(Long id) {
+		// ...
+	}
+}
+

framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvcservlet/mvclocaleresolvercookie/WebConfiguration.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvc.mvcservlet.mvclocaleresolvercookie;
+
+import java.time.Duration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.i18n.CookieLocaleResolver;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration {
+
+	@Bean
+	public LocaleResolver localeResolver() {
+		CookieLocaleResolver localeResolver = new CookieLocaleResolver("clientlanguage");
+		localeResolver.setCookieMaxAge(Duration.ofSeconds(100000));
+		return localeResolver;
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvcservlet/mvclocaleresolverinterceptor/WebConfiguration.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvc.mvcservlet.mvclocaleresolverinterceptor;
+
+import java.util.Map;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
+import org.springframework.web.servlet.i18n.CookieLocaleResolver;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration {
+
+	@Bean
+	public LocaleResolver localeResolver() {
+		return new CookieLocaleResolver();
+	}
+
+	@Bean
+	public SimpleUrlHandlerMapping urlMapping() {
+		SimpleUrlHandlerMapping urlHandlerMapping = new SimpleUrlHandlerMapping();
+		LocaleChangeInterceptor interceptor = new LocaleChangeInterceptor();
+		interceptor.setParamName("siteLanguage");
+		urlHandlerMapping.setInterceptors(interceptor);
+		urlHandlerMapping.setUrlMap(Map.of("/**/*.view", "someController"));
+		return urlHandlerMapping;
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/webmvcfnrunning/WebConfiguration.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvcfnrunning;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverters;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.function.RouterFunction;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+	@Bean
+	public RouterFunction<?> routerFunctionA() {
+		// ...
+		return null;
+	}
+
+	@Bean
+	public RouterFunction<?> routerFunctionB() {
+		// ...
+		return null;
+	}
+
+	@Override
+	public void configureMessageConverters(HttpMessageConverters.ServerBuilder builder) {
+		// configure message conversion...
+	}
+
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		// configure CORS...
+	}
+
+	@Override
+	public void configureViewResolvers(ViewResolverRegistry registry) {
+		// configure view resolution for HTML rendering...
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/webmvcview/mvcviewfreemarkercontextconfig/WebConfiguration.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvcview.mvcviewfreemarkercontextconfig;
+
+import java.nio.charset.StandardCharsets;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+	@Override
+	public void configureViewResolvers(ViewResolverRegistry registry) {
+		registry.freeMarker();
+	}
+
+	// Configure FreeMarker...
+
+	@Bean
+	public FreeMarkerConfigurer freeMarkerConfigurer() {
+		FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
+		configurer.setTemplateLoaderPath("/WEB-INF/freemarker");
+		configurer.setDefaultCharset(StandardCharsets.UTF_8);
+		return configurer;
+	}
+}
+// end::snippet[]

framework-docs/src/main/java/org/springframework/docs/web/webmvcview/mvcviewgroovymarkupconfiguration/WebConfiguration.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvcview.mvcviewgroovymarkupconfiguration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+	@Override
+	public void configureViewResolvers(ViewResolverRegistry registry) {
+		registry.groovy();
+	}
+
+	// Configure the Groovy Markup Template Engine...
+
+	@Bean
+	public GroovyMarkupConfigurer groovyMarkupConfigurer() {
+		GroovyMarkupConfigurer configurer = new GroovyMarkupConfigurer();
+		configurer.setResourceLoaderPath("/WEB-INF/");
+		return configurer;
+	}
+}
+// end::snippet[]

framework-docs/src/main/java/org/springframework/docs/web/webmvcview/mvcviewjspresolver/WebConfiguration.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvcview.mvcviewjspresolver;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+	@Override
+	public void configureViewResolvers(ViewResolverRegistry registry) {
+		registry.jsp();
+	}
+}
+// end::snippet[]

framework-docs/src/main/java/org/springframework/docs/web/webmvcview/mvcviewscriptintegrate/WebConfiguration.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvcview.mvcviewscriptintegrate;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.script.ScriptTemplateConfigurer;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+	@Override
+	public void configureViewResolvers(ViewResolverRegistry registry) {
+		registry.scriptTemplate();
+	}
+
+	@Bean
+	public ScriptTemplateConfigurer configurer() {
+		ScriptTemplateConfigurer configurer = new ScriptTemplateConfigurer();
+		configurer.setEngineName("jython");
+		configurer.setScripts("render.py");
+		configurer.setRenderFunction("render");
+		return configurer;
+	}
+}
+// end::snippet[]

framework-docs/src/main/java/org/springframework/docs/web/webmvcview/mvcviewsfreemarker/WebConfiguration.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvcview.mvcviewsfreemarker;
+
+import java.util.Map;
+
+import freemarker.template.utility.XmlEscape;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
+
+@Configuration
+public class WebConfiguration {
+
+	// tag::snippet[]
+	@Bean
+	public FreeMarkerConfigurer freeMarkerConfigurer() {
+		FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
+		configurer.setTemplateLoaderPath("/WEB-INF/freemarker");
+		configurer.setFreemarkerVariables(Map.of("xml_escape", new XmlEscape()));
+		return configurer;
+	}
+	// end::snippet[]
+}

framework-docs/src/main/java/org/springframework/docs/web/webmvcview/mvcviewxsltbeandefs/WebConfiguration.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvcview.mvcviewxsltbeandefs;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.xslt.XsltViewResolver;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+	@Bean
+	public XsltViewResolver xsltViewResolver() {
+		XsltViewResolver viewResolver = new XsltViewResolver();
+		viewResolver.setPrefix("/WEB-INF/xsl/");
+		viewResolver.setSuffix(".xslt");
+		return viewResolver;
+	}
+}
+// end::snippet[]

framework-docs/src/main/java/org/springframework/docs/web/websocket/websocketfallbacksockjsclient/WebSocketConfiguration.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.websocket.websocketfallbacksockjsclient;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurationSupport;
+
+// tag::snippet[]
+@Configuration
+public class WebSocketConfiguration extends WebSocketMessageBrokerConfigurationSupport {
+
+	@Override
+	public void registerStompEndpoints(StompEndpointRegistry registry) {
+		registry.addEndpoint("/sockjs").withSockJS()
+			// Set the streamBytesLimit property to 512KB (the default is 128KB -- 128 * 1024)
+			.setStreamBytesLimit(512 * 1024)
+			// Set the httpMessageCacheSize property to 1,000 (the default is 100)
+			.setHttpMessageCacheSize(1000)
+			// Set the disconnectDelay property to 30 property seconds (the default is five seconds -- 5 * 1000)
+			.setDisconnectDelay(30 * 1000);
+	}
+
+	// ...
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/websocket/websocketfallbackxhrvsiframe/WebSocketConfiguration.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.websocket.websocketfallbackxhrvsiframe;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+// tag::snippet[]
+@Configuration
+@EnableWebSocketMessageBroker
+public class WebSocketConfiguration implements WebSocketMessageBrokerConfigurer {
+
+	@Override
+	public void registerStompEndpoints(StompEndpointRegistry registry) {
+		registry.addEndpoint("/portfolio").withSockJS()
+				.setClientLibraryUrl("http://localhost:8080/myapp/js/sockjs-client.js");
+	}
+
+	// ...
+
+	@Override
+	public void configureMessageBroker(MessageBrokerRegistry registry) {
+		// Configure message broker...
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/kotlin/org/springframework/docs/testing/resttestclient/assertj/AssertJTests.kt

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.assertj
+
+import org.assertj.core.api.Assertions
+import org.junit.jupiter.api.Test
+import org.springframework.http.MediaType
+import org.springframework.test.web.servlet.client.RestTestClient
+import org.springframework.test.web.servlet.client.assertj.RestTestClientResponse
+
+class AssertJTests {
+
+
+	lateinit var client: RestTestClient
+
+	@Test
+	fun withSpec() {
+		// tag::withSpec[]
+		val spec = client.get().uri("/persons").exchange()
+
+		val response = RestTestClientResponse.from(spec)
+		Assertions.assertThat(response).hasStatusOk()
+		Assertions.assertThat(response).hasContentTypeCompatibleWith(MediaType.TEXT_PLAIN)
+		// end::withSpec[]
+	}
+
+	@Test
+	fun withResult() {
+		// tag::withResult[]
+		val result = client.get().uri("/persons").exchange().returnResult()
+
+		val response = RestTestClientResponse.from(result)
+		Assertions.assertThat(response).hasStatusOk()
+		Assertions.assertThat(response).hasContentTypeCompatibleWith(MediaType.TEXT_PLAIN)
+		// end::withResult[]
+	}
+
+}

framework-docs/src/main/kotlin/org/springframework/docs/testing/resttestclient/contextconfig/RestClientContextTests.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.contextconfig
+
+import org.junit.jupiter.api.BeforeEach
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig
+import org.springframework.test.web.servlet.client.RestTestClient
+import org.springframework.web.context.WebApplicationContext
+
+@SpringJUnitConfig(WebConfig::class) // Specify the configuration to load
+class RestClientContextTests {
+
+	lateinit var client: RestTestClient
+
+	@BeforeEach
+	fun setUp(context: WebApplicationContext) {  // Inject the configuration
+		// Create the `RestTestClient`
+		client = RestTestClient.bindToApplicationContext(context).build()
+	}
+}

framework-docs/src/main/kotlin/org/springframework/docs/testing/resttestclient/contextconfig/WebConfig.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.contextconfig
+
+class WebConfig {
+}

framework-docs/src/main/kotlin/org/springframework/docs/testing/resttestclient/json/JsonTests.kt

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.json
+
+import org.junit.jupiter.api.Test
+import org.springframework.test.web.servlet.client.RestTestClient
+
+class JsonTests {
+
+	lateinit var client: RestTestClient
+
+	@Test
+	fun jsonBody() {
+		// tag::jsonBody[]
+		client.get().uri("/persons/1")
+			.exchange()
+			.expectStatus().isOk()
+			.expectBody()
+			.json("{\"name\":\"Jane\"}")
+		// end::jsonBody[]
+	}
+
+	@Test
+	fun jsonPath() {
+		// tag::jsonPath[]
+		client.get().uri("/persons")
+			.exchange()
+			.expectStatus().isOk()
+			.expectBody()
+			.jsonPath("$[0].name").isEqualTo("Jane")
+			.jsonPath("$[1].name").isEqualTo("Jason")
+		// end::jsonPath[]
+	}
+
+}

framework-docs/src/main/kotlin/org/springframework/docs/testing/resttestclient/nocontent/NoContentTests.kt

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.nocontent
+
+import org.junit.jupiter.api.Test
+import org.springframework.test.web.servlet.client.RestTestClient
+import org.springframework.test.web.servlet.client.expectBody
+
+class NoContentTests {
+
+	lateinit var client: RestTestClient
+
+	@Test
+	fun emptyBody() {
+		val person = Person("Jane")
+		// tag::emptyBody[]
+		client.post().uri("/persons")
+			.body(person)
+			.exchange()
+			.expectStatus().isCreated()
+			.expectBody().isEmpty()
+		// end::emptyBody[]
+	}
+
+	@Test
+	fun ignoreBody() {
+		val person = Person("Jane")
+		// tag::ignoreBody[]
+		client.get().uri("/persons/123")
+			.exchange()
+			.expectStatus().isNotFound
+			.expectBody<Unit>()
+		// end::ignoreBody[]
+	}
+
+	data class Person(val name: String)
+
+}

framework-docs/src/main/kotlin/org/springframework/docs/testing/resttestclient/workflow/RestClientWorkflowTests.kt

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2025-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.testing.resttestclient.workflow
+
+import org.junit.jupiter.api.Test
+import org.springframework.http.MediaType
+import org.springframework.test.web.servlet.client.RestTestClient
+import org.springframework.test.web.servlet.client.expectBody
+
+class RestClientWorkflowTests {
+
+	lateinit var client: RestTestClient
+
+	@Test
+	fun workflowTest() {
+		// tag::test[]
+		client.get().uri("/persons/1")
+			.accept(MediaType.APPLICATION_JSON)
+			.exchange()
+			.expectStatus().isOk()
+			.expectHeader().contentType(MediaType.APPLICATION_JSON)
+			.expectBody()
+		// end::test[]
+	}
+
+	@Test
+	fun softAssertions() {
+		// tag::soft-assertions[]
+		client.get().uri("/persons/1")
+			.accept(MediaType.APPLICATION_JSON)
+			.exchange()
+			.expectAll(
+				{ spec -> spec.expectStatus().isOk() },
+				{ spec -> spec.expectHeader().contentType(MediaType.APPLICATION_JSON) }
+			)
+		// end::soft-assertions[]
+	}
+
+	@Test
+	fun consumeWith() {
+		// tag::consume[]
+		client.get().uri("/persons/1")
+			.exchange()
+			.expectStatus().isOk()
+			.expectBody<Person>()
+			.consumeWith {
+				// custom assertions (for example, AssertJ)...
+			}
+		// end::consume[]
+	}
+
+	@Test
+	fun returnResult() {
+		// tag::result[]
+		val result = client.get().uri("/persons/1")
+			.exchange()
+			.expectStatus().isOk
+			.expectBody<Person>()
+			.returnResult()
+
+		val person: Person? = result.responseBody
+		val requestHeaders = result.responseHeaders
+		// end::result[]
+	}
+
+	data class Person(val name: String)
+
+}

framework-docs/src/main/kotlin/org/springframework/docs/web/mvccorsglobal/WebConfiguration.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.mvccorsglobal
+
+import org.springframework.context.annotation.Configuration
+import org.springframework.web.servlet.config.annotation.CorsRegistry
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
+
+// tag::snippet[]
+@Configuration
+class WebConfiguration : WebMvcConfigurer {
+
+	override fun addCorsMappings(registry: CorsRegistry) {
+		registry.addMapping("/api/**")
+				.allowedOrigins("https://domain1.com", "https://domain2.com")
+				.allowedMethods("GET", "PUT")
+				.allowedHeaders("header1", "header2", "header3")
+				.exposedHeaders("header1", "header2")
+				.allowCredentials(true)
+				.maxAge(3600)
+
+		// Add more mappings...
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/kotlin/org/springframework/docs/web/webflux/controller/annmethods/partevent/PartEventController.kt

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2026-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.web.webflux.controller.annmethods.partevent
+
+import org.springframework.core.io.buffer.DataBuffer
+import org.springframework.http.codec.multipart.FilePartEvent
+import org.springframework.http.codec.multipart.FormPartEvent
+import org.springframework.http.codec.multipart.PartEvent
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RestController
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+
+@RestController
+class PartEventController {
+
+	// tag::snippet[]
+	@PostMapping("/")
+	fun handle(@RequestBody allPartEvents: Flux<PartEvent>) {
+
+		//	The final PartEvent for a particular part will have isLast() set to true, and can be
+		//	followed by additional events belonging to subsequent parts.
+		//	This makes the isLast property suitable as a predicate for the Flux::windowUntil operator, to
+		//	split events from all parts into windows that each belong to a single part.
+		allPartEvents.windowUntil(PartEvent::isLast)
+				.concatMap {
+
+					//	The Flux::switchOnFirst operator allows you to see whether you are handling
+					//	a form field or file upload
+					it.switchOnFirst { signal, partEvents ->
+						if (signal.hasValue()) {
+							val event = signal.get()
+							if (event is FormPartEvent) {
+								val value: String = event.value()
+								// Handling of the form field
+							} else if (event is FilePartEvent) {
+								val filename: String = event.filename()
+
+								// The body contents must be completely consumed, relayed, or released to avoid memory leaks
+								val contents: Flux<DataBuffer> = partEvents.map(PartEvent::content)
+								// Handling of the file upload
+							} else {
+								return@switchOnFirst Mono.error(RuntimeException("Unexpected event: $event"))
+							}
+						} else {
+							return@switchOnFirst partEvents // either complete or error signal
+						}
+						Mono.empty()
+					}
+				}
+	}
+	// end::snippet[]
+
+}

framework-docs/src/main/kotlin/org/springframework/docs/web/webfluxfnhandlerclasses/Person.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerclasses
+
+data class Person(val name: String)

framework-docs/src/main/kotlin/org/springframework/docs/web/webfluxfnhandlerclasses/PersonHandler.kt

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerclasses
+
+import kotlinx.coroutines.flow.Flow
+import org.springframework.http.MediaType.APPLICATION_JSON
+import org.springframework.web.reactive.function.server.ServerRequest
+import org.springframework.web.reactive.function.server.ServerResponse
+import org.springframework.web.reactive.function.server.awaitBody
+import org.springframework.web.reactive.function.server.bodyAndAwait
+import org.springframework.web.reactive.function.server.bodyValueAndAwait
+import org.springframework.web.reactive.function.server.buildAndAwait
+
+// tag::snippet[]
+class PersonHandler(private val repository: PersonRepository) {
+
+	// listPeople is a handler function that returns all Person objects found
+	// in the repository as JSON
+	suspend fun listPeople(request: ServerRequest): ServerResponse {
+		val people: Flow<Person> = repository.allPeople()
+		return ServerResponse.ok().contentType(APPLICATION_JSON).bodyAndAwait(people)
+	}
+
+	// createPerson is a handler function that stores a new Person contained
+	// in the request body.
+	// Note that PersonRepository.savePerson(Person) returns Mono<Void>: an empty
+	// Mono that emits a completion signal when the person has been read from the
+	// request and stored. So we use the build(Publisher<Void>) method to send a
+	// response when that completion signal is received (that is, when the Person
+	// has been saved)
+	suspend fun createPerson(request: ServerRequest): ServerResponse {
+		val person = request.awaitBody<Person>()
+		repository.savePerson(person)
+		return ServerResponse.ok().buildAndAwait()
+	}
+
+	// getPerson is a handler function that returns a single person, identified by
+	// the id path variable. We retrieve that Person from the repository and create
+	// a JSON response, if it is found. If it is not found, we use switchIfEmpty(Mono<T>)
+	// to return a 404 Not Found response.
+	suspend fun getPerson(request: ServerRequest): ServerResponse {
+		val personId = request.pathVariable("id").toInt()
+		return repository.getPerson(personId)?.let { ServerResponse.ok().contentType(APPLICATION_JSON).bodyValueAndAwait(it) }
+				?: ServerResponse.notFound().buildAndAwait()
+
+	}
+}
+// end::snippet[]

framework-docs/src/main/kotlin/org/springframework/docs/web/webfluxfnhandlerclasses/PersonRepository.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerclasses
+
+import kotlinx.coroutines.flow.Flow
+
+interface PersonRepository {
+
+	fun allPeople(): Flow<Person>
+
+	suspend fun savePerson(person: Person)
+
+	suspend fun getPerson(id: Int): Person?
+}

framework-docs/src/main/kotlin/org/springframework/docs/web/webfluxfnhandlerfilterfunction/RouterConfiguration.kt

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerfilterfunction
+
+import org.springframework.docs.web.webfluxfnhandlerclasses.PersonHandler
+import org.springframework.http.HttpStatus.UNAUTHORIZED
+import org.springframework.http.MediaType.APPLICATION_JSON
+import org.springframework.web.reactive.function.server.RouterFunction
+import org.springframework.web.reactive.function.server.ServerResponse
+import org.springframework.web.reactive.function.server.buildAndAwait
+import org.springframework.web.reactive.function.server.coRouter
+
+class RouterConfiguration {
+
+	fun route(handler: PersonHandler): RouterFunction<ServerResponse> {
+		// tag::snippet[]
+		val securityManager: SecurityManager = getSecurityManager()
+
+		val route = coRouter {
+			("/person" and accept(APPLICATION_JSON)).nest {
+				GET("/{id}", handler::getPerson)
+				GET("/", handler::listPeople)
+				POST("/", handler::createPerson)
+				filter { request, next ->
+					if (securityManager.allowAccessTo(request.path())) {
+						next(request)
+					}
+					else {
+						ServerResponse.status(UNAUTHORIZED).buildAndAwait()
+					}
+				}
+			}
+		}
+		// end::snippet[]
+		return route
+	}
+
+}
+
+fun getSecurityManager() = object : SecurityManager {
+	override fun allowAccessTo(path: String): Boolean {
+		TODO("Not yet implemented")
+	}
+}

framework-docs/src/main/kotlin/org/springframework/docs/web/webfluxfnhandlerfilterfunction/SecurityManager.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlerfilterfunction
+
+interface SecurityManager {
+
+	fun allowAccessTo(path: String): Boolean
+}

framework-docs/src/main/kotlin/org/springframework/docs/web/webfluxfnhandlervalidation/PersonHandler.kt

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlervalidation
+
+import org.springframework.docs.web.webfluxfnhandlerclasses.Person
+import org.springframework.docs.web.webfluxfnhandlerclasses.PersonRepository
+import org.springframework.validation.BeanPropertyBindingResult
+import org.springframework.validation.Errors
+import org.springframework.web.reactive.function.server.ServerRequest
+import org.springframework.web.reactive.function.server.ServerResponse
+import org.springframework.web.reactive.function.server.awaitBody
+import org.springframework.web.reactive.function.server.buildAndAwait
+import org.springframework.web.server.ServerWebInputException
+
+// tag::snippet[]
+class PersonHandler(private val repository: PersonRepository) {
+
+	// Create Validator instance
+	private val validator = PersonValidator()
+
+	suspend fun createPerson(request: ServerRequest): ServerResponse {
+		val person = request.awaitBody<Person>()
+		// Apply validation
+		validate(person)
+		repository.savePerson(person)
+		return ServerResponse.ok().buildAndAwait()
+	}
+
+	private fun validate(person: Person) {
+		val errors: Errors = BeanPropertyBindingResult(person, "person")
+		validator.validate(person, errors)
+		if (errors.hasErrors()) {
+			// Raise exception for a 400 response
+			throw ServerWebInputException(errors.toString())
+		}
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/kotlin/org/springframework/docs/web/webfluxfnhandlervalidation/PersonValidator.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnhandlervalidation
+
+import org.springframework.docs.web.webfluxfnhandlerclasses.Person
+import org.springframework.validation.Errors
+import org.springframework.validation.Validator
+
+class PersonValidator : Validator {
+
+	override fun supports(clazz: Class<*>): Boolean {
+		return Person::class.java.isAssignableFrom(clazz)
+	}
+
+	override fun validate(target: Any, errors: Errors) {
+		// Validation logic
+	}
+}

framework-docs/src/main/kotlin/org/springframework/docs/web/webfluxfnpredicates/RouterConfiguration.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webfluxfnpredicates
+
+import org.springframework.http.MediaType
+import org.springframework.web.reactive.function.server.RouterFunction
+import org.springframework.web.reactive.function.server.ServerResponse
+import org.springframework.web.reactive.function.server.bodyValueAndAwait
+import org.springframework.web.reactive.function.server.coRouter
+
+class RouterConfiguration {
+
+	fun route(): RouterFunction<ServerResponse> {
+		// tag::snippet[]
+		val route = coRouter {
+			GET("/hello-world", accept(MediaType.TEXT_PLAIN)) {
+				ServerResponse.ok().bodyValueAndAwait("Hello World")
+			}
+		}
+		// end::snippet[]
+		return route
+	}
+}