See {@link #setDefaultEncoding(String)} for details. * @since 6.2 * @see java.nio.charset.StandardCharsets */ - public void setDefaultEncoding(Charset defaultEncoding) { - setDefaultEncoding(defaultEncoding.name()); + public void setDefaultCharset(Charset defaultCharset) { + this.defaultEncoding = defaultCharset.name(); } /** diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java index eba3fe69fa8..76b54358ac3 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java @@ -69,7 +69,7 @@ public class FreeMarkerConfigurer extends FreeMarkerConfigurationFactory public FreeMarkerConfigurer() { - setDefaultEncoding(StandardCharsets.UTF_8); + setDefaultCharset(StandardCharsets.UTF_8); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java index 9a7d6f2867d..15253c7fa5c 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java @@ -167,7 +167,7 @@ public class FreeMarkerView extends AbstractUrlBasedView { * process. See the note in the {@linkplain FreeMarkerView class-level * documentation} for details. * @see freemarker.template.Configuration#setDefaultEncoding - * @see #setEncoding(Charset) + * @see #setCharset(Charset) * @see #getEncoding() */ public void setEncoding(@Nullable String encoding) { @@ -175,14 +175,14 @@ public class FreeMarkerView extends AbstractUrlBasedView { } /** - * Set the encoding used to decode byte sequences to character sequences when - * reading the FreeMarker template file for this view. + * Set the {@link Charset} used to decode byte sequences to character sequences + * when reading the FreeMarker template file for this view. *
See {@link #setEncoding(String)} for details. * @since 6.2 * @see java.nio.charset.StandardCharsets */ - public void setEncoding(@Nullable Charset encoding) { - setEncoding(encoding != null ? encoding.name() : null); + public void setCharset(@Nullable Charset charset) { + this.encoding = (charset != null ? charset.name() : null); } /** 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 b87b47a89bd..e29dde154f3 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 @@ -135,7 +135,7 @@ class WebFluxViewResolutionIntegrationTests { public FreeMarkerConfigurer freeMarkerConfigurer() { FreeMarkerConfigurer configurer = new FreeMarkerConfigurer(); configurer.setPreTemplateLoaders(classTemplateLoader); - configurer.setDefaultEncoding(UTF_8); + configurer.setDefaultCharset(UTF_8); return configurer; } } @@ -158,7 +158,7 @@ class WebFluxViewResolutionIntegrationTests { public FreeMarkerConfigurer freeMarkerConfigurer() { FreeMarkerConfigurer configurer = new FreeMarkerConfigurer(); configurer.setPreTemplateLoaders(classTemplateLoader); - configurer.setDefaultEncoding(ISO_8859_1); + configurer.setDefaultCharset(ISO_8859_1); return configurer; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java index 80dae950e67..c9f829172bc 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java @@ -116,7 +116,7 @@ public class FreeMarkerView extends AbstractTemplateView { * process. See the note in the {@linkplain FreeMarkerView class-level * documentation} for details. * @see freemarker.template.Configuration#setDefaultEncoding - * @see #setEncoding(Charset) + * @see #setCharset(Charset) * @see #getEncoding() * @see #setContentType(String) */ @@ -125,14 +125,14 @@ public class FreeMarkerView extends AbstractTemplateView { } /** - * Set the encoding used to decode byte sequences to character sequences when - * reading the FreeMarker template file for this view. + * Set the {@link Charset} used to decode byte sequences to character sequences + * when reading the FreeMarker template file for this view. *
See {@link #setEncoding(String)} for details. * @since 6.2 * @see java.nio.charset.StandardCharsets */ - public void setEncoding(@Nullable Charset encoding) { - setEncoding(encoding != null ? encoding.name() : null); + public void setCharset(@Nullable Charset charset) { + this.encoding = (charset != null ? charset.name() : null); } /** diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java index 94c76add16c..6b7654179be 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java @@ -164,7 +164,7 @@ class ViewResolutionIntegrationTests { public FreeMarkerConfigurer freeMarkerConfigurer() { FreeMarkerConfigurer configurer = new FreeMarkerConfigurer(); configurer.setTemplateLoaderPath("/WEB-INF/"); - configurer.setDefaultEncoding(UTF_8); + configurer.setDefaultCharset(UTF_8); return configurer; } } @@ -183,7 +183,7 @@ class ViewResolutionIntegrationTests { public FreeMarkerConfigurer freeMarkerConfigurer() { FreeMarkerConfigurer configurer = new FreeMarkerConfigurer(); configurer.setTemplateLoaderPath("/WEB-INF/"); - configurer.setDefaultEncoding(UTF_8); + configurer.setDefaultCharset(UTF_8); return configurer; } }