Clean up warnings related to deprecated HttpStatus values, etc.

sbrannen · sbrannen · commit 6dc5bf76345c · 2025-09-02T12:50:57.000+02:00
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
@@ -134,20 +134,16 @@ static class TestBean {
 
 		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
@@ -20,7 +20,7 @@
 
 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
@@ -20,7 +20,7 @@
 
 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
@@ -20,7 +20,7 @@
 
 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
@@ -20,7 +20,7 @@
 
 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
@@ -149,7 +149,7 @@ ResponseEntity<String> savePerson(@RequestBody Person person) {
 	}
 
 
-	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
@@ -29,11 +29,11 @@
 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 @@ protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterC
 		};
 
 		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
@@ -35,8 +35,8 @@
 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 @@ void matcher() {
 	}
 
 	@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
@@ -35,8 +35,8 @@
 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 @@ void httpStatus() throws Exception {
 
 	@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 @@ void reasonWithMatcher() throws Exception {
 	}
 
 	@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
@@ -95,6 +95,7 @@ public static HttpClientErrorException create(
 	 * 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
@@ -175,7 +175,7 @@ void unprocessableContent() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecate")
+	@SuppressWarnings("deprecation")
 	void unprocessableEntity() {
 		ResponseEntity<String> 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
@@ -86,6 +86,7 @@ void handleErrorException(HttpStatus httpStatus, Class<? extends Throwable> expe
 				.isThrownBy(() -> this.handler.handleError(URI.create("/"), HttpMethod.GET, this.response));
 	}
 
+	@SuppressWarnings("deprecation")
 	static Stream<Arguments> 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
@@ -57,14 +57,14 @@ void setup() {
 		HttpMessageConverter<Object> 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 @@ void hasError() throws Exception {
 	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 @@ void hasErrorOverride() throws Exception {
 
 	@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
@@ -297,6 +297,7 @@ public static WebClientResponseException create(
 	 * 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
@@ -178,6 +178,7 @@ void notFound() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void unprocessableEntity() {
 		Mono<ServerResponse> 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
@@ -45,19 +45,19 @@ protected ResponseStatusExceptionHandler createResponseStatusExceptionHandler()
 	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
@@ -199,6 +199,7 @@ void handleReturnValueTypes() {
 		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
@@ -55,7 +55,7 @@ void create() throws Exception {
 
 	@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
@@ -138,6 +138,7 @@ void notFound() {
 	}
 
 	@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
@@ -3889,7 +3889,7 @@ static class ModelAndViewController {
 
 		@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 @@ public void raiseException() throws Exception {
 
 		@ExceptionHandler(TestException.class)
 		public ModelAndView handleException() {
-			return new ModelAndView("view", HttpStatus.UNPROCESSABLE_ENTITY);
+			return new ModelAndView("view", HttpStatus.UNPROCESSABLE_CONTENT);
 		}
 
 		@SuppressWarnings("serial")

Original file line number	Diff line number	Diff line change
`@@ -134,20 +134,16 @@ static class TestBean {`
`134`	`134`
`135`	`135`	`private String one;`
`136`	`136`
`137`		`- private String test;`
`138`		`-`
`139`		`- private Integer count;`
`140`		`-`
`141`	`137`	`public void setOne(String one) {`
`142`	`138`	`this.one = one;`
`143`	`139`	`}`
`144`	`140`
`145`	`141`	`public void setTest(String test) {`
`146`		`- this.test = test;`
	`142`	`+ // no-op`
`147`	`143`	`}`
`148`	`144`
`149`	`145`	`public void setCount(Integer count) {`
`150`		`- this.count = count;`
	`146`	`+ // no-op`
`151`	`147`	`}`
`152`	`148`	`}`
`153`	`149`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ ResponseEntity<String> savePerson(@RequestBody Person person) {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`
`152`		`- private static class Person {`
	`152`	`+ static class Person {`
`153`	`153`	`private String firstName;`
`154`	`154`	`private String lastName;`
`155`	`155`