Merge pull request square#2103 from square/jw/deprecate-apache-shim

Deprecate the Apache shim.
PerryTingGit · Dec 15, 2015 · 4b25c2c · 4b25c2c
2 parents d512ec4 + f8923a4
commit 4b25c2c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/okhttp-apache/src/main/java/com/squareup/okhttp/apache/OkApacheClient.java b/okhttp-apache/src/main/java/com/squareup/okhttp/apache/OkApacheClient.java
@@ -32,11 +32,9 @@
 import static org.apache.http.HttpVersion.HTTP_1_1;
 
 /**
- * Implements Apache's {@link HttpClient} API using {@link OkHttpClient}.
- * <p>
- * <strong>Warning:</strong> Many core features of Apache HTTP client are not implemented by this
- * API. This includes the keep-alive strategy, cookie store, credentials provider, route planner
- * and others.
+ * @deprecated OkHttp will be dropping its ability to be used with {@link HttpClient} in an
+ *     upcoming release. Applications that need this should either downgrade to the Apache
+ *     implementation or upgrade to OkHttp's Request/Response API.
  */
 public final class OkApacheClient implements HttpClient {
   private static Request transformRequest(HttpRequest request) {