[httpcomponents-client] 04/10: Update httpcore-ThreadSafe.patch
Markus Koschany
apo at moszumanska.debian.org
Thu Jul 14 21:27:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository httpcomponents-client.
commit 185a311e6ac6b1c74fb64e807bdae912111d9d8b
Author: Markus Koschany <apo at debian.org>
Date: Thu Jul 14 23:01:36 2016 +0200
Update httpcore-ThreadSafe.patch
---
debian/patches/httpcore-ThreadSafe.patch | 1456 +++++++++++++++++++++++++++++-
1 file changed, 1444 insertions(+), 12 deletions(-)
diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
index 297e499..4a3b2b7 100644
--- a/debian/patches/httpcore-ThreadSafe.patch
+++ b/debian/patches/httpcore-ThreadSafe.patch
@@ -3,9 +3,14 @@ Date: Thu, 14 Jul 2016 22:55:45 +0200
Subject: httpcore ThreadSafe
---
+ debian/patches/httpcore-ThreadSafe.patch | 1 -
+ .../client/fluent/InternalEntityEnclosingHttpRequest.java | 2 --
+ .../org/apache/http/client/fluent/InternalHttpRequest.java | 2 --
.../org/apache/http/impl/client/cache/CachingHttpClient.java | 5 +++--
.../java/org/apache/http/client/cache/HeaderConstants.java | 5 +++--
+ .../java/org/apache/http/client/cache/HttpCacheContext.java | 2 --
.../java/org/apache/http/client/cache/HttpCacheEntry.java | 5 +++--
+ .../main/java/org/apache/http/client/cache/InputLimit.java | 2 --
.../apache/http/impl/client/cache/BasicHttpCacheStorage.java | 5 +++--
.../org/apache/http/impl/client/cache/BasicIdGenerator.java | 5 +++--
.../java/org/apache/http/impl/client/cache/CacheEntity.java | 5 +++--
@@ -18,6 +23,7 @@ Subject: httpcore ThreadSafe
.../impl/client/cache/CachedResponseSuitabilityChecker.java | 5 +++--
.../java/org/apache/http/impl/client/cache/CachingExec.java | 5 +++--
.../org/apache/http/impl/client/cache/CachingHttpClients.java | 5 +++--
+ .../org/apache/http/impl/client/cache/CombinedEntity.java | 2 --
.../http/impl/client/cache/ConditionalRequestBuilder.java | 5 +++--
.../apache/http/impl/client/cache/DefaultFailureCache.java | 5 +++--
.../impl/client/cache/DefaultHttpCacheEntrySerializer.java | 5 +++--
@@ -31,52 +37,70 @@ Subject: httpcore ThreadSafe
.../http/impl/client/cache/ImmediateSchedulingStrategy.java | 5 +++--
.../http/impl/client/cache/ManagedHttpCacheStorage.java | 5 +++--
.../apache/http/impl/client/cache/OptionsHttp11Response.java | 5 +++--
+ .../main/java/org/apache/http/impl/client/cache/Proxies.java | 2 --
.../http/impl/client/cache/RequestProtocolCompliance.java | 5 +++--
.../org/apache/http/impl/client/cache/ResourceReference.java | 5 +++--
.../apache/http/impl/client/cache/ResponseCachingPolicy.java | 5 +++--
.../http/impl/client/cache/ResponseProtocolCompliance.java | 5 +++--
+ .../apache/http/impl/client/cache/ResponseProxyHandler.java | 2 --
+ .../http/impl/client/cache/SizeLimitedResponseReader.java | 2 --
.../apache/http/impl/auth/win/CurrentWindowsCredentials.java | 5 +++--
.../apache/http/impl/auth/win/WindowsCredentialsProvider.java | 5 +++--
.../apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java | 5 +++--
+ .../org/apache/http/impl/auth/win/WindowsNegotiateScheme.java | 2 --
.../http/impl/auth/win/WindowsNegotiateSchemeFactory.java | 5 +++--
.../org/apache/http/auth/params/AuthParams.java | 5 +++--
.../org/apache/http/client/params/AuthPolicy.java | 5 +++--
+ .../org/apache/http/client/params/ClientParamBean.java | 2 --
.../org/apache/http/client/params/CookiePolicy.java | 5 +++--
.../org/apache/http/client/params/HttpClientParams.java | 5 +++--
+ .../apache/http/client/protocol/ClientContextConfigurer.java | 2 --
.../http/client/protocol/RequestProxyAuthentication.java | 5 +++--
.../http/client/protocol/RequestTargetAuthentication.java | 5 +++--
.../org/apache/http/client/protocol/ResponseAuthCache.java | 5 +++--
.../java-deprecated/org/apache/http/client/utils/JdkIdn.java | 5 +++--
.../org/apache/http/client/utils/Punycode.java | 5 +++--
.../org/apache/http/client/utils/Rfc3492Idn.java | 5 +++--
+ .../org/apache/http/conn/BasicEofSensorWatcher.java | 2 --
+ .../org/apache/http/conn/BasicManagedEntity.java | 2 --
.../org/apache/http/conn/MultihomePlainSocketFactory.java | 5 +++--
+ .../org/apache/http/conn/params/ConnManagerParamBean.java | 2 --
.../org/apache/http/conn/params/ConnManagerParams.java | 5 +++--
.../org/apache/http/conn/params/ConnPerRouteBean.java | 5 +++--
+ .../org/apache/http/conn/params/ConnRouteParamBean.java | 2 --
.../org/apache/http/conn/params/ConnRouteParams.java | 5 +++--
.../org/apache/http/conn/scheme/PlainSocketFactory.java | 5 +++--
+ .../org/apache/http/conn/ssl/SSLContextBuilder.java | 2 --
.../java-deprecated/org/apache/http/conn/ssl/SSLContexts.java | 5 +++--
.../org/apache/http/conn/ssl/SSLSocketFactory.java | 5 +++--
+ .../org/apache/http/cookie/params/CookieSpecParamBean.java | 2 --
.../http/impl/client/AbstractAuthenticationHandler.java | 5 +++--
.../org/apache/http/impl/client/AbstractHttpClient.java | 5 +++--
.../http/impl/client/AuthenticationStrategyAdaptor.java | 5 +++--
.../org/apache/http/impl/client/AutoRetryHttpClient.java | 5 +++--
+ .../org/apache/http/impl/client/ClientParamsStack.java | 2 --
+ .../apache/http/impl/client/CloseableHttpResponseProxy.java | 2 --
.../apache/http/impl/client/ContentEncodingHttpClient.java | 5 +++--
.../org/apache/http/impl/client/DefaultHttpClient.java | 5 +++--
.../http/impl/client/DefaultProxyAuthenticationHandler.java | 5 +++--
.../org/apache/http/impl/client/DefaultRedirectHandler.java | 5 +++--
.../http/impl/client/DefaultRedirectStrategyAdaptor.java | 5 +++--
+ .../org/apache/http/impl/client/DefaultRequestDirector.java | 2 --
.../http/impl/client/DefaultTargetAuthenticationHandler.java | 5 +++--
- .../org/apache/http/impl/client/RoutedRequest.java | 2 +-
+ .../org/apache/http/impl/client/RoutedRequest.java | 5 +----
.../org/apache/http/impl/client/SystemDefaultHttpClient.java | 5 +++--
.../org/apache/http/impl/client/TunnelRefusedException.java | 5 +++--
+ .../org/apache/http/impl/conn/AbstractClientConnAdapter.java | 2 --
.../apache/http/impl/conn/BasicClientConnectionManager.java | 5 +++--
+ .../org/apache/http/impl/conn/DefaultClientConnection.java | 2 --
.../http/impl/conn/DefaultClientConnectionOperator.java | 7 ++++---
.../org/apache/http/impl/conn/DefaultHttpRoutePlanner.java | 7 ++++---
.../org/apache/http/impl/conn/DefaultResponseParser.java | 5 +++--
.../org/apache/http/impl/conn/LoggingSessionInputBuffer.java | 5 +++--
.../org/apache/http/impl/conn/LoggingSessionOutputBuffer.java | 5 +++--
+ .../apache/http/impl/conn/ManagedClientConnectionImpl.java | 2 --
.../apache/http/impl/conn/PoolingClientConnectionManager.java | 5 +++--
- .../org/apache/http/impl/conn/ProxySelectorRoutePlanner.java | 2 +-
+ .../org/apache/http/impl/conn/ProxySelectorRoutePlanner.java | 4 +---
.../org/apache/http/impl/conn/SchemeRegistryFactory.java | 5 +++--
.../org/apache/http/impl/conn/SingleClientConnManager.java | 5 +++--
.../org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java | 2 +-
@@ -97,6 +121,7 @@ Subject: httpcore ThreadSafe
httpclient/src/main/java/org/apache/http/auth/AuthOption.java | 5 +++--
.../main/java/org/apache/http/auth/AuthSchemeRegistry.java | 5 +++--
httpclient/src/main/java/org/apache/http/auth/AuthScope.java | 5 +++--
+ httpclient/src/main/java/org/apache/http/auth/AuthState.java | 2 --
.../java/org/apache/http/auth/AuthenticationException.java | 5 +++--
.../main/java/org/apache/http/auth/BasicUserPrincipal.java | 5 +++--
.../org/apache/http/auth/InvalidCredentialsException.java | 5 +++--
@@ -113,6 +138,22 @@ Subject: httpcore ThreadSafe
.../main/java/org/apache/http/client/config/AuthSchemes.java | 5 +++--
.../main/java/org/apache/http/client/config/CookieSpecs.java | 5 +++--
.../java/org/apache/http/client/config/RequestConfig.java | 5 +++--
+ .../java/org/apache/http/client/entity/EntityBuilder.java | 2 --
+ .../http/client/entity/LazyDecompressingInputStream.java | 2 --
+ .../org/apache/http/client/entity/UrlEncodedFormEntity.java | 2 --
+ .../main/java/org/apache/http/client/methods/HttpDelete.java | 2 --
+ .../http/client/methods/HttpEntityEnclosingRequestBase.java | 2 --
+ .../src/main/java/org/apache/http/client/methods/HttpGet.java | 2 --
+ .../main/java/org/apache/http/client/methods/HttpHead.java | 2 --
+ .../main/java/org/apache/http/client/methods/HttpOptions.java | 2 --
+ .../main/java/org/apache/http/client/methods/HttpPatch.java | 2 --
+ .../main/java/org/apache/http/client/methods/HttpPost.java | 2 --
+ .../src/main/java/org/apache/http/client/methods/HttpPut.java | 2 --
+ .../java/org/apache/http/client/methods/HttpRequestBase.java | 2 --
+ .../org/apache/http/client/methods/HttpRequestWrapper.java | 2 --
+ .../main/java/org/apache/http/client/methods/HttpTrace.java | 2 --
+ .../java/org/apache/http/client/methods/RequestBuilder.java | 2 --
+ .../org/apache/http/client/protocol/HttpClientContext.java | 2 --
.../apache/http/client/protocol/RequestAcceptEncoding.java | 5 +++--
.../org/apache/http/client/protocol/RequestAddCookies.java | 5 +++--
.../org/apache/http/client/protocol/RequestAuthCache.java | 5 +++--
@@ -123,14 +164,17 @@ Subject: httpcore ThreadSafe
.../apache/http/client/protocol/ResponseProcessCookies.java | 5 +++--
.../main/java/org/apache/http/client/utils/CloneUtils.java | 5 +++--
.../src/main/java/org/apache/http/client/utils/DateUtils.java | 5 +++--
+ .../main/java/org/apache/http/client/utils/URIBuilder.java | 2 --
.../src/main/java/org/apache/http/client/utils/URIUtils.java | 5 +++--
.../java/org/apache/http/client/utils/URLEncodedUtils.java | 5 +++--
.../java/org/apache/http/conn/ConnectTimeoutException.java | 5 +++--
.../org/apache/http/conn/ConnectionPoolTimeoutException.java | 5 +++--
+ .../main/java/org/apache/http/conn/EofSensorInputStream.java | 2 --
.../java/org/apache/http/conn/HttpHostConnectException.java | 5 +++--
.../java/org/apache/http/conn/UnsupportedSchemeException.java | 5 +++--
.../java/org/apache/http/conn/routing/BasicRouteDirector.java | 5 +++--
.../src/main/java/org/apache/http/conn/routing/HttpRoute.java | 5 +++--
+ .../main/java/org/apache/http/conn/routing/RouteTracker.java | 2 --
.../src/main/java/org/apache/http/conn/scheme/Scheme.java | 5 +++--
.../main/java/org/apache/http/conn/scheme/SchemeRegistry.java | 5 +++--
.../apache/http/conn/socket/PlainConnectionSocketFactory.java | 5 +++--
@@ -152,11 +196,20 @@ Subject: httpcore ThreadSafe
.../http/cookie/CookieRestrictionViolationException.java | 5 +++--
.../main/java/org/apache/http/cookie/CookieSpecRegistry.java | 5 +++--
.../java/org/apache/http/cookie/MalformedCookieException.java | 5 +++--
+ .../main/java/org/apache/http/impl/auth/AuthSchemeBase.java | 2 --
+ .../src/main/java/org/apache/http/impl/auth/BasicScheme.java | 2 --
.../java/org/apache/http/impl/auth/BasicSchemeFactory.java | 5 +++--
+ .../src/main/java/org/apache/http/impl/auth/DigestScheme.java | 2 --
.../java/org/apache/http/impl/auth/DigestSchemeFactory.java | 5 +++--
+ .../main/java/org/apache/http/impl/auth/GGSSchemeBase.java | 2 --
+ .../main/java/org/apache/http/impl/auth/KerberosScheme.java | 2 --
.../java/org/apache/http/impl/auth/KerberosSchemeFactory.java | 5 +++--
.../java/org/apache/http/impl/auth/NTLMEngineException.java | 5 +++--
+ .../main/java/org/apache/http/impl/auth/NTLMEngineImpl.java | 2 --
+ .../src/main/java/org/apache/http/impl/auth/NTLMScheme.java | 2 --
.../java/org/apache/http/impl/auth/NTLMSchemeFactory.java | 5 +++--
+ .../main/java/org/apache/http/impl/auth/RFC2617Scheme.java | 2 --
+ .../src/main/java/org/apache/http/impl/auth/SPNegoScheme.java | 2 --
.../java/org/apache/http/impl/auth/SPNegoSchemeFactory.java | 5 +++--
.../http/impl/auth/UnsupportedDigestAlgorithmException.java | 5 +++--
.../org/apache/http/impl/client/AbstractResponseHandler.java | 5 +++--
@@ -171,31 +224,43 @@ Subject: httpcore ThreadSafe
.../org/apache/http/impl/client/DefaultRedirectStrategy.java | 5 +++--
.../impl/client/DefaultServiceUnavailableRetryStrategy.java | 5 +++--
.../org/apache/http/impl/client/DefaultUserTokenHandler.java | 5 +++--
+ .../http/impl/client/EntityEnclosingRequestWrapper.java | 2 --
.../http/impl/client/FutureRequestExecutionService.java | 5 +++--
+ .../java/org/apache/http/impl/client/HttpClientBuilder.java | 2 --
.../main/java/org/apache/http/impl/client/HttpClients.java | 5 +++--
.../java/org/apache/http/impl/client/InternalHttpClient.java | 5 +++--
.../java/org/apache/http/impl/client/LaxRedirectStrategy.java | 5 +++--
.../java/org/apache/http/impl/client/MinimalHttpClient.java | 5 +++--
.../org/apache/http/impl/client/NoopUserTokenHandler.java | 5 +++--
.../apache/http/impl/client/ProxyAuthenticationStrategy.java | 5 +++--
+ .../java/org/apache/http/impl/client/RedirectLocations.java | 2 --
+ .../main/java/org/apache/http/impl/client/RequestWrapper.java | 2 --
.../http/impl/client/StandardHttpRequestRetryHandler.java | 5 +++--
.../http/impl/client/SystemDefaultCredentialsProvider.java | 5 +++--
.../apache/http/impl/client/TargetAuthenticationStrategy.java | 5 +++--
.../http/impl/conn/BasicHttpClientConnectionManager.java | 5 +++--
httpclient/src/main/java/org/apache/http/impl/conn/CPool.java | 5 +++--
.../src/main/java/org/apache/http/impl/conn/CPoolEntry.java | 5 +++--
+ .../src/main/java/org/apache/http/impl/conn/CPoolProxy.java | 2 --
.../apache/http/impl/conn/ConnectionShutdownException.java | 5 +++--
.../http/impl/conn/DefaultHttpClientConnectionOperator.java | 5 +++--
+ .../org/apache/http/impl/conn/DefaultHttpResponseParser.java | 2 --
.../http/impl/conn/DefaultHttpResponseParserFactory.java | 5 +++--
+ .../http/impl/conn/DefaultManagedHttpClientConnection.java | 2 --
.../org/apache/http/impl/conn/DefaultProxyRoutePlanner.java | 5 +++--
.../java/org/apache/http/impl/conn/DefaultRoutePlanner.java | 5 +++--
.../org/apache/http/impl/conn/DefaultSchemePortResolver.java | 5 +++--
+ .../java/org/apache/http/impl/conn/LoggingInputStream.java | 2 --
+ .../http/impl/conn/LoggingManagedHttpClientConnection.java | 2 --
+ .../java/org/apache/http/impl/conn/LoggingOutputStream.java | 2 --
.../http/impl/conn/ManagedHttpClientConnectionFactory.java | 5 +++--
.../http/impl/conn/PoolingHttpClientConnectionManager.java | 5 +++--
.../org/apache/http/impl/conn/SystemDefaultRoutePlanner.java | 5 +++--
httpclient/src/main/java/org/apache/http/impl/conn/Wire.java | 5 +++--
.../http/impl/cookie/AbstractCookieAttributeHandler.java | 5 +++--
.../java/org/apache/http/impl/cookie/AbstractCookieSpec.java | 5 +++--
+ .../java/org/apache/http/impl/cookie/BasicClientCookie.java | 2 --
+ .../java/org/apache/http/impl/cookie/BasicClientCookie2.java | 2 --
.../java/org/apache/http/impl/cookie/BasicCommentHandler.java | 5 +++--
.../java/org/apache/http/impl/cookie/BasicDomainHandler.java | 5 +++--
.../java/org/apache/http/impl/cookie/BasicExpiresHandler.java | 5 +++--
@@ -231,16 +296,66 @@ Subject: httpcore ThreadSafe
.../java/org/apache/http/impl/cookie/RFC6265StrictSpec.java | 5 +++--
.../org/apache/http/impl/execchain/BackoffStrategyExec.java | 5 +++--
.../java/org/apache/http/impl/execchain/ConnectionHolder.java | 5 +++--
+ .../org/apache/http/impl/execchain/HttpResponseProxy.java | 2 --
.../java/org/apache/http/impl/execchain/MainClientExec.java | 5 +++--
.../org/apache/http/impl/execchain/MinimalClientExec.java | 5 +++--
.../java/org/apache/http/impl/execchain/ProtocolExec.java | 5 +++--
.../java/org/apache/http/impl/execchain/RedirectExec.java | 5 +++--
.../apache/http/impl/execchain/RequestAbortedException.java | 5 +++--
+ .../org/apache/http/impl/execchain/RequestEntityProxy.java | 2 --
+ .../org/apache/http/impl/execchain/ResponseEntityProxy.java | 2 --
.../main/java/org/apache/http/impl/execchain/RetryExec.java | 5 +++--
.../http/impl/execchain/ServiceUnavailableRetryExec.java | 5 +++--
.../apache/http/impl/execchain/TunnelRefusedException.java | 5 +++--
- 236 files changed, 707 insertions(+), 474 deletions(-)
+ 304 files changed, 707 insertions(+), 614 deletions(-)
+diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
+index 297e499..9eee152 100644
+--- a/debian/patches/httpcore-ThreadSafe.patch
++++ b/debian/patches/httpcore-ThreadSafe.patch
+@@ -1679,7 +1679,6 @@ index 43a0a80..bde608a 100644
+ @@ -42,7 +42,7 @@ import org.apache.http.conn.routing.HttpRoute;
+ public class RoutedRequest {
+
+- protected final RequestWrapper request; // @NotThreadSafe
+ - protected final HttpRoute route; // @Immutable
+ + protected final HttpRoute route; // @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
+
+diff --git a/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java b/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java
+index 6e0b4d6..a7972b8 100644
+--- a/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java
++++ b/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java
+@@ -32,10 +32,8 @@ import java.net.URI;
+ import org.apache.http.Header;
+ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpEntityEnclosingRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.protocol.HTTP;
+
+- at NotThreadSafe
+ class InternalEntityEnclosingHttpRequest extends InternalHttpRequest implements HttpEntityEnclosingRequest {
+
+ private HttpEntity entity;
+diff --git a/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java b/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java
+index 8d45954..0dccb31 100644
+--- a/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java
++++ b/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java
+@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.AtomicReference;
+ import org.apache.http.HttpVersion;
+ import org.apache.http.ProtocolVersion;
+ import org.apache.http.RequestLine;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.config.RequestConfig;
+ import org.apache.http.client.methods.Configurable;
+ import org.apache.http.client.methods.HttpExecutionAware;
+@@ -44,7 +43,6 @@ import org.apache.http.message.AbstractHttpMessage;
+ import org.apache.http.message.BasicRequestLine;
+ import org.apache.http.util.Args;
+
+- at NotThreadSafe
+ class InternalHttpRequest extends AbstractHttpMessage
+ implements HttpUriRequest, HttpExecutionAware, Configurable {
+
diff --git a/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java b/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
index a54ff19..30383ba 100644
--- a/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
@@ -285,6 +400,26 @@ index 0a25f24..f6e30e5 100644
public class HeaderConstants {
public static final String GET_METHOD = "GET";
+diff --git a/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java b/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java
+index 6c8af1d..f1a0d19 100644
+--- a/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java
++++ b/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java
+@@ -26,7 +26,6 @@
+ */
+ package org.apache.http.client.cache;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.protocol.HttpClientContext;
+ import org.apache.http.protocol.BasicHttpContext;
+ import org.apache.http.protocol.HttpContext;
+@@ -34,7 +33,6 @@ import org.apache.http.protocol.HttpContext;
+ /**
+ * @since 4.3
+ */
+- at NotThreadSafe
+ public class HttpCacheContext extends HttpClientContext {
+
+ /**
diff --git a/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java b/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java
index d8bf81b..8ab31d1 100644
--- a/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java
@@ -308,6 +443,26 @@ index d8bf81b..8ab31d1 100644
public class HttpCacheEntry implements Serializable {
private static final long serialVersionUID = -6300496422359477413L;
+diff --git a/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java b/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java
+index dd96eeb..40cf2b7 100644
+--- a/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java
++++ b/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java
+@@ -26,7 +26,6 @@
+ */
+ package org.apache.http.client.cache;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * Used to limiting the size of an incoming response body of
+@@ -34,7 +33,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ * of caching it.
+ * @since 4.1
+ */
+- at NotThreadSafe // reached
+ public class InputLimit {
+
+ private final long value;
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java
index 76a525c..74109a4 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java
@@ -578,6 +733,23 @@ index 35beb6d..9e8a4a5 100644
public class CachingHttpClients {
private CachingHttpClients() {
+diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java
+index a4cd65c..c665339 100644
+--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java
++++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java
+@@ -32,12 +32,10 @@ import java.io.InputStream;
+ import java.io.OutputStream;
+ import java.io.SequenceInputStream;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.cache.Resource;
+ import org.apache.http.entity.AbstractHttpEntity;
+ import org.apache.http.util.Args;
+
+- at NotThreadSafe
+ class CombinedEntity extends AbstractHttpEntity {
+
+ private final Resource resource;
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java
index 0f4bd09..50cafd7 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java
@@ -870,6 +1042,26 @@ index 2245360..7f8e131 100644
final class OptionsHttp11Response extends AbstractHttpMessage implements HttpResponse {
private final StatusLine statusLine = new BasicStatusLine(HttpVersion.HTTP_1_1,
+diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java
+index c86a039..c17521b 100644
+--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java
++++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java
+@@ -29,7 +29,6 @@ package org.apache.http.impl.client.cache;
+ import java.lang.reflect.Proxy;
+
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.methods.CloseableHttpResponse;
+ import org.apache.http.util.Args;
+
+@@ -38,7 +37,6 @@ import org.apache.http.util.Args;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ class Proxies {
+
+ public static CloseableHttpResponse enhanceResponse(final HttpResponse original) {
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java
index c74a607..af735e8 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java
@@ -959,6 +1151,46 @@ index bde392d..9e89ea2 100644
class ResponseProtocolCompliance {
private static final String UNEXPECTED_100_CONTINUE = "The incoming request did not contain a "
+diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java
+index 26f3c9d..5b491c3 100644
+--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java
++++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java
+@@ -34,7 +34,6 @@ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * A proxy class that can enhance an arbitrary {@link HttpResponse} with
+@@ -42,7 +41,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ class ResponseProxyHandler implements InvocationHandler {
+
+ private static final Method CLOSE_METHOD;
+diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java
+index 4cb520a..f02e608 100644
+--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java
++++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java
+@@ -33,7 +33,6 @@ import java.lang.reflect.Proxy;
+ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.cache.InputLimit;
+ import org.apache.http.client.cache.Resource;
+ import org.apache.http.client.cache.ResourceFactory;
+@@ -43,7 +42,6 @@ import org.apache.http.message.BasicHttpResponse;
+ /**
+ * @since 4.1
+ */
+- at NotThreadSafe
+ class SizeLimitedResponseReader {
+
+ private final ResourceFactory resourceFactory;
diff --git a/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java b/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java
index 8174992..5021e51 100644
--- a/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java
@@ -1028,6 +1260,26 @@ index 21bed64..0f703ef 100644
public class WindowsNTLMSchemeFactory implements AuthSchemeProvider {
private final String servicePrincipalName;
+diff --git a/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java b/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
+index 3b0223f..7e8b866 100644
+--- a/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
++++ b/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
+@@ -32,7 +32,6 @@ import org.apache.commons.logging.LogFactory;
+ import org.apache.http.Header;
+ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AUTH;
+ import org.apache.http.auth.AuthenticationException;
+ import org.apache.http.auth.Credentials;
+@@ -67,7 +66,6 @@ import com.sun.jna.ptr.IntByReference;
+ *
+ * @since 4.4
+ */
+- at NotThreadSafe
+ public class WindowsNegotiateScheme extends AuthSchemeBase {
+
+ private final Log log = LogFactory.getLog(getClass());
diff --git a/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java b/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java
index 29e5ffd..e0f793e 100644
--- a/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java
@@ -1097,6 +1349,26 @@ index 768ddf9..b8ce0a4 100644
public final class AuthPolicy {
private AuthPolicy() {
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java b/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java
+index 99ba851..7a84c77 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java
+@@ -31,7 +31,6 @@ import java.util.Collection;
+
+ import org.apache.http.Header;
+ import org.apache.http.HttpHost;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.params.HttpAbstractParamBean;
+ import org.apache.http.params.HttpParams;
+
+@@ -45,7 +44,6 @@ import org.apache.http.params.HttpParams;
+ * @deprecated (4.3) use {@link org.apache.http.client.config.RequestConfig}.
+ */
+ @Deprecated
+- at NotThreadSafe
+ public class ClientParamBean extends HttpAbstractParamBean {
+
+ public ClientParamBean (final HttpParams params) {
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java b/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java
index e12ab42..4672c3d 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java
@@ -1143,6 +1415,26 @@ index c27cb7f..6953958 100644
public class HttpClientParams {
private HttpClientParams() {
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java b/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java
+index 39645ec..6476a6b 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java
+@@ -27,7 +27,6 @@
+
+ package org.apache.http.client.protocol;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AuthSchemeRegistry;
+ import org.apache.http.client.CookieStore;
+ import org.apache.http.client.CredentialsProvider;
+@@ -42,7 +41,6 @@ import org.apache.http.util.Args;
+ *
+ * @deprecated (4.3) use {@link HttpClientContext}
+ */
+- at NotThreadSafe
+ @Deprecated
+ public class ClientContextConfigurer implements ClientContext {
+
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java b/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java
index b5ef5ad..6906547 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java
@@ -1281,6 +1573,46 @@ index 29dabc4..c415e40 100644
@Deprecated
public class Rfc3492Idn implements Idn {
private static final int base = 36;
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java
+index 9fa2c33..6b64f37 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java
+@@ -29,7 +29,6 @@ package org.apache.http.conn;
+ import java.io.IOException;
+ import java.io.InputStream;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.util.Args;
+
+ /**
+@@ -41,7 +40,6 @@ import org.apache.http.util.Args;
+ * @deprecated (4.3) do not use.
+ */
+ @Deprecated
+- at NotThreadSafe
+ public class BasicEofSensorWatcher implements EofSensorWatcher {
+
+ /** The connection to auto-release. */
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java
+index 24dca91..93765e7 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java
+@@ -32,7 +32,6 @@ import java.io.OutputStream;
+ import java.net.SocketException;
+
+ import org.apache.http.HttpEntity;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.entity.HttpEntityWrapper;
+ import org.apache.http.util.Args;
+ import org.apache.http.util.EntityUtils;
+@@ -48,7 +47,6 @@ import org.apache.http.util.EntityUtils;
+ * @deprecated (4.3) do not use.
+ */
+ @Deprecated
+- at NotThreadSafe
+ public class BasicManagedEntity extends HttpEntityWrapper
+ implements ConnectionReleaseTrigger, EofSensorWatcher {
+
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java
index 7ce6e05..15efa24 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java
@@ -1304,6 +1636,26 @@ index 7ce6e05..15efa24 100644
public final class MultihomePlainSocketFactory implements SocketFactory {
/**
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java
+index 2dd56a0..d05d461 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java
+@@ -27,7 +27,6 @@
+
+ package org.apache.http.conn.params;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.params.HttpAbstractParamBean;
+ import org.apache.http.params.HttpParams;
+
+@@ -40,7 +39,6 @@ import org.apache.http.params.HttpParams;
+ *
+ * @deprecated (4.1) use configuration methods of the specific connection manager implementation.
+ */
+- at NotThreadSafe
+ @Deprecated
+ public class ConnManagerParamBean extends HttpAbstractParamBean {
+
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java
index 3c4ddfb..3088c78 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java
@@ -1350,6 +1702,26 @@ index 241424f..7fed2b6 100644
public final class ConnPerRouteBean implements ConnPerRoute {
/** The default maximum number of connections allowed per host */
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java
+index f574c71..e75c8c4 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java
+@@ -30,7 +30,6 @@ package org.apache.http.conn.params;
+ import java.net.InetAddress;
+
+ import org.apache.http.HttpHost;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.routing.HttpRoute;
+ import org.apache.http.params.HttpAbstractParamBean;
+ import org.apache.http.params.HttpParams;
+@@ -45,7 +44,6 @@ import org.apache.http.params.HttpParams;
+ * @deprecated (4.3) use {@link org.apache.http.client.config.RequestConfig}.
+ */
+ @Deprecated
+- at NotThreadSafe
+ public class ConnRouteParamBean extends HttpAbstractParamBean {
+
+ public ConnRouteParamBean (final HttpParams params) {
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java
index c4a9bc1..a366593 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java
@@ -1396,6 +1768,26 @@ index a6973b1..1ed3bc6 100644
@Deprecated
public class PlainSocketFactory implements SocketFactory, SchemeSocketFactory {
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java
+index c54db0c..d42f9cd 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java
+@@ -51,7 +51,6 @@ import javax.net.ssl.TrustManagerFactory;
+ import javax.net.ssl.X509KeyManager;
+ import javax.net.ssl.X509TrustManager;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * Builder for {@link SSLContext} instances.
+@@ -60,7 +59,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @deprecated (4.4) use {@link org.apache.http.ssl.SSLContextBuilder}.
+ */
+- at NotThreadSafe
+ @Deprecated
+ public class SSLContextBuilder {
+
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContexts.java b/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContexts.java
index 26ab3e5..80863c4 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContexts.java
@@ -1442,6 +1834,26 @@ index 37f539c..dc8deb7 100644
@Deprecated
public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeLayeredSocketFactory,
LayeredSchemeSocketFactory, LayeredSocketFactory {
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java b/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java
+index ea6a929..917c054 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java
+@@ -29,7 +29,6 @@ package org.apache.http.cookie.params;
+
+ import java.util.Collection;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.params.HttpAbstractParamBean;
+ import org.apache.http.params.HttpParams;
+
+@@ -44,7 +43,6 @@ import org.apache.http.params.HttpParams;
+ * org.apache.http.cookie.CookieSpecProvider}s.
+ */
+ @Deprecated
+- at NotThreadSafe
+ public class CookieSpecParamBean extends HttpAbstractParamBean {
+
+ public CookieSpecParamBean (final HttpParams params) {
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java
index c3af00d..eb7e10b 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java
@@ -1534,6 +1946,46 @@ index 272872a..4dafc07 100644
public class AutoRetryHttpClient implements HttpClient {
private final HttpClient backend;
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
+index 65f80d2..ea57a78 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
+@@ -27,7 +27,6 @@
+
+ package org.apache.http.impl.client;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.params.AbstractHttpParams;
+ import org.apache.http.params.HttpParams;
+ import org.apache.http.util.Args;
+@@ -69,7 +68,6 @@ import org.apache.http.util.Args;
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
+ */
+- at NotThreadSafe
+ @Deprecated
+ public class ClientParamsStack extends AbstractHttpParams {
+
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java
+index aa3fcec..649d359 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java
+@@ -36,7 +36,6 @@ import java.lang.reflect.Proxy;
+
+ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.methods.CloseableHttpResponse;
+ import org.apache.http.util.EntityUtils;
+
+@@ -44,7 +43,6 @@ import org.apache.http.util.EntityUtils;
+ * @since 4.3
+ */
+ @Deprecated
+- at NotThreadSafe
+ class CloseableHttpResponseProxy implements InvocationHandler {
+
+ private final static Constructor<?> CONSTRUCTOR;
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java
index 4f1bd33..ebb5037 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java
@@ -1649,6 +2101,26 @@ index d87090f..5b47c24 100644
@Deprecated
class DefaultRedirectStrategyAdaptor implements RedirectStrategy {
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
+index ed233b2..45cb998 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
+@@ -45,7 +45,6 @@ import org.apache.http.HttpResponse;
+ import org.apache.http.NoHttpResponseException;
+ import org.apache.http.ProtocolException;
+ import org.apache.http.ProtocolVersion;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AuthProtocolState;
+ import org.apache.http.auth.AuthScheme;
+ import org.apache.http.auth.AuthState;
+@@ -132,7 +131,6 @@ import org.apache.http.util.EntityUtils;
+ * @deprecated (4.3)
+ */
+ @Deprecated
+- at NotThreadSafe // e.g. managedConn
+ public class DefaultRequestDirector implements RequestDirector {
+
+ private final Log log;
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
index c47f9e0..aa9dffc 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
@@ -1673,13 +2145,25 @@ index c47f9e0..aa9dffc 100644
public DefaultTargetAuthenticationHandler() {
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java
-index 43a0a80..bde608a 100644
+index 43a0a80..02b83fb 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java
+++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java
-@@ -42,7 +42,7 @@ import org.apache.http.conn.routing.HttpRoute;
+@@ -27,7 +27,6 @@
+
+ package org.apache.http.impl.client;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.routing.HttpRoute;
+
+ /**
+@@ -38,11 +37,9 @@ import org.apache.http.conn.routing.HttpRoute;
+ * @deprecated (4.3) do not use.
+ */
+ @Deprecated
+- at NotThreadSafe // RequestWrapper is @NotThreadSafe
public class RoutedRequest {
- protected final RequestWrapper request; // @NotThreadSafe
+- protected final RequestWrapper request; // @NotThreadSafe
- protected final HttpRoute route; // @Immutable
+ protected final HttpRoute route; // @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
@@ -1731,6 +2215,26 @@ index 0a6f134..a2fb1d3 100644
public class TunnelRefusedException extends HttpException {
private static final long serialVersionUID = -8646722842745617323L;
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
+index 5a1827a..3f2a420 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
+@@ -40,7 +40,6 @@ import org.apache.http.HttpEntityEnclosingRequest;
+ import org.apache.http.HttpException;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.ClientConnectionManager;
+ import org.apache.http.conn.ManagedClientConnection;
+ import org.apache.http.conn.OperatedClientConnection;
+@@ -70,7 +69,6 @@ import org.apache.http.protocol.HttpContext;
+ * @deprecated (4.2) do not use
+ */
+ @Deprecated
+- at NotThreadSafe
+ public abstract class AbstractClientConnAdapter implements ManagedClientConnection, HttpContext {
+
+ /**
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
index 9e424a4..fd625d3 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
@@ -1754,6 +2258,26 @@ index 9e424a4..fd625d3 100644
@Deprecated
public class BasicClientConnectionManager implements ClientConnectionManager {
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
+index 5a29784..fcd31af 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
+@@ -44,7 +44,6 @@ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+ import org.apache.http.HttpResponseFactory;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.OperatedClientConnection;
+ import org.apache.http.conn.ManagedHttpClientConnection;
+ import org.apache.http.impl.SocketHttpClientConnection;
+@@ -64,7 +63,6 @@ import org.apache.http.util.Args;
+ *
+ * @deprecated (4.3) use {@link ManagedHttpClientConnectionFactory}.
+ */
+- at NotThreadSafe // connSecure, targetHost
+ @Deprecated
+ public class DefaultClientConnection extends SocketHttpClientConnection
+ implements OperatedClientConnection, ManagedHttpClientConnection, HttpContext {
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
index ee14079..0e2692f 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
@@ -1882,6 +2406,26 @@ index a4e9912..90a74f4 100644
@Deprecated
public class LoggingSessionOutputBuffer implements SessionOutputBuffer {
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
+index 7b5b70f..dea2e11 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
+@@ -41,7 +41,6 @@ import org.apache.http.HttpException;
+ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.ClientConnectionManager;
+ import org.apache.http.conn.ClientConnectionOperator;
+ import org.apache.http.conn.ManagedClientConnection;
+@@ -59,7 +58,6 @@ import org.apache.http.util.Asserts;
+ * @deprecated (4.3) use {@link ManagedHttpClientConnectionFactory}.
+ */
+ @Deprecated
+- at NotThreadSafe
+ class ManagedClientConnectionImpl implements ManagedClientConnection {
+
+ private final ClientConnectionManager manager;
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java
index a4e5f28..662b668 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java
@@ -1906,10 +2450,23 @@ index a4e5f28..662b668 100644
private final Log log = LogFactory.getLog(getClass());
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
-index 2fe96d1..bffbf3e 100644
+index 2fe96d1..be08daa 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
+++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
-@@ -76,7 +76,7 @@ import org.apache.http.util.Asserts;
+@@ -39,7 +39,6 @@ import java.util.List;
+ import org.apache.http.HttpException;
+ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.params.ConnRouteParams;
+ import org.apache.http.conn.routing.HttpRoute;
+ import org.apache.http.conn.routing.HttpRoutePlanner;
+@@ -71,12 +70,11 @@ import org.apache.http.util.Asserts;
+ *
+ * @deprecated (4.3) use {@link SystemDefaultRoutePlanner}
+ */
+- at NotThreadSafe // e.g [gs]etProxySelector()
+ @Deprecated
public class ProxySelectorRoutePlanner implements HttpRoutePlanner {
/** The scheme registry. */
@@ -2392,6 +2949,26 @@ index 5488540..c6f0753 100644
public class AuthScope {
/**
+diff --git a/httpclient/src/main/java/org/apache/http/auth/AuthState.java b/httpclient/src/main/java/org/apache/http/auth/AuthState.java
+index 9b932e7..64febf3 100644
+--- a/httpclient/src/main/java/org/apache/http/auth/AuthState.java
++++ b/httpclient/src/main/java/org/apache/http/auth/AuthState.java
+@@ -28,7 +28,6 @@ package org.apache.http.auth;
+
+ import java.util.Queue;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.util.Args;
+
+ /**
+@@ -36,7 +35,6 @@ import org.apache.http.util.Args;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class AuthState {
+
+ /** Actual state of authentication protocol */
diff --git a/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java b/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
index 8d8e34c..59d0fe2 100644
--- a/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
@@ -2750,11 +3327,328 @@ index 87f772f..637cfad 100644
* The default setting for stale connection checking changed
* to false, and the feature was deprecated starting with version 4.4.
*/
-- at Immutable
-+ at Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
- public class RequestConfig implements Cloneable {
+- at Immutable
++ at Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
+ public class RequestConfig implements Cloneable {
+
+ public static final RequestConfig DEFAULT = new Builder().build();
+diff --git a/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java b/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java
+index ce3dfe2..3c96678 100644
+--- a/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java
++++ b/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java
+@@ -35,7 +35,6 @@ import java.util.List;
+
+ import org.apache.http.HttpEntity;
+ import org.apache.http.NameValuePair;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.entity.AbstractHttpEntity;
+ import org.apache.http.entity.BasicHttpEntity;
+ import org.apache.http.entity.ByteArrayEntity;
+@@ -63,7 +62,6 @@ import org.apache.http.entity.StringEntity;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ public class EntityBuilder {
+
+ private String text;
+diff --git a/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java b/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java
+index db95ce8..613f034 100644
+--- a/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java
++++ b/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java
+@@ -29,12 +29,10 @@ package org.apache.http.client.entity;
+ import java.io.IOException;
+ import java.io.InputStream;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * Lazy init InputStream wrapper.
+ */
+- at NotThreadSafe
+ class LazyDecompressingInputStream extends InputStream {
+
+ private final InputStream wrappedStream;
+diff --git a/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java b/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java
+index 80bf863..29b5be1 100644
+--- a/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java
++++ b/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java
+@@ -31,7 +31,6 @@ import java.nio.charset.Charset;
+ import java.util.List;
+
+ import org.apache.http.NameValuePair;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.utils.URLEncodedUtils;
+ import org.apache.http.entity.ContentType;
+ import org.apache.http.entity.StringEntity;
+@@ -43,7 +42,6 @@ import org.apache.http.protocol.HTTP;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe // AbstractHttpEntity is not thread-safe
+ public class UrlEncodedFormEntity extends StringEntity {
+
+ /**
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java
+index 9b078a3..c94af88 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java
+@@ -29,7 +29,6 @@ package org.apache.http.client.methods;
+
+ import java.net.URI;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * HTTP DELETE method
+@@ -46,7 +45,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe // HttpRequestBase is @NotThreadSafe
+ public class HttpDelete extends HttpRequestBase {
+
+ public final static String METHOD_NAME = "DELETE";
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java
+index 5efb828..4fdf006 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java
+@@ -30,7 +30,6 @@ package org.apache.http.client.methods;
+ import org.apache.http.Header;
+ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpEntityEnclosingRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.utils.CloneUtils;
+ import org.apache.http.protocol.HTTP;
+
+@@ -40,7 +39,6 @@ import org.apache.http.protocol.HTTP;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe // HttpRequestBase is @NotThreadSafe
+ public abstract class HttpEntityEnclosingRequestBase
+ extends HttpRequestBase implements HttpEntityEnclosingRequest {
+
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java
+index 35de2d3..a268322 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java
+@@ -29,7 +29,6 @@ package org.apache.http.client.methods;
+
+ import java.net.URI;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * HTTP GET method.
+@@ -47,7 +46,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class HttpGet extends HttpRequestBase {
+
+ public final static String METHOD_NAME = "GET";
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java
+index 4e4bd96..b7898cd 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java
+@@ -29,7 +29,6 @@ package org.apache.http.client.methods;
+
+ import java.net.URI;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * HTTP HEAD method.
+@@ -50,7 +49,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class HttpHead extends HttpRequestBase {
+
+ public final static String METHOD_NAME = "HEAD";
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java
+index 382edda..304ed4a 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java
+@@ -35,7 +35,6 @@ import org.apache.http.Header;
+ import org.apache.http.HeaderElement;
+ import org.apache.http.HeaderIterator;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.util.Args;
+
+ /**
+@@ -55,7 +54,6 @@ import org.apache.http.util.Args;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class HttpOptions extends HttpRequestBase {
+
+ public final static String METHOD_NAME = "OPTIONS";
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpPatch.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpPatch.java
+index 43153e4..d43188e 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpPatch.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpPatch.java
+@@ -29,7 +29,6 @@ package org.apache.http.client.methods;
+
+ import java.net.URI;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * HTTP PATCH method.
+@@ -50,7 +49,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.2
+ */
+- at NotThreadSafe
+ public class HttpPatch extends HttpEntityEnclosingRequestBase {
+
+ public final static String METHOD_NAME = "PATCH";
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java
+index 410092e..6407e3f 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java
+@@ -29,7 +29,6 @@ package org.apache.http.client.methods;
+
+ import java.net.URI;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * HTTP POST method.
+@@ -54,7 +53,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class HttpPost extends HttpEntityEnclosingRequestBase {
+
+ public final static String METHOD_NAME = "POST";
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java
+index ac0515a..2a061ad 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java
+@@ -29,7 +29,6 @@ package org.apache.http.client.methods;
+
+ import java.net.URI;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * HTTP PUT method.
+@@ -46,7 +45,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class HttpPut extends HttpEntityEnclosingRequestBase {
+
+ public final static String METHOD_NAME = "PUT";
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
+index f997c3c..e5c47d4 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
+@@ -31,7 +31,6 @@ import java.net.URI;
+
+ import org.apache.http.ProtocolVersion;
+ import org.apache.http.RequestLine;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.config.RequestConfig;
+ import org.apache.http.message.BasicRequestLine;
+ import org.apache.http.params.HttpProtocolParams;
+@@ -42,7 +41,6 @@ import org.apache.http.params.HttpProtocolParams;
+ * @since 4.0
+ */
+ @SuppressWarnings("deprecation")
+- at NotThreadSafe
+ public abstract class HttpRequestBase extends AbstractExecutionAwareRequest
+ implements HttpUriRequest, Configurable {
+
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
+index 3df8bbb..dbfbd0e 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
+@@ -36,7 +36,6 @@ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.ProtocolVersion;
+ import org.apache.http.RequestLine;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.message.AbstractHttpMessage;
+ import org.apache.http.message.BasicRequestLine;
+ import org.apache.http.params.HttpParams;
+@@ -50,7 +49,6 @@ import org.apache.http.util.Args;
+ * @since 4.3
+ */
+ @SuppressWarnings("deprecation")
+- at NotThreadSafe
+ public class HttpRequestWrapper extends AbstractHttpMessage implements HttpUriRequest {
+
+ private final HttpRequest original;
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java
+index c0bcc86..7a0d908 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java
+@@ -29,7 +29,6 @@ package org.apache.http.client.methods;
+
+ import java.net.URI;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * HTTP TRACE method.
+@@ -49,7 +48,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class HttpTrace extends HttpRequestBase {
+
+ public final static String METHOD_NAME = "TRACE";
+diff --git a/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java b/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java
+index f6cd681..b630dba 100644
+--- a/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java
++++ b/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java
+@@ -43,7 +43,6 @@ import org.apache.http.HttpEntityEnclosingRequest;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.NameValuePair;
+ import org.apache.http.ProtocolVersion;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.config.RequestConfig;
+ import org.apache.http.client.entity.UrlEncodedFormEntity;
+ import org.apache.http.client.utils.URIBuilder;
+@@ -67,7 +66,6 @@ import org.apache.http.util.Args;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ public class RequestBuilder {
+
+ private String method;
+diff --git a/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java b/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java
+index db363c4..e763e9a 100644
+--- a/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java
++++ b/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java
+@@ -30,7 +30,6 @@ package org.apache.http.client.protocol;
+ import java.net.URI;
+ import java.util.List;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AuthSchemeProvider;
+ import org.apache.http.auth.AuthState;
+ import org.apache.http.client.AuthCache;
+@@ -54,7 +53,6 @@ import org.apache.http.protocol.HttpCoreContext;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ public class HttpClientContext extends HttpCoreContext {
- public static final RequestConfig DEFAULT = new Builder().build();
+ /**
diff --git a/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java b/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java
index 9b260e2..69cc7ec 100644
--- a/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java
@@ -2984,6 +3878,26 @@ index a18fbd7..0abb464 100644
public final class DateUtils {
/**
+diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
+index 227e494..1cc54eb 100644
+--- a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
++++ b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
+@@ -35,7 +35,6 @@ import java.util.List;
+
+ import org.apache.http.Consts;
+ import org.apache.http.NameValuePair;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.util.InetAddressUtils;
+ import org.apache.http.message.BasicNameValuePair;
+
+@@ -44,7 +43,6 @@ import org.apache.http.message.BasicNameValuePair;
+ *
+ * @since 4.2
+ */
+- at NotThreadSafe
+ public class URIBuilder {
+
+ private String scheme;
diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java b/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
index 72c299e..e6b0f58 100644
--- a/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
@@ -3076,6 +3990,26 @@ index 3328cc4..0b6f319 100644
public class ConnectionPoolTimeoutException extends ConnectTimeoutException {
private static final long serialVersionUID = -7898874842020245128L;
+diff --git a/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java b/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
+index 3b81bd0..3e962a0 100644
+--- a/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
++++ b/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
+@@ -29,7 +29,6 @@ package org.apache.http.conn;
+ import java.io.IOException;
+ import java.io.InputStream;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.util.Args;
+
+ /**
+@@ -43,7 +42,6 @@ import org.apache.http.util.Args;
+ */
+ // don't use FilterInputStream as the base class, we'd have to
+ // override markSupported(), mark(), and reset() to disable them
+- at NotThreadSafe
+ public class EofSensorInputStream extends InputStream implements ConnectionReleaseTrigger {
+
+ /**
diff --git a/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java b/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
index fa88a45..a62fab0 100644
--- a/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
@@ -3167,6 +4101,26 @@ index 847fa7e..146e5ff 100644
public final class HttpRoute implements RouteInfo, Cloneable {
/** The target host to connect to. */
+diff --git a/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java b/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
+index e550799..b58aca6 100644
+--- a/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
++++ b/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
+@@ -30,7 +30,6 @@ package org.apache.http.conn.routing;
+ import java.net.InetAddress;
+
+ import org.apache.http.HttpHost;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.util.Args;
+ import org.apache.http.util.Asserts;
+ import org.apache.http.util.LangUtils;
+@@ -40,7 +39,6 @@ import org.apache.http.util.LangUtils;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public final class RouteTracker implements RouteInfo, Cloneable {
+
+ /** The target host to connect to. */
diff --git a/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java b/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
index 68d7aa9..68c260c 100644
--- a/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
@@ -3649,6 +4603,46 @@ index da70979..6c5076b 100644
public class MalformedCookieException extends ProtocolException {
private static final long serialVersionUID = -6695462944287282185L;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java b/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
+index 452516a..296b15c 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
+@@ -31,7 +31,6 @@ import java.util.Locale;
+ import org.apache.http.FormattedHeader;
+ import org.apache.http.Header;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AUTH;
+ import org.apache.http.auth.AuthenticationException;
+ import org.apache.http.auth.ChallengeState;
+@@ -53,7 +52,6 @@ import org.apache.http.util.CharArrayBuffer;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public abstract class AuthSchemeBase implements ContextAwareAuthScheme {
+
+ protected ChallengeState challengeState;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
+index 2f51de7..cfd5a6e 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
+@@ -32,7 +32,6 @@ import org.apache.commons.codec.binary.Base64;
+ import org.apache.http.Consts;
+ import org.apache.http.Header;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AUTH;
+ import org.apache.http.auth.AuthenticationException;
+ import org.apache.http.auth.ChallengeState;
+@@ -50,7 +49,6 @@ import org.apache.http.util.EncodingUtils;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class BasicScheme extends RFC2617Scheme {
+
+ private static final long serialVersionUID = -1931571557597830536L;
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java b/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
index 5409a77..5cc1794 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
@@ -3672,6 +4666,26 @@ index 5409a77..5cc1794 100644
@SuppressWarnings("deprecation")
public class BasicSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
+index a7607e3..1e3c62f 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
+@@ -43,7 +43,6 @@ import org.apache.http.Header;
+ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpEntityEnclosingRequest;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AUTH;
+ import org.apache.http.auth.AuthenticationException;
+ import org.apache.http.auth.ChallengeState;
+@@ -72,7 +71,6 @@ import org.apache.http.util.EncodingUtils;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class DigestScheme extends RFC2617Scheme {
+
+ private static final long serialVersionUID = 3883908186234566916L;
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java b/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
index 67a4e9e..ce4340f 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
@@ -3695,6 +4709,46 @@ index 67a4e9e..ce4340f 100644
@SuppressWarnings("deprecation")
public class DigestSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java b/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
+index ffb22b0..c3b9005 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
+@@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory;
+ import org.apache.http.Header;
+ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AUTH;
+ import org.apache.http.auth.AuthenticationException;
+ import org.apache.http.auth.Credentials;
+@@ -59,7 +58,6 @@ import org.ietf.jgss.Oid;
+ /**
+ * @since 4.2
+ */
+- at NotThreadSafe
+ public abstract class GGSSchemeBase extends AuthSchemeBase {
+
+ enum State {
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
+index 9b2ba62..6cbb05b 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
+@@ -28,7 +28,6 @@ package org.apache.http.impl.auth;
+
+ import org.apache.http.Header;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AuthenticationException;
+ import org.apache.http.auth.Credentials;
+ import org.apache.http.protocol.HttpContext;
+@@ -41,7 +40,6 @@ import org.ietf.jgss.Oid;
+ *
+ * @since 4.2
+ */
+- at NotThreadSafe
+ public class KerberosScheme extends GGSSchemeBase {
+
+ private static final String KERBEROS_OID = "1.2.840.113554.1.2.2";
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java b/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java
index 431258e..68b6c15 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java
@@ -3741,6 +4795,46 @@ index f902ae1..59d1758 100644
public class NTLMEngineException extends AuthenticationException {
private static final long serialVersionUID = 6027981323731768824L;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
+index 890f647..1a7dc8b 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
+@@ -38,7 +38,6 @@ import javax.crypto.spec.SecretKeySpec;
+
+ import org.apache.commons.codec.binary.Base64;
+ import org.apache.http.Consts;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.util.CharsetUtils;
+ import org.apache.http.util.EncodingUtils;
+
+@@ -48,7 +47,6 @@ import org.apache.http.util.EncodingUtils;
+ *
+ * @since 4.1
+ */
+- at NotThreadSafe
+ final class NTLMEngineImpl implements NTLMEngine {
+
+ /** Unicode encoding */
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
+index 1ec4957..cd1a212 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
+@@ -28,7 +28,6 @@ package org.apache.http.impl.auth;
+
+ import org.apache.http.Header;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AUTH;
+ import org.apache.http.auth.AuthenticationException;
+ import org.apache.http.auth.Credentials;
+@@ -45,7 +44,6 @@ import org.apache.http.util.CharArrayBuffer;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class NTLMScheme extends AuthSchemeBase {
+
+ enum State {
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java
index 8e38c82..6f28754 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java
@@ -3764,6 +4858,46 @@ index 8e38c82..6f28754 100644
@SuppressWarnings("deprecation")
public class NTLMSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
+index 9475c03..d7b6852 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
+@@ -39,7 +39,6 @@ import java.util.Map;
+ import org.apache.http.Consts;
+ import org.apache.http.HeaderElement;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.ChallengeState;
+ import org.apache.http.auth.MalformedChallengeException;
+ import org.apache.http.auth.params.AuthPNames;
+@@ -57,7 +56,6 @@ import org.apache.http.util.CharsetUtils;
+ * @since 4.0
+ */
+ @SuppressWarnings("deprecation")
+- at NotThreadSafe // AuthSchemeBase, params
+ public abstract class RFC2617Scheme extends AuthSchemeBase implements Serializable {
+
+ private static final long serialVersionUID = -2845454858205884623L;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
+index 808738b..46ebeb8 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
++++ b/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
+@@ -28,7 +28,6 @@ package org.apache.http.impl.auth;
+
+ import org.apache.http.Header;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AuthenticationException;
+ import org.apache.http.auth.Credentials;
+ import org.apache.http.protocol.HttpContext;
+@@ -42,7 +41,6 @@ import org.ietf.jgss.Oid;
+ *
+ * @since 4.2
+ */
+- at NotThreadSafe
+ public class SPNegoScheme extends GGSSchemeBase {
+
+ private static final String SPNEGO_OID = "1.3.6.1.5.5.2";
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java b/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java
index 42e506d..75dd845 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java
@@ -4086,6 +5220,26 @@ index e2a43c4..b3250ae 100644
public class DefaultUserTokenHandler implements UserTokenHandler {
public static final DefaultUserTokenHandler INSTANCE = new DefaultUserTokenHandler();
+diff --git a/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java b/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
+index 15aedd5..061ae3f 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
++++ b/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
+@@ -35,7 +35,6 @@ import org.apache.http.Header;
+ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpEntityEnclosingRequest;
+ import org.apache.http.ProtocolException;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.entity.HttpEntityWrapper;
+ import org.apache.http.protocol.HTTP;
+
+@@ -53,7 +52,6 @@ import org.apache.http.protocol.HTTP;
+ * @deprecated (4.3) do not use.
+ */
+ @Deprecated
+- at NotThreadSafe // e.g. [gs]etEntity()
+ public class EntityEnclosingRequestWrapper extends RequestWrapper
+ implements HttpEntityEnclosingRequest {
+
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java b/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java
index 0fcfd4d..5214917 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java
@@ -4109,6 +5263,26 @@ index 0fcfd4d..5214917 100644
public class FutureRequestExecutionService implements Closeable {
private final HttpClient httpclient;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
+index dab3ab1..507f7d3 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
++++ b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
+@@ -47,7 +47,6 @@ import org.apache.http.Header;
+ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequestInterceptor;
+ import org.apache.http.HttpResponseInterceptor;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AuthSchemeProvider;
+ import org.apache.http.client.AuthenticationStrategy;
+ import org.apache.http.client.BackoffManager;
+@@ -153,7 +152,6 @@ import org.apache.http.util.VersionInfo;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ public class HttpClientBuilder {
+
+ private HttpRequestExecutor requestExec;
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/HttpClients.java b/httpclient/src/main/java/org/apache/http/impl/client/HttpClients.java
index 569b047..7f1b884 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/HttpClients.java
@@ -4247,6 +5421,46 @@ index 49e6e91..ce443e9 100644
public class ProxyAuthenticationStrategy extends AuthenticationStrategyImpl {
public static final ProxyAuthenticationStrategy INSTANCE = new ProxyAuthenticationStrategy();
+diff --git a/httpclient/src/main/java/org/apache/http/impl/client/RedirectLocations.java b/httpclient/src/main/java/org/apache/http/impl/client/RedirectLocations.java
+index e0d4464..a00f682 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/client/RedirectLocations.java
++++ b/httpclient/src/main/java/org/apache/http/impl/client/RedirectLocations.java
+@@ -35,7 +35,6 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Set;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * This class represents a collection of {@link java.net.URI}s used
+@@ -43,7 +42,6 @@ import org.apache.http.annotation.NotThreadSafe;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe // HashSet/ArrayList are not synch.
+ public class RedirectLocations extends AbstractList<Object> {
+
+ private final Set<URI> unique;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java b/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
+index be6a743..61eb5d1 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
++++ b/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
+@@ -34,7 +34,6 @@ import org.apache.http.HttpRequest;
+ import org.apache.http.ProtocolException;
+ import org.apache.http.ProtocolVersion;
+ import org.apache.http.RequestLine;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.methods.HttpUriRequest;
+ import org.apache.http.message.AbstractHttpMessage;
+ import org.apache.http.message.BasicRequestLine;
+@@ -54,7 +53,6 @@ import org.apache.http.util.Args;
+ *
+ * @deprecated (4.3) do not use.
+ */
+- at NotThreadSafe
+ @Deprecated
+ public class RequestWrapper extends AbstractHttpMessage implements HttpUriRequest {
+
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java b/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java
index ae3342b..437e3ea 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java
@@ -4385,6 +5599,25 @@ index 71f9183..094ee6b 100644
class CPoolEntry extends PoolEntry<HttpRoute, ManagedHttpClientConnection> {
private final Log log;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java b/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java
+index 27b7f87..8c8f623 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java
++++ b/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java
+@@ -38,14 +38,12 @@ import org.apache.http.HttpEntityEnclosingRequest;
+ import org.apache.http.HttpException;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.ManagedHttpClientConnection;
+ import org.apache.http.protocol.HttpContext;
+
+ /**
+ * @since 4.3
+ */
+- at NotThreadSafe
+ class CPoolProxy implements ManagedHttpClientConnection, HttpContext {
+
+ private volatile CPoolEntry poolEntry;
diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/ConnectionShutdownException.java b/httpclient/src/main/java/org/apache/http/impl/conn/ConnectionShutdownException.java
index b0b6bb6..4925f95 100644
--- a/httpclient/src/main/java/org/apache/http/impl/conn/ConnectionShutdownException.java
@@ -4431,6 +5664,26 @@ index 5821364..1de8fdc 100644
public class DefaultHttpClientConnectionOperator implements HttpClientConnectionOperator {
static final String SOCKET_FACTORY_REGISTRY = "http.socket-factory-registry";
+diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java b/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
+index c685bf2..e5578ec 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
++++ b/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
+@@ -37,7 +37,6 @@ import org.apache.http.HttpResponseFactory;
+ import org.apache.http.NoHttpResponseException;
+ import org.apache.http.ProtocolException;
+ import org.apache.http.StatusLine;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.config.MessageConstraints;
+ import org.apache.http.impl.DefaultHttpResponseFactory;
+ import org.apache.http.impl.io.AbstractMessageParser;
+@@ -55,7 +54,6 @@ import org.apache.http.util.CharArrayBuffer;
+ * @since 4.2
+ */
+ @SuppressWarnings("deprecation")
+- at NotThreadSafe
+ public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
+
+ private final Log log = LogFactory.getLog(getClass());
diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java b/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java
index f5c0af0..f6a4427 100644
--- a/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java
@@ -4454,6 +5707,26 @@ index f5c0af0..f6a4427 100644
public class DefaultHttpResponseParserFactory implements HttpMessageParserFactory<HttpResponse> {
public static final DefaultHttpResponseParserFactory INSTANCE = new DefaultHttpResponseParserFactory();
+diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java b/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java
+index 7eabfac..1a74f5e 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java
++++ b/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java
+@@ -40,7 +40,6 @@ import javax.net.ssl.SSLSocket;
+
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.config.MessageConstraints;
+ import org.apache.http.conn.ManagedHttpClientConnection;
+ import org.apache.http.entity.ContentLengthStrategy;
+@@ -53,7 +52,6 @@ import org.apache.http.protocol.HttpContext;
+ * Default {@link ManagedHttpClientConnection} implementation.
+ * @since 4.3
+ */
+- at NotThreadSafe
+ public class DefaultManagedHttpClientConnection extends DefaultBHttpClientConnection
+ implements ManagedHttpClientConnection, HttpContext {
+
diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/DefaultProxyRoutePlanner.java b/httpclient/src/main/java/org/apache/http/impl/conn/DefaultProxyRoutePlanner.java
index 376654a..55b2e7e 100644
--- a/httpclient/src/main/java/org/apache/http/impl/conn/DefaultProxyRoutePlanner.java
@@ -4523,6 +5796,66 @@ index c5d54ed..8799572 100644
public class DefaultSchemePortResolver implements SchemePortResolver {
public static final DefaultSchemePortResolver INSTANCE = new DefaultSchemePortResolver();
+diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java b/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java
+index c47e7c0..b1de760 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java
++++ b/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java
+@@ -27,7 +27,6 @@
+
+ package org.apache.http.impl.conn;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ import java.io.IOException;
+ import java.io.InputStream;
+@@ -37,7 +36,6 @@ import java.io.InputStream;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ class LoggingInputStream extends InputStream {
+
+ private final InputStream in;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java b/httpclient/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java
+index 2614b0c..14a9071 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java
++++ b/httpclient/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java
+@@ -31,7 +31,6 @@ import org.apache.commons.logging.Log;
+ import org.apache.http.Header;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.config.MessageConstraints;
+ import org.apache.http.entity.ContentLengthStrategy;
+ import org.apache.http.io.HttpMessageParserFactory;
+@@ -44,7 +43,6 @@ import java.net.Socket;
+ import java.nio.charset.CharsetDecoder;
+ import java.nio.charset.CharsetEncoder;
+
+- at NotThreadSafe
+ class LoggingManagedHttpClientConnection extends DefaultManagedHttpClientConnection {
+
+ private final Log log;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java b/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java
+index b292453..995c618 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java
++++ b/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java
+@@ -27,7 +27,6 @@
+
+ package org.apache.http.impl.conn;
+
+-import org.apache.http.annotation.NotThreadSafe;
+
+ import java.io.IOException;
+ import java.io.OutputStream;
+@@ -37,7 +36,6 @@ import java.io.OutputStream;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ class LoggingOutputStream extends OutputStream {
+
+ private final OutputStream out;
diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java b/httpclient/src/main/java/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java
index 2d7d521..9ce8064 100644
--- a/httpclient/src/main/java/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java
@@ -4661,6 +5994,46 @@ index 1c6914a..9223161 100644
public abstract class AbstractCookieSpec implements CookieSpec {
/**
+diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java b/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
+index dc261ab..e5503bc 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
++++ b/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
+@@ -33,7 +33,6 @@ import java.util.HashMap;
+ import java.util.Locale;
+ import java.util.Map;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.cookie.ClientCookie;
+ import org.apache.http.cookie.SetCookie;
+ import org.apache.http.util.Args;
+@@ -43,7 +42,6 @@ import org.apache.http.util.Args;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class BasicClientCookie implements SetCookie, ClientCookie, Cloneable, Serializable {
+
+ private static final long serialVersionUID = -3869795591041535538L;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java b/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
+index e9c50a3..9a191ff 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
++++ b/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
+@@ -29,7 +29,6 @@ package org.apache.http.impl.cookie;
+
+ import java.util.Date;
+
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.cookie.SetCookie2;
+
+ /**
+@@ -37,7 +36,6 @@ import org.apache.http.cookie.SetCookie2;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class BasicClientCookie2 extends BasicClientCookie implements SetCookie2 {
+
+ private static final long serialVersionUID = -7744598295706617057L;
diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java b/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java
index 14c9cfe..2ab5fb9 100644
--- a/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java
@@ -5466,6 +6839,26 @@ index 0f6e4f3..0cdf9e0 100644
class ConnectionHolder implements ConnectionReleaseTrigger, Cancellable, Closeable {
private final Log log;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/execchain/HttpResponseProxy.java b/httpclient/src/main/java/org/apache/http/impl/execchain/HttpResponseProxy.java
+index 0184ec2..533eb70 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/execchain/HttpResponseProxy.java
++++ b/httpclient/src/main/java/org/apache/http/impl/execchain/HttpResponseProxy.java
+@@ -36,7 +36,6 @@ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpResponse;
+ import org.apache.http.ProtocolVersion;
+ import org.apache.http.StatusLine;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.methods.CloseableHttpResponse;
+ import org.apache.http.params.HttpParams;
+
+@@ -46,7 +45,6 @@ import org.apache.http.params.HttpParams;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ class HttpResponseProxy implements CloseableHttpResponse {
+
+ private final HttpResponse original;
diff --git a/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java b/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
index 9496813..0ce6845 100644
--- a/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
@@ -5580,6 +6973,45 @@ index 2a3d0a5..fb894e4 100644
public class RequestAbortedException extends InterruptedIOException {
private static final long serialVersionUID = 4973849966012490112L;
+diff --git a/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityProxy.java b/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityProxy.java
+index e4ed35b..1affd94 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityProxy.java
++++ b/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityProxy.java
+@@ -34,14 +34,12 @@ import org.apache.http.Header;
+ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpEntityEnclosingRequest;
+ import org.apache.http.HttpRequest;
+-import org.apache.http.annotation.NotThreadSafe;
+
+ /**
+ * A Proxy class for {@link org.apache.http.HttpEntity} enclosed in a request message.
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ class RequestEntityProxy implements HttpEntity {
+
+ static void enhance(final HttpEntityEnclosingRequest request) {
+diff --git a/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityProxy.java b/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityProxy.java
+index 5955cbe..88caa96 100644
+--- a/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityProxy.java
++++ b/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityProxy.java
+@@ -34,7 +34,6 @@ import java.net.SocketException;
+
+ import org.apache.http.HttpEntity;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.conn.EofSensorInputStream;
+ import org.apache.http.conn.EofSensorWatcher;
+ import org.apache.http.entity.HttpEntityWrapper;
+@@ -44,7 +43,6 @@ import org.apache.http.entity.HttpEntityWrapper;
+ *
+ * @since 4.3
+ */
+- at NotThreadSafe
+ class ResponseEntityProxy extends HttpEntityWrapper implements EofSensorWatcher {
+
+ private final ConnectionHolder connHolder;
diff --git a/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java b/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java
index cade164..9a53bdf 100644
--- a/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-client.git
More information about the pkg-java-commits
mailing list