Polishing

This commit is contained in:
Juergen Hoeller
2026-02-17 18:41:07 +01:00
parent acab61f9a7
commit 999bbe3959
4 changed files with 8 additions and 5 deletions
@@ -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.
* <p>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}.
@@ -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 {
@@ -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 {
@@ -402,7 +402,7 @@ public class XsltView extends AbstractUrlBasedView {
* 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})