Merge branch '6.1.x'

rstoyanchev · rstoyanchev · commit 7aa25e083a9c · 2024-08-28T18:59:47.000+03:00
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -176,6 +176,16 @@ public HttpStatusCode getStatus() {
 		return this.response.getStatusCode();
 	}
 
+	/**
+	 * Return the HTTP status code as an integer.
+	 * @since 5.1.10
+	 * @deprecated in favor of {@link #getStatus()}, for removal in 7.0
+	 */
+	@Deprecated(since = "6.0", forRemoval = true)
+	public int getRawStatusCode() {
+		return getStatus().value();
+	}
+
 	/**
 	 * Return the response headers received from the server.
 	 */
diff --git a/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java
@@ -42,6 +42,19 @@ public interface ClientHttpResponse extends HttpInputMessage, Closeable {
 	 */
 	HttpStatusCode getStatusCode() throws IOException;
 
+	/**
+	 * Get the HTTP status code as an integer.
+	 * @return the HTTP status as an integer value
+	 * @throws IOException in case of I/O errors
+	 * @since 3.1.1
+	 * @see #getStatusCode()
+	 * @deprecated in favor of {@link #getStatusCode()}, for removal in 7.0
+	 */
+	@Deprecated(since = "6.0", forRemoval = true)
+	default int getRawStatusCode() throws IOException {
+		return getStatusCode().value();
+	}
+
 	/**
 	 * Get the HTTP status text of the response.
 	 * @return the HTTP status text
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,18 @@ default String getId() {
 	 */
 	HttpStatusCode getStatusCode();
 
+	/**
+	 * Return the HTTP status code as an integer.
+	 * @return the HTTP status as an integer value
+	 * @since 5.0.6
+	 * @see #getStatusCode()
+	 * @deprecated in favor of {@link #getStatusCode()}, for removal in 7.0
+	 */
+	@Deprecated(since = "6.0", forRemoval = true)
+	default int getRawStatusCode() {
+		return getStatusCode().value();
+	}
+
 	/**
 	 * Return a read-only map of response cookies received from the server.
 	 */
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,13 +115,6 @@ public boolean setRawStatusCode(@Nullable Integer statusCode) {
 		return setStatusCode(statusCode != null ? HttpStatusCode.valueOf(statusCode) : null);
 	}
 
-	@Deprecated
-	@Override
-	@Nullable
-	public Integer getRawStatusCode() {
-		return (this.statusCode != null ? this.statusCode.value() : null);
-	}
-
 	@Override
 	public HttpHeaders getHeaders() {
 		if (this.readOnlyHeaders != null) {
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpResponse.java
@@ -78,6 +78,7 @@ public HttpStatusCode getStatusCode() {
 
 	@Override
 	@Deprecated
+	@SuppressWarnings("removal")
 	public Integer getRawStatusCode() {
 		Integer status = super.getRawStatusCode();
 		return (status != null ? status : this.response.status().code());
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
@@ -77,6 +77,7 @@ public HttpStatusCode getStatusCode() {
 
 	@Override
 	@Deprecated
+	@SuppressWarnings("removal")
 	public Integer getRawStatusCode() {
 		Integer status = super.getRawStatusCode();
 		return (status != null ? status : this.response.status().code());
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponse.java
@@ -65,9 +65,9 @@ default boolean setRawStatusCode(@Nullable Integer value) {
 	 * status of the response from the underlying server. The return value may
 	 * be {@code null} if there is no default value from the underlying server.
 	 * @since 5.2.4
-	 * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
+	 * @deprecated in favor of {@link #getStatusCode()}, for removal in 7.0
 	 */
-	@Deprecated(since = "6.0")
+	@Deprecated(since = "6.0", forRemoval = true)
 	@Nullable
 	default Integer getRawStatusCode() {
 		HttpStatusCode httpStatus = getStatusCode();
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,6 +74,7 @@ public boolean setRawStatusCode(@Nullable Integer value) {
 	@Override
 	@Nullable
 	@Deprecated
+	@SuppressWarnings("removal")
 	public Integer getRawStatusCode() {
 		return getDelegate().getRawStatusCode();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
@@ -112,6 +112,7 @@ public HttpStatusCode getStatusCode() {
 
 	@Override
 	@Deprecated
+	@SuppressWarnings("removal")
 	public Integer getRawStatusCode() {
 		Integer status = super.getRawStatusCode();
 		return (status != null ? status : this.response.getStatus());
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java
@@ -89,6 +89,7 @@ public HttpStatusCode getStatusCode() {
 
 	@Override
 	@Deprecated
+	@SuppressWarnings("removal")
 	public Integer getRawStatusCode() {
 		Integer status = super.getRawStatusCode();
 		return (status != null ? status : this.exchange.getStatusCode());
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java b/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java
@@ -125,7 +125,7 @@ public HttpStatusCode getStatusCode() {
 
 	/**
 	 * Return the raw HTTP status code value.
-	 * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
+	 * @deprecated in favor of {@link #getStatusCode()}, for removal in 7.0
 	 */
 	@Deprecated(since = "6.0")
 	public int getRawStatusCode() {
diff --git a/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java b/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -113,7 +113,7 @@ public HttpStatusCode getStatusCode() {
 
 	/**
 	 * Return the raw HTTP status code value.
-	 * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
+	 * @deprecated in favor of {@link #getStatusCode()}, for removal in 7.0
 	 */
 	@Deprecated(since = "6.0")
 	public int getRawStatusCode() {
diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java b/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java
@@ -132,9 +132,9 @@ protected HttpStatusCode determineStatus(Throwable ex) {
 	 * @param ex the exception to check
 	 * @return the associated HTTP status code, or -1 if it can't be derived.
 	 * @since 5.3
-	 * @deprecated as of 6.0, in favor of {@link #determineStatus(Throwable)}
+	 * @deprecated in favor of {@link #determineStatus(Throwable)}, for removal in 7.0
 	 */
-	@Deprecated(since = "6.0")
+	@Deprecated(since = "6.0", forRemoval = true)
 	protected int determineRawStatusCode(Throwable ex) {
 		if (ex instanceof ResponseStatusException responseStatusException) {
 			return responseStatusException.getStatusCode().value();
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,6 +57,17 @@ public interface ClientResponse {
 	 */
 	HttpStatusCode statusCode();
 
+	/**
+	 * Return the raw status code of this response.
+	 * @return the HTTP status as an integer value
+	 * @since 5.1
+	 * @deprecated in favor of {@link #statusCode()}, for removal in 7.0
+	 */
+	@Deprecated(since = "6.0", forRemoval = true)
+	default int rawStatusCode() {
+		return statusCode().value();
+	}
+
 	/**
 	 * Return the headers of this response.
 	 */
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -824,7 +824,7 @@ interface ResponseSpec {
 		 *     .retrieve()
 		 *     .bodyToMono(Account.class)
 		 *     .onErrorResume(WebClientResponseException.class,
-		 *          ex -&gt; ex.getRawStatusCode() == 404 ? Mono.empty() : Mono.error(ex));
+		 *          ex -&gt; ex.getStatusCode().value() == 404 ? Mono.empty() : Mono.error(ex));
 		 * </pre>
 		 * @param statusPredicate to match responses with
 		 * @param exceptionFunction to map the response to an error signal
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
@@ -172,7 +172,7 @@ public HttpStatusCode getStatusCode() {
 
 	/**
 	 * Return the raw HTTP status code value.
-	 * @deprecated as of 6.0, in favor of {@link #getStatusCode()}
+	 * @deprecated in favor of {@link #getStatusCode()}, for removal in 7.0
 	 */
 	@Deprecated(since = "6.0")
 	public int getRawStatusCode() {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
@@ -328,6 +328,7 @@ public final HttpStatusCode statusCode() {
 
 		@Override
 		@Deprecated
+		@SuppressWarnings("removal")
 		public int rawStatusCode() {
 			return this.statusCode.value();
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
@@ -70,9 +70,9 @@ public interface ServerResponse {
 	 * Return the status code of this response as integer.
 	 * @return the status as an integer
 	 * @since 5.2
-	 * @deprecated as of 6.0, in favor of {@link #statusCode()}
+	 * @deprecated in favor of {@link #statusCode()}, for removal in 7.0
 	 */
-	@Deprecated(since = "6.0")
+	@Deprecated(since = "6.0", forRemoval = true)
 	int rawStatusCode();
 
 	/**
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java
@@ -84,7 +84,7 @@ void fromProducer() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("removal")
 	void status() {
 		String body = "foo";
 		Mono<EntityResponse<String>> result = EntityResponse.fromObject(body).status(HttpStatus.CREATED).build();
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
@@ -80,7 +80,7 @@ void from() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("removal")
 	void status() {
 		Mono<ServerResponse> result = ServerResponse.status(HttpStatus.CREATED).build();
 		StepVerifier.create(result)
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
@@ -223,7 +223,7 @@ void toHttpHandlerHandlerReturnResponseStatusExceptionInResponseWriteTo() {
 					public HttpStatus statusCode() {
 						return HttpStatus.OK;
 					}
-					@SuppressWarnings("deprecation")
+					@SuppressWarnings("removal")
 					@Override
 					public int rawStatusCode() {
 						return 200;
@@ -262,7 +262,7 @@ void toHttpHandlerHandlerThrowResponseStatusExceptionInResponseWriteTo() {
 					public HttpStatus statusCode() {
 						return HttpStatus.OK;
 					}
-					@SuppressWarnings("deprecation")
+					@SuppressWarnings("removal")
 					@Override
 					public int rawStatusCode() {
 						return 200;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java
@@ -67,6 +67,7 @@ public final HttpStatusCode statusCode() {
 
 	@Override
 	@Deprecated
+	@SuppressWarnings("removal")
 	public int rawStatusCode() {
 		return this.statusCode.value();
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/CompletedAsyncServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/CompletedAsyncServerResponse.java
@@ -58,6 +58,7 @@ public HttpStatusCode statusCode() {
 
 	@Override
 	@Deprecated
+	@SuppressWarnings("removal")
 	public int rawStatusCode() {
 		return this.serverResponse.rawStatusCode();
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultAsyncServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultAsyncServerResponse.java
@@ -85,6 +85,7 @@ public HttpStatusCode statusCode() {
 
 	@Override
 	@Deprecated
+	@SuppressWarnings("removal")
 	public int rawStatusCode() {
 		return delegate(ServerResponse::rawStatusCode);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
@@ -68,9 +68,9 @@ public interface ServerResponse {
 	/**
 	 * Return the status code of this response as integer.
 	 * @return the status as an integer
-	 * @deprecated as of 6.0, in favor of {@link #statusCode()}
+	 * @deprecated in favor of {@link #statusCode()}, for removal in 7.0
 	 */
-	@Deprecated(since = "6.0")
+	@Deprecated(since = "6.0", forRemoval = true)
 	int rawStatusCode();
 
 	/**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
@@ -66,7 +66,7 @@ void fromObjectTypeReference() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("removal")
 	void status() {
 		String body = "foo";
 		EntityResponse<String> result =
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
@@ -55,7 +55,7 @@ class DefaultServerResponseBuilderTests {
 	static final ServerResponse.Context EMPTY_CONTEXT = Collections::emptyList;
 
 	@Test
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("removal")
 	void status() {
 		ServerResponse response = ServerResponse.status(HttpStatus.CREATED).build();
 		assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2022 the original author or authors.`
	`2`	`+ * Copyright 2002-2024 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -74,6 +74,7 @@ public boolean setRawStatusCode(@Nullable Integer value) {`
`74`	`74`	`@Override`
`75`	`75`	`@Nullable`
`76`	`76`	`@Deprecated`
	`77`	`+ @SuppressWarnings("removal")`
`77`	`78`	`public Integer getRawStatusCode() {`
`78`	`79`	`return getDelegate().getRawStatusCode();`
`79`	`80`	`}`