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 1064e6c0a9..cdfcaebb74 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 @@ -29,8 +29,8 @@ import org.springframework.core.annotation.Order; import org.springframework.web.filter.CharacterEncodingFilter; /** - * {@link EnableAutoConfiguration Auto-configuration} for configuring the - * encoding to use in web applications. + * {@link EnableAutoConfiguration Auto-configuration} for configuring the encoding to use + * in web applications. * * @author Stephane Nicoll * @since 1.2.0 @@ -44,13 +44,13 @@ public class HttpEncodingAutoConfiguration { @Autowired private HttpEncodingProperties httpEncodingProperties; - @ConditionalOnMissingBean @Bean @Order(Ordered.HIGHEST_PRECEDENCE) + @ConditionalOnMissingBean public CharacterEncodingFilter characterEncodingFilter() { CharacterEncodingFilter filter = new CharacterEncodingFilter(); - filter.setEncoding(httpEncodingProperties.getCharset().name()); - filter.setForceEncoding(httpEncodingProperties.isForce()); + filter.setEncoding(this.httpEncodingProperties.getCharset().name()); + filter.setForceEncoding(this.httpEncodingProperties.isForce()); return filter; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java index d16e612f55..835b41314d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java @@ -37,12 +37,13 @@ public class HttpEncodingProperties { private Charset charset = DEFAULT_CHARSET; /** - * To force the encoding to the configured charset typically on HTTP requests and responses. + * To force the encoding to the configured charset typically on HTTP requests and + * responses. */ private boolean force = true; public Charset getCharset() { - return charset; + return this.charset; } public void setCharset(Charset charset) { @@ -50,7 +51,7 @@ public class HttpEncodingProperties { } public boolean isForce() { - return force; + return this.force; } public void setForce(boolean force) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java index 6c35b56cc2..b7d8884fac 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java @@ -54,7 +54,6 @@ import com.google.gson.Gson; @ConditionalOnClass(HttpMessageConverter.class) public class HttpMessageConvertersAutoConfiguration { - @Autowired(required = false) private final List> converters = Collections.emptyList(); @@ -127,12 +126,12 @@ public class HttpMessageConvertersAutoConfiguration { protected static class StringHttpMessageConverterConfiguration { @Autowired - private HttpEncodingProperties httpEncodingProperties; + private HttpEncodingProperties encodingProperties; @Bean @ConditionalOnMissingBean public StringHttpMessageConverter stringHttpMessageConverter() { - return new StringHttpMessageConverter(httpEncodingProperties.getCharset()); + return new StringHttpMessageConverter(this.encodingProperties.getCharset()); } } 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 9e29910175..9e21098d00 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 @@ -20,7 +20,6 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; - import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.test.EnvironmentTestUtils; @@ -53,40 +52,46 @@ public class HttpEncodingAutoConfigurationTests { @Test public void defaultConfiguration() { load(EmptyConfiguration.class); - CharacterEncodingFilter filter = context.getBean(CharacterEncodingFilter.class); + CharacterEncodingFilter filter = this.context + .getBean(CharacterEncodingFilter.class); assertCharacterEncodingFilter(filter, "UTF-8", true); } @Test public void disableConfiguration() { load(EmptyConfiguration.class, "spring.http.encoding.enabled:false"); - - thrown.expect(NoSuchBeanDefinitionException.class); - context.getBean(CharacterEncodingFilter.class); + this.thrown.expect(NoSuchBeanDefinitionException.class); + this.context.getBean(CharacterEncodingFilter.class); } @Test public void customConfiguration() { - load(EmptyConfiguration.class, "spring.http.encoding.charset:ISO-8859-15", "spring.http.encoding.force:false"); - CharacterEncodingFilter filter = context.getBean(CharacterEncodingFilter.class); + load(EmptyConfiguration.class, "spring.http.encoding.charset:ISO-8859-15", + "spring.http.encoding.force:false"); + CharacterEncodingFilter filter = this.context + .getBean(CharacterEncodingFilter.class); assertCharacterEncodingFilter(filter, "ISO-8859-15", false); } @Test public void customFilterConfiguration() { - load(FilterConfiguration.class, "spring.http.encoding.charset:ISO-8859-15", "spring.http.encoding.force:false"); - CharacterEncodingFilter filter = context.getBean(CharacterEncodingFilter.class); + load(FilterConfiguration.class, "spring.http.encoding.charset:ISO-8859-15", + "spring.http.encoding.force:false"); + CharacterEncodingFilter filter = this.context + .getBean(CharacterEncodingFilter.class); assertCharacterEncodingFilter(filter, "US-ASCII", false); } - private void assertCharacterEncodingFilter(CharacterEncodingFilter actual, String encoding, boolean forceEncoding) { + private void assertCharacterEncodingFilter(CharacterEncodingFilter actual, + String encoding, boolean forceEncoding) { DirectFieldAccessor accessor = new DirectFieldAccessor(actual); assertEquals("Wrong encoding", encoding, accessor.getPropertyValue("encoding")); - assertEquals("Wrong forceEncoding flag", forceEncoding, accessor.getPropertyValue("forceEncoding")); + assertEquals("Wrong forceEncoding flag", forceEncoding, + accessor.getPropertyValue("forceEncoding")); } private void load(Class config, String... environment) { - this.context = doLoad(new Class[] {config}, environment); + this.context = doLoad(new Class[] { config }, environment); } private AnnotationConfigApplicationContext doLoad(Class[] configs, @@ -99,9 +104,9 @@ public class HttpEncodingAutoConfigurationTests { return applicationContext; } - @Configuration static class EmptyConfiguration { + } @Configuration @@ -114,6 +119,7 @@ public class HttpEncodingAutoConfigurationTests { filter.setForceEncoding(false); return filter; } + } } diff --git a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java index fed68bab27..3b031801a2 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/ui/SampleWebStaticApplicationTests.java @@ -64,7 +64,8 @@ public class SampleWebStaticApplicationTests { assertEquals(HttpStatus.OK, entity.getStatusCode()); assertTrue("Wrong body:\n" + entity.getBody(), entity.getBody().contains("body")); assertEquals("Wrong content type:\n" + entity.getHeaders().getContentType(), - MediaType.valueOf("text/css;charset=UTF-8"), entity.getHeaders().getContentType()); + MediaType.valueOf("text/css;charset=UTF-8"), entity.getHeaders() + .getContentType()); } } diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java index c5998c04a0..b7175cb633 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java @@ -121,4 +121,5 @@ public class WarLauncherTests { jarOutputStream.close(); return warRoot; } + }