From 05c3666fad8665e27ac636b9cc0fa1dd258998f5 Mon Sep 17 00:00:00 2001
From: DongNyoung Lee <121621378+Dongnyoung@users.noreply.github.com>
Date: Tue, 6 May 2025 20:12:36 +0900
Subject: [PATCH 1/3] Fix grammatical error in JavaDoc of setResponse method in
 MockClientHttpRequest
This pull request fixes a grammatical mistake in the JavaDoc of the setResponse method in MockClientHttpRequest.
- Original: "the this request"
- Changed to: "this request"
This change improves the clarity and quality of the documentation.
Signed-off-by: DongNyoung Lee <121621378+Dongnyoung@users.noreply.github.com>
---
 .../springframework/mock/http/client/MockClientHttpRequest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
index 42222f449375..5c2c8c3229da 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
@@ -104,7 +104,7 @@ public URI getURI() {
 
 	/**
 	 * Set the {@link ClientHttpResponse} to be used as the result of executing
-	 * the this request.
+	 * this request.
 	 * @see #execute()
 	 */
 	public void setResponse(ClientHttpResponse clientHttpResponse) {
From 6e9553a2fc7b22ad339cd913784ae6c6a1cb5cf2 Mon Sep 17 00:00:00 2001
From: DongNyoung Lee <121621378+Dongnyoung@users.noreply.github.com>
Date: Mon, 8 Sep 2025 22:11:15 +0900
Subject: [PATCH 2/3] Update mvc-jsp.adoc
Signed-off-by: DongNyoung Lee <121621378+Dongnyoung@users.noreply.github.com>
---
 .../ROOT/pages/web/webmvc-view/mvc-jsp.adoc   | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc b/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc
index 6ca828bef563..340aea3363f1 100644
--- a/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc
+++ b/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc
@@ -9,19 +9,41 @@ The Spring Framework has a built-in integration for using Spring MVC with JSP an
 
 When developing with JSPs, you typically declare an `InternalResourceViewResolver` bean.
 
-`InternalResourceViewResolver` can be used for dispatching to any Servlet resource but in
-particular for JSPs. As a best practice, we strongly encourage placing your JSP files in
-a directory under the `'WEB-INF'` directory so there can be no direct access by clients.
+`InternalResourceViewResolver` can be used for dispatching to any Servlet resource but in particular for JSPs.
+As a best practice, we strongly encourage placing your JSP files in a directory under the `WEB-INF` directory so there can be no direct access by clients.
 
-[source,xml,indent=0,subs="verbatim,quotes"]
+[source,java]
 ----
-	
-		
-		
-		
-	
+@EnableWebMvc
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void configureViewResolvers(ViewResolverRegistry registry) {
+        // Use sensible defaults
+        registry.jsp();
+        // Example of customizing:
+        // registry.jsp("/WEB-INF/views/", ".jsp");
+    }
+}
 ----
 
+[NOTE]
+====
+For legacy XML configuration:
+
+[source,xml]
+----
+
+    
+
+----
+
+Prefer JavaConfig for new applications.
+====
+
+[.text-muted]
+See the Javadoc of {api-docs}/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.html#jsp() for defaults.
 
 [[mvc-view-jsp-jstl]]
 == JSPs versus JSTL
From 89cdcdf8c616cebc1e8e317d282bdb231e24797b Mon Sep 17 00:00:00 2001
From: DongNyoung Lee <121621378+Dongnyoung@users.noreply.github.com>
Date: Mon, 8 Sep 2025 22:28:45 +0900
Subject: [PATCH 3/3] Update mvc-jsp.adoc
Signed-off-by: DongNyoung Lee <121621378+Dongnyoung@users.noreply.github.com>
---
 framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc b/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc
index 340aea3363f1..920081c0b781 100644
--- a/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc
+++ b/framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc
@@ -43,7 +43,7 @@ Prefer JavaConfig for new applications.
 ====
 
 [.text-muted]
-See the Javadoc of {api-docs}/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.html#jsp() for defaults.
+See the Javadoc of ViewResolverRegistry#jsp() for default prefix and suffix values.
 
 [[mvc-view-jsp-jstl]]
 == JSPs versus JSTL