Polishing

jhoeller · jhoeller · commit 9b10bb5e08ce · 2026-02-17T18:57:09.000+01:00
diff --git a/spring-web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java
@@ -41,8 +41,8 @@
  * @since 15.03.2004
  * @see #setEncoding
  * @see #setForceEncoding
- * @see jakarta.servlet.http.HttpServletRequest#setCharacterEncoding
- * @see jakarta.servlet.http.HttpServletResponse#setCharacterEncoding
+ * @see jakarta.servlet.http.HttpServletRequest#setCharacterEncoding(String)
+ * @see jakarta.servlet.http.HttpServletResponse#setCharacterEncoding(String)
  */
 public class CharacterEncodingFilter extends OncePerRequestFilter {
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxViewResolutionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxViewResolutionIntegrationTests.java
@@ -59,7 +59,6 @@ class WebFluxViewResolutionIntegrationTests {
 	private static final MediaType TEXT_HTML_ISO_8859_1 = MediaType.parseMediaType("text/html;charset=ISO-8859-1");
 
 
-
 	@Nested
 	class FreeMarkerTests {
 
@@ -115,6 +114,7 @@ public void configureViewResolvers(ViewResolverRegistry registry) {
 			}
 		}
 
+
 		@Configuration(proxyBeanMethods = false)
 		static class FreeMarkerWebFluxConfig extends AbstractWebFluxConfig {
 
@@ -131,6 +131,7 @@ public FreeMarkerConfigurer freeMarkerConfigurer() {
 			}
 		}
 
+
 		@Configuration(proxyBeanMethods = false)
 		static class ExplicitDefaultEncodingConfig extends AbstractWebFluxConfig {
 
@@ -148,6 +149,7 @@ public FreeMarkerConfigurer freeMarkerConfigurer() {
 			}
 		}
 
+
 		@Configuration(proxyBeanMethods = false)
 		static class ExplicitDefaultEncodingAndContentTypeConfig extends AbstractWebFluxConfig {
 
@@ -196,6 +198,7 @@ public SampleController sampleController() {
 		}
 	}
 
+
 	@Controller
 	static class SampleController {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ErrorHandlingServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ErrorHandlingServerResponse.java
@@ -34,6 +34,7 @@
 
 /**
  * Base class for {@link ServerResponse} implementations with error handling.
+ *
  * @author Arjen Poutsma
  * @since 5.3
  */
@@ -81,6 +82,7 @@ else if (t instanceof IOException ioException ) {
 		return null;
 	}
 
+
 	private static class ErrorHandler<T extends ServerResponse> {
 
 		private final Predicate<Throwable> predicate;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
@@ -395,7 +395,7 @@ protected final void copyModelParameters(Map<String, Object> model, Transformer
 	 * Configure the supplied {@link HttpServletResponse}.
 	 * <p>The default implementation of this method sets the
 	 * {@link HttpServletResponse#setContentType content type} and
-	 * {@link HttpServletResponse#setCharacterEncoding encoding}
+	 * {@link HttpServletResponse#setCharacterEncoding(String) encoding}
 	 * from the "media-type" and "encoding" output properties
 	 * specified in the {@link Transformer}.
 	 * @param model merged output Map (never {@code null})

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ class WebFluxViewResolutionIntegrationTests {`
`59`	`59`	`private static final MediaType TEXT_HTML_ISO_8859_1 = MediaType.parseMediaType("text/html;charset=ISO-8859-1");`
`60`	`60`
`61`	`61`
`62`		`-`
`63`	`62`	`@Nested`
`64`	`63`	`class FreeMarkerTests {`
`65`	`64`
`@@ -115,6 +114,7 @@ public void configureViewResolvers(ViewResolverRegistry registry) {`
`115`	`114`	`}`
`116`	`115`	`}`
`117`	`116`
	`117`	`+`
`118`	`118`	`@Configuration(proxyBeanMethods = false)`
`119`	`119`	`static class FreeMarkerWebFluxConfig extends AbstractWebFluxConfig {`
`120`	`120`
`@@ -131,6 +131,7 @@ public FreeMarkerConfigurer freeMarkerConfigurer() {`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
	`134`	`+`
`134`	`135`	`@Configuration(proxyBeanMethods = false)`
`135`	`136`	`static class ExplicitDefaultEncodingConfig extends AbstractWebFluxConfig {`
`136`	`137`
`@@ -148,6 +149,7 @@ public FreeMarkerConfigurer freeMarkerConfigurer() {`
`148`	`149`	`}`
`149`	`150`	`}`
`150`	`151`
	`152`	`+`
`151`	`153`	`@Configuration(proxyBeanMethods = false)`
`152`	`154`	`static class ExplicitDefaultEncodingAndContentTypeConfig extends AbstractWebFluxConfig {`
`153`	`155`
`@@ -196,6 +198,7 @@ public SampleController sampleController() {`
`196`	`198`	`}`
`197`	`199`	`}`
`198`	`200`
	`201`	`+`
`199`	`202`	`@Controller`
`200`	`203`	`static class SampleController {`
`201`	`204`