From 9409543dacb49a422fd854cdb34d2c34519fea7c Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Thu, 18 Jul 2024 09:42:26 +0100 Subject: [PATCH] Update deprecation notices See gh-33123 --- .../http/client/OkHttp3ClientHttpRequest.java | 4 +++- .../http/client/OkHttp3ClientHttpRequestFactory.java | 6 +++--- .../http/client/OkHttp3ClientHttpResponse.java | 4 +++- .../org/springframework/web/util/UriComponentsBuilder.java | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java index 20bc2ed7621..f6448d92448 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.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. @@ -39,6 +39,8 @@ import org.springframework.util.StringUtils; * @author Arjen Poutsma * @author Roy Clarkson * @since 4.3 + * @deprecated since 6.1, in favor of other HTTP client libraries; + * scheduled for removal in 7.0 */ @Deprecated(since = "6.1", forRemoval = true) class OkHttp3ClientHttpRequest extends AbstractStreamingClientHttpRequest { diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.java index 88d1ee186e4..6a9a637e339 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.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. @@ -36,8 +36,8 @@ import org.springframework.util.Assert; * @author Arjen Poutsma * @author Roy Clarkson * @since 4.3 - * @deprecated since 6.1, in favor of other {@link ClientHttpRequestFactory} - * implementations; scheduled for removal in 6.2 + * @deprecated since 6.1, in favor of other {@link ClientHttpRequestFactory} implementations; + * scheduled for removal in 7.0 */ @Deprecated(since = "6.1", forRemoval = true) public class OkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, DisposableBean { diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpResponse.java index a2f4da45086..1e233e82ad5 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpResponse.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. @@ -34,6 +34,8 @@ import org.springframework.util.Assert; * @author Arjen Poutsma * @author Roy Clarkson * @since 4.3 + * @deprecated since 6.1, in favor of other HTTP client libraries; + * scheduled for removal in 7.0 */ @Deprecated(since = "6.1", forRemoval = true) class OkHttp3ClientHttpResponse implements ClientHttpResponse { diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java index 3b80c38f6a8..32bc0eda0a2 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java @@ -265,7 +265,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { * @param httpUrl the source URI * @return the URI components of the URI * @deprecated as of 6.2, in favor of {@link #fromUriString(String)}; - * scheduled for removal in 8.0. + * scheduled for removal in 7.0. */ @Deprecated(since = "6.2") public static UriComponentsBuilder fromHttpUrl(String httpUrl) throws InvalidUrlException { @@ -291,7 +291,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { * @return the URI components of the URI * @since 4.1.5 * @deprecated in favor of {@link ForwardedHeaderUtils#adaptFromForwardedHeaders}; - * to be removed in 6.2 + * to be removed in 7.0 */ @Deprecated(since = "6.1", forRemoval = true) public static UriComponentsBuilder fromHttpRequest(HttpRequest request) {