Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use HttpStatusCode interface

Browse Source 
This commit contains changes made because of the introduction of
HttpStatusCode. In general, methods that used to return a HttpStatus
now return HttpStatusCode instead, and methods that returned raw status
codes are now deprecated.

See gh-28214
This commit is contained in:
Arjen Poutsma
2022-03-17 14:21:04 +01:00
parent ca4b6e86a4
commit 28ac0d3883
143 changed files with 1064 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionBuilderTests.java
View File

@@ -26,6 +26,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
import org.springframework.lang.Nullable;
import org.springframework.web.servlet.handler.PathPatternsTestUtils;
@@ -53,7 +54,7 @@ class RouterFunctionBuilderTests {
ServerRequest getFooRequest = initRequest("GET", "/foo");
Optional<HttpStatus> responseStatus = route.route(getFooRequest)
Optional<HttpStatusCode> responseStatus = route.route(getFooRequest)
.map(handlerFunction -> handle(handlerFunction, getFooRequest))
.map(ServerResponse::statusCode);
assertThat(responseStatus).contains(HttpStatus.OK);
@@ -102,7 +103,7 @@ class RouterFunctionBuilderTests {
ServerRequest resourceRequest = initRequest("GET", "/resources/response.txt");
Optional<HttpStatus> responseStatus = route.route(resourceRequest)
Optional<HttpStatusCode> responseStatus = route.route(resourceRequest)
.map(handlerFunction -> handle(handlerFunction, resourceRequest))
.map(ServerResponse::statusCode);
assertThat(responseStatus).contains(HttpStatus.OK);
@@ -127,7 +128,7 @@ class RouterFunctionBuilderTests {
ServerRequest fooRequest = initRequest("GET", "/foo/bar/baz");
Optional<HttpStatus> responseStatus = route.route(fooRequest)
Optional<HttpStatusCode> responseStatus = route.route(fooRequest)
.map(handlerFunction -> handle(handlerFunction, fooRequest))
.map(ServerResponse::statusCode);
assertThat(responseStatus).contains(HttpStatus.OK);
@@ -175,7 +176,7 @@ class RouterFunctionBuilderTests {
ServerRequest barRequest = initRequest("GET", "/bar");
Optional<HttpStatus> responseStatus = route.route(barRequest)
Optional<HttpStatusCode> responseStatus = route.route(barRequest)
.map(handlerFunction -> handle(handlerFunction, barRequest))
.map(ServerResponse::statusCode);
assertThat(responseStatus).contains(HttpStatus.INTERNAL_SERVER_ERROR);
@@ -194,7 +195,7 @@ class RouterFunctionBuilderTests {
MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/error");
ServerRequest serverRequest = new DefaultServerRequest(servletRequest, emptyList());
Optional<HttpStatus> responseStatus = route.route(serverRequest)
Optional<HttpStatusCode> responseStatus = route.route(serverRequest)
.map(handlerFunction -> handle(handlerFunction, serverRequest))
.map(ServerResponse::statusCode);
assertThat(responseStatus).contains(HttpStatus.OK);

3
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
View File

@@ -31,6 +31,7 @@ import org.springframework.core.MethodParameter;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -330,7 +331,7 @@ public class ResponseEntityExceptionHandlerTests {
@Override
protected ResponseEntity<Object> handleServletRequestBindingException(
ServletRequestBindingException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
ServletRequestBindingException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {
headers = new HttpHeaders();
headers.set("someHeader", "someHeaderValue");