From 999bbe395978120fa6a711f7eb0451498dc008fe Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 17 Feb 2026 18:41:07 +0100 Subject: [PATCH] Polishing --- .../transaction/interceptor/TransactionAspectSupport.java | 2 +- .../springframework/web/filter/CharacterEncodingFilter.java | 4 ++-- .../config/WebFluxViewResolutionIntegrationTests.java | 5 ++++- .../org/springframework/web/servlet/view/xslt/XsltView.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java index c6aad5ef6d0..0808f01500c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java @@ -150,7 +150,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init * Mainly intended for code that wants to set the current transaction * rollback-only but not throw an application exception. *

This exposes the locally declared transaction boundary with its declared name - * and characteristics, as managed by the aspect. Ar runtime, the local boundary may + * and characteristics, as managed by the aspect. At runtime, the local boundary may * participate in an outer transaction: If you need transaction metadata from such * an outer transaction (the actual resource transaction) instead, consider using * {@link org.springframework.transaction.support.TransactionSynchronizationManager}. 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 9fb11c2dac0..81b5eb97826 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/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java index b3d433adf5e..be59705a581 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 @@ -402,7 +402,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})