Added release version to deprecation annotations; removed references to deprecated methods / classes

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1335088 13f79535-47bb-0310-9956-ffa450edef68

httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java

@@ -147,7 +147,7 @@ public class CacheConfig {
      * Returns the current maximum response body size that will be cached.
      * @return size in bytes
      *
-     * @deprecated use {@link #getMaxObjectSize()}
+     * @deprecated (4.2)  use {@link #getMaxObjectSize()}
      */
     @Deprecated 
     public int getMaxObjectSizeBytes() {
@@ -158,7 +158,7 @@ public class CacheConfig {
      * Specifies the maximum response body size that will be eligible for caching.
      * @param maxObjectSizeBytes size in bytes
      *
-     * @deprecated use {@link #setMaxObjectSize(long)}
+     * @deprecated (4.2)  use {@link #setMaxObjectSize(long)}
      */
     @Deprecated 
     public void setMaxObjectSizeBytes(int maxObjectSizeBytes) {

httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java

@@ -37,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.http.Consts;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpHost;
@@ -44,7 +45,6 @@ import org.apache.http.HttpRequest;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.protocol.HTTP;
 
 /**
  * @since 4.1
@@ -166,10 +166,10 @@ class CacheKeyGenerator {
                 if (!first) {
                     buf.append("&");
                 }
-                buf.append(URLEncoder.encode(headerName, HTTP.UTF_8));
+                buf.append(URLEncoder.encode(headerName, Consts.UTF_8.name()));
                 buf.append("=");
                 buf.append(URLEncoder.encode(getFullHeaderValue(req.getHeaders(headerName)),
-                        HTTP.UTF_8));
+                        Consts.UTF_8.name()));
                 first = false;
             }
             buf.append("}");

httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java

@@ -43,6 +43,7 @@ import org.apache.http.annotation.Immutable;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.entity.AbstractHttpEntity;
+import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.RequestWrapper;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicHttpResponse;
@@ -184,7 +185,8 @@ class RequestProtocolCompliance {
 
     private void addContentTypeHeaderIfMissing(HttpEntityEnclosingRequest request) {
         if (request.getEntity().getContentType() == null) {
-            ((AbstractHttpEntity) request.getEntity()).setContentType(HTTP.OCTET_STREAM_TYPE);
+            ((AbstractHttpEntity) request.getEntity()).setContentType(
+                    ContentType.APPLICATION_OCTET_STREAM.getMimeType());
         }
     }
 

httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java

@@ -129,6 +129,8 @@ public class MemcachedHttpCacheStorage implements HttpCacheStorage {
      * @param client how to talk to <i>memcached</i>
      * @param config apply HTTP cache-related options
      * @param serializer <b>ignored</b>
+     *
+     * @deprecated (4.2) do not use
      */
     @Deprecated
     public MemcachedHttpCacheStorage(MemcachedClientIF client, CacheConfig config,

httpclient/src/main/java/org/apache/http/auth/AuthScheme.java

@@ -121,7 +121,7 @@ public interface AuthScheme {
      *
      * @return the authorization string
      *
-     * @deprecated Use {@link ContextAwareAuthScheme#authenticate(Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
+     * @deprecated (4.1)  Use {@link ContextAwareAuthScheme#authenticate(Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
      */
     @Deprecated
     Header authenticate(Credentials credentials, HttpRequest request)

httpclient/src/main/java/org/apache/http/auth/AuthState.java

@@ -157,13 +157,16 @@ public class AuthState {
     /**
      * Invalidates the authentication state by resetting its parameters.
      *
-     * @deprecated use {@link #reset()}
+     * @deprecated (4.2)  use {@link #reset()}
      */
     @Deprecated 
     public void invalidate() {
         reset();
     }
 
+    /**
+     * @deprecated (4.2) do not use
+     */
     @Deprecated
     public boolean isValid() {
         return this.authScheme != null;
@@ -174,7 +177,7 @@ public class AuthState {
      *
      * @param authScheme the {@link AuthScheme authentication scheme}
      *
-     * @deprecated use {@link #update(AuthScheme, Credentials)}
+     * @deprecated (4.2)  use {@link #update(AuthScheme, Credentials)}
      */
     @Deprecated 
     public void setAuthScheme(final AuthScheme authScheme) {
@@ -190,7 +193,7 @@ public class AuthState {
      *
      * @param credentials User credentials
      *
-     * @deprecated use {@link #update(AuthScheme, Credentials)}
+     * @deprecated (4.2)  use {@link #update(AuthScheme, Credentials)}
      */
     @Deprecated
     public void setCredentials(final Credentials credentials) {
@@ -202,7 +205,7 @@ public class AuthState {
      *
      * @return actual authentication scope if available, <code>null</code otherwise
      *
-     * @deprecated do not use.
+     * @deprecated (4.2)  do not use.
      */
     @Deprecated
     public AuthScope getAuthScope() {
@@ -214,7 +217,7 @@ public class AuthState {
      *
      * @param authScope Authentication scope
      *
-     * @deprecated do not use.
+     * @deprecated (4.2)  do not use.
      */
     @Deprecated
     public void setAuthScope(final AuthScope authScope) {

httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java

@@ -48,7 +48,7 @@ import org.apache.http.protocol.HttpContext;
  *
  * @since 4.0
  *
- * @deprecated use {@link AuthenticationStrategy}
+ * @deprecated (4.2)  use {@link AuthenticationStrategy}
  */
 @Deprecated
 public interface AuthenticationHandler {

httpclient/src/main/java/org/apache/http/client/RedirectHandler.java

@@ -44,7 +44,7 @@ import org.apache.http.protocol.HttpContext;
  *
  * @since 4.0
  *
- * @deprecated use {@link RedirectStrategy}
+ * @deprecated (4.1)  use {@link RedirectStrategy}
  */
 @Deprecated
 public interface RedirectHandler {

httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java

@@ -34,13 +34,13 @@ package org.apache.http.client.params;
 public interface ClientPNames {
 
     /**
-     * @deprecated do not use
+     * @deprecated (4.2)  do not use
      */
     @Deprecated
     public static final String CONNECTION_MANAGER_FACTORY_CLASS_NAME = "http.connection-manager.factory-class-name";
 
     /**
-     * @deprecated do not use
+     * @deprecated (4.0) do not use
      */
     @Deprecated 
     public static final String CONNECTION_MANAGER_FACTORY = "http.connection-manager.factory-object";

httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java

@@ -51,11 +51,17 @@ public class ClientParamBean extends HttpAbstractParamBean {
         super(params);
     }
 
+    /**
+     * @deprecated (4.0)  do not use.
+     */
     @Deprecated 
     public void setConnectionManagerFactoryClassName (final String factory) {
         params.setParameter(ClientPNames.CONNECTION_MANAGER_FACTORY_CLASS_NAME, factory);
     }
 
+    /**
+     * @deprecated (4.2)  do not use.
+     */
     @Deprecated 
     public void setConnectionManagerFactory(ClientConnectionManagerFactory factory) {
         params.setParameter(ClientPNames.CONNECTION_MANAGER_FACTORY, factory);

httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java

@@ -95,7 +95,7 @@ public interface ClientContext {
     public static final String PROXY_AUTH_STATE      = "http.auth.proxy-scope";
 
     /**
-     * @deprecated do not use
+     * @deprecated (4.1)  do not use
      */
     @Deprecated
     public static final String AUTH_SCHEME_PREF      = "http.auth.scheme-pref";

httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java

@@ -71,7 +71,7 @@ public class ClientContextConfigurer implements ClientContext {
     }
 
     /**
-     * @deprecated (4.1-alpha1) Use {@link HttpParams#setParameter(String, Object)} to set the parameters
+     * @deprecated (4.0) Use {@link HttpParams#setParameter(String, Object)} to set the parameters
      * {@link org.apache.http.auth.params.AuthPNames#TARGET_AUTH_PREF AuthPNames#TARGET_AUTH_PREF} and
      * {@link org.apache.http.auth.params.AuthPNames#PROXY_AUTH_PREF AuthPNames#PROXY_AUTH_PREF} instead
      */

httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java

@@ -55,7 +55,7 @@ import org.apache.http.protocol.HttpContext;
  *
  * @since 4.1
  *
- * @deprecated use {@link AuthenticationStrategy}
+ * @deprecated (4.2)  use {@link AuthenticationStrategy}
  */
 @Immutable
 @Deprecated 

httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java

@@ -104,7 +104,9 @@ public class BasicManagedEntity extends HttpEntityWrapper
         }
     }
 
-    @Deprecated
+    /**
+     * @deprecated (4.1) Use {@link EntityUtils#consume(HttpEntity)}
+     */
     @Override
     public void consumeContent() throws IOException {
         ensureConsumed();

httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java

@@ -53,7 +53,7 @@ import org.apache.http.params.HttpParams;
  *
  * @since 4.0
  *
- * @deprecated Do not use. For multihome support socket factories must implement
+ * @deprecated (4.1)  Do not use. For multihome support socket factories must implement
  * {@link SchemeSocketFactory} interface.
  */
 @Deprecated

httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java

@@ -27,9 +27,7 @@
 
 package org.apache.http.conn.params;
 
-import org.apache.http.annotation.NotThreadSafe;
+import org.apache.http.impl.conn.DefaultHttpResponseParser;
-
-import org.apache.http.impl.conn.DefaultResponseParser;
 import org.apache.http.params.HttpAbstractParamBean;
 import org.apache.http.params.HttpParams;
 
@@ -39,8 +37,9 @@ import org.apache.http.params.HttpParams;
  * using Java Beans conventions.
  *
  * @since 4.0
+ * 
+ * @deprecated (4.2) do not use
  */
-@NotThreadSafe
 @Deprecated 
 public class ConnConnectionParamBean extends HttpAbstractParamBean {
 
@@ -49,7 +48,7 @@ public class ConnConnectionParamBean extends HttpAbstractParamBean {
     }
 
     /**
-     * @deprecated Use custom {@link DefaultResponseParser} implementation
+     * @deprecated (4.2)  Use custom {@link DefaultHttpResponseParser} implementation
      */
     public void setMaxStatusLineGarbage (final int maxStatusLineGarbage) {
         params.setIntParameter(ConnConnectionPNames.MAX_STATUS_LINE_GARBAGE, maxStatusLineGarbage);

httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java

@@ -26,14 +26,13 @@
 
 package org.apache.http.conn.params;
 
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.apache.http.params.CoreConnectionPNames;
-
 /**
  * Parameter names for connection managers in HttpConn.
  *
  * @since 4.0
- */
+ * 
+ * @deprecated (4.1.2) use configuration methods of the specific connection manager implementation.
+*/
 @Deprecated 
 public interface ConnManagerPNames {
 
@@ -43,10 +42,7 @@ public interface ConnManagerPNames {
      * {@link org.apache.http.conn.ClientConnectionManager}.
      * <p>
      * This parameter expects a value of type {@link Long}.
-     * <p>
-     * @deprecated use {@link CoreConnectionPNames#CONNECTION_TIMEOUT}
      */
-    @Deprecated
     public static final String TIMEOUT = "http.conn-manager.timeout";
 
     /**
@@ -56,10 +52,7 @@ public interface ConnManagerPNames {
      * <p>
      * This parameter expects a value of type {@link ConnPerRoute}.
      * <p>
-     * @deprecated use {@link ThreadSafeClientConnManager#setMaxForRoute(org.apache.http.conn.routing.HttpRoute, int)},
-     *  {@link ThreadSafeClientConnManager#getMaxForRoute(org.apache.http.conn.routing.HttpRoute)}
      */
-    @Deprecated
     public static final String MAX_CONNECTIONS_PER_ROUTE = "http.conn-manager.max-per-route";
 
     /**
@@ -68,11 +61,7 @@ public interface ConnManagerPNames {
      * and applies to individual manager instances.
      * <p>
      * This parameter expects a value of type {@link Integer}.
-     * <p>
-     * @deprecated use {@link ThreadSafeClientConnManager#setMaxTotal(int)},
-     *  {@link ThreadSafeClientConnManager#getMaxTotal()}
      */
-    @Deprecated
     public static final String MAX_TOTAL_CONNECTIONS = "http.conn-manager.max-total";
 
 }

httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java

@@ -38,6 +38,8 @@ import org.apache.http.params.HttpParams;
  * using Java Beans conventions.
  *
  * @since 4.0
+ * 
+ * @deprecated (4.1.2) use configuration methods of the specific connection manager implementation.
  */
 @NotThreadSafe
 @Deprecated 
@@ -51,14 +53,10 @@ public class ConnManagerParamBean extends HttpAbstractParamBean {
         params.setLongParameter(ConnManagerPNames.TIMEOUT, timeout);
     }
 
-    /** @see ConnManagerPNames#MAX_TOTAL_CONNECTIONS */
-    @Deprecated
     public void setMaxTotalConnections (final int maxConnections) {
         params.setIntParameter(ConnManagerPNames.MAX_TOTAL_CONNECTIONS, maxConnections);
     }
 
-    /** @see ConnManagerPNames#MAX_CONNECTIONS_PER_ROUTE */
-    @Deprecated
     public void setConnectionsPerRoute(final ConnPerRouteBean connPerRoute) {
         params.setParameter(ConnManagerPNames.MAX_CONNECTIONS_PER_ROUTE, connPerRoute);
     }

httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java

@@ -29,7 +29,6 @@ package org.apache.http.conn.params;
 import org.apache.http.annotation.Immutable;
 
 import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 
@@ -40,6 +39,8 @@ import org.apache.http.params.HttpParams;
  * @since 4.0
  *
  * @see ConnManagerPNames
+ * 
+ * @deprecated (4.1.2) use configuration methods of the specific connection manager implementation.
  */
 @Deprecated 
 @Immutable
@@ -55,9 +56,8 @@ public final class ConnManagerParams implements ConnManagerPNames {
      *
      * @return timeout in milliseconds.
      *
-     * @deprecated use {@link HttpConnectionParams#getConnectionTimeout(HttpParams)}
+     * @deprecated (4.1)  use {@link HttpConnectionParams#getConnectionTimeout(HttpParams)}
      */
-    @Deprecated
     public static long getTimeout(final HttpParams params) {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
@@ -72,9 +72,8 @@ public final class ConnManagerParams implements ConnManagerPNames {
      *
      * @param timeout the timeout in milliseconds
      *
-     * @deprecated use {@link HttpConnectionParams#setConnectionTimeout(HttpParams, int)}
+     * @deprecated (4.1)  use {@link HttpConnectionParams#setConnectionTimeout(HttpParams, int)}
      */
-    @Deprecated
     public static void setTimeout(final HttpParams params, long timeout) {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
@@ -97,10 +96,7 @@ public final class ConnManagerParams implements ConnManagerPNames {
      * @param params HTTP parameters
      * @param connPerRoute lookup interface for maximum number of connections allowed
      *        per route
-     *
-     * @deprecated use {@link ThreadSafeClientConnManager#setMaxForRoute(org.apache.http.conn.routing.HttpRoute, int)}
      */
-    @Deprecated
     public static void setMaxConnectionsPerRoute(final HttpParams params,
                                                 final ConnPerRoute connPerRoute) {
         if (params == null) {
@@ -116,10 +112,7 @@ public final class ConnManagerParams implements ConnManagerPNames {
      * @param params HTTP parameters
      *
      * @return lookup interface for maximum number of connections allowed per route.
-     *
-     * @deprecated use {@link ThreadSafeClientConnManager#getMaxForRoute(org.apache.http.conn.routing.HttpRoute)}
      */
-    @Deprecated
     public static ConnPerRoute getMaxConnectionsPerRoute(final HttpParams params) {
         if (params == null) {
             throw new IllegalArgumentException
@@ -137,10 +130,7 @@ public final class ConnManagerParams implements ConnManagerPNames {
      *
      * @param params HTTP parameters
      * @param maxTotalConnections The maximum number of connections allowed.
-     *
-     * @deprecated use {@link ThreadSafeClientConnManager#setMaxTotal(int)}
      */
-    @Deprecated
     public static void setMaxTotalConnections(
             final HttpParams params,
             int maxTotalConnections) {
@@ -157,10 +147,7 @@ public final class ConnManagerParams implements ConnManagerPNames {
      * @param params HTTP parameters
      *
      * @return The maximum number of connections allowed.
-     *
-     * @deprecated use {@link ThreadSafeClientConnManager#getMaxTotal()}
      */
-    @Deprecated
     public static int getMaxTotalConnections(
             final HttpParams params) {
         if (params == null) {

httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java

@@ -42,7 +42,7 @@ import org.apache.http.pool.ConnPoolControl;
  *
  * @since 4.0
  *
- * @deprecated use {@link ConnPoolControl}
+ * @deprecated (4.2)  use {@link ConnPoolControl}
  */
 @Deprecated 
 @ThreadSafe
@@ -65,10 +65,6 @@ public final class ConnPerRouteBean implements ConnPerRoute {
         this(DEFAULT_MAX_CONNECTIONS_PER_ROUTE);
     }
 
-    /**
-     * @deprecated Use {@link #getDefaultMaxPerRoute()} instead
-     */
-    @Deprecated
     public int getDefaultMax() {
         return this.defaultMax;
     }

httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java

@@ -35,7 +35,7 @@ import java.net.InetAddress;
  *
  * @since 4.0
  *
- * @deprecated Do not use
+ * @deprecated (4.1)  Do not use
  */
 @Deprecated 
 public interface HostNameResolver {

httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java

@@ -36,7 +36,7 @@ import java.net.UnknownHostException;
  *
  * @since 4.1
  * 
- * @deprecated use {@link SchemeLayeredSocketFactory}
+ * @deprecated (4.2)  use {@link SchemeLayeredSocketFactory}
  */
 @Deprecated
 public interface LayeredSchemeSocketFactory extends SchemeSocketFactory {

httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java

@@ -37,7 +37,7 @@ import java.net.UnknownHostException;
  *
  * @since 4.0
  *
- * @deprecated use {@link SchemeSocketFactory}
+ * @deprecated (4.1)  use {@link SchemeSocketFactory}
  */
 @Deprecated 
 public interface LayeredSocketFactory extends SocketFactory {

httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java

@@ -31,6 +31,9 @@ import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
+/**
+ * @deprecated (4.1) do not use
+ */
 @Deprecated
 class LayeredSocketFactoryAdaptor extends SocketFactoryAdaptor implements LayeredSocketFactory {
 

httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java

@@ -37,6 +37,7 @@ import java.net.UnknownHostException;
 import org.apache.http.annotation.Immutable;
 
 import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.DnsResolver;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 
@@ -67,6 +68,9 @@ public class PlainSocketFactory implements SocketFactory, SchemeSocketFactory {
         return new PlainSocketFactory();
     }
 
+    /**
+     * @deprecated (4.1) use {@link DnsResolver}
+     */
     @Deprecated
     public PlainSocketFactory(final HostNameResolver nameResolver) {
         super();
@@ -153,7 +157,7 @@ public class PlainSocketFactory implements SocketFactory, SchemeSocketFactory {
     }
 
     /**
-     * @deprecated Use {@link #connectSocket(Socket, InetSocketAddress, InetSocketAddress, HttpParams)}
+     * @deprecated (4.1)  Use {@link #connectSocket(Socket, InetSocketAddress, InetSocketAddress, HttpParams)}
      */
     @Deprecated
     public Socket connectSocket(

httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java

@@ -117,7 +117,7 @@ public final class Scheme {
      *                  with this scheme
      * @param port      the default port for this scheme
      *
-     * @deprecated Use {@link #Scheme(String, int, SchemeSocketFactory)}
+     * @deprecated (4.1)  Use {@link #Scheme(String, int, SchemeSocketFactory)}
      */
     @Deprecated 
     public Scheme(final String name,
@@ -166,7 +166,7 @@ public final class Scheme {
      *
      * @return  the socket factory for this scheme
      *
-     * @deprecated Use {@link #getSchemeSocketFactory()}
+     * @deprecated (4.1)  Use {@link #getSchemeSocketFactory()}
      */
     @Deprecated
     public final SocketFactory getSocketFactory() {

httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java

@@ -33,6 +33,9 @@ import java.net.UnknownHostException;
 
 import org.apache.http.params.HttpParams;
 
+/**
+ * @deprecated (4.2) do not use
+ */
 @Deprecated
 class SchemeLayeredSocketFactoryAdaptor extends SchemeSocketFactoryAdaptor
     implements SchemeLayeredSocketFactory {

httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java

@@ -35,6 +35,9 @@ import java.net.UnknownHostException;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.params.HttpParams;
 
+/**
+ * @deprecated (4.2) do not use
+ */
 @Deprecated 
 class SchemeLayeredSocketFactoryAdaptor2 implements SchemeLayeredSocketFactory {
 

httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java

@@ -36,6 +36,9 @@ import java.net.UnknownHostException;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.params.HttpParams;
 
+/**
+ * @deprecated (4.1) do not use
+ */
 @Deprecated
 class SchemeSocketFactoryAdaptor implements SchemeSocketFactory {
 

httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java

@@ -41,7 +41,7 @@ import org.apache.http.params.HttpParams;
  *
  * @since 4.0
  *
- * @deprecated use {@link SchemeSocketFactory}
+ * @deprecated (4.1)  use {@link SchemeSocketFactory}
  */
 @Deprecated
 public interface SocketFactory {

httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java

@@ -37,6 +37,9 @@ import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 
+/**
+ * @deprecated (4.1) do not use
+ */
 @Deprecated
 class SocketFactoryAdaptor implements SocketFactory {
 

httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java

@@ -33,6 +33,7 @@ import org.apache.http.Header;
 import org.apache.http.HttpRequest;
 import org.apache.http.auth.AuthenticationException;
 import org.apache.http.auth.ChallengeState;
+import org.apache.http.auth.ContextAwareAuthScheme;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.AUTH;
 import org.apache.http.auth.InvalidCredentialsException;
@@ -119,6 +120,9 @@ public class BasicScheme extends RFC2617Scheme {
         return false;
     }
 
+    /**
+     * @deprecated (4.2) Use {@link ContextAwareAuthScheme#authenticate(Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
+     */
     @Deprecated
     public Header authenticate(
             final Credentials credentials, final HttpRequest request) throws AuthenticationException {

httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java

@@ -45,6 +45,7 @@ import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpRequest;
 import org.apache.http.auth.AuthenticationException;
 import org.apache.http.auth.ChallengeState;
+import org.apache.http.auth.ContextAwareAuthScheme;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.AUTH;
 import org.apache.http.auth.MalformedChallengeException;
@@ -177,6 +178,9 @@ public class DigestScheme extends RFC2617Scheme {
         getParameters().put(name, value);
     }
 
+    /**
+     * @deprecated (4.2) Use {@link ContextAwareAuthScheme#authenticate(Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
+     */
     @Deprecated 
     public Header authenticate(
             final Credentials credentials, final HttpRequest request) throws AuthenticationException {

httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java

@@ -32,6 +32,7 @@ import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.auth.AuthenticationException;
+import org.apache.http.auth.ContextAwareAuthScheme;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.InvalidCredentialsException;
 import org.apache.http.auth.MalformedChallengeException;
@@ -45,6 +46,9 @@ import org.ietf.jgss.GSSManager;
 import org.ietf.jgss.GSSName;
 import org.ietf.jgss.Oid;
 
+/**
+ * @since 4.2
+ */
 public abstract class GGSSchemeBase extends AuthSchemeBase {
 
     enum State {
@@ -102,6 +106,9 @@ public abstract class GGSSchemeBase extends AuthSchemeBase {
         return this.state == State.TOKEN_GENERATED || this.state == State.FAILED;
     }
 
+    /**
+     * @deprecated (4.2) Use {@link ContextAwareAuthScheme#authenticate(Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
+     */
     @Deprecated 
     public Header authenticate(
             final Credentials credentials,

httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java

@@ -43,7 +43,7 @@ import org.ietf.jgss.Oid;
  *
  * @since 4.1
  *
- * @deprecated use {@link SPNegoScheme} or {@link KerberosScheme}.
+ * @deprecated (4.2)  use {@link SPNegoScheme} or {@link KerberosScheme}.
  */
 @Deprecated
 public class NegotiateScheme extends GGSSchemeBase {
@@ -81,6 +81,12 @@ public class NegotiateScheme extends GGSSchemeBase {
         return "Negotiate";
     }
 
+    public Header authenticate(
+            final Credentials credentials,
+            final HttpRequest request) throws AuthenticationException {
+        return authenticate(credentials, request, null);
+    }
+
     /**
      * Produces Negotiate authorization Header based on token created by
      * processChallenge.

httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java

@@ -36,7 +36,7 @@ import org.apache.http.params.HttpParams;
  *
  * @since 4.1
  *
- * @deprecated
+ * @deprecated (4.2)  use {@link SPNegoSchemeFactory} or {@link KerberosSchemeFactory}.
  */
 @Deprecated 
 public class NegotiateSchemeFactory implements AuthSchemeFactory {

httpclient/src/main/java/org/apache/http/impl/auth/SpnegoTokenGenerator.java

@@ -36,7 +36,7 @@ import java.io.IOException;
  *
  * @since 4.1
  *
- * @deprecated subclass {@link KerberosScheme} and override
+ * @deprecated (4.2)  subclass {@link KerberosScheme} and override
  *   {@link KerberosScheme#generateGSSToken(byte[], org.ietf.jgss.Oid, String)}
  */
 @Deprecated

httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java

@@ -58,7 +58,7 @@ import org.apache.http.util.CharArrayBuffer;
  *
  * @since 4.0
  *
- * @deprecated use {@link AuthenticationStrategy}
+ * @deprecated (4.2)  use {@link AuthenticationStrategy}
  */
 @Deprecated 
 @Immutable

httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java

@@ -382,70 +382,66 @@ public abstract class AbstractHttpClient implements HttpClient {
         return new HttpRequestExecutor();
     }
 
-
     protected ConnectionReuseStrategy createConnectionReuseStrategy() {
         return new DefaultConnectionReuseStrategy();
     }
 
-
     protected ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy() {
         return new DefaultConnectionKeepAliveStrategy();
     }
 
-
     protected HttpRequestRetryHandler createHttpRequestRetryHandler() {
         return new DefaultHttpRequestRetryHandler();
     }
 
-
+    /**
+     * @deprecated (4.1) do not use
+     */
     @Deprecated 
     protected RedirectHandler createRedirectHandler() {
         return new DefaultRedirectHandler();
     }
 
-
     protected AuthenticationStrategy createTargetAuthenticationStrategy() {
         return new TargetAuthenticationStrategy();
     }
 
-
+    /**
+     * @deprecated (4.2) do not use
+     */
     @Deprecated 
     protected AuthenticationHandler createTargetAuthenticationHandler() {
         return new DefaultTargetAuthenticationHandler();
     }
 
-
     protected AuthenticationStrategy createProxyAuthenticationStrategy() {
         return new ProxyAuthenticationStrategy();
     }
 
-
+    /**
+     * @deprecated (4.2) do not use
+     */
     @Deprecated 
     protected AuthenticationHandler createProxyAuthenticationHandler() {
         return new DefaultProxyAuthenticationHandler();
     }
 
-
     protected CookieStore createCookieStore() {
         return new BasicCookieStore();
     }
 
-
     protected CredentialsProvider createCredentialsProvider() {
         return new BasicCredentialsProvider();
     }
 
-
     protected HttpRoutePlanner createHttpRoutePlanner() {
         return new DefaultHttpRoutePlanner(getConnectionManager().getSchemeRegistry());
     }
 
-
     protected UserTokenHandler createUserTokenHandler() {
         return new DefaultUserTokenHandler();
     }
 
-
     // non-javadoc, see interface HttpClient
     public synchronized final HttpParams getParams() {
         if (defaultParams == null) {
@@ -454,7 +450,6 @@ public abstract class AbstractHttpClient implements HttpClient {
         return defaultParams;
     }
 
-
     /**
      * Replaces the parameters.
      * The implementation here does not update parameters of dependent objects.
@@ -553,18 +548,21 @@ public abstract class AbstractHttpClient implements HttpClient {
         return retryHandler;
     }
 
-
     public synchronized void setHttpRequestRetryHandler(final HttpRequestRetryHandler handler) {
         this.retryHandler = handler;
     }
 
-
+    /**
+     * @deprecated (4.1) do not use
+     */
     @Deprecated 
     public synchronized final RedirectHandler getRedirectHandler() {
         return createRedirectHandler();
     }
 
-
+    /**
+     * @deprecated (4.1) do not use
+     */
     @Deprecated 
     public synchronized void setRedirectHandler(final RedirectHandler handler) {
         this.redirectStrategy = new DefaultRedirectStrategyAdaptor(handler);
@@ -587,19 +585,22 @@ public abstract class AbstractHttpClient implements HttpClient {
         this.redirectStrategy = strategy;
     }
 
-
+    /**
+     * @deprecated (4.2) do not use
+     */
     @Deprecated 
     public synchronized final AuthenticationHandler getTargetAuthenticationHandler() {
         return createTargetAuthenticationHandler();
     }
 
-
+    /**
+     * @deprecated (4.2) do not use
+     */
     @Deprecated 
     public synchronized void setTargetAuthenticationHandler(final AuthenticationHandler handler) {
         this.targetAuthStrategy = new AuthenticationStrategyAdaptor(handler);
     }
 
-
     /**
      * @since 4.2
      */
@@ -610,7 +611,6 @@ public abstract class AbstractHttpClient implements HttpClient {
         return targetAuthStrategy;
     }
 
-
     /**
      * @since 4.2
      */
@@ -618,19 +618,22 @@ public abstract class AbstractHttpClient implements HttpClient {
         this.targetAuthStrategy = strategy;
     }
 
-
+    /**
+     * @deprecated (4.2) do not use
+     */
     @Deprecated 
     public synchronized final AuthenticationHandler getProxyAuthenticationHandler() {
         return createProxyAuthenticationHandler();
     }
 
-
+    /**
+     * @deprecated (4.2) do not use
+     */
     @Deprecated 
     public synchronized void setProxyAuthenticationHandler(final AuthenticationHandler handler) {
         this.proxyAuthStrategy = new AuthenticationStrategyAdaptor(handler);
     }
 
-
     /**
      * @since 4.2
      */
@@ -641,7 +644,6 @@ public abstract class AbstractHttpClient implements HttpClient {
         return proxyAuthStrategy;
     }
 
-
     /**
      * @since 4.2
      */
@@ -649,7 +651,6 @@ public abstract class AbstractHttpClient implements HttpClient {
         this.proxyAuthStrategy = strategy;
     }
 
-
     public synchronized final CookieStore getCookieStore() {
         if (cookieStore == null) {
             cookieStore = createCookieStore();
@@ -657,12 +658,10 @@ public abstract class AbstractHttpClient implements HttpClient {
         return cookieStore;
     }
 
-
     public synchronized void setCookieStore(final CookieStore cookieStore) {
         this.cookieStore = cookieStore;
     }
 
-
     public synchronized final CredentialsProvider getCredentialsProvider() {
         if (credsProvider == null) {
             credsProvider = createCredentialsProvider();
@@ -670,12 +669,10 @@ public abstract class AbstractHttpClient implements HttpClient {
         return credsProvider;
     }
 
-
     public synchronized void setCredentialsProvider(final CredentialsProvider credsProvider) {
         this.credsProvider = credsProvider;
     }
 
-
     public synchronized final HttpRoutePlanner getRoutePlanner() {
         if (this.routePlanner == null) {
             this.routePlanner = createHttpRoutePlanner();
@@ -683,12 +680,10 @@ public abstract class AbstractHttpClient implements HttpClient {
         return this.routePlanner;
     }
 
-
     public synchronized void setRoutePlanner(final HttpRoutePlanner routePlanner) {
         this.routePlanner = routePlanner;
     }
 
-
     public synchronized final UserTokenHandler getUserTokenHandler() {
         if (this.userTokenHandler == null) {
             this.userTokenHandler = createUserTokenHandler();
@@ -696,12 +691,10 @@ public abstract class AbstractHttpClient implements HttpClient {
         return this.userTokenHandler;
     }
 
-
     public synchronized void setUserTokenHandler(final UserTokenHandler handler) {
         this.userTokenHandler = handler;
     }
 
-
     protected synchronized final BasicHttpProcessor getHttpProcessor() {
         if (mutableProcessor == null) {
             mutableProcessor = createHttpProcessor();
@@ -709,7 +702,6 @@ public abstract class AbstractHttpClient implements HttpClient {
         return mutableProcessor;
     }
 
-
     private synchronized final HttpProcessor getProtocolProcessor() {
         if (protocolProcessor == null) {
             // Get mutable HTTP processor
@@ -730,69 +722,57 @@ public abstract class AbstractHttpClient implements HttpClient {
         return protocolProcessor;
     }
 
-
     public synchronized int getResponseInterceptorCount() {
         return getHttpProcessor().getResponseInterceptorCount();
     }
 
-
     public synchronized HttpResponseInterceptor getResponseInterceptor(int index) {
         return getHttpProcessor().getResponseInterceptor(index);
     }
 
-
     public synchronized HttpRequestInterceptor getRequestInterceptor(int index) {
         return getHttpProcessor().getRequestInterceptor(index);
     }
 
-
     public synchronized int getRequestInterceptorCount() {
         return getHttpProcessor().getRequestInterceptorCount();
     }
 
-
     public synchronized void addResponseInterceptor(final HttpResponseInterceptor itcp) {
         getHttpProcessor().addInterceptor(itcp);
         protocolProcessor = null;
     }
 
-
     public synchronized void addResponseInterceptor(final HttpResponseInterceptor itcp, int index) {
         getHttpProcessor().addInterceptor(itcp, index);
         protocolProcessor = null;
     }
 
-
     public synchronized void clearResponseInterceptors() {
         getHttpProcessor().clearResponseInterceptors();
         protocolProcessor = null;
     }
 
-
     public synchronized void removeResponseInterceptorByClass(Class<? extends HttpResponseInterceptor> clazz) {
         getHttpProcessor().removeResponseInterceptorByClass(clazz);
         protocolProcessor = null;
     }
 
-
     public synchronized void addRequestInterceptor(final HttpRequestInterceptor itcp) {
         getHttpProcessor().addInterceptor(itcp);
         protocolProcessor = null;
     }
 
-
     public synchronized void addRequestInterceptor(final HttpRequestInterceptor itcp, int index) {
         getHttpProcessor().addInterceptor(itcp, index);
         protocolProcessor = null;
     }
 
-
     public synchronized void clearRequestInterceptors() {
         getHttpProcessor().clearRequestInterceptors();
         protocolProcessor = null;
     }
 
-
     public synchronized void removeRequestInterceptorByClass(Class<? extends HttpRequestInterceptor> clazz) {
         getHttpProcessor().removeRequestInterceptorByClass(clazz);
         protocolProcessor = null;
@@ -804,7 +784,6 @@ public abstract class AbstractHttpClient implements HttpClient {
         return execute(request, (HttpContext) null);
     }
 
-
     /**
      * Maps to {@link HttpClient#execute(HttpHost,HttpRequest,HttpContext)
      *                           execute(target, request, context)}.
@@ -931,6 +910,9 @@ public abstract class AbstractHttpClient implements HttpClient {
         }
     }
 
+    /**
+     * @deprecated (4.1) do not use
+     */
     @Deprecated
     protected RequestDirector createClientRequestDirector(
             final HttpRequestExecutor requestExec,
@@ -960,6 +942,9 @@ public abstract class AbstractHttpClient implements HttpClient {
                 params);
     }
 
+    /**
+     * @deprecated (4.2) do not use
+     */
     @Deprecated 
     protected RequestDirector createClientRequestDirector(
             final HttpRequestExecutor requestExec,

httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java

@@ -53,9 +53,8 @@ import org.apache.http.client.protocol.ClientContext;
 import org.apache.http.protocol.HttpContext;
 
 /**
- * @since 4.2
+ * @deprecated (4.2) do not use
  */
-@SuppressWarnings("deprecation")
 @Immutable
 @Deprecated
 class AuthenticationStrategyAdaptor implements AuthenticationStrategy {
@@ -64,7 +63,6 @@ class AuthenticationStrategyAdaptor implements AuthenticationStrategy {
 
     private final AuthenticationHandler handler;
 
-    @Deprecated
     public AuthenticationStrategyAdaptor(final AuthenticationHandler handler) {
         super();
         this.handler = handler;

httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java

@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpContext;
  *
  * @since 4.0
  *
- * @deprecated use {@link ProxyAuthenticationStrategy}
+ * @deprecated (4.2)  use {@link ProxyAuthenticationStrategy}
  */
 @Deprecated 
 @Immutable

httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java

@@ -55,7 +55,7 @@ import org.apache.http.protocol.ExecutionContext;
  *
  * @since 4.0
  *
- * @deprecated use {@link DefaultRedirectStrategy}.
+ * @deprecated (4.1)  use {@link DefaultRedirectStrategy}.
  */
 @Immutable
 @Deprecated

httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java

@@ -41,16 +41,14 @@ import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.protocol.HttpContext;
 
 /**
- * @since 4.1
+ * @deprecated (4.1) do not use
  */
-@SuppressWarnings("deprecation")
 @Immutable
 @Deprecated 
 class DefaultRedirectStrategyAdaptor implements RedirectStrategy {
 
     private final RedirectHandler handler;
 
-    @Deprecated
     public DefaultRedirectStrategyAdaptor(final RedirectHandler handler) {
         super();
         this.handler = handler;

httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java

@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpContext;
  *
  * @since 4.0
  *
- * @deprecated use {@link TargetAuthenticationStrategy}
+ * @deprecated (4.2)  use {@link TargetAuthenticationStrategy}
  */
 @Deprecated
 @Immutable

httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java

@@ -89,7 +89,7 @@ public class EntityEnclosingRequestWrapper extends RequestWrapper
             super(entity);
         }
 
-        @Deprecated
+        @SuppressWarnings("deprecation")
         @Override
         public void consumeContent() throws IOException {
             consumed = true;

httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java

@@ -67,7 +67,7 @@ import org.apache.http.protocol.HttpContext;
  *
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2)  do not use
  */
 @Deprecated
 @NotThreadSafe
@@ -126,9 +126,8 @@ public abstract class AbstractClientConnAdapter implements ManagedClientConnecti
     }
 
     /**
-     * @deprecated use {@link #assertValid(OperatedClientConnection)}
+     * @deprecated (4.1)  use {@link #assertValid(OperatedClientConnection)}
      */
-    @Deprecated
     protected final void assertNotAborted() throws InterruptedIOException {
         if (isReleased()) {
             throw new InterruptedIOException("Connection has been shut down");

httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java

@@ -53,7 +53,7 @@ import org.apache.http.conn.OperatedClientConnection;
  *
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2)  do not use
  */
 @Deprecated
 public abstract class AbstractPoolEntry {

httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java

@@ -47,7 +47,7 @@ import org.apache.http.conn.OperatedClientConnection;
  *
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2)  do not use
  */
 @Deprecated
 public abstract class AbstractPooledConnAdapter extends AbstractClientConnAdapter {
@@ -71,6 +71,8 @@ public abstract class AbstractPooledConnAdapter extends AbstractClientConnAdapte
      * Obtains the pool entry.
      *
      * @return  the pool entry, or <code>null</code> if detached
+     * 
+     * @deprecated (4.0.1) 
      */
     protected AbstractPoolEntry getPoolEntry() {
         return this.poolEntry;
@@ -91,9 +93,8 @@ public abstract class AbstractPooledConnAdapter extends AbstractClientConnAdapte
     }
 
     /**
-     * @deprecated use {@link #assertValid(AbstractPoolEntry)}
+     * @deprecated (4.1)  use {@link #assertValid(AbstractPoolEntry)}
      */
-    @Deprecated
     protected final void assertAttached() {
         if (poolEntry == null) {
             throw new ConnectionShutdownException();

httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java

@@ -45,7 +45,7 @@ import org.apache.http.HttpConnection;
  *
  * @since 4.0
  *
- * @deprecated no longer used
+ * @deprecated (4.1)  no longer used
  */
 @Deprecated
 public class IdleConnectionHandler {

httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java

@@ -58,7 +58,7 @@ import org.apache.http.params.HttpParams;
  *
  * @since 4.0
  *
- * @deprecated use {@link BasicClientConnectionManager}
+ * @deprecated (4.2)  use {@link BasicClientConnectionManager}
  */
 @ThreadSafe
 @Deprecated 
@@ -105,9 +105,8 @@ public class SingleClientConnManager implements ClientConnectionManager {
      * @param params    the parameters for this manager
      * @param schreg    the scheme registry
      *
-     * @deprecated use {@link SingleClientConnManager#SingleClientConnManager(SchemeRegistry)}
+     * @deprecated (4.1)  use {@link SingleClientConnManager#SingleClientConnManager(SchemeRegistry)}
      */
-    @Deprecated
     public SingleClientConnManager(HttpParams params,
                                    SchemeRegistry schreg) {
         this(schreg);
@@ -361,10 +360,6 @@ public class SingleClientConnManager implements ClientConnectionManager {
         }
     }
 
-    /**
-     * @deprecated no longer used
-     */
-    @Deprecated
     protected void revokeConnection() {
         ConnAdapter conn = managedConn;
         if (conn == null)

httpclient/src/main/java/org/apache/http/impl/conn/Wire.java

@@ -141,6 +141,9 @@ public class Wire {
         input(new byte[] {(byte) b});
     }
 
+    /**
+     * @deprecated (4.1)  do not use
+     */
     @Deprecated 
     public void output(final String s)
       throws IOException {
@@ -150,6 +153,9 @@ public class Wire {
         output(s.getBytes());
     }
 
+    /**
+     * @deprecated (4.1)  do not use
+     */
     @Deprecated 
     public void input(final String s)
       throws IOException {

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java

@@ -54,9 +54,8 @@ import org.apache.http.impl.conn.IdleConnectionHandler;
  *
  * @since 4.0
  *
- * @deprecated use {@link org.apache.http.pool.AbstractConnPool}
+ * @deprecated (4.2) use {@link org.apache.http.pool.AbstractConnPool}
  */
-
 @Deprecated
 public abstract class AbstractConnPool implements RefQueueHandler {
 

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java

@@ -39,7 +39,7 @@ import org.apache.http.impl.conn.AbstractPoolEntry;
  *
  * @since 4.0
  *
- * @deprecated use {@link org.apache.http.pool.PoolEntry}
+ * @deprecated (4.2)  use {@link org.apache.http.pool.PoolEntry}
  */
 @Deprecated
 public class BasicPoolEntry extends AbstractPoolEntry {
@@ -50,10 +50,6 @@ public class BasicPoolEntry extends AbstractPoolEntry {
     private long validUntil;
     private long expiry;
 
-    /**
-     * @deprecated do not use
-     */
-    @Deprecated
     public BasicPoolEntry(ClientConnectionOperator op,
                           HttpRoute route,
                           ReferenceQueue<Object> queue) {
@@ -110,7 +106,6 @@ public class BasicPoolEntry extends AbstractPoolEntry {
         return super.route;
     }
 
-    @Deprecated
     protected final BasicPoolEntryRef getWeakRef() {
         return null;
     }

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java

@@ -38,7 +38,7 @@ import org.apache.http.conn.routing.HttpRoute;
  *
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2)  do not use
  */
 @Deprecated 
 public class BasicPoolEntryRef extends WeakReference<BasicPoolEntry> {

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java

@@ -37,7 +37,7 @@ import org.apache.http.impl.conn.AbstractPooledConnAdapter;
  *
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2)  do not use
  */
 @Deprecated 
 public class BasicPooledConnAdapter extends AbstractPooledConnAdapter {

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java

@@ -63,7 +63,7 @@ import org.apache.http.params.HttpParams;
  *
  * @since 4.0
  *
- * @deprecated use {@link org.apache.http.pool.AbstractConnPool}
+ * @deprecated (4.2)  use {@link org.apache.http.pool.AbstractConnPool}
  */
 @Deprecated 
 public class ConnPoolByRoute extends AbstractConnPool {
@@ -147,9 +147,8 @@ public class ConnPoolByRoute extends AbstractConnPool {
     /**
      * Creates a new connection pool, managed by route.
      *
-     * @deprecated use {@link ConnPoolByRoute#ConnPoolByRoute(ClientConnectionOperator, ConnPerRoute, int)}
+     * @deprecated (4.1)  use {@link ConnPoolByRoute#ConnPoolByRoute(ClientConnectionOperator, ConnPerRoute, int)}
      */
-    @Deprecated
     public ConnPoolByRoute(final ClientConnectionOperator operator, final HttpParams params) {
         this(operator,
                 ConnManagerParams.getMaxConnectionsPerRoute(params),

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java

@@ -36,7 +36,7 @@ import org.apache.http.conn.ConnectionPoolTimeoutException;
  *
  * @since 4.0
  *
- * @deprecated use {@link Future}
+ * @deprecated (4.2)  use {@link Future}
  */
 @Deprecated 
 public interface PoolEntryRequest {

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RefQueueHandler.java

@@ -29,7 +29,7 @@ package org.apache.http.impl.conn.tsccm;
 import java.lang.ref.Reference;
 
 /**
- * @deprecated do not use
+ * @deprecated (4.0)  do not use
  *
  * @since 4.0
  */

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RefQueueWorker.java

@@ -38,7 +38,7 @@ import java.lang.ref.ReferenceQueue;
  * this worker. It will pick up the queued references and pass them
  * on to a handler for appropriate processing.
  *
- * @deprecated do not use
+ * @deprecated (4.0)  do not use
  */
 @Deprecated 
 public class RefQueueWorker implements Runnable {

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java

@@ -46,7 +46,7 @@ import org.apache.http.util.LangUtils;
  *
  * @since 4.0
  *
- * @deprecated use {@link org.apache.http.pool.AbstractConnPool}
+ * @deprecated (4.2)  use {@link org.apache.http.pool.AbstractConnPool}
  */
 @Deprecated
 public class RouteSpecificPool {
@@ -56,7 +56,6 @@ public class RouteSpecificPool {
     /** The route this pool is for. */
     protected final HttpRoute route; //Immutable
 
-    @Deprecated
     protected final int maxEntries;
 
     /** Connections per route */
@@ -75,11 +74,9 @@ public class RouteSpecificPool {
     /** The number of created entries. */
     protected int numEntries;
 
-
     /**
-     * @deprecated use {@link RouteSpecificPool#RouteSpecificPool(HttpRoute, ConnPerRoute)}
+     * @deprecated (4.1)  use {@link RouteSpecificPool#RouteSpecificPool(HttpRoute, ConnPerRoute)}
      */
-    @Deprecated
     public RouteSpecificPool(HttpRoute route, int maxEntries) {
         this.route = route;
         this.maxEntries = maxEntries;

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java

@@ -64,7 +64,7 @@ import org.apache.http.impl.conn.SchemeRegistryFactory;
  *
  * @since 4.0
  *
- * @deprecated use {@link PoolingClientConnectionManager}
+ * @deprecated (4.2)  use {@link PoolingClientConnectionManager}
  */
 @ThreadSafe
 @Deprecated 
@@ -75,7 +75,6 @@ public class ThreadSafeClientConnManager implements ClientConnectionManager {
     /** The schemes supported by this connection manager. */
     protected final SchemeRegistry schemeRegistry; // @ThreadSafe
 
-    @Deprecated
     protected final AbstractConnPool connectionPool;
 
     /** The pool of connections being managed. */
@@ -148,9 +147,8 @@ public class ThreadSafeClientConnManager implements ClientConnectionManager {
      * @param params    the parameters for this manager.
      * @param schreg    the scheme registry.
      *
-     * @deprecated use {@link ThreadSafeClientConnManager#ThreadSafeClientConnManager(SchemeRegistry)}
+     * @deprecated (4.1)  use {@link ThreadSafeClientConnManager#ThreadSafeClientConnManager(SchemeRegistry)}
      */
-    @Deprecated
     public ThreadSafeClientConnManager(HttpParams params,
                                        SchemeRegistry schreg) {
         if (schreg == null) {
@@ -178,9 +176,8 @@ public class ThreadSafeClientConnManager implements ClientConnectionManager {
      *
      * @return  the connection pool to use
      *
-     * @deprecated use #createConnectionPool(long, TimeUnit))
+     * @deprecated (4.1)  use #createConnectionPool(long, TimeUnit))
      */
-    @Deprecated
     protected AbstractConnPool createConnectionPool(final HttpParams params) {
         return new ConnPoolByRoute(connOperator, params);
     }

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java

@@ -43,7 +43,7 @@ import java.util.concurrent.locks.Condition;
  *
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2)  do not use
  */
 @Deprecated 
 public class WaitingThread {

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java

@@ -33,7 +33,7 @@ package org.apache.http.impl.conn.tsccm;
  *
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2)  do not use
  */
 @Deprecated 
 public class WaitingThreadAborter {

httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java

@@ -55,6 +55,9 @@ import org.apache.http.util.CharArrayBuffer;
 @NotThreadSafe // superclass is @NotThreadSafe
 public class BrowserCompatSpec extends CookieSpecBase {
 
+    /**
+     * @deprecated (4.0) do not use
+     */
     @Deprecated
     protected static final String[] DATE_PATTERNS = new String[] {
             DateUtils.PATTERN_RFC1123,

httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java

@@ -86,7 +86,7 @@ public class FileBody extends AbstractContentBody {
     }
 
     /**
-     * @deprecated use {@link #writeTo(OutputStream)}
+     * @deprecated (4.0)  use {@link #writeTo(OutputStream)}
      */
     @Deprecated 
     public void writeTo(final OutputStream out, int mode) throws IOException {

httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java

@@ -60,7 +60,7 @@ public class InputStreamBody extends AbstractContentBody {
     }
 
     /**
-     * @deprecated use {@link #writeTo(OutputStream)}
+     * @deprecated (4.0)  use {@link #writeTo(OutputStream)}
      */
     @Deprecated 
     public void writeTo(final OutputStream out, int mode) throws IOException {

httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java

@@ -133,7 +133,7 @@ public class StringBody extends AbstractContentBody {
     }
 
     /**
-     * @deprecated use {@link #writeTo(OutputStream)}
+     * @deprecated (4.0)  use {@link #writeTo(OutputStream)}
      */
     @Deprecated
     public void writeTo(final OutputStream out, int mode) throws IOException {