diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfiguration.java index e1f443078fc..eade4b54df3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfiguration.java @@ -50,7 +50,7 @@ public class HttpEncodingAutoConfiguration { public CharacterEncodingFilter characterEncodingFilter() { CharacterEncodingFilter filter = new OrderedCharacterEncodingFilter(); filter.setEncoding(this.httpEncodingProperties.getCharset().name()); - filter.setForceEncoding(this.httpEncodingProperties.isForce()); + filter.setForceRequestEncoding(this.httpEncodingProperties.isForce()); return filter; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfigurationTests.java index 1a89565a88c..c892d58a821 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfigurationTests.java @@ -103,11 +103,10 @@ public class HttpEncodingAutoConfigurationTests { } private void assertCharacterEncodingFilter(CharacterEncodingFilter actual, - String encoding, boolean forceEncoding) { - DirectFieldAccessor accessor = new DirectFieldAccessor(actual); - assertThat(accessor.getPropertyValue("encoding")).as("Wrong encoding") - .isEqualTo(encoding); - assertThat(accessor.getPropertyValue("forceEncoding")).isEqualTo(forceEncoding); + String encoding, boolean forceRequestEncoding) { + assertThat(actual.getEncoding()).isEqualTo(encoding); + assertThat(actual.isForceRequestEncoding()).isEqualTo(forceRequestEncoding); + assertThat(actual.isForceResponseEncoding()).isFalse(); } private void load(Class config, String... environment) {