From 9b10bb5e08cef036e1933ce75feb5ab83e44d57d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 17 Feb 2026 18:57:09 +0100 Subject: [PATCH] Polishing --- .../springframework/web/filter/CharacterEncodingFilter.java | 4 ++-- .../config/WebFluxViewResolutionIntegrationTests.java | 5 ++++- .../web/servlet/function/ErrorHandlingServerResponse.java | 2 ++ .../org/springframework/web/servlet/view/xslt/XsltView.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) 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 index 65977a7eb90..5048318a93f 100644 --- 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 @@ import org.springframework.util.Assert; * @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 index b9cced771c1..eaa380360dc 100644 --- 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 @@ class WebFluxViewResolutionIntegrationTests { } } + @Configuration(proxyBeanMethods = false) static class FreeMarkerWebFluxConfig extends AbstractWebFluxConfig { @@ -131,6 +131,7 @@ class WebFluxViewResolutionIntegrationTests { } } + @Configuration(proxyBeanMethods = false) static class ExplicitDefaultEncodingConfig extends AbstractWebFluxConfig { @@ -148,6 +149,7 @@ class WebFluxViewResolutionIntegrationTests { } } + @Configuration(proxyBeanMethods = false) static class ExplicitDefaultEncodingAndContentTypeConfig extends AbstractWebFluxConfig { @@ -196,6 +198,7 @@ class WebFluxViewResolutionIntegrationTests { } } + @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 index d3609a3a7da..365678b3c44 100644 --- 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 @@ import org.springframework.web.servlet.ModelAndView; /** * Base class for {@link ServerResponse} implementations with error handling. + * * @author Arjen Poutsma * @since 5.3 */ @@ -81,6 +82,7 @@ abstract class ErrorHandlingServerResponse implements ServerResponse { return null; } + private static class ErrorHandler { private final Predicate 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 index 4ea962ab51b..c40c3811313 100644 --- 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 @@ public class XsltView extends AbstractUrlBasedView { * Configure the supplied {@link HttpServletResponse}. *

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})