From 6dc5bf76345c3e265add79b4f0a7b16d894137b9 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Tue, 2 Sep 2025 12:50:57 +0200 Subject: [PATCH] Clean up warnings related to deprecated HttpStatus values, etc. --- .../ResourceElementResolverMethodTests.java | 8 ++------ .../PackagePrivateMethodResourceSample.java | 2 +- .../annotation/PrivateMethodResourceSample.java | 2 +- .../PrivateMethodResourceWithCustomNameSample.java | 2 +- .../annotation/PublicMethodResourceSample.java | 2 +- .../web/servlet/client/samples/JsonContentTests.java | 2 +- .../web/servlet/client/samples/bind/FilterTests.java | 6 +++--- .../resultmatches/StatusAssertionTests.java | 8 ++++---- .../resultmatchers/StatusAssertionTests.java | 12 ++++++------ .../web/client/HttpClientErrorException.java | 1 + .../springframework/http/ResponseEntityTests.java | 2 +- .../DefaultResponseErrorHandlerHttpStatusTests.java | 1 + .../client/ExtractingResponseErrorHandlerTests.java | 8 ++++---- .../function/client/WebClientResponseException.java | 1 + .../server/DefaultServerResponseBuilderTests.java | 1 + .../WebFluxResponseStatusExceptionHandlerTests.java | 6 +++--- .../view/ViewResolutionResultHandlerTests.java | 1 + .../function/DefaultRenderingResponseTests.java | 2 +- .../function/DefaultServerResponseBuilderTests.java | 1 + ...ervletAnnotationControllerHandlerMethodTests.java | 4 ++-- 20 files changed, 37 insertions(+), 35 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java index 66622487a19..897525f9964 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java @@ -134,20 +134,16 @@ class ResourceElementResolverMethodTests { private String one; - private String test; - - private Integer count; - public void setOne(String one) { this.one = one; } public void setTest(String test) { - this.test = test; + // no-op } public void setCount(Integer count) { - this.count = count; + // no-op } } diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PackagePrivateMethodResourceSample.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PackagePrivateMethodResourceSample.java index 0998df3bc50..0a2d4633a12 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PackagePrivateMethodResourceSample.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PackagePrivateMethodResourceSample.java @@ -20,7 +20,7 @@ import jakarta.annotation.Resource; public class PackagePrivateMethodResourceSample { - private String one; + String one; @Resource void setOne(String one) { diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PrivateMethodResourceSample.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PrivateMethodResourceSample.java index be0cf4e73ca..c57f9bb8ef8 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PrivateMethodResourceSample.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PrivateMethodResourceSample.java @@ -20,7 +20,7 @@ import jakarta.annotation.Resource; public class PrivateMethodResourceSample { - private String one; + String one; @Resource private void setOne(String one) { diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PrivateMethodResourceWithCustomNameSample.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PrivateMethodResourceWithCustomNameSample.java index 9b10ba8f6e6..57d4ff0318a 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PrivateMethodResourceWithCustomNameSample.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PrivateMethodResourceWithCustomNameSample.java @@ -20,7 +20,7 @@ import jakarta.annotation.Resource; public class PrivateMethodResourceWithCustomNameSample { - private String text; + String text; @Resource(name = "one") private void setText(String text) { diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PublicMethodResourceSample.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PublicMethodResourceSample.java index aaaa2d335da..51bb08a48d5 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PublicMethodResourceSample.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PublicMethodResourceSample.java @@ -20,7 +20,7 @@ import jakarta.annotation.Resource; public class PublicMethodResourceSample { - private String one; + String one; @Resource public void setOne(String one) { diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/JsonContentTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/JsonContentTests.java index 58d47dcebc6..978b7a708bd 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/JsonContentTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/JsonContentTests.java @@ -149,7 +149,7 @@ class JsonContentTests { } - private static class Person { + static class Person { private String firstName; private String lastName; diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java index 5be11ab68b2..c59fdd5f8c1 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java @@ -29,11 +29,11 @@ import org.junit.jupiter.api.Test; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.web.servlet.function.ServerResponse; -import static org.springframework.http.HttpStatus.I_AM_A_TEAPOT; - +import static org.springframework.http.HttpStatus.EXPECTATION_FAILED; /** * Tests for a {@link Filter}. + * * @author Rob Worsnop */ class FilterTests { @@ -49,7 +49,7 @@ class FilterTests { }; RestTestClient client = RestTestClient.bindToRouterFunction( - request -> Optional.of(req -> ServerResponse.status(I_AM_A_TEAPOT).build())) + request -> Optional.of(req -> ServerResponse.status(EXPECTATION_FAILED).build())) .configureServer(builder -> builder.addFilters(filter)) .build(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/StatusAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/StatusAssertionTests.java index 28e5f6cb1c7..70432654359 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/StatusAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/StatusAssertionTests.java @@ -35,8 +35,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.EXPECTATION_FAILED; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; -import static org.springframework.http.HttpStatus.I_AM_A_TEAPOT; import static org.springframework.http.HttpStatus.NOT_IMPLEMENTED; /** @@ -55,11 +55,11 @@ class StatusAssertionTests { @Test void statusInt() { - testClient.get().uri("/teaPot").exchange().expectStatus().isEqualTo(I_AM_A_TEAPOT.value()); + testClient.get().uri("/teaPot").exchange().expectStatus().isEqualTo(EXPECTATION_FAILED.value()); testClient.get().uri("/created").exchange().expectStatus().isEqualTo(CREATED.value()); testClient.get().uri("/createdWithComposedAnnotation").exchange().expectStatus().isEqualTo(CREATED.value()); testClient.get().uri("/badRequest").exchange().expectStatus().isEqualTo(BAD_REQUEST.value()); - testClient.get().uri("/throwsException").exchange().expectStatus().isEqualTo(I_AM_A_TEAPOT.value()); + testClient.get().uri("/throwsException").exchange().expectStatus().isEqualTo(EXPECTATION_FAILED.value()); } @Test @@ -88,7 +88,7 @@ class StatusAssertionTests { } @RestController - @ResponseStatus(I_AM_A_TEAPOT) + @ResponseStatus(EXPECTATION_FAILED) private static class StatusController { @RequestMapping("/teaPot") diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java index ea8cd9e122a..3fa9a451671 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java @@ -35,8 +35,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.EXPECTATION_FAILED; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; -import static org.springframework.http.HttpStatus.I_AM_A_TEAPOT; import static org.springframework.http.HttpStatus.NOT_IMPLEMENTED; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -62,11 +62,11 @@ class StatusAssertionTests { @Test void statusCode() throws Exception { - this.mockMvc.perform(get("/teaPot")).andExpect(status().is(I_AM_A_TEAPOT.value())); + this.mockMvc.perform(get("/expectationFailed")).andExpect(status().is(EXPECTATION_FAILED.value())); this.mockMvc.perform(get("/created")).andExpect(status().is(CREATED.value())); this.mockMvc.perform(get("/createdWithComposedAnnotation")).andExpect(status().is(CREATED.value())); this.mockMvc.perform(get("/badRequest")).andExpect(status().is(BAD_REQUEST.value())); - this.mockMvc.perform(get("/throwsException")).andExpect(status().is(I_AM_A_TEAPOT.value())); + this.mockMvc.perform(get("/throwsException")).andExpect(status().is(EXPECTATION_FAILED.value())); } @Test @@ -99,11 +99,11 @@ class StatusAssertionTests { } @RestController - @ResponseStatus(I_AM_A_TEAPOT) + @ResponseStatus(EXPECTATION_FAILED) private static class StatusController { - @RequestMapping("/teaPot") - void teaPot() { + @RequestMapping("/expectationFailed") + void expectationFailed() { } @RequestMapping("/created") diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java b/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java index 56a794d8e37..d2add587043 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java @@ -95,6 +95,7 @@ public class HttpClientErrorException extends HttpStatusCodeException { * with an optional prepared message. * @since 5.2.2 */ + @SuppressWarnings("deprecation") public static HttpClientErrorException create(@Nullable String message, HttpStatusCode statusCode, String statusText, HttpHeaders headers, byte[] body, @Nullable Charset charset) { diff --git a/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java b/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java index e3f27b0b0a6..11c37744e24 100644 --- a/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java +++ b/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java @@ -175,7 +175,7 @@ class ResponseEntityTests { } @Test - @SuppressWarnings("deprecate") + @SuppressWarnings("deprecation") void unprocessableEntity() { ResponseEntity responseEntity = ResponseEntity.unprocessableEntity().body("error"); diff --git a/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java index b0be9fc3a1e..085158845e6 100644 --- a/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java @@ -86,6 +86,7 @@ class DefaultResponseErrorHandlerHttpStatusTests { .isThrownBy(() -> this.handler.handleError(URI.create("/"), HttpMethod.GET, this.response)); } + @SuppressWarnings("deprecation") static Stream errorCodes() { return Stream.of( // 4xx diff --git a/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java b/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java index d19f535c7f1..51f6b04a63c 100644 --- a/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java @@ -57,14 +57,14 @@ class ExtractingResponseErrorHandlerTests { HttpMessageConverter converter = new JacksonJsonHttpMessageConverter(); this.errorHandler = new ExtractingResponseErrorHandler(List.of(converter)); - this.errorHandler.setStatusMapping(Map.of(HttpStatus.I_AM_A_TEAPOT, MyRestClientException.class)); + this.errorHandler.setStatusMapping(Map.of(HttpStatus.EXPECTATION_FAILED, MyRestClientException.class)); this.errorHandler.setSeriesMapping(Map.of(HttpStatus.Series.SERVER_ERROR, MyRestClientException.class)); } @Test void hasError() throws Exception { - given(this.response.getStatusCode()).willReturn(HttpStatus.I_AM_A_TEAPOT); + given(this.response.getStatusCode()).willReturn(HttpStatus.EXPECTATION_FAILED); assertThat(this.errorHandler.hasError(this.response)).isTrue(); given(this.response.getStatusCode()).willReturn(HttpStatus.INTERNAL_SERVER_ERROR); @@ -78,7 +78,7 @@ class ExtractingResponseErrorHandlerTests { void hasErrorOverride() throws Exception { this.errorHandler.setSeriesMapping(Collections.singletonMap(HttpStatus.Series.CLIENT_ERROR, null)); - given(this.response.getStatusCode()).willReturn(HttpStatus.I_AM_A_TEAPOT); + given(this.response.getStatusCode()).willReturn(HttpStatus.EXPECTATION_FAILED); assertThat(this.errorHandler.hasError(this.response)).isTrue(); given(this.response.getStatusCode()).willReturn(HttpStatus.NOT_FOUND); @@ -90,7 +90,7 @@ class ExtractingResponseErrorHandlerTests { @Test void handleErrorStatusMatch() throws Exception { - given(this.response.getStatusCode()).willReturn(HttpStatus.I_AM_A_TEAPOT); + given(this.response.getStatusCode()).willReturn(HttpStatus.EXPECTATION_FAILED); HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.setContentType(MediaType.APPLICATION_JSON); given(this.response.getHeaders()).willReturn(responseHeaders); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java index c8948475231..3babe8fe12f 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java @@ -297,6 +297,7 @@ public class WebClientResponseException extends WebClientException { * Create {@code WebClientResponseException} or an HTTP status specific subclass. * @since 6.0 */ + @SuppressWarnings("deprecation") public static WebClientResponseException create( HttpStatusCode statusCode, String statusText, HttpHeaders headers, byte[] body, @Nullable Charset charset, @Nullable HttpRequest request) { diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java index 34fd1c2bcbe..5ef4693e10e 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java @@ -178,6 +178,7 @@ class DefaultServerResponseBuilderTests { } @Test + @SuppressWarnings("deprecation") void unprocessableEntity() { Mono result = ServerResponse.unprocessableEntity().build(); StepVerifier.create(result) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/handler/WebFluxResponseStatusExceptionHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/handler/WebFluxResponseStatusExceptionHandlerTests.java index 90b6ff59d97..199b7dfebc1 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/handler/WebFluxResponseStatusExceptionHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/handler/WebFluxResponseStatusExceptionHandlerTests.java @@ -45,19 +45,19 @@ class WebFluxResponseStatusExceptionHandlerTests extends AbstractResponseStatusE void handleAnnotatedException() { Throwable ex = new CustomException(); this.handler.handle(this.exchange, ex).block(Duration.ofSeconds(5)); - assertThat(this.exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.I_AM_A_TEAPOT); + assertThat(this.exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.ALREADY_REPORTED); } @Test void handleNestedAnnotatedException() { Throwable ex = new Exception(new CustomException()); this.handler.handle(this.exchange, ex).block(Duration.ofSeconds(5)); - assertThat(this.exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.I_AM_A_TEAPOT); + assertThat(this.exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.ALREADY_REPORTED); } @SuppressWarnings("serial") - @ResponseStatus(HttpStatus.I_AM_A_TEAPOT) + @ResponseStatus(HttpStatus.ALREADY_REPORTED) private static class CustomException extends Exception { } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java index 6f2bd3b9e83..97199c88451 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java @@ -199,6 +199,7 @@ class ViewResolutionResultHandlerTests { testHandle("/account", returnType, 99L, "account: {id=123, myLong=99}", resolver); returnType = on(Handler.class).resolveReturnType(Rendering.class); + @SuppressWarnings("deprecation") HttpStatus status = HttpStatus.UNPROCESSABLE_ENTITY; returnValue = Rendering.view("account").modelAttribute("a", "a1").status(status).header("h", "h1").build(); String expected = "account: {a=a1, id=123}"; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java index 0bec82bd17b..d823eefe15f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java @@ -55,7 +55,7 @@ class DefaultRenderingResponseTests { @Test void status() throws Exception { - HttpStatus status = HttpStatus.I_AM_A_TEAPOT; + HttpStatus status = HttpStatus.ALREADY_REPORTED; RenderingResponse result = RenderingResponse.create("foo").status(status).build(); MockHttpServletRequest request = new MockHttpServletRequest(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java index 4d6f73b32e9..d5d6f41bf1e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java @@ -138,6 +138,7 @@ class DefaultServerResponseBuilderTests { } @Test + @SuppressWarnings("deprecation") void unprocessableEntity() { ServerResponse response = ServerResponse.unprocessableEntity().build(); assertThat(response.statusCode()).isEqualTo(HttpStatus.UNPROCESSABLE_ENTITY); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index c3985629e19..6b9e18651a7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -3889,7 +3889,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl @RequestMapping("/path") public ModelAndView methodWithHttpStatus(MyEntity object) { - return new ModelAndView("view", HttpStatus.UNPROCESSABLE_ENTITY); + return new ModelAndView("view", HttpStatus.UNPROCESSABLE_CONTENT); } @RequestMapping("/redirect") @@ -3904,7 +3904,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl @ExceptionHandler(TestException.class) public ModelAndView handleException() { - return new ModelAndView("view", HttpStatus.UNPROCESSABLE_ENTITY); + return new ModelAndView("view", HttpStatus.UNPROCESSABLE_CONTENT); } @SuppressWarnings("serial")