Browse Source

Merge branch '5.3.x'

pull/26393/head
Sam Brannen 4 years ago
parent
commit
04dde03451
  1. 2
      spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
  2. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java
  3. 2
      spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java

2
spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java

@ -57,7 +57,7 @@ import static org.assertj.core.api.Assertions.within;
*/ */
public class MappingJackson2HttpMessageConverterTests { public class MappingJackson2HttpMessageConverterTests {
protected static final String NEWLINE_SYSTEM_PROPERTY = System.getProperty("line.separator"); protected static final String NEWLINE_SYSTEM_PROPERTY = System.lineSeparator();
private final MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); private final MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();

2
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java

@ -83,7 +83,7 @@ import static org.springframework.web.testfixture.method.ResolvableMethod.on;
*/ */
public class ResponseEntityResultHandlerTests { public class ResponseEntityResultHandlerTests {
private static final String NEWLINE_SYSTEM_PROPERTY = System.getProperty("line.separator"); private static final String NEWLINE_SYSTEM_PROPERTY = System.lineSeparator();
private ResponseEntityResultHandler resultHandler; private ResponseEntityResultHandler resultHandler;

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java

@ -89,7 +89,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class RequestResponseBodyMethodProcessorTests { public class RequestResponseBodyMethodProcessorTests {
protected static final String NEWLINE_SYSTEM_PROPERTY = System.getProperty("line.separator"); protected static final String NEWLINE_SYSTEM_PROPERTY = System.lineSeparator();
private ModelAndViewContainer container; private ModelAndViewContainer container;

Loading…
Cancel
Save