svn commit: r1770506 [1/6] - in /httpcomponents/httpclient/branches/4.5.x: ./ fluent-hc/src/main/java/org/apache/http/client/fluent/ httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/ httpclient-cache/src/main/java/org/apache/...

[ol...@apache.org]

Author: olegk
Date: Sat Nov 19 16:40:54 2016
New Revision: 1770506

URL: http://svn.apache.org/viewvc?rev=1770506&view=rev
Log:
Upgraded HttpCore to version 4.4.5

Modified:
    httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java
    httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HeaderConstants.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheableRequestPolicy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClients.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultFailureCache.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FailureCacheValue.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResource.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResourceFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResource.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/IOUtils.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsCredentialsProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/auth/params/AuthParams.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/AuthPolicy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/HttpClientParams.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContexts.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/TunnelRefusedException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultResponseParser.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SchemeRegistryFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/BestMatchSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/BestMatchSpecFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/BrowserCompatSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/DateParseException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/DateUtils.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/IgnoreSpecFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/PublicSuffixListParser.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/RFC2109SpecFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/RFC2965SpecFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/AUTH.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/AuthOption.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/AuthState.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/KerberosCredentials.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/RedirectException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/config/AuthSchemes.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/config/CookieSpecs.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpPatch.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestExpectContinue.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/utils/DateUtils.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/UnsupportedSchemeException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/socket/PlainConnectionSocketFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ssl/NoopHostnameVerifier.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixList.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixListParser.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcher.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/cookie/CookiePriorityComparator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/cookie/CookieRestrictionViolationException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/AbstractResponseHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/HttpClients.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/ProxyAuthenticationStrategy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/RedirectLocations.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/TargetAuthenticationStrategy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/CPool.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/CPoolEntry.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/ConnectionShutdownException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultProxyRoutePlanner.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultRoutePlanner.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultSchemePortResolver.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/DefaultCookieSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/DefaultCookieSpecProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpecProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/LaxExpiresHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/LaxMaxAgeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixDomainFilter.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/BackoffStrategyExec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/ConnectionHolder.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/HttpResponseProxy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/RequestAbortedException.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityProxy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityProxy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/execchain/TunnelRefusedException.java
    httpcomponents/httpclient/branches/4.5.x/pom.xml

Modified: httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java Sat Nov 19 16:40:54 2016
@@ -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;
 
-@NotThreadSafe
 class InternalEntityEnclosingHttpRequest extends InternalHttpRequest implements HttpEntityEnclosingRequest {
 
     private HttpEntity entity;

Modified: httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalHttpRequest.java Sat Nov 19 16:40:54 2016
@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.Atomi
 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.AbstractH
 import org.apache.http.message.BasicRequestLine;
 import org.apache.http.util.Args;
 
-@NotThreadSafe
 class InternalHttpRequest extends AbstractHttpMessage
         implements HttpUriRequest, HttpExecutionAware, Configurable {
 

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java Sat Nov 19 16:40:54 2016
@@ -57,7 +57,8 @@ import org.apache.http.HttpVersion;
 import org.apache.http.ProtocolException;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.RequestLine;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.ResponseHandler;
@@ -126,7 +127,7 @@ import org.apache.http.util.VersionInfo;
  * @deprecated (4.3) use {@link CachingHttpClientBuilder} or {@link CachingHttpClients}.
  */
 @Deprecated
-@ThreadSafe // So long as the responseCache implementation is threadsafe
+@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
 public class CachingHttpClient implements HttpClient {
 
     /**

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HeaderConstants.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HeaderConstants.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HeaderConstants.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HeaderConstants.java Sat Nov 19 16:40:54 2016
@@ -26,13 +26,10 @@
  */
 package org.apache.http.client.cache;
 
-import org.apache.http.annotation.Immutable;
-
 /**
  * Records static constants for various HTTP header names.
  * @since 4.1
  */
-@Immutable
 public class HeaderConstants {
 
     public static final String GET_METHOD = "GET";

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheContext.java Sat Nov 19 16:40:54 2016
@@ -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.HttpCont
 /**
  * @since 4.3
  */
-@NotThreadSafe
 public class HttpCacheContext extends HttpClientContext {
 
     /**

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java Sat Nov 19 16:40:54 2016
@@ -36,7 +36,8 @@ import org.apache.http.Header;
 import org.apache.http.HeaderIterator;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.StatusLine;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.utils.DateUtils;
 import org.apache.http.message.HeaderGroup;
 import org.apache.http.protocol.HTTP;
@@ -51,7 +52,7 @@ import org.apache.http.util.Args;
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 public class HttpCacheEntry implements Serializable {
 
     private static final long serialVersionUID = -6300496422359477413L;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java Sat Nov 19 16:40:54 2016
@@ -26,15 +26,12 @@
  */
 package org.apache.http.client.cache;
 
-import org.apache.http.annotation.NotThreadSafe;
-
 /**
  * Used to limiting the size of an incoming response body of
  * unknown size that is optimistically being read in anticipation
  * of caching it.
  * @since 4.1
  */
-@NotThreadSafe // reached
 public class InputLimit {
 
     private final long value;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java Sat Nov 19 16:40:54 2016
@@ -28,7 +28,8 @@ package org.apache.http.impl.client.cach
 
 import java.io.IOException;
 
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.cache.HttpCacheStorage;
 import org.apache.http.client.cache.HttpCacheUpdateCallback;
@@ -43,7 +44,7 @@ import org.apache.http.client.cache.Http
  *
  * @since 4.1
  */
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
 public class BasicHttpCacheStorage implements HttpCacheStorage {
 
     private final CacheMap entries;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java Sat Nov 19 16:40:54 2016
@@ -33,19 +33,17 @@ import java.security.SecureRandom;
 import java.util.Formatter;
 import java.util.Locale;
 
-import org.apache.http.annotation.GuardedBy;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 
 /**
  * Should produce reasonably unique tokens.
  */
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
 class BasicIdGenerator {
 
     private final String hostname;
     private final SecureRandom rnd;
-
-    @GuardedBy("this")
     private long count;
 
     public BasicIdGenerator() {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java Sat Nov 19 16:40:54 2016
@@ -33,12 +33,13 @@ import java.io.Serializable;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.Args;
 
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 class CacheEntity implements HttpEntity, Serializable {
 
     private static final long serialVersionUID = -3467082284120936233L;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java Sat Nov 19 16:40:54 2016
@@ -36,7 +36,8 @@ import java.util.ListIterator;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.cache.Resource;
@@ -52,7 +53,7 @@ import org.apache.http.util.Args;
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
 class CacheEntryUpdater {
 
     private final ResourceFactory resourceFactory;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java Sat Nov 19 16:40:54 2016
@@ -37,7 +37,8 @@ import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.cache.HttpCacheInvalidator;
@@ -51,7 +52,7 @@ import org.apache.http.protocol.HTTP;
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
 class CacheInvalidator implements HttpCacheInvalidator {
 
     private final HttpCacheStorage storage;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java Sat Nov 19 16:40:54 2016
@@ -40,7 +40,8 @@ import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.utils.URIUtils;
@@ -48,7 +49,7 @@ import org.apache.http.client.utils.URIU
 /**
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 class CacheKeyGenerator {
 
     private static final URI BASE_URI = URI.create("http://example.com/");

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java Sat Nov 19 16:40:54 2016
@@ -31,7 +31,8 @@ import java.util.Date;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpRequest;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.utils.DateUtils;
@@ -40,7 +41,7 @@ import org.apache.http.protocol.HTTP;
 /**
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 class CacheValidityPolicy {
 
     public static final long MAX_AGE = 2147483648L;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheableRequestPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheableRequestPolicy.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheableRequestPolicy.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheableRequestPolicy.java Sat Nov 19 16:40:54 2016
@@ -33,7 +33,8 @@ import org.apache.http.HeaderElement;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpVersion;
 import org.apache.http.ProtocolVersion;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 
 /**
@@ -41,7 +42,7 @@ import org.apache.http.client.cache.Head
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 class CacheableRequestPolicy {
 
     private final Log log = LogFactory.getLog(getClass());

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java Sat Nov 19 16:40:54 2016
@@ -33,7 +33,8 @@ import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -48,7 +49,7 @@ import org.apache.http.protocol.HTTP;
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
 class CachedHttpResponseGenerator {
 
     private final CacheValidityPolicy validityStrategy;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java Sat Nov 19 16:40:54 2016
@@ -35,7 +35,8 @@ import org.apache.http.HeaderElement;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpStatus;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.utils.DateUtils;
@@ -46,7 +47,7 @@ import org.apache.http.client.utils.Date
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
 class CachedResponseSuitabilityChecker {
 
     private final Log log = LogFactory.getLog(getClass());

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java Sat Nov 19 16:40:54 2016
@@ -49,7 +49,8 @@ import org.apache.http.HttpVersion;
 import org.apache.http.ProtocolException;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.RequestLine;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.CacheResponseStatus;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheContext;
@@ -99,7 +100,7 @@ import org.apache.http.util.VersionInfo;
  *
  * @since 4.3
  */
-@ThreadSafe // So long as the responseCache implementation is threadsafe
+@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
 public class CachingExec implements ClientExecChain {
 
     private final static boolean SUPPORTS_RANGE_AND_CONTENT_RANGE_HEADERS = false;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClients.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClients.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClients.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClients.java Sat Nov 19 16:40:54 2016
@@ -29,7 +29,6 @@ package org.apache.http.impl.client.cach
 
 import java.io.File;
 
-import org.apache.http.annotation.Immutable;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 /**
@@ -38,7 +37,6 @@ import org.apache.http.impl.client.Close
  *
  * @since 4.3
  */
-@Immutable
 public class CachingHttpClients {
 
     private CachingHttpClients() {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java Sat Nov 19 16:40:54 2016
@@ -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;
 
-@NotThreadSafe
 class CombinedEntity extends AbstractHttpEntity {
 
     private final Resource resource;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java Sat Nov 19 16:40:54 2016
@@ -31,7 +31,8 @@ import java.util.Map;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.ProtocolException;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.methods.HttpRequestWrapper;
@@ -39,7 +40,7 @@ import org.apache.http.client.methods.Ht
 /**
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 class ConditionalRequestBuilder {
 
     /**

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultFailureCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultFailureCache.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultFailureCache.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultFailureCache.java Sat Nov 19 16:40:54 2016
@@ -26,19 +26,20 @@
  */
 package org.apache.http.impl.client.cache;
 
-import org.apache.http.annotation.ThreadSafe;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+
 /**
  * Implements a bounded failure cache. The oldest entries are discarded when
  * the maximum size is exceeded.
  *
  * @since 4.3
  */
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
 public class DefaultFailureCache implements FailureCache {
 
     static final int DEFAULT_MAX_SIZE = 1000;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.java Sat Nov 19 16:40:54 2016
@@ -32,7 +32,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.cache.HttpCacheEntrySerializationException;
 import org.apache.http.client.cache.HttpCacheEntrySerializer;
@@ -45,7 +46,7 @@ import org.apache.http.client.cache.Http
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 public class DefaultHttpCacheEntrySerializer implements HttpCacheEntrySerializer {
 
     @Override

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java Sat Nov 19 16:40:54 2016
@@ -26,13 +26,14 @@
  */
 package org.apache.http.impl.client.cache;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.util.Args;
-
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.util.Args;
+
 /**
  * An implementation that backs off exponentially based on the number of
  * consecutive failed attempts stored in the
@@ -56,7 +57,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @since 4.3
  */
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
 public class ExponentialBackOffSchedulingStrategy implements SchedulingStrategy {
 
     public static final long DEFAULT_BACK_OFF_RATE = 10;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FailureCacheValue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FailureCacheValue.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FailureCacheValue.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FailureCacheValue.java Sat Nov 19 16:40:54 2016
@@ -26,14 +26,15 @@
  */
 package org.apache.http.impl.client.cache;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 
 /**
  * The error count with a creation timestamp and its associated key.
  *
  * @since 4.3
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 public class FailureCacheValue {
 
     private final long creationTimeInNanos;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResource.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResource.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResource.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResource.java Sat Nov 19 16:40:54 2016
@@ -31,7 +31,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.Resource;
 
 /**
@@ -39,7 +40,7 @@ import org.apache.http.client.cache.Reso
  *
  * @since 4.1
  */
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
 public class FileResource implements Resource {
 
     private static final long serialVersionUID = 4132244415919043397L;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResourceFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResourceFactory.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResourceFactory.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/FileResourceFactory.java Sat Nov 19 16:40:54 2016
@@ -31,7 +31,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.InputLimit;
 import org.apache.http.client.cache.Resource;
 import org.apache.http.client.cache.ResourceFactory;
@@ -41,7 +42,7 @@ import org.apache.http.client.cache.Reso
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 public class FileResourceFactory implements ResourceFactory {
 
     private final File cacheDir;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResource.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResource.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResource.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResource.java Sat Nov 19 16:40:54 2016
@@ -29,7 +29,8 @@ package org.apache.http.impl.client.cach
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.Resource;
 
 /**
@@ -37,7 +38,7 @@ import org.apache.http.client.cache.Reso
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 public class HeapResource implements Resource {
 
     private static final long serialVersionUID = -2078599905620463394L;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java Sat Nov 19 16:40:54 2016
@@ -30,7 +30,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.InputLimit;
 import org.apache.http.client.cache.Resource;
 import org.apache.http.client.cache.ResourceFactory;
@@ -40,7 +41,7 @@ import org.apache.http.client.cache.Reso
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 public class HeapResourceFactory implements ResourceFactory {
 
     @Override

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/IOUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/IOUtils.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/IOUtils.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/IOUtils.java Sat Nov 19 16:40:54 2016
@@ -35,9 +35,7 @@ import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 
 import org.apache.http.HttpEntity;
-import org.apache.http.annotation.Immutable;
 
-@Immutable
 class IOUtils {
 
     static void consume(final HttpEntity entity) throws IOException {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.java Sat Nov 19 16:40:54 2016
@@ -26,21 +26,22 @@
  */
 package org.apache.http.impl.client.cache;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.util.Args;
-
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.util.Args;
+
 /**
  * Immediately schedules any incoming validation request. Relies on
  * {@link CacheConfig} to configure the used {@link java.util.concurrent.ThreadPoolExecutor}.
  *
  * @since 4.3
  */
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
 public class ImmediateSchedulingStrategy implements SchedulingStrategy {
 
     private final ExecutorService executor;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java Sat Nov 19 16:40:54 2016
@@ -33,7 +33,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.cache.HttpCacheStorage;
 import org.apache.http.client.cache.HttpCacheUpdateCallback;
@@ -70,7 +71,7 @@ import org.apache.http.util.Args;
  *
  * @since 4.1
  */
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
 public class ManagedHttpCacheStorage implements HttpCacheStorage, Closeable {
 
     private final CacheMap entries;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java Sat Nov 19 16:40:54 2016
@@ -36,7 +36,8 @@ import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.StatusLine;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.message.AbstractHttpMessage;
 import org.apache.http.message.BasicStatusLine;
 import org.apache.http.params.BasicHttpParams;
@@ -46,7 +47,7 @@ import org.apache.http.params.HttpParams
  * @since 4.1
  */
 @SuppressWarnings("deprecation")
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 final class OptionsHttp11Response extends AbstractHttpMessage implements HttpResponse {
 
     private final StatusLine statusLine = new BasicStatusLine(HttpVersion.HTTP_1_1,

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java Sat Nov 19 16:40:54 2016
@@ -29,7 +29,6 @@ package org.apache.http.impl.client.cach
 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
  */
-@NotThreadSafe
 class Proxies {
 
     public static CloseableHttpResponse enhanceResponse(final HttpResponse original) {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java Sat Nov 19 16:40:54 2016
@@ -38,7 +38,8 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
 import org.apache.http.ProtocolVersion;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.methods.HttpRequestWrapper;
@@ -52,7 +53,7 @@ import org.apache.http.protocol.HTTP;
 /**
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 class RequestProtocolCompliance {
     private final boolean weakETagOnPutDeleteAllowed;
 

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java Sat Nov 19 16:40:54 2016
@@ -29,12 +29,13 @@ package org.apache.http.impl.client.cach
 import java.lang.ref.PhantomReference;
 import java.lang.ref.ReferenceQueue;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HttpCacheEntry;
 import org.apache.http.client.cache.Resource;
 import org.apache.http.util.Args;
 
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 class ResourceReference extends PhantomReference<HttpCacheEntry> {
 
     private final Resource resource;

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java?rev=1770506&r1=1770505&r2=1770506&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java Sat Nov 19 16:40:54 2016
@@ -40,7 +40,8 @@ import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.cache.HeaderConstants;
 import org.apache.http.client.utils.DateUtils;
 import org.apache.http.protocol.HTTP;
@@ -50,7 +51,7 @@ import org.apache.http.protocol.HTTP;
  *
  * @since 4.1
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
 class ResponseCachingPolicy {
 
     private static final String[] AUTH_CACHEABLE_PARAMS = {