You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/12/27 19:48:10 UTC
svn commit: r1776187 [1/21] - in /httpcomponents/httpclient/trunk: ./
httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/
httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/
httpclient5-cache/src/test/java/org/apache/hc...
Author: olegk
Date: Tue Dec 27 19:48:07 2016
New Revision: 1776187
URL: http://svn.apache.org/viewvc?rev=1776187&view=rev
Log:
Upgraded HttpCore to version 5.0-alpha2; Upgraded to the latest 5.0 APIs
Added:
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java
- copied, changed from r1772287, httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpResponse.java (contents, props changed)
- copied, changed from r1772287, httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequestBase.java (contents, props changed)
- copied, changed from r1772287, httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/RoutedHttpRequest.java (with props)
httpcomponents/httpclient/trunk/httpclient5/src/test/resources/log4j2-debug.xml.template
Removed:
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Proxies.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProxyHandler.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/OKStatus.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalByteArrayEntity.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalFileEntity.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalHttpRequest.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalInputStreamEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorWatcher.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/SessionInputBufferMock.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/io/TestEofSensorInputStream.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java
Modified:
httpcomponents/httpclient/trunk/.gitignore
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheInvalidator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheKeyGenerator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheValidityPolicy.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CombinedEntity.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultFailureCache.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultHttpCacheEntrySerializer.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ExponentialBackOffSchedulingStrategy.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCacheValue.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResource.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResourceFactory.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResource.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResourceFactory.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/IOUtils.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ImmediateSchedulingStrategy.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ManagedHttpCacheStorage.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/OptionsHttp11Response.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResourceReference.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SizeLimitedResponseReader.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheEntryUpdater.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheInvalidator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheValidityPolicy.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCombinedEntity.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheEntrySerializers.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Async.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Content.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java
httpcomponents/httpclient/trunk/httpclient5-fluent/src/test/java/org/apache/hc/client5/http/fluent/TestFluent.java
httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml
httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
httpcomponents/httpclient/trunk/httpclient5-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java
httpcomponents/httpclient/trunk/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient5-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectTimeoutException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectionPoolTimeoutException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/HttpHostConnectException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRoute.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/RouteTracker.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/UnsupportedSchemeException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthExchange.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthenticationException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/BasicUserPrincipal.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/InvalidCredentialsException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/KerberosCredentials.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/MalformedChallengeException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/NTCredentials.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/NTUserPrincipal.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/UsernamePasswordCredentials.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/util/ByteArrayBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/config/AuthSchemes.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/config/CookieSpecs.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieIdentityComparator.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieOrigin.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePathComparator.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieRestrictionViolationException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/MalformedCookieException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/UnsupportedDigestAlgorithmException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionReleaseTrigger.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixList.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestDefaultHttpResponseParser.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAcceptEncoding.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java
httpcomponents/httpclient/trunk/pom.xml
Modified: httpcomponents/httpclient/trunk/.gitignore
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/.gitignore?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/.gitignore (original)
+++ httpcomponents/httpclient/trunk/.gitignore Tue Dec 27 19:48:07 2016
@@ -7,3 +7,4 @@ bin
target
.idea
*.iml
+/httpclient5/src/test/resources/log4j2-debug.xml
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java Tue Dec 27 19:48:07 2016
@@ -26,13 +26,14 @@
*/
package org.apache.hc.client5.http.cache;
-import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
/**
* Records static constants for various HTTP header names.
* @since 4.1
*/
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
public class HeaderConstants {
public static final String GET_METHOD = "GET";
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java Tue Dec 27 19:48:07 2016
@@ -27,14 +27,12 @@
package org.apache.hc.client5.http.cache;
import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.core5.annotation.NotThreadSafe;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
/**
* @since 4.3
*/
-@NotThreadSafe
public class HttpCacheContext extends HttpClientContext {
/**
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java Tue Dec 27 19:48:07 2016
@@ -34,11 +34,13 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.hc.client5.http.utils.DateUtils;
-import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.MessageHeaders;
+import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.message.HeaderGroup;
import org.apache.hc.core5.util.Args;
@@ -51,15 +53,15 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.1
*/
-@Immutable
-public class HttpCacheEntry implements Serializable {
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
+public class HttpCacheEntry implements MessageHeaders, Serializable {
private static final long serialVersionUID = -6300496422359477413L;
private static final String REQUEST_METHOD_HEADER_NAME = "Hc-Request-Method";
private final Date requestDate;
private final Date responseDate;
- private final StatusLine statusLine;
+ private final int status;
private final HeaderGroup responseHeaders;
private final Resource resource;
private final Map<String,String> variantMap;
@@ -73,8 +75,8 @@ public class HttpCacheEntry implements S
* @param responseDate
* Date/time that the response came back (Used for age
* calculations)
- * @param statusLine
- * HTTP status line from origin response
+ * @param status
+ * HTTP status from origin response
* @param responseHeaders
* Header[] from original HTTP Response
* @param resource representing origin response body
@@ -82,63 +84,30 @@ public class HttpCacheEntry implements S
* of this parent entry; this maps a "variant key" (derived
* from the varying request headers) to a "cache key" (where
* in the cache storage the particular variant is located)
- * @param requestMethod HTTP method used when the request was made
*/
public HttpCacheEntry(
final Date requestDate,
final Date responseDate,
- final StatusLine statusLine,
+ final int status,
final Header[] responseHeaders,
final Resource resource,
- final Map<String,String> variantMap,
- final String requestMethod) {
+ final Map<String,String> variantMap) {
super();
Args.notNull(requestDate, "Request date");
Args.notNull(responseDate, "Response date");
- Args.notNull(statusLine, "Status line");
+ Args.check(status >= HttpStatus.SC_SUCCESS, "Status code");
Args.notNull(responseHeaders, "Response headers");
this.requestDate = requestDate;
this.responseDate = responseDate;
- this.statusLine = statusLine;
+ this.status = status;
this.responseHeaders = new HeaderGroup();
this.responseHeaders.setHeaders(responseHeaders);
this.resource = resource;
- this.variantMap = variantMap != null
- ? new HashMap<>(variantMap)
- : null;
+ this.variantMap = variantMap != null ? new HashMap<>(variantMap) : null;
this.date = parseDate();
}
/**
- * Create a new {@link HttpCacheEntry} with variants.
- * @param requestDate
- * Date/time when the request was made (Used for age
- * calculations)
- * @param responseDate
- * Date/time that the response came back (Used for age
- * calculations)
- * @param statusLine
- * HTTP status line from origin response
- * @param responseHeaders
- * Header[] from original HTTP Response
- * @param resource representing origin response body
- * @param variantMap describing cache entries that are variants
- * of this parent entry; this maps a "variant key" (derived
- * from the varying request headers) to a "cache key" (where
- * in the cache storage the particular variant is located)
- */
- public HttpCacheEntry(
- final Date requestDate,
- final Date responseDate,
- final StatusLine statusLine,
- final Header[] responseHeaders,
- final Resource resource,
- final Map<String,String> variantMap) {
- this(requestDate, responseDate, statusLine, responseHeaders, resource,
- variantMap, null);
- }
-
- /**
* Create a new {@link HttpCacheEntry}.
*
* @param requestDate
@@ -147,38 +116,15 @@ public class HttpCacheEntry implements S
* @param responseDate
* Date/time that the response came back (Used for age
* calculations)
- * @param statusLine
- * HTTP status line from origin response
+ * @param status
+ * HTTP status from origin response
* @param responseHeaders
* Header[] from original HTTP Response
* @param resource representing origin response body
*/
- public HttpCacheEntry(final Date requestDate, final Date responseDate, final StatusLine statusLine,
+ public HttpCacheEntry(final Date requestDate, final Date responseDate, final int status,
final Header[] responseHeaders, final Resource resource) {
- this(requestDate, responseDate, statusLine, responseHeaders, resource,
- new HashMap<String,String>());
- }
-
- /**
- * Create a new {@link HttpCacheEntry}.
- *
- * @param requestDate
- * Date/time when the request was made (Used for age
- * calculations)
- * @param responseDate
- * Date/time that the response came back (Used for age
- * calculations)
- * @param statusLine
- * HTTP status line from origin response
- * @param responseHeaders
- * Header[] from original HTTP Response
- * @param resource representing origin response body
- * @param requestMethod HTTP method used when the request was made
- */
- public HttpCacheEntry(final Date requestDate, final Date responseDate, final StatusLine statusLine,
- final Header[] responseHeaders, final Resource resource, final String requestMethod) {
- this(requestDate, responseDate, statusLine, responseHeaders, resource,
- new HashMap<String,String>(),requestMethod);
+ this(requestDate, responseDate, status, responseHeaders, resource, new HashMap<String,String>());
}
/**
@@ -194,35 +140,10 @@ public class HttpCacheEntry implements S
}
/**
- * Returns the {@link StatusLine} from the origin
- * {@link org.apache.hc.core5.http.HttpResponse}.
+ * Returns the status from the origin {@link org.apache.hc.core5.http.HttpResponse}.
*/
- public StatusLine getStatusLine() {
- return this.statusLine;
- }
-
- /**
- * Returns the {@link ProtocolVersion} from the origin
- * {@link org.apache.hc.core5.http.HttpResponse}.
- */
- public ProtocolVersion getProtocolVersion() {
- return this.statusLine.getProtocolVersion();
- }
-
- /**
- * Gets the reason phrase from the origin
- * {@link org.apache.hc.core5.http.HttpResponse}, for example, "Not Modified".
- */
- public String getReasonPhrase() {
- return this.statusLine.getReasonPhrase();
- }
-
- /**
- * Returns the HTTP response code from the origin
- * {@link org.apache.hc.core5.http.HttpResponse}.
- */
- public int getStatusCode() {
- return this.statusLine.getStatusCode();
+ public int getStatus() {
+ return this.status;
}
/**
@@ -245,6 +166,7 @@ public class HttpCacheEntry implements S
/**
* Returns all the headers that were on the origin response.
*/
+ @Override
public Header[] getAllHeaders() {
final HeaderGroup filteredHeaders = new HeaderGroup();
for (final Iterator<Header> iterator = responseHeaders.headerIterator(); iterator.hasNext();) {
@@ -260,6 +182,7 @@ public class HttpCacheEntry implements S
* Returns the first header from the origin response with the given
* name.
*/
+ @Override
public Header getFirstHeader(final String name) {
if (REQUEST_METHOD_HEADER_NAME.equalsIgnoreCase(name)) {
return null;
@@ -268,9 +191,18 @@ public class HttpCacheEntry implements S
}
/**
+ * @since 5.0
+ */
+ @Override
+ public Header getLastHeader(final String name) {
+ return responseHeaders.getLastHeader(name);
+ }
+
+ /**
* Gets all the headers with the given name that were on the origin
* response.
*/
+ @Override
public Header[] getHeaders(final String name) {
if (REQUEST_METHOD_HEADER_NAME.equalsIgnoreCase(name)) {
return new Header[0];
@@ -279,6 +211,46 @@ public class HttpCacheEntry implements S
}
/**
+ * @since 5.0
+ */
+ @Override
+ public boolean containsHeader(final String name) {
+ return responseHeaders.containsHeader(name);
+ }
+
+ /**
+ * @since 5.0
+ */
+ @Override
+ public int containsHeaders(final String name) {
+ return responseHeaders.containsHeaders(name);
+ }
+
+ /**
+ * @since 5.0
+ */
+ @Override
+ public Header getSingleHeader(final String name) throws ProtocolException {
+ return responseHeaders.getSingleHeader(name);
+ }
+
+ /**
+ * @since 5.0
+ */
+ @Override
+ public Iterator<Header> headerIterator() {
+ return responseHeaders.headerIterator();
+ }
+
+ /**
+ * @since 5.0
+ */
+ @Override
+ public Iterator<Header> headerIterator(final String name) {
+ return responseHeaders.headerIterator(name);
+ }
+
+ /**
* Gets the Date value of the "Date" header or null if the header is missing or cannot be
* parsed.
*
@@ -325,8 +297,7 @@ public class HttpCacheEntry implements S
* @since 4.4
*/
public String getRequestMethod() {
- final Header requestMethodHeader = responseHeaders
- .getFirstHeader(REQUEST_METHOD_HEADER_NAME);
+ final Header requestMethodHeader = responseHeaders.getFirstHeader(REQUEST_METHOD_HEADER_NAME);
if (requestMethodHeader != null) {
return requestMethodHeader.getValue();
}
@@ -340,7 +311,7 @@ public class HttpCacheEntry implements S
@Override
public String toString() {
return "[request date=" + this.requestDate + "; response date=" + this.responseDate
- + "; statusLine=" + this.statusLine + "]";
+ + "; status=" + this.status + "]";
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java Tue Dec 27 19:48:07 2016
@@ -26,15 +26,12 @@
*/
package org.apache.hc.client5.http.cache;
-import org.apache.hc.core5.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/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java Tue Dec 27 19:48:07 2016
@@ -30,13 +30,12 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.cache.HeaderConstants;
import org.apache.hc.client5.http.cache.HttpCacheEntry;
-import org.apache.hc.client5.http.methods.CloseableHttpResponse;
import org.apache.hc.client5.http.methods.HttpExecutionAware;
-import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.methods.RoutedHttpRequest;
import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpResponse;
@@ -48,8 +47,7 @@ import org.apache.hc.core5.http.HttpResp
public class AsynchronousValidationRequest implements Runnable {
private final AsynchronousValidator parent;
private final CachingExec cachingExec;
- private final HttpRoute route;
- private final HttpRequestWrapper request;
+ private final RoutedHttpRequest request;
private final HttpClientContext context;
private final HttpExecutionAware execAware;
private final HttpCacheEntry cacheEntry;
@@ -70,8 +68,7 @@ public class AsynchronousValidationReque
AsynchronousValidationRequest(
final AsynchronousValidator parent,
final CachingExec cachingExec,
- final HttpRoute route,
- final HttpRequestWrapper request,
+ final RoutedHttpRequest request,
final HttpClientContext context,
final HttpExecutionAware execAware,
final HttpCacheEntry cacheEntry,
@@ -79,7 +76,6 @@ public class AsynchronousValidationReque
final int consecutiveFailedAttempts) {
this.parent = parent;
this.cachingExec = cachingExec;
- this.route = route;
this.request = request;
this.context = context;
this.execAware = execAware;
@@ -110,8 +106,8 @@ public class AsynchronousValidationReque
*/
private boolean revalidateCacheEntry() {
try {
- try (CloseableHttpResponse httpResponse = cachingExec.revalidateCacheEntry(route, request, context, execAware, cacheEntry)) {
- final int statusCode = httpResponse.getStatusLine().getStatusCode();
+ try (ClassicHttpResponse httpResponse = cachingExec.revalidateCacheEntry(request, context, execAware, cacheEntry)) {
+ final int statusCode = httpResponse.getCode();
return isNotServerError(statusCode) && isNotStale(httpResponse);
}
} catch (final IOException ioe) {
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java Tue Dec 27 19:48:07 2016
@@ -35,10 +35,9 @@ import java.util.concurrent.RejectedExec
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.cache.HttpCacheEntry;
import org.apache.hc.client5.http.methods.HttpExecutionAware;
-import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.methods.RoutedHttpRequest;
import org.apache.hc.client5.http.protocol.HttpClientContext;
/**
@@ -91,19 +90,18 @@ class AsynchronousValidator implements C
*/
public synchronized void revalidateCacheEntry(
final CachingExec cachingExec,
- final HttpRoute route,
- final HttpRequestWrapper request,
+ final RoutedHttpRequest request,
final HttpClientContext context,
final HttpExecutionAware execAware,
final HttpCacheEntry entry) {
// getVariantURI will fall back on getURI if no variants exist
- final String uri = cacheKeyGenerator.getVariantURI(context.getTargetHost(), request, entry);
+ final String uri = cacheKeyGenerator.generateVariantURI(request.getTargetHost(), request, entry);
if (!queued.contains(uri)) {
final int consecutiveFailedAttempts = failureCache.getErrorCount(uri);
final AsynchronousValidationRequest revalidationRequest =
new AsynchronousValidationRequest(
- this, cachingExec, route, request, context, execAware, entry, uri, consecutiveFailedAttempts);
+ this, cachingExec, request, context, execAware, entry, uri, consecutiveFailedAttempts);
try {
schedulingStrategy.schedule(revalidationRequest);
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java Tue Dec 27 19:48:07 2016
@@ -44,17 +44,15 @@ import org.apache.hc.client5.http.cache.
import org.apache.hc.client5.http.cache.HttpCacheUpdateException;
import org.apache.hc.client5.http.cache.Resource;
import org.apache.hc.client5.http.cache.ResourceFactory;
-import org.apache.hc.client5.http.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.entity.ByteArrayEntity;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
class BasicHttpCache implements HttpCache {
private static final Set<String> safeRequestMethods = new HashSet<>(
@@ -114,15 +112,15 @@ class BasicHttpCache implements HttpCach
@Override
public void flushCacheEntriesFor(final HttpHost host, final HttpRequest request)
throws IOException {
- if (!safeRequestMethods.contains(request.getRequestLine().getMethod())) {
- final String uri = uriExtractor.getURI(host, request);
+ if (!safeRequestMethods.contains(request.getMethod())) {
+ final String uri = uriExtractor.generateKey(host, request);
storage.removeEntry(uri);
}
}
@Override
public void flushInvalidatedCacheEntriesFor(final HttpHost host, final HttpRequest request, final HttpResponse response) {
- if (!safeRequestMethods.contains(request.getRequestLine().getMethod())) {
+ if (!safeRequestMethods.contains(request.getMethod())) {
cacheInvalidator.flushInvalidatedCacheEntries(host, request, response);
}
}
@@ -138,7 +136,7 @@ class BasicHttpCache implements HttpCach
void storeNonVariantEntry(
final HttpHost target, final HttpRequest req, final HttpCacheEntry entry) throws IOException {
- final String uri = uriExtractor.getURI(target, req);
+ final String uri = uriExtractor.generateKey(target, req);
storage.putEntry(uri, entry);
}
@@ -146,8 +144,8 @@ class BasicHttpCache implements HttpCach
final HttpHost target,
final HttpRequest req,
final HttpCacheEntry entry) throws IOException {
- final String parentURI = uriExtractor.getURI(target, req);
- final String variantURI = uriExtractor.getVariantURI(target, req, entry);
+ final String parentURI = uriExtractor.generateKey(target, req);
+ final String variantURI = uriExtractor.generateVariantURI(target, req, entry);
storage.putEntry(variantURI, entry);
final HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
@@ -155,8 +153,8 @@ class BasicHttpCache implements HttpCach
@Override
public HttpCacheEntry update(final HttpCacheEntry existing) throws IOException {
return doGetUpdatedParentEntry(
- req.getRequestLine().getUri(), existing, entry,
- uriExtractor.getVariantKey(req, entry),
+ req.getRequestUri(), existing, entry,
+ uriExtractor.generateVariantKey(req, entry),
variantURI);
}
@@ -172,16 +170,16 @@ class BasicHttpCache implements HttpCach
@Override
public void reuseVariantEntryFor(final HttpHost target, final HttpRequest req,
final Variant variant) throws IOException {
- final String parentCacheKey = uriExtractor.getURI(target, req);
+ final String parentCacheKey = uriExtractor.generateKey(target, req);
final HttpCacheEntry entry = variant.getEntry();
- final String variantKey = uriExtractor.getVariantKey(req, entry);
+ final String variantKey = uriExtractor.generateVariantKey(req, entry);
final String variantCacheKey = variant.getCacheKey();
final HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
@Override
public HttpCacheEntry update(final HttpCacheEntry existing)
throws IOException {
- return doGetUpdatedParentEntry(req.getRequestLine().getUri(),
+ return doGetUpdatedParentEntry(req.getRequestUri(),
existing, entry, variantKey, variantCacheKey);
}
};
@@ -194,7 +192,7 @@ class BasicHttpCache implements HttpCach
}
boolean isIncompleteResponse(final HttpResponse resp, final Resource resource) {
- final int status = resp.getStatusLine().getStatusCode();
+ final int status = resp.getCode();
if (status != HttpStatus.SC_OK
&& status != HttpStatus.SC_PARTIAL_CONTENT) {
return false;
@@ -215,11 +213,10 @@ class BasicHttpCache implements HttpCach
return (resource.length() < contentLength);
}
- CloseableHttpResponse generateIncompleteResponseError(
+ ClassicHttpResponse generateIncompleteResponseError(
final HttpResponse response, final Resource resource) {
final Integer contentLength = Integer.valueOf(response.getFirstHeader(HttpHeaders.CONTENT_LENGTH).getValue());
- final HttpResponse error =
- new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_BAD_GATEWAY, "Bad Gateway");
+ final ClassicHttpResponse error = new BasicClassicHttpResponse(HttpStatus.SC_BAD_GATEWAY, "Bad Gateway");
error.setHeader("Content-Type","text/plain;charset=UTF-8");
final String msg = String.format("Received incomplete response " +
"with Content-Length %d but actual body length %d",
@@ -227,7 +224,7 @@ class BasicHttpCache implements HttpCach
final byte[] msgBytes = msg.getBytes();
error.setHeader("Content-Length", Integer.toString(msgBytes.length));
error.setEntity(new ByteArrayEntity(msgBytes));
- return Proxies.enhanceResponse(error);
+ return error;
}
HttpCacheEntry doGetUpdatedParentEntry(
@@ -250,11 +247,10 @@ class BasicHttpCache implements HttpCach
return new HttpCacheEntry(
src.getRequestDate(),
src.getResponseDate(),
- src.getStatusLine(),
+ src.getStatus(),
src.getAllHeaders(),
resource,
- variantMap,
- src.getRequestMethod());
+ variantMap);
}
@Override
@@ -262,7 +258,7 @@ class BasicHttpCache implements HttpCach
final HttpCacheEntry stale, final HttpResponse originResponse,
final Date requestSent, final Date responseReceived) throws IOException {
final HttpCacheEntry updatedEntry = cacheEntryUpdater.updateCacheEntry(
- request.getRequestLine().getUri(),
+ request.getRequestUri(),
stale,
requestSent,
responseReceived,
@@ -276,7 +272,7 @@ class BasicHttpCache implements HttpCach
final HttpCacheEntry stale, final HttpResponse originResponse,
final Date requestSent, final Date responseReceived, final String cacheKey) throws IOException {
final HttpCacheEntry updatedEntry = cacheEntryUpdater.updateCacheEntry(
- request.getRequestLine().getUri(),
+ request.getRequestUri(),
stale,
requestSent,
responseReceived,
@@ -286,19 +282,10 @@ class BasicHttpCache implements HttpCach
}
@Override
- public HttpResponse cacheAndReturnResponse(final HttpHost host, final HttpRequest request,
- final HttpResponse originResponse, final Date requestSent, final Date responseReceived)
- throws IOException {
- return cacheAndReturnResponse(host, request,
- Proxies.enhanceResponse(originResponse), requestSent,
- responseReceived);
- }
-
- @Override
- public CloseableHttpResponse cacheAndReturnResponse(
+ public ClassicHttpResponse cacheAndReturnResponse(
final HttpHost host,
final HttpRequest request,
- final CloseableHttpResponse originResponse,
+ final ClassicHttpResponse originResponse,
final Date requestSent,
final Date responseReceived) throws IOException {
@@ -320,12 +307,11 @@ class BasicHttpCache implements HttpCach
final HttpCacheEntry entry = new HttpCacheEntry(
requestSent,
responseReceived,
- originResponse.getStatusLine(),
+ originResponse.getCode(),
originResponse.getAllHeaders(),
- resource,
- request.getRequestLine().getMethod());
+ resource);
storeInCache(host, request, entry);
- return responseGenerator.generateResponse(HttpRequestWrapper.wrap(request, host), entry);
+ return responseGenerator.generateResponse(request, entry);
} finally {
if (closeOriginResponse) {
originResponse.close();
@@ -334,21 +320,21 @@ class BasicHttpCache implements HttpCach
}
SizeLimitedResponseReader getResponseReader(final HttpRequest request,
- final CloseableHttpResponse backEndResponse) {
+ final ClassicHttpResponse backEndResponse) {
return new SizeLimitedResponseReader(
resourceFactory, maxObjectSizeBytes, request, backEndResponse);
}
@Override
public HttpCacheEntry getCacheEntry(final HttpHost host, final HttpRequest request) throws IOException {
- final HttpCacheEntry root = storage.getEntry(uriExtractor.getURI(host, request));
+ final HttpCacheEntry root = storage.getEntry(uriExtractor.generateKey(host, request));
if (root == null) {
return null;
}
if (!root.hasVariants()) {
return root;
}
- final String variantCacheKey = root.getVariantMap().get(uriExtractor.getVariantKey(request, root));
+ final String variantCacheKey = root.getVariantMap().get(uriExtractor.generateVariantKey(request, root));
if (variantCacheKey == null) {
return null;
}
@@ -365,7 +351,7 @@ class BasicHttpCache implements HttpCach
public Map<String, Variant> getVariantCacheEntriesWithEtags(final HttpHost host, final HttpRequest request)
throws IOException {
final Map<String,Variant> variants = new HashMap<>();
- final HttpCacheEntry root = storage.getEntry(uriExtractor.getURI(host, request));
+ final HttpCacheEntry root = storage.getEntry(uriExtractor.generateKey(host, request));
if (root == null || !root.hasVariants()) {
return variants;
}
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java Tue Dec 27 19:48:07 2016
@@ -31,7 +31,8 @@ import java.io.IOException;
import org.apache.hc.client5.http.cache.HttpCacheEntry;
import org.apache.hc.client5.http.cache.HttpCacheStorage;
import org.apache.hc.client5.http.cache.HttpCacheUpdateCallback;
-import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
/**
* Basic {@link HttpCacheStorage} implementation backed by an instance of
@@ -43,7 +44,7 @@ import org.apache.hc.core5.annotation.Th
*
* @since 4.1
*/
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
public class BasicHttpCacheStorage implements HttpCacheStorage {
private final CacheMap entries;
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java Tue Dec 27 19:48:07 2016
@@ -33,19 +33,18 @@ import java.security.SecureRandom;
import java.util.Formatter;
import java.util.Locale;
-import org.apache.hc.core5.annotation.GuardedBy;
-import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.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/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java Tue Dec 27 19:48:07 2016
@@ -30,17 +30,19 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
+import java.util.List;
import java.util.Set;
import org.apache.hc.client5.http.cache.HttpCacheEntry;
-import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
+import org.apache.hc.core5.function.Supplier;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.TrailerSupplier;
import org.apache.hc.core5.util.Args;
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
class CacheEntity implements HttpEntity, Serializable {
private static final long serialVersionUID = -3467082284120936233L;
@@ -98,7 +100,7 @@ class CacheEntity implements HttpEntity,
}
@Override
- public TrailerSupplier getTrailers() {
+ public Supplier<List<? extends Header>> getTrailers() {
return null;
}
@@ -107,4 +109,8 @@ class CacheEntity implements HttpEntity,
return null;
}
+ @Override
+ public void close() throws IOException {
+ }
+
}
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java Tue Dec 27 19:48:07 2016
@@ -38,7 +38,8 @@ import org.apache.hc.client5.http.cache.
import org.apache.hc.client5.http.cache.Resource;
import org.apache.hc.client5.http.cache.ResourceFactory;
import org.apache.hc.client5.http.utils.DateUtils;
-import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpResponse;
@@ -52,7 +53,7 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.1
*/
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
class CacheEntryUpdater {
private final ResourceFactory resourceFactory;
@@ -84,7 +85,7 @@ class CacheEntryUpdater {
final Date requestDate,
final Date responseDate,
final HttpResponse response) throws IOException {
- Args.check(response.getStatusLine().getStatusCode() == HttpStatus.SC_NOT_MODIFIED,
+ Args.check(response.getCode() == HttpStatus.SC_NOT_MODIFIED,
"Response must have 304 status code");
final Header[] mergedHeaders = mergeHeaders(entry, response);
Resource resource = null;
@@ -94,10 +95,9 @@ class CacheEntryUpdater {
return new HttpCacheEntry(
requestDate,
responseDate,
- entry.getStatusLine(),
+ entry.getStatus(),
mergedHeaders,
- resource,
- entry.getRequestMethod());
+ resource);
}
protected Header[] mergeHeaders(final HttpCacheEntry entry, final HttpResponse response) {