Skip to content

Commit f2ae106

Browse files
committed
Update deprecation Javadoc regarding "for removal in 6.2"
See gh-30608
1 parent 7b20aef commit f2ae106

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

spring-core/src/main/java/org/springframework/util/Base64Utils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
* @author Gary Russell
2828
* @since 4.1
2929
* @see java.util.Base64
30-
* @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}.
30+
* @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled
31+
* for removal in 6.2
3132
*/
3233
@Deprecated(since = "6.0.5", forRemoval = true)
3334
public abstract class Base64Utils {

spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* @author Arjen Poutsma
2727
* @since 3.1.1
28-
* @deprecated as of 6.0, with no direct replacement
28+
* @deprecated as of 6.0, with no direct replacement; scheduled for removal in 6.2
2929
*/
3030
@Deprecated(since = "6.0")
3131
public abstract class AbstractClientHttpResponse implements ClientHttpResponse {

spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public interface ClientHttpResponse extends HttpInputMessage, Closeable {
4848
* @throws IOException in case of I/O errors
4949
* @since 3.1.1
5050
* @see #getStatusCode()
51-
* @deprecated as of 6.0, in favor of {@link #getStatusCode()}
51+
* @deprecated as of 6.0, in favor of {@link #getStatusCode()}; scheduled for
52+
* removal in 6.2
5253
*/
5354
@Deprecated(since = "6.0")
5455
int getRawStatusCode() throws IOException;

spring-web/src/main/java/org/springframework/http/client/observation/ClientHttpObservationDocumentation.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ public String asString() {
139139

140140
/**
141141
* Client name derived from the request URI host.
142-
* @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME}.
143-
* This will be available both as a low and high cardinality key value.
142+
* @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME};
143+
* scheduled for removal in 6.2. This will be available both as a low and
144+
* high cardinality key value.
144145
*/
145146
@Deprecated(since = "6.0.5", forRemoval = true)
146147
CLIENT_NAME {

spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientHttpObservationDocumentation.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ public String asString() {
136136

137137
/**
138138
* Client name derived from the request URI host.
139-
* @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME}.
140-
* This will be available both as a low and high cardinality key value.
139+
* @deprecated in favor of {@link LowCardinalityKeyNames#CLIENT_NAME};
140+
* scheduled for removal in 6.2. This will be available both as a low and
141+
* high cardinality key value.
141142
*/
142143
@Deprecated(since = "6.0.5", forRemoval = true)
143144
CLIENT_NAME {

0 commit comments

Comments
 (0)