From ccf791b63fa93ffc1c6582080e05873ebc8aad13 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 4 Jul 2016 23:23:28 +0200 Subject: [PATCH] Deprecate OkHttp 2.x support Issue: SPR-14344 --- .../http/client/OkHttpAsyncClientHttpRequest.java | 3 +++ .../springframework/http/client/OkHttpClientHttpRequest.java | 2 ++ .../http/client/OkHttpClientHttpRequestFactory.java | 2 ++ .../springframework/http/client/OkHttpClientHttpResponse.java | 2 ++ 4 files changed, 9 insertions(+) diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java index 6b042422627..644709423a7 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttpAsyncClientHttpRequest.java @@ -39,7 +39,9 @@ import org.springframework.util.concurrent.SettableListenableFuture; * @author Arjen Poutsma * @since 4.3 * @see org.springframework.http.client.OkHttp3AsyncClientHttpRequest + * @deprecated as of Spring 5.0, in favor of OkHttp 3.x */ +@Deprecated class OkHttpAsyncClientHttpRequest extends AbstractBufferingAsyncClientHttpRequest { private final OkHttpClient client; @@ -75,6 +77,7 @@ class OkHttpAsyncClientHttpRequest extends AbstractBufferingAsyncClientHttpReque } + @Deprecated private static class OkHttpListenableFuture extends SettableListenableFuture { private final Call call; diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java index a2f75be435a..70821c345ec 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequest.java @@ -34,7 +34,9 @@ import org.springframework.http.HttpMethod; * @author Arjen Poutsma * @since 4.2 * @see org.springframework.http.client.OkHttp3ClientHttpRequest + * @deprecated as of Spring 5.0, in favor of OkHttp 3.x */ +@Deprecated class OkHttpClientHttpRequest extends AbstractBufferingClientHttpRequest { private final OkHttpClient client; diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequestFactory.java index d5ae9e97eee..c0cf802a98f 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpRequestFactory.java @@ -42,7 +42,9 @@ import org.springframework.util.StringUtils; * @author Arjen Poutsma * @since 4.2 * @see org.springframework.http.client.OkHttp3ClientHttpRequestFactory + * @deprecated as of Spring 5.0, in favor of OkHttp 3.x */ +@Deprecated public class OkHttpClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory, DisposableBean { diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpResponse.java index 6a0639f536b..9d5e2a0e989 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttpClientHttpResponse.java @@ -31,7 +31,9 @@ import org.springframework.util.Assert; * @author Arjen Poutsma * @since 4.2 * @see org.springframework.http.client.OkHttp3ClientHttpResponse + * @deprecated as of Spring 5.0, in favor of OkHttp 3.x */ +@Deprecated class OkHttpClientHttpResponse extends AbstractClientHttpResponse { private final Response response;