root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-06-07 12:01:54 +02:00
parent df7223f39c f2ae106c32
commit 714d380ec0
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {

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

@ -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", forRemoval = true)
public abstract class AbstractClientHttpResponse implements ClientHttpResponse {

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

@ -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", forRemoval = true)
default int getRawStatusCode() throws IOException {

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

@ -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 {

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

@ -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 {