You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/05/07 18:06:13 UTC
svn commit: r1335088 [1/2] - in /httpcomponents/httpclient/trunk:
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/
httpclient/src/main/java/org/apache/http/aut...
Author: olegk
Date: Mon May 7 16:06:11 2012
New Revision: 1335088
URL: http://svn.apache.org/viewvc?rev=1335088&view=rev
Log:
Added release version to deprecation annotations; removed references to deprecated methods / classes
Modified:
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SpnegoTokenGenerator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RefQueueHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RefQueueWorker.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/tsccm/AwaitThread.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java Mon May 7 16:06:11 2012
@@ -147,9 +147,9 @@ 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
+ @Deprecated
public int getMaxObjectSizeBytes() {
return maxObjectSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) maxObjectSize;
}
@@ -158,9 +158,9 @@ 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
+ @Deprecated
public void setMaxObjectSizeBytes(int maxObjectSizeBytes) {
if (maxObjectSizeBytes > Integer.MAX_VALUE) {
this.maxObjectSize = Integer.MAX_VALUE;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java Mon May 7 16:06:11 2012
@@ -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("}");
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java Mon May 7 16:06:11 2012
@@ -43,6 +43,7 @@ import org.apache.http.annotation.Immuta
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());
}
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java Mon May 7 16:06:11 2012
@@ -129,6 +129,8 @@ public class MemcachedHttpCacheStorage i
* @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,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java Mon May 7 16:06:11 2012
@@ -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)
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java Mon May 7 16:06:11 2012
@@ -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
+ @Deprecated
public void invalidate() {
reset();
}
+ /**
+ * @deprecated (4.2) do not use
+ */
@Deprecated
public boolean isValid() {
return this.authScheme != null;
@@ -174,9 +177,9 @@ 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
+ @Deprecated
public void setAuthScheme(final AuthScheme authScheme) {
if (authScheme == null) {
reset();
@@ -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) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java Mon May 7 16:06:11 2012
@@ -48,7 +48,7 @@ import org.apache.http.protocol.HttpCont
*
* @since 4.0
*
- * @deprecated use {@link AuthenticationStrategy}
+ * @deprecated (4.2) use {@link AuthenticationStrategy}
*/
@Deprecated
public interface AuthenticationHandler {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java Mon May 7 16:06:11 2012
@@ -44,7 +44,7 @@ import org.apache.http.protocol.HttpCont
*
* @since 4.0
*
- * @deprecated use {@link RedirectStrategy}
+ * @deprecated (4.1) use {@link RedirectStrategy}
*/
@Deprecated
public interface RedirectHandler {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java Mon May 7 16:06:11 2012
@@ -34,15 +34,15 @@ 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
+ @Deprecated
public static final String CONNECTION_MANAGER_FACTORY = "http.connection-manager.factory-object";
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java Mon May 7 16:06:11 2012
@@ -51,12 +51,18 @@ public class ClientParamBean extends Htt
super(params);
}
- @Deprecated
+ /**
+ * @deprecated (4.0) do not use.
+ */
+ @Deprecated
public void setConnectionManagerFactoryClassName (final String factory) {
params.setParameter(ClientPNames.CONNECTION_MANAGER_FACTORY_CLASS_NAME, factory);
}
- @Deprecated
+ /**
+ * @deprecated (4.2) do not use.
+ */
+ @Deprecated
public void setConnectionManagerFactory(ClientConnectionManagerFactory factory) {
params.setParameter(ClientPNames.CONNECTION_MANAGER_FACTORY, factory);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java Mon May 7 16:06:11 2012
@@ -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";
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java Mon May 7 16:06:11 2012
@@ -71,11 +71,11 @@ public class ClientContextConfigurer imp
}
/**
- * @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
*/
- @Deprecated
+ @Deprecated
public void setAuthSchemePref(final List<String> list) {
this.context.setAttribute(AUTH_SCHEME_PREF, list);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java Mon May 7 16:06:11 2012
@@ -55,10 +55,10 @@ import org.apache.http.protocol.HttpCont
*
* @since 4.1
*
- * @deprecated use {@link AuthenticationStrategy}
+ * @deprecated (4.2) use {@link AuthenticationStrategy}
*/
@Immutable
-@Deprecated
+@Deprecated
public class ResponseAuthCache implements HttpResponseInterceptor {
private final Log log = LogFactory.getLog(getClass());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java Mon May 7 16:06:11 2012
@@ -104,7 +104,9 @@ public class BasicManagedEntity extends
}
}
- @Deprecated
+ /**
+ * @deprecated (4.1) Use {@link EntityUtils#consume(HttpEntity)}
+ */
@Override
public void consumeContent() throws IOException {
ensureConsumed();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java Mon May 7 16:06:11 2012
@@ -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
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java Mon May 7 16:06:11 2012
@@ -27,9 +27,7 @@
package org.apache.http.conn.params;
-import org.apache.http.annotation.NotThreadSafe;
-
-import org.apache.http.impl.conn.DefaultResponseParser;
+import org.apache.http.impl.conn.DefaultHttpResponseParser;
import org.apache.http.params.HttpAbstractParamBean;
import org.apache.http.params.HttpParams;
@@ -39,9 +37,10 @@ import org.apache.http.params.HttpParams
* using Java Beans conventions.
*
* @since 4.0
+ *
+ * @deprecated (4.2) do not use
*/
-@NotThreadSafe
-@Deprecated
+@Deprecated
public class ConnConnectionParamBean extends HttpAbstractParamBean {
public ConnConnectionParamBean (final HttpParams params) {
@@ -49,7 +48,7 @@ public class ConnConnectionParamBean ext
}
/**
- * @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);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java Mon May 7 16:06:11 2012
@@ -26,15 +26,14 @@
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
+ *
+ * @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";
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java Mon May 7 16:06:11 2012
@@ -38,9 +38,11 @@ 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
+@Deprecated
public class ConnManagerParamBean extends HttpAbstractParamBean {
public ConnManagerParamBean (final HttpParams params) {
@@ -51,14 +53,10 @@ public class ConnManagerParamBean extend
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);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java Mon May 7 16:06:11 2012
@@ -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,8 +39,10 @@ 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
+@Deprecated
@Immutable
public final class ConnManagerParams implements ConnManagerPNames {
@@ -55,9 +56,8 @@ public final class ConnManagerParams imp
*
* @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 imp
*
* @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 imp
* @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 imp
* @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 imp
*
* @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 imp
* @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) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java Mon May 7 16:06:11 2012
@@ -42,9 +42,9 @@ import org.apache.http.pool.ConnPoolCont
*
* @since 4.0
*
- * @deprecated use {@link ConnPoolControl}
+ * @deprecated (4.2) use {@link ConnPoolControl}
*/
-@Deprecated
+@Deprecated
@ThreadSafe
public final class ConnPerRouteBean implements ConnPerRoute {
@@ -65,10 +65,6 @@ public final class ConnPerRouteBean impl
this(DEFAULT_MAX_CONNECTIONS_PER_ROUTE);
}
- /**
- * @deprecated Use {@link #getDefaultMaxPerRoute()} instead
- */
- @Deprecated
public int getDefaultMax() {
return this.defaultMax;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java Mon May 7 16:06:11 2012
@@ -35,9 +35,9 @@ import java.net.InetAddress;
*
* @since 4.0
*
- * @deprecated Do not use
+ * @deprecated (4.1) Do not use
*/
-@Deprecated
+@Deprecated
public interface HostNameResolver {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java Mon May 7 16:06:11 2012
@@ -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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java Mon May 7 16:06:11 2012
@@ -37,9 +37,9 @@ import java.net.UnknownHostException;
*
* @since 4.0
*
- * @deprecated use {@link SchemeSocketFactory}
+ * @deprecated (4.1) use {@link SchemeSocketFactory}
*/
-@Deprecated
+@Deprecated
public interface LayeredSocketFactory extends SocketFactory {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java Mon May 7 16:06:11 2012
@@ -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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java Mon May 7 16:06:11 2012
@@ -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 implemen
return new PlainSocketFactory();
}
+ /**
+ * @deprecated (4.1) use {@link DnsResolver}
+ */
@Deprecated
public PlainSocketFactory(final HostNameResolver nameResolver) {
super();
@@ -153,7 +157,7 @@ public class PlainSocketFactory implemen
}
/**
- * @deprecated Use {@link #connectSocket(Socket, InetSocketAddress, InetSocketAddress, HttpParams)}
+ * @deprecated (4.1) Use {@link #connectSocket(Socket, InetSocketAddress, InetSocketAddress, HttpParams)}
*/
@Deprecated
public Socket connectSocket(
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java Mon May 7 16:06:11 2012
@@ -117,9 +117,9 @@ 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
+ @Deprecated
public Scheme(final String name,
final SocketFactory factory,
final int port) {
@@ -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() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java Mon May 7 16:06:11 2012
@@ -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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java Mon May 7 16:06:11 2012
@@ -35,7 +35,10 @@ import java.net.UnknownHostException;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.params.HttpParams;
-@Deprecated
+/**
+ * @deprecated (4.2) do not use
+ */
+@Deprecated
class SchemeLayeredSocketFactoryAdaptor2 implements SchemeLayeredSocketFactory {
private final LayeredSchemeSocketFactory factory;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java Mon May 7 16:06:11 2012
@@ -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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java Mon May 7 16:06:11 2012
@@ -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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java Mon May 7 16:06:11 2012
@@ -37,6 +37,9 @@ import org.apache.http.conn.ConnectTimeo
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
+/**
+ * @deprecated (4.1) do not use
+ */
@Deprecated
class SocketFactoryAdaptor implements SocketFactory {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java Mon May 7 16:06:11 2012
@@ -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 RFC2617
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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java Mon May 7 16:06:11 2012
@@ -45,6 +45,7 @@ import org.apache.http.HttpEntityEnclosi
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,7 +178,10 @@ public class DigestScheme extends RFC261
getParameters().put(name, value);
}
- @Deprecated
+ /**
+ * @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 {
return authenticate(credentials, request, new BasicHttpContext());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java Mon May 7 16:06:11 2012
@@ -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,7 +106,10 @@ public abstract class GGSSchemeBase exte
return this.state == State.TOKEN_GENERATED || this.state == State.FAILED;
}
- @Deprecated
+ /**
+ * @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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java Mon May 7 16:06:11 2012
@@ -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 GGS
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.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java Mon May 7 16:06:11 2012
@@ -36,9 +36,9 @@ import org.apache.http.params.HttpParams
*
* @since 4.1
*
- * @deprecated
+ * @deprecated (4.2) use {@link SPNegoSchemeFactory} or {@link KerberosSchemeFactory}.
*/
-@Deprecated
+@Deprecated
public class NegotiateSchemeFactory implements AuthSchemeFactory {
private final SpnegoTokenGenerator spengoGenerator;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SpnegoTokenGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SpnegoTokenGenerator.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SpnegoTokenGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SpnegoTokenGenerator.java Mon May 7 16:06:11 2012
@@ -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
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java Mon May 7 16:06:11 2012
@@ -58,9 +58,9 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.0
*
- * @deprecated use {@link AuthenticationStrategy}
+ * @deprecated (4.2) use {@link AuthenticationStrategy}
*/
-@Deprecated
+@Deprecated
@Immutable
public abstract class AbstractAuthenticationHandler implements AuthenticationHandler {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java Mon May 7 16:06:11 2012
@@ -382,70 +382,66 @@ public abstract class AbstractHttpClient
return new HttpRequestExecutor();
}
-
protected ConnectionReuseStrategy createConnectionReuseStrategy() {
return new DefaultConnectionReuseStrategy();
}
-
protected ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy() {
return new DefaultConnectionKeepAliveStrategy();
}
-
protected HttpRequestRetryHandler createHttpRequestRetryHandler() {
return new DefaultHttpRequestRetryHandler();
}
-
- @Deprecated
+ /**
+ * @deprecated (4.1) do not use
+ */
+ @Deprecated
protected RedirectHandler createRedirectHandler() {
return new DefaultRedirectHandler();
}
-
protected AuthenticationStrategy createTargetAuthenticationStrategy() {
return new TargetAuthenticationStrategy();
}
-
- @Deprecated
+ /**
+ * @deprecated (4.2) do not use
+ */
+ @Deprecated
protected AuthenticationHandler createTargetAuthenticationHandler() {
return new DefaultTargetAuthenticationHandler();
}
-
protected AuthenticationStrategy createProxyAuthenticationStrategy() {
return new ProxyAuthenticationStrategy();
}
-
- @Deprecated
+ /**
+ * @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
return defaultParams;
}
-
/**
* Replaces the parameters.
* The implementation here does not update parameters of dependent objects.
@@ -553,19 +548,22 @@ public abstract class AbstractHttpClient
return retryHandler;
}
-
public synchronized void setHttpRequestRetryHandler(final HttpRequestRetryHandler handler) {
this.retryHandler = handler;
}
-
- @Deprecated
+ /**
+ * @deprecated (4.1) do not use
+ */
+ @Deprecated
public synchronized final RedirectHandler getRedirectHandler() {
return createRedirectHandler();
}
-
- @Deprecated
+ /**
+ * @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
this.redirectStrategy = strategy;
}
-
- @Deprecated
+ /**
+ * @deprecated (4.2) do not use
+ */
+ @Deprecated
public synchronized final AuthenticationHandler getTargetAuthenticationHandler() {
return createTargetAuthenticationHandler();
}
-
- @Deprecated
+ /**
+ * @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
return targetAuthStrategy;
}
-
/**
* @since 4.2
*/
@@ -618,19 +618,22 @@ public abstract class AbstractHttpClient
this.targetAuthStrategy = strategy;
}
-
- @Deprecated
+ /**
+ * @deprecated (4.2) do not use
+ */
+ @Deprecated
public synchronized final AuthenticationHandler getProxyAuthenticationHandler() {
return createProxyAuthenticationHandler();
}
-
- @Deprecated
+ /**
+ * @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
return proxyAuthStrategy;
}
-
/**
* @since 4.2
*/
@@ -649,7 +651,6 @@ public abstract class AbstractHttpClient
this.proxyAuthStrategy = strategy;
}
-
public synchronized final CookieStore getCookieStore() {
if (cookieStore == null) {
cookieStore = createCookieStore();
@@ -657,12 +658,10 @@ public abstract class AbstractHttpClient
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
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
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
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
return mutableProcessor;
}
-
private synchronized final HttpProcessor getProtocolProcessor() {
if (protocolProcessor == null) {
// Get mutable HTTP processor
@@ -730,69 +722,57 @@ public abstract class AbstractHttpClient
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
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
}
}
+ /**
+ * @deprecated (4.1) do not use
+ */
@Deprecated
protected RequestDirector createClientRequestDirector(
final HttpRequestExecutor requestExec,
@@ -960,7 +942,10 @@ public abstract class AbstractHttpClient
params);
}
- @Deprecated
+ /**
+ * @deprecated (4.2) do not use
+ */
+ @Deprecated
protected RequestDirector createClientRequestDirector(
final HttpRequestExecutor requestExec,
final ClientConnectionManager conman,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java Mon May 7 16:06:11 2012
@@ -53,9 +53,8 @@ import org.apache.http.client.protocol.C
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 impl
private final AuthenticationHandler handler;
- @Deprecated
public AuthenticationStrategyAdaptor(final AuthenticationHandler handler) {
super();
this.handler = handler;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java Mon May 7 16:06:11 2012
@@ -47,9 +47,9 @@ import org.apache.http.protocol.HttpCont
*
* @since 4.0
*
- * @deprecated use {@link ProxyAuthenticationStrategy}
+ * @deprecated (4.2) use {@link ProxyAuthenticationStrategy}
*/
-@Deprecated
+@Deprecated
@Immutable
public class DefaultProxyAuthenticationHandler extends AbstractAuthenticationHandler {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java Mon May 7 16:06:11 2012
@@ -55,7 +55,7 @@ import org.apache.http.protocol.Executio
*
* @since 4.0
*
- * @deprecated use {@link DefaultRedirectStrategy}.
+ * @deprecated (4.1) use {@link DefaultRedirectStrategy}.
*/
@Immutable
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java Mon May 7 16:06:11 2012
@@ -41,16 +41,14 @@ import org.apache.http.client.methods.Ht
import org.apache.http.protocol.HttpContext;
/**
- * @since 4.1
+ * @deprecated (4.1) do not use
*/
-@SuppressWarnings("deprecation")
@Immutable
-@Deprecated
+@Deprecated
class DefaultRedirectStrategyAdaptor implements RedirectStrategy {
private final RedirectHandler handler;
- @Deprecated
public DefaultRedirectStrategyAdaptor(final RedirectHandler handler) {
super();
this.handler = handler;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java Mon May 7 16:06:11 2012
@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpCont
*
* @since 4.0
*
- * @deprecated use {@link TargetAuthenticationStrategy}
+ * @deprecated (4.2) use {@link TargetAuthenticationStrategy}
*/
@Deprecated
@Immutable
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java Mon May 7 16:06:11 2012
@@ -89,7 +89,7 @@ public class EntityEnclosingRequestWrapp
super(entity);
}
- @Deprecated
+ @SuppressWarnings("deprecation")
@Override
public void consumeContent() throws IOException {
consumed = true;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java Mon May 7 16:06:11 2012
@@ -67,7 +67,7 @@ import org.apache.http.protocol.HttpCont
*
* @since 4.0
*
- * @deprecated do not use
+ * @deprecated (4.2) do not use
*/
@Deprecated
@NotThreadSafe
@@ -126,9 +126,8 @@ public abstract class AbstractClientConn
}
/**
- * @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");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java Mon May 7 16:06:11 2012
@@ -53,7 +53,7 @@ import org.apache.http.conn.OperatedClie
*
* @since 4.0
*
- * @deprecated do not use
+ * @deprecated (4.2) do not use
*/
@Deprecated
public abstract class AbstractPoolEntry {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java Mon May 7 16:06:11 2012
@@ -47,7 +47,7 @@ import org.apache.http.conn.OperatedClie
*
* @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 AbstractPooledConn
* 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 AbstractPooledConn
}
/**
- * @deprecated use {@link #assertValid(AbstractPoolEntry)}
+ * @deprecated (4.1) use {@link #assertValid(AbstractPoolEntry)}
*/
- @Deprecated
protected final void assertAttached() {
if (poolEntry == null) {
throw new ConnectionShutdownException();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java Mon May 7 16:06:11 2012
@@ -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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java Mon May 7 16:06:11 2012
@@ -58,10 +58,10 @@ import org.apache.http.params.HttpParams
*
* @since 4.0
*
- * @deprecated use {@link BasicClientConnectionManager}
+ * @deprecated (4.2) use {@link BasicClientConnectionManager}
*/
@ThreadSafe
-@Deprecated
+@Deprecated
public class SingleClientConnManager implements ClientConnectionManager {
private final Log log = LogFactory.getLog(getClass());
@@ -105,9 +105,8 @@ public class SingleClientConnManager imp
* @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 imp
}
}
- /**
- * @deprecated no longer used
- */
- @Deprecated
protected void revokeConnection() {
ConnAdapter conn = managedConn;
if (conn == null)
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java Mon May 7 16:06:11 2012
@@ -141,7 +141,10 @@ public class Wire {
input(new byte[] {(byte) b});
}
- @Deprecated
+ /**
+ * @deprecated (4.1) do not use
+ */
+ @Deprecated
public void output(final String s)
throws IOException {
if (s == null) {
@@ -150,7 +153,10 @@ public class Wire {
output(s.getBytes());
}
- @Deprecated
+ /**
+ * @deprecated (4.1) do not use
+ */
+ @Deprecated
public void input(final String s)
throws IOException {
if (s == null) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java Mon May 7 16:06:11 2012
@@ -54,9 +54,8 @@ import org.apache.http.impl.conn.IdleCon
*
* @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 {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java Mon May 7 16:06:11 2012
@@ -39,7 +39,7 @@ import org.apache.http.impl.conn.Abstrac
*
* @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 Abst
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 Abst
return super.route;
}
- @Deprecated
protected final BasicPoolEntryRef getWeakRef() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java Mon May 7 16:06:11 2012
@@ -38,9 +38,9 @@ import org.apache.http.conn.routing.Http
*
* @since 4.0
*
- * @deprecated do not use
+ * @deprecated (4.2) do not use
*/
-@Deprecated
+@Deprecated
public class BasicPoolEntryRef extends WeakReference<BasicPoolEntry> {
/** The planned route of the entry. */
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java Mon May 7 16:06:11 2012
@@ -37,9 +37,9 @@ import org.apache.http.impl.conn.Abstrac
*
* @since 4.0
*
- * @deprecated do not use
+ * @deprecated (4.2) do not use
*/
-@Deprecated
+@Deprecated
public class BasicPooledConnAdapter extends AbstractPooledConnAdapter {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=1335088&r1=1335087&r2=1335088&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Mon May 7 16:06:11 2012
@@ -63,9 +63,9 @@ 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
+@Deprecated
public class ConnPoolByRoute extends AbstractConnPool {
private final Log log = LogFactory.getLog(getClass());
@@ -147,9 +147,8 @@ public class ConnPoolByRoute extends Abs
/**
* 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),