From 4756a4be235d501b626572e487e52610bc316f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?=
 <sdeleuze@users.noreply.github.com>
Date: Mon, 17 Nov 2025 11:31:09 +0100
Subject: [PATCH] Polishing

See gh-35820
---
 .../ROOT/pages/testing/mockmvc/hamcrest/expectations.adoc     | 4 ++--
 .../modules/ROOT/pages/testing/mockmvc/hamcrest/requests.adoc | 2 +-
 .../modules/ROOT/pages/testing/mockmvc/htmlunit/mah.adoc      | 2 +-
 .../ROOT/pages/testing/mockmvc/htmlunit/webdriver.adoc        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/expectations.adoc b/framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/expectations.adoc
index e8a81fe2c61..38ff2221889 100644
--- a/framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/expectations.adoc
+++ b/framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/expectations.adoc
@@ -185,8 +185,8 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	standaloneSetup(SimpleController())
-		.alwaysExpect<StandaloneMockMvcBuilder>(MockMvcResultMatchers.status().isOk())
-		.alwaysExpect<StandaloneMockMvcBuilder>(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
+		.alwaysExpect<StandaloneMockMvcBuilder>(status().isOk())
+		.alwaysExpect<StandaloneMockMvcBuilder>(content().contentType("application/json;charset=UTF-8"))
 		.build()
 ----
 ======
diff --git a/framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/requests.adoc b/framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/requests.adoc
index 5bc0f331d35..e4a131e562d 100644
--- a/framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/requests.adoc
+++ b/framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/requests.adoc
@@ -165,7 +165,7 @@ Kotlin::
 
 		@BeforeEach
 		fun setup() {
-			mockMvc = MockMvcBuilders.standaloneSetup(AccountController())
+			mockMvc = standaloneSetup(AccountController())
 				.defaultRequest<StandaloneMockMvcBuilder>(get("/")
 				.contextPath("/app").servletPath("/main")
 				.accept(MediaType.APPLICATION_JSON)).build()
diff --git a/framework-docs/modules/ROOT/pages/testing/mockmvc/htmlunit/mah.adoc b/framework-docs/modules/ROOT/pages/testing/mockmvc/htmlunit/mah.adoc
index e78e83787c8..3a3b625f11c 100644
--- a/framework-docs/modules/ROOT/pages/testing/mockmvc/htmlunit/mah.adoc
+++ b/framework-docs/modules/ROOT/pages/testing/mockmvc/htmlunit/mah.adoc
@@ -269,7 +269,7 @@ Kotlin::
 ----
 	val mockMvc = MockMvcBuilders
 			.webAppContextSetup(context)
-			.apply(springSecurity())
+			.apply<DefaultMockMvcBuilder>(springSecurity())
 			.build()
 
 	webClient = MockMvcWebClientBuilder
diff --git a/framework-docs/modules/ROOT/pages/testing/mockmvc/htmlunit/webdriver.adoc b/framework-docs/modules/ROOT/pages/testing/mockmvc/htmlunit/webdriver.adoc
index ea1575a9353..2aab6e66686 100644
--- a/framework-docs/modules/ROOT/pages/testing/mockmvc/htmlunit/webdriver.adoc
+++ b/framework-docs/modules/ROOT/pages/testing/mockmvc/htmlunit/webdriver.adoc
@@ -564,7 +564,7 @@ Kotlin::
 ----
 	val mockMvc: MockMvc = MockMvcBuilders
 			.webAppContextSetup(context)
-			.apply(springSecurity())
+			.apply<DefaultMockMvcBuilder>(springSecurity())
 			.build()
 
 	driver = MockMvcHtmlUnitDriverBuilder