From f2ae106c325b6257830ac8d13fc277b602ce1cd6 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 7 Jun 2023 11:59:54 +0200 Subject: [PATCH] Update deprecation Javadoc regarding "for removal in 6.2" See gh-30608 --- .../src/main/java/org/springframework/util/Base64Utils.java | 3 ++- .../http/client/AbstractClientHttpResponse.java | 2 +- .../org/springframework/http/client/ClientHttpResponse.java | 3 ++- .../observation/ClientHttpObservationDocumentation.java | 5 +++-- .../function/client/ClientHttpObservationDocumentation.java | 5 +++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/Base64Utils.java b/spring-core/src/main/java/org/springframework/util/Base64Utils.java index 6d6985d4ee..0403c29990 100644 --- a/spring-core/src/main/java/org/springframework/util/Base64Utils.java +++ b/spring-core/src/main/java/org/springframework/util/Base64Utils.java @@ -27,7 +27,8 @@ import java.util.Base64; * @author Gary Russell * @since 4.1 * @see java.util.Base64 - * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}. + * @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled + * for removal in 6.2 */ @Deprecated(since = "6.0.5", forRemoval = true) public abstract class Base64Utils { diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java index db9e5d1961..c14fac17a0 100644 --- a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java @@ -25,7 +25,7 @@ import org.springframework.http.HttpStatusCode; * * @author Arjen Poutsma * @since 3.1.1 - * @deprecated as of 6.0, with no direct replacement + * @deprecated as of 6.0, with no direct replacement; scheduled for removal in 6.2 */ @Deprecated(since = "6.0") public abstract class AbstractClientHttpResponse implements ClientHttpResponse { 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 index ab4001df32..2a29008491 100644 --- a/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java @@ -48,7 +48,8 @@ public interface ClientHttpResponse extends HttpInputMessage, Closeable { * @throws IOException in case of I/O errors * @since 3.1.1 * @see #getStatusCode() - * @deprecated as of 6.0, in favor of {@link #getStatusCode()} + * @deprecated as of 6.0, in favor of {@link #getStatusCode()}; scheduled for + * removal in 6.2 */ @Deprecated(since = "6.0") int getRawStatusCode() throws IOException; diff --git a/spring-web/src/main/java/org/springframework/http/client/observation/ClientHttpObservationDocumentation.java b/spring-web/src/main/java/org/springframework/http/client/observation/ClientHttpObservationDocumentation.java index 2e68799526..d77b46981c 100644 --- a/spring-web/src/main/java/org/springframework/http/client/observation/ClientHttpObservationDocumentation.java +++ b/spring-web/src/main/java/org/springframework/http/client/observation/ClientHttpObservationDocumentation.java @@ -139,8 +139,9 @@ public enum ClientHttpObservationDocumentation implements ObservationDocumentati /** * Client name derived from the request URI host. - * @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME}. - * This will be available both as a low and high cardinality key value. + * @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME}; + * scheduled for removal in 6.2. This will be available both as a low and + * high cardinality key value. */ @Deprecated(since = "6.0.5", forRemoval = true) CLIENT_NAME { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientHttpObservationDocumentation.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientHttpObservationDocumentation.java index f50492e770..e7bbd8af3f 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientHttpObservationDocumentation.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientHttpObservationDocumentation.java @@ -136,8 +136,9 @@ public enum ClientHttpObservationDocumentation implements ObservationDocumentati /** * Client name derived from the request URI host. - * @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME}. - * This will be available both as a low and high cardinality key value. + * @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME}; + * scheduled for removal in 6.2. This will be available both as a low and + * high cardinality key value. */ @Deprecated(since = "6.0.5", forRemoval = true) CLIENT_NAME {