From 6d17126cbfda7e751555b8c52c8c69d788438a32 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Sat, 2 Sep 2017 17:27:30 +0200 Subject: [PATCH] Moved classes and renamed packages (no functional changes) --- .../http/cache/CacheResponseStatus.java | 2 +- .../client5/http/cache/HttpCacheStorage.java | 2 +- .../cache/AsynchronousValidationRequest.java | 2 +- .../impl/cache/AsynchronousValidator.java | 2 +- .../client5/http/impl/cache/CacheConfig.java | 4 +- .../client5/http/impl/cache/CachingExec.java | 4 +- .../impl/cache/CachingHttpClientBuilder.java | 8 +- .../http/impl/cache/CachingHttpClients.java | 2 +- .../impl/cache/RequestProtocolCompliance.java | 2 +- .../cache/ResponseProtocolCompliance.java | 2 +- .../http/impl/cache/AbstractProtocolTest.java | 6 +- .../client5/http/impl/cache/DummyBackend.java | 2 +- .../TestAsynchronousValidationRequest.java | 6 +- .../impl/cache/TestAsynchronousValidator.java | 6 +- .../http/impl/cache/TestBasicHttpCache.java | 12 +-- .../impl/cache/TestCacheKeyGenerator.java | 2 +- .../http/impl/cache/TestCachingExec.java | 4 +- .../http/impl/cache/TestCachingExecChain.java | 12 +-- ...ponentialBackingOffSchedulingStrategy.java | 4 +- .../cache/TestHttpCacheJiraNumber1147.java | 8 +- .../impl/cache/TestProtocolDeviations.java | 8 +- .../cache/TestProtocolRecommendations.java | 6 +- .../impl/cache/TestProtocolRequirements.java | 4 +- .../cache/TestRequestProtocolCompliance.java | 2 +- .../impl/cache/TestResponseCachingPolicy.java | 2 +- .../cache/TestResponseProtocolCompliance.java | 6 +- .../cache/TestSizeLimitedResponseReader.java | 2 +- ...leWhileRevalidationReleasesConnection.java | 6 +- .../TestEhcacheProtocolRequirements.java | 2 +- .../fluent/FluentResponseHandling.java | 4 +- .../http/fluent/ContentResponseHandler.java | 2 +- .../hc/client5/http/fluent/Executor.java | 6 +- .../hc/client5/http/fluent/Request.java | 20 ++--- .../hc/client5/http/fluent/Response.java | 4 +- .../impl/HttpClientBuilderConfigurator.java | 2 +- .../impl/HttpProxyConfigurationActivator.java | 2 +- .../impl/OSGiCachingClientBuilderFactory.java | 2 +- .../osgi/impl/OSGiClientBuilderFactory.java | 4 +- .../services/HttpClientBuilderFactory.java | 2 +- .../testing/async/TestAsyncRedirects.java | 4 +- .../TestAsyncStatefulConnManagement.java | 2 +- .../async/TestClientAuthentication.java | 6 +- .../HttpAsyncClientCompatibilityTest.java | 2 +- .../external/HttpClientCompatibilityTest.java | 10 +-- .../hc/client5/testing/fluent/TestFluent.java | 2 +- .../testing/sync/LocalServerTestBase.java | 4 +- .../sync/TestBasicConnectionManager.java | 4 +- .../sync/TestClientAuthentication.java | 16 ++-- .../TestClientAuthenticationFakeNTLM.java | 6 +- .../sync/TestClientRequestExecution.java | 10 +-- .../testing/sync/TestConnectionReuse.java | 4 +- .../testing/sync/TestContentCodings.java | 6 +- .../testing/sync/TestCookieVirtualHost.java | 4 +- .../sync/TestIdleConnectionEviction.java | 6 +- .../sync/TestMalformedServerResponse.java | 8 +- .../TestMinimalClientRequestExecution.java | 4 +- .../client5/testing/sync/TestRedirects.java | 10 +-- .../testing/sync/TestSPNegoScheme.java | 6 +- .../sync/TestStatefulConnManagement.java | 6 +- .../sync/TestWindowsNegotiateScheme.java | 8 +- .../examples/client/win/ClientWinAuth.java | 6 +- .../client5/http/impl/win/WinHttpClients.java | 6 +- .../examples/AsyncClientAuthentication.java | 2 +- .../examples/AsyncClientInterceptors.java | 2 +- .../examples/AsyncClientMessageTrailers.java | 2 +- .../http/examples/ClientAbortMethod.java | 8 +- .../http/examples/ClientAuthentication.java | 10 +-- .../http/examples/ClientChunkEncodedPost.java | 8 +- .../http/examples/ClientConfiguration.java | 10 +-- .../examples/ClientConnectionRelease.java | 8 +- .../http/examples/ClientCustomContext.java | 8 +- .../ClientCustomPublicSuffixList.java | 8 +- .../http/examples/ClientCustomSSL.java | 8 +- .../ClientEvictExpiredConnections.java | 8 +- .../http/examples/ClientExecuteProxy.java | 8 +- .../http/examples/ClientExecuteSOCKS.java | 8 +- .../http/examples/ClientFormLogin.java | 10 +-- .../http/examples/ClientInterceptors.java | 14 ++-- .../ClientMultiThreadedExecution.java | 8 +- .../examples/ClientMultipartFormPost.java | 8 +- .../ClientPreemptiveBasicAuthentication.java | 8 +- .../ClientPreemptiveDigestAuthentication.java | 8 +- .../examples/ClientProxyAuthentication.java | 10 +-- .../examples/ClientWithRequestFuture.java | 10 +-- .../examples/ClientWithResponseHandler.java | 8 +- .../http/examples/ProxyTunnelDemo.java | 2 +- .../hc/client5/http/examples/QuickStart.java | 10 +-- .../AuthenticationStrategy.java | 2 +- .../CircularRedirectException.java | 2 +- .../ClientProtocolException.java | 2 +- .../{sync => }/HttpRequestRetryHandler.java | 2 +- .../{protocol => }/HttpResponseException.java | 2 +- .../NonRepeatableRequestException.java | 2 +- .../{protocol => }/RedirectException.java | 2 +- .../ServiceUnavailableRetryStrategy.java | 2 +- .../http/{protocol => }/UserTokenHandler.java | 3 +- .../{sync => classic}/BackoffManager.java | 2 +- .../ConnectionBackoffStrategy.java | 2 +- .../http/{sync => classic}/ExecChain.java | 2 +- .../{sync => classic}/ExecChainHandler.java | 2 +- .../http/{sync => classic}/ExecRuntime.java | 2 +- .../http/{sync => classic}/HttpClient.java | 2 +- .../{sync => classic}/methods/HttpDelete.java | 2 +- .../methods/HttpExecutionAware.java | 2 +- .../{sync => classic}/methods/HttpGet.java | 2 +- .../{sync => classic}/methods/HttpHead.java | 2 +- .../methods/HttpOptions.java | 2 +- .../{sync => classic}/methods/HttpPatch.java | 2 +- .../{sync => classic}/methods/HttpPost.java | 2 +- .../{sync => classic}/methods/HttpPut.java | 2 +- .../{sync => classic}/methods/HttpTrace.java | 2 +- .../methods/HttpUriRequest.java | 2 +- .../methods/HttpUriRequestBase.java | 2 +- .../methods/RequestBuilder.java | 2 +- .../methods/package-info.java | 2 +- .../http/{sync => classic}/package-info.java | 2 +- .../http/impl/{sync => }/ChainElements.java | 2 +- .../impl/{sync => }/CookieSpecRegistries.java | 2 +- .../DefaultAuthenticationStrategy.java | 4 +- .../DefaultHttpRequestRetryHandler.java | 6 +- .../DefaultRedirectStrategy.java | 4 +- ...efaultServiceUnavailableRetryStrategy.java | 4 +- .../http/impl/DefaultUserTokenHandler.java | 2 +- .../http/impl/NoopUserTokenHandler.java | 2 +- .../{sync => }/TunnelRefusedException.java | 2 +- .../http/impl/async/AsyncConnectExec.java | 4 +- .../http/impl/async/AsyncMainClientExec.java | 2 +- .../http/impl/async/AsyncProtocolExec.java | 4 +- .../http/impl/async/AsyncRedirectExec.java | 2 +- .../http/impl/async/AsyncRetryExec.java | 2 +- .../impl/async/HttpAsyncClientBuilder.java | 18 ++--- .../BasicCredentialsProvider.java | 2 +- .../http/impl/auth/HttpAuthenticator.java | 2 +- .../SystemDefaultCredentialsProvider.java | 1 - .../{sync => classic}/AIMDBackoffManager.java | 4 +- .../AbstractHttpClientResponseHandler.java | 8 +- .../BackoffStrategyExec.java | 10 +-- .../BasicHttpClientResponseHandler.java | 16 ++-- .../http/impl/{sync => classic}/Clock.java | 2 +- .../CloseableHttpClient.java | 6 +- .../CloseableHttpResponse.java | 4 +- .../impl/{sync => classic}/ConnectExec.java | 11 +-- .../ContentCompressionExec.java | 6 +- .../DefaultBackoffStrategy.java | 4 +- .../{sync => classic}/ExecChainElement.java | 6 +- .../{sync => classic}/ExecRuntimeImpl.java | 4 +- .../FutureRequestExecutionMetrics.java | 2 +- .../FutureRequestExecutionService.java | 4 +- .../{sync => classic}/HttpClientBuilder.java | 24 +++--- .../impl/{sync => classic}/HttpClients.java | 2 +- .../HttpRequestFutureTask.java | 2 +- .../HttpRequestTaskCallable.java | 4 +- .../{sync => classic}/InternalHttpClient.java | 8 +- .../{sync => classic}/MainClientExec.java | 10 +-- .../{sync => classic}/MinimalHttpClient.java | 6 +- .../NullBackoffStrategy.java | 4 +- .../impl/{sync => classic}/ProtocolExec.java | 14 ++-- .../impl/{sync => classic}/ProxyClient.java | 8 +- .../impl/{sync => classic}/RedirectExec.java | 12 +-- .../RequestAbortedException.java | 2 +- .../{sync => classic}/RequestEntityProxy.java | 2 +- .../RequestFailedException.java | 2 +- .../ResponseEntityProxy.java | 4 +- .../impl/{sync => classic}/RetryExec.java | 10 +-- .../ServiceUnavailableRetryExec.java | 8 +- .../impl/{sync => classic}/SystemClock.java | 2 +- .../impl/{sync => classic}/package-info.java | 2 +- .../methods/TestHttpOptions.java | 2 +- .../methods/TestHttpRequestBase.java | 2 +- .../methods/TestRequestBuilder.java | 37 +++++++++- .../TestAuthenticationStrategy.java | 4 +- .../TestDefaultHttpRequestRetryHandler.java | 4 +- .../TestDefaultRedirectStrategy.java | 6 +- ...efaultServiceUnavailableRetryStrategy.java | 2 +- .../auth/TestBasicCredentialsProvider.java | 1 - .../http/impl/auth/TestBasicScheme.java | 1 - .../http/impl/auth/TestDigestScheme.java | 1 - .../http/impl/auth/TestHttpAuthenticator.java | 2 +- .../http/impl/auth/TestRequestAuthCache.java | 1 - .../TestSystemDefaultCredentialsProvider.java | 2 +- .../impl/{sync => classic}/MockClock.java | 2 +- .../MockConnPoolControl.java | 2 +- .../TestAIMDBackoffManager.java | 4 +- ...TestAbstractHttpClientResponseHandler.java | 6 +- .../TestBasicResponseHandler.java | 5 +- .../TestCloseableHttpClient.java | 4 +- .../{sync => classic}/TestConnectExec.java | 12 +-- .../TestContentCompressionExec.java | 6 +- .../TestCookieIdentityComparator.java | 2 +- .../TestDefaultBackoffStrategy.java | 2 +- .../TestExecRuntimeImpl.java | 2 +- .../TestFutureRequestExecutionService.java | 4 +- .../TestInternalHttpClient.java | 10 +-- .../{sync => classic}/TestMainClientExec.java | 10 +-- .../TestNullBackoffStrategy.java | 2 +- .../{sync => classic}/TestProtocolExec.java | 15 ++-- .../{sync => classic}/TestRedirectExec.java | 10 +-- .../TestResponseEntityWrapper.java | 4 +- .../impl/{sync => classic}/TestRetryExec.java | 14 ++-- .../TestServiceUnavailableRetryExec.java | 12 +-- .../http/utils/TestRequestBuilder.java | 74 ------------------- 201 files changed, 540 insertions(+), 576 deletions(-) rename httpclient5/src/main/java/org/apache/hc/client5/http/{protocol => }/AuthenticationStrategy.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{protocol => }/CircularRedirectException.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{protocol => }/ClientProtocolException.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => }/HttpRequestRetryHandler.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{protocol => }/HttpResponseException.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{protocol => }/NonRepeatableRequestException.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{protocol => }/RedirectException.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => }/ServiceUnavailableRetryStrategy.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{protocol => }/UserTokenHandler.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/BackoffManager.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/ConnectionBackoffStrategy.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/ExecChain.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/ExecChainHandler.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/ExecRuntime.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/HttpClient.java (99%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpDelete.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpExecutionAware.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpGet.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpHead.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpOptions.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpPatch.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpPost.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpPut.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpTrace.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpUriRequest.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/HttpUriRequestBase.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/RequestBuilder.java (99%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/methods/package-info.java (95%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{sync => classic}/package-info.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => }/ChainElements.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => }/CookieSpecRegistries.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{protocol => }/DefaultAuthenticationStrategy.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => }/DefaultHttpRequestRetryHandler.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{protocol => }/DefaultRedirectStrategy.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => }/DefaultServiceUnavailableRetryStrategy.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => }/TunnelRefusedException.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => auth}/BasicCredentialsProvider.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/AIMDBackoffManager.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/AbstractHttpClientResponseHandler.java (92%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/BackoffStrategyExec.java (91%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/BasicHttpClientResponseHandler.java (82%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/Clock.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/CloseableHttpClient.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/CloseableHttpResponse.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/ConnectExec.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/ContentCompressionExec.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/DefaultBackoffStrategy.java (94%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/ExecChainElement.java (93%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/ExecRuntimeImpl.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/FutureRequestExecutionMetrics.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/FutureRequestExecutionService.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/HttpClientBuilder.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/HttpClients.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/HttpRequestFutureTask.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/HttpRequestTaskCallable.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/InternalHttpClient.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/MainClientExec.java (95%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/MinimalHttpClient.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/NullBackoffStrategy.java (93%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/ProtocolExec.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/ProxyClient.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/RedirectExec.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/RequestAbortedException.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/RequestEntityProxy.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/RequestFailedException.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/ResponseEntityProxy.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/RetryExec.java (94%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/ServiceUnavailableRetryExec.java (95%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/SystemClock.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/{sync => classic}/package-info.java (97%) rename httpclient5/src/test/java/org/apache/hc/client5/http/{sync => classic}/methods/TestHttpOptions.java (97%) rename httpclient5/src/test/java/org/apache/hc/client5/http/{sync => classic}/methods/TestHttpRequestBase.java (97%) rename httpclient5/src/test/java/org/apache/hc/client5/http/{sync => classic}/methods/TestRequestBuilder.java (87%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{protocol => }/TestAuthenticationStrategy.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => }/TestDefaultHttpRequestRetryHandler.java (96%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{protocol => }/TestDefaultRedirectStrategy.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => }/TestDefaultServiceUnavailableRetryStrategy.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/MockClock.java (96%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/MockConnPoolControl.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestAIMDBackoffManager.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{ => classic}/TestAbstractHttpClientResponseHandler.java (92%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{ => classic}/TestBasicResponseHandler.java (94%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestCloseableHttpClient.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestConnectExec.java (97%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestContentCompressionExec.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestCookieIdentityComparator.java (99%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestDefaultBackoffStrategy.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestExecRuntimeImpl.java (99%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestFutureRequestExecutionService.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestInternalHttpClient.java (96%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestMainClientExec.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestNullBackoffStrategy.java (97%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestProtocolExec.java (97%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestRedirectExec.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestResponseEntityWrapper.java (98%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestRetryExec.java (94%) rename httpclient5/src/test/java/org/apache/hc/client5/http/impl/{sync => classic}/TestServiceUnavailableRetryExec.java (94%) delete mode 100644 httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java index c74a471a5..fefdc368d 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java @@ -28,7 +28,7 @@ /** * This enumeration represents the various ways a response can be generated - * by the caching {@link org.apache.hc.client5.http.sync.HttpClient}; + * by the caching {@link org.apache.hc.client5.http.classic.HttpClient}; * if a request is executed with an {@link HttpCacheContext} * then a parameter with one of these values will be registered in the * context under the key {@link HttpCacheContext#CACHE_RESPONSE_STATUS}. diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java index 9b9fee473..29884e79a 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java @@ -31,7 +31,7 @@ /** * New storage backends should implement this {@link HttpCacheStorage} * interface. They can then be plugged into the existing caching - * {@link org.apache.hc.client5.http.sync.HttpClient} implementation. + * {@link org.apache.hc.client5.http.classic.HttpClient} implementation. * * @since 4.1 */ diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java index 0af765da7..01a8e6be2 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java @@ -30,7 +30,7 @@ import org.apache.hc.client5.http.cache.HeaderConstants; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.sync.ExecChain; +import org.apache.hc.client5.http.classic.ExecChain; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java index 654f9c048..6eea5d512 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java @@ -34,7 +34,7 @@ import java.util.concurrent.RejectedExecutionException; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.sync.ExecChain; +import org.apache.hc.client5.http.classic.ExecChain; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.HttpHost; import org.apache.logging.log4j.LogManager; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java index a2c35f4a8..5994aa519 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java @@ -29,7 +29,7 @@ import org.apache.hc.core5.util.Args; /** - *

Java Beans-style configuration for caching {@link org.apache.hc.client5.http.sync.HttpClient}. + *

Java Beans-style configuration for caching {@link org.apache.hc.client5.http.classic.HttpClient}. * Any class in the caching module that has configuration options should take a * {@link CacheConfig} argument in one of its constructors. A * {@code CacheConfig} instance has sane and conservative defaults, so the @@ -38,7 +38,7 @@ * *

N.B. This class is only for caching-specific configuration; to * configure the behavior of the rest of the client, configure the - * {@link org.apache.hc.client5.http.sync.HttpClient} used as the "backend" + * {@link org.apache.hc.client5.http.classic.HttpClient} used as the "backend" * for the {@code CachingHttpClient}.

* *

Cache configuration can be grouped into the following categories:

diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java index 0507d85e0..2db9a9391 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java @@ -41,9 +41,9 @@ import org.apache.hc.client5.http.cache.HttpCacheEntry; import org.apache.hc.client5.http.cache.HttpCacheStorage; import org.apache.hc.client5.http.cache.ResourceFactory; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java index e7345233f..cf0252e21 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java @@ -33,13 +33,13 @@ import org.apache.hc.client5.http.cache.HttpCacheInvalidator; import org.apache.hc.client5.http.cache.HttpCacheStorage; import org.apache.hc.client5.http.cache.ResourceFactory; -import org.apache.hc.client5.http.impl.sync.ChainElements; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; -import org.apache.hc.client5.http.sync.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.impl.ChainElements; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.core5.http.config.NamedElementChain; /** - * Builder for {@link org.apache.hc.client5.http.impl.sync.CloseableHttpClient} + * Builder for {@link org.apache.hc.client5.http.impl.classic.CloseableHttpClient} * instances capable of client-side caching. * * @since 4.3 diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java index fe7aab2f7..0ea8eede5 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java @@ -29,7 +29,7 @@ import java.io.File; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java index 5a8879953..92757e048 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java @@ -31,8 +31,8 @@ import java.util.Iterator; import java.util.List; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.cache.HeaderConstants; -import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java index f5f403f57..b1340c133 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java @@ -31,8 +31,8 @@ import java.util.Date; import java.util.List; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.cache.HeaderConstants; -import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java index c32d4b5d6..7a5be9d4a 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java @@ -30,11 +30,11 @@ import java.util.HashMap; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.impl.ExecSupport; -import org.apache.hc.client5.http.sync.ExecRuntime; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java index c9f05792c..50b49cd3d 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java @@ -28,7 +28,7 @@ import java.io.IOException; -import org.apache.hc.client5.http.sync.ExecChain; +import org.apache.hc.client5.http.classic.ExecChain; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java index f8529ea12..8f585d764 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java @@ -35,10 +35,10 @@ 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.sync.ExecRuntime; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java index 67d6f86b7..9e53c4be5 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java @@ -40,10 +40,10 @@ 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.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java index 95e5c4cb6..2caba3266 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java @@ -44,12 +44,12 @@ import org.apache.hc.client5.http.cache.HeaderConstants; import org.apache.hc.client5.http.cache.HttpCacheEntry; import org.apache.hc.client5.http.cache.Resource; -import org.apache.hc.client5.http.sync.methods.HttpDelete; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpHead; -import org.apache.hc.client5.http.sync.methods.HttpOptions; -import org.apache.hc.client5.http.sync.methods.HttpPost; -import org.apache.hc.client5.http.sync.methods.HttpTrace; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpHead; +import org.apache.hc.client5.http.classic.methods.HttpOptions; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpTrace; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java index 1732503a7..d14028dda 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.when; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java index 281f8594f..21facaa2c 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java @@ -45,8 +45,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java index fcf05f26c..cc8d86a4c 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java @@ -47,19 +47,19 @@ import java.util.Date; import java.util.List; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.CacheResponseStatus; import org.apache.hc.client5.http.cache.HttpCacheContext; import org.apache.hc.client5.http.cache.HttpCacheEntry; import org.apache.hc.client5.http.cache.HttpCacheStorage; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpOptions; import org.apache.hc.client5.http.impl.ExecSupport; -import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpOptions; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java index 908d509d0..5954c4314 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java @@ -34,9 +34,9 @@ import java.util.concurrent.TimeUnit; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.sync.ExecRuntime; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.message.BasicClassicHttpRequest; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java index a99b3abc8..da362a789 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java @@ -38,11 +38,11 @@ import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HttpCacheStorage; import org.apache.hc.client5.http.cache.ResourceFactory; -import org.apache.hc.client5.http.sync.ExecRuntime; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java index 86c1c3fce..0c59c04fc 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java @@ -30,13 +30,13 @@ import java.util.Date; import java.util.Random; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HttpCacheContext; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.impl.ExecSupport; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java index 96f87c6b9..3f4cf5c7e 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java @@ -38,9 +38,9 @@ import java.util.Iterator; import java.util.List; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java index f0325cd48..5729a8163 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java @@ -35,10 +35,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.sync.ExecChain; +import org.apache.hc.client5.http.classic.ExecChain; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java index c8d5ca239..ad9b25ae6 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java @@ -32,8 +32,8 @@ import java.util.Arrays; +import org.apache.hc.client5.http.classic.methods.HttpPut; import org.apache.hc.client5.http.impl.ExecSupport; -import org.apache.hc.client5.http.sync.methods.HttpPut; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolVersion; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java index 6bc5ae8a0..2c4d8813c 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java @@ -29,7 +29,7 @@ import java.util.Date; import java.util.Random; -import org.apache.hc.client5.http.sync.methods.HttpOptions; +import org.apache.hc.client5.http.classic.methods.HttpOptions; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java index 85f4d6798..e548e1870 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java @@ -32,11 +32,11 @@ import java.io.ByteArrayInputStream; import java.util.Date; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpHead; import org.apache.hc.client5.http.impl.ExecSupport; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpHead; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java index 9c8b0dbf8..49454ed1a 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpRequest; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java index 83b06d785..3f4374581 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java @@ -34,13 +34,13 @@ import java.util.Locale; import java.util.concurrent.TimeUnit; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.cache.CacheResponseStatus; import org.apache.hc.client5.http.cache.HttpCacheContext; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java index 2e3df46a1..ca5421a94 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java @@ -27,11 +27,11 @@ package org.apache.hc.client5.http.impl.cache.ehcache; import org.apache.hc.client5.http.cache.HttpCacheStorage; +import org.apache.hc.client5.http.classic.ExecChain; import org.apache.hc.client5.http.impl.cache.CacheConfig; import org.apache.hc.client5.http.impl.cache.CachingExec; import org.apache.hc.client5.http.impl.cache.HeapResourceFactory; import org.apache.hc.client5.http.impl.cache.TestProtocolRequirements; -import org.apache.hc.client5.http.sync.ExecChain; import org.easymock.EasyMock; import org.junit.After; import org.junit.AfterClass; diff --git a/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java b/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java index fe62aae1a..a72509164 100644 --- a/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java +++ b/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java @@ -34,9 +34,9 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.apache.hc.client5.http.ClientProtocolException; +import org.apache.hc.client5.http.HttpResponseException; import org.apache.hc.client5.http.fluent.Request; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.protocol.HttpResponseException; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpEntity; diff --git a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java index 0c3e4a4b1..55445f680 100644 --- a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java +++ b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java @@ -28,7 +28,7 @@ import java.io.IOException; -import org.apache.hc.client5.http.impl.sync.AbstractHttpClientResponseHandler; +import org.apache.hc.client5.http.impl.classic.AbstractHttpClientResponseHandler; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java index cbfae8469..ec5f50eeb 100644 --- a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java +++ b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java @@ -37,11 +37,11 @@ import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.cookie.CookieStore; import org.apache.hc.client5.http.impl.auth.BasicAuthCache; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicScheme; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.util.TimeValue; diff --git a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java index 533f3211d..938b4f13a 100644 --- a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java +++ b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java @@ -41,18 +41,18 @@ import java.util.Locale; import java.util.TimeZone; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpHead; +import org.apache.hc.client5.http.classic.methods.HttpOptions; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPut; +import org.apache.hc.client5.http.classic.methods.HttpTrace; +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.sync.methods.HttpDelete; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpHead; -import org.apache.hc.client5.http.sync.methods.HttpOptions; -import org.apache.hc.client5.http.sync.methods.HttpPatch; -import org.apache.hc.client5.http.sync.methods.HttpPost; -import org.apache.hc.client5.http.sync.methods.HttpPut; -import org.apache.hc.client5.http.sync.methods.HttpTrace; -import org.apache.hc.client5.http.sync.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java index 2cd74fa6e..df4d42fbd 100644 --- a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java +++ b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java @@ -31,8 +31,8 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.protocol.HttpResponseException; +import org.apache.hc.client5.http.ClientProtocolException; +import org.apache.hc.client5.http.HttpResponseException; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpEntity; diff --git a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java index efe41cae5..59ec8ec94 100644 --- a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java +++ b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java @@ -30,8 +30,8 @@ import java.util.List; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; import org.apache.hc.client5.http.osgi.services.ProxyConfiguration; import org.apache.hc.client5.http.osgi.services.TrustedHostsConfiguration; import org.apache.hc.client5.http.socket.ConnectionSocketFactory; diff --git a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java index 152a86038..c8a8ab7eb 100644 --- a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java +++ b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.osgi.services.CachingHttpClientBuilderFactory; import org.apache.hc.client5.http.osgi.services.HttpClientBuilderFactory; import org.apache.hc.client5.http.osgi.services.ProxyConfiguration; diff --git a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCachingClientBuilderFactory.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCachingClientBuilderFactory.java index 42791c83a..3de724b0c 100644 --- a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCachingClientBuilderFactory.java +++ b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCachingClientBuilderFactory.java @@ -27,7 +27,7 @@ package org.apache.hc.client5.http.osgi.impl; import org.apache.hc.client5.http.impl.cache.CachingHttpClientBuilder; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.osgi.services.CachingHttpClientBuilderFactory; /** diff --git a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java index f3b2e695e..2474d2795 100644 --- a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java +++ b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java @@ -26,8 +26,8 @@ */ package org.apache.hc.client5.http.osgi.impl; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.osgi.services.HttpClientBuilderFactory; /** diff --git a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java index 0899bdc8c..b0b62b4f6 100644 --- a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java +++ b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java @@ -26,7 +26,7 @@ */ package org.apache.hc.client5.http.osgi.services; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; /** * @since 4.3 diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncRedirects.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncRedirects.java index 9bfc3b264..a11081769 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncRedirects.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncRedirects.java @@ -38,6 +38,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import org.apache.hc.client5.http.CircularRedirectException; +import org.apache.hc.client5.http.RedirectException; import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.async.methods.SimpleRequestProducer; @@ -46,9 +48,7 @@ import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.CookieStore; import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; -import org.apache.hc.client5.http.protocol.CircularRedirectException; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.RedirectException; import org.apache.hc.client5.testing.SSLTestContexts; import org.apache.hc.core5.function.Supplier; import org.apache.hc.core5.http.ContentType; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncStatefulConnManagement.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncStatefulConnManagement.java index 4e27593b5..1918fa56c 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncStatefulConnManagement.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncStatefulConnManagement.java @@ -29,11 +29,11 @@ import java.util.concurrent.Future; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.UserTokenHandler; import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.UserTokenHandler; import org.apache.hc.core5.function.Supplier; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.EndpointDetails; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestClientAuthentication.java index 44eb1bea9..fa54a3507 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestClientAuthentication.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestClientAuthentication.java @@ -45,12 +45,12 @@ import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.CredentialsStore; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicScheme; -import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.client5.testing.BasicTestAuthenticator; import org.apache.hc.client5.testing.auth.Authenticator; import org.apache.hc.core5.function.Decorator; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpAsyncClientCompatibilityTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpAsyncClientCompatibilityTest.java index 0f5a3ece3..33e02ca70 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpAsyncClientCompatibilityTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpAsyncClientCompatibilityTest.java @@ -41,9 +41,9 @@ import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.ssl.H2TlsStrategy; import org.apache.hc.core5.http.HeaderElements; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpClientCompatibilityTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpClientCompatibilityTest.java index dd33f99dc..bcaea20ad 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpClientCompatibilityTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpClientCompatibilityTest.java @@ -33,16 +33,16 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpOptions; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.HttpClients; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpOptions; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HeaderElements; import org.apache.hc.core5.http.HttpHeaders; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/fluent/TestFluent.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/fluent/TestFluent.java index a5df79c91..412a5869e 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/fluent/TestFluent.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/fluent/TestFluent.java @@ -31,9 +31,9 @@ import java.net.URI; import java.nio.charset.Charset; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.fluent.Content; import org.apache.hc.client5.http.fluent.Request; -import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.testing.sync.LocalServerTestBase; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/LocalServerTestBase.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/LocalServerTestBase.java index ae71dba69..38761fe24 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/LocalServerTestBase.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/LocalServerTestBase.java @@ -30,9 +30,9 @@ import java.io.IOException; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; import org.apache.hc.client5.testing.SSLTestContexts; import org.apache.hc.client5.testing.classic.EchoHandler; import org.apache.hc.client5.testing.classic.RandomHandler; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestBasicConnectionManager.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestBasicConnectionManager.java index 80136fa7d..a2ac6f87c 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestBasicConnectionManager.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestBasicConnectionManager.java @@ -26,9 +26,9 @@ */ package org.apache.hc.client5.testing.sync; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.junit.Assert; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java index 0ab7b88e4..71948c390 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hc.client5.http.ClientProtocolException; +import org.apache.hc.client5.http.NonRepeatableRequestException; import org.apache.hc.client5.http.auth.AuthCache; import org.apache.hc.client5.http.auth.AuthChallenge; import org.apache.hc.client5.http.auth.AuthScheme; @@ -44,19 +46,17 @@ import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPut; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy; import org.apache.hc.client5.http.impl.auth.BasicAuthCache; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicScheme; import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; -import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.protocol.ClientProtocolException; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.NonRepeatableRequestException; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; -import org.apache.hc.client5.http.sync.methods.HttpPut; import org.apache.hc.client5.testing.BasicTestAuthenticator; import org.apache.hc.client5.testing.auth.Authenticator; import org.apache.hc.client5.testing.classic.AuthenticatingDecorator; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java index 64da94e73..377d8268e 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java @@ -30,10 +30,10 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.NTCredentials; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestExecution.java index c715248a3..c12d6cf33 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestExecution.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestExecution.java @@ -31,12 +31,12 @@ import java.net.URI; import java.util.List; -import org.apache.hc.client5.http.protocol.ClientProtocolException; +import org.apache.hc.client5.http.ClientProtocolException; +import org.apache.hc.client5.http.HttpRequestRetryHandler; +import org.apache.hc.client5.http.NonRepeatableRequestException; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.NonRepeatableRequestException; -import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; import org.apache.hc.client5.http.utils.URIUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java index b3f04faa1..c2cd44c3d 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java @@ -30,8 +30,8 @@ import java.io.IOException; import java.net.URI; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java index 35b22bd35..8b9a49017 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java @@ -41,9 +41,9 @@ import java.util.zip.Deflater; import java.util.zip.GZIPOutputStream; -import org.apache.hc.client5.http.impl.sync.BasicHttpClientResponseHandler; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HeaderElement; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestCookieVirtualHost.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestCookieVirtualHost.java index 8adbd8561..7223558cf 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestCookieVirtualHost.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestCookieVirtualHost.java @@ -30,12 +30,12 @@ import java.net.URI; import java.util.List; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.Cookie; import org.apache.hc.client5.http.cookie.CookieStore; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestIdleConnectionEviction.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestIdleConnectionEviction.java index 474c413a1..a2ac66f9b 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestIdleConnectionEviction.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestIdleConnectionEviction.java @@ -27,10 +27,10 @@ package org.apache.hc.client5.testing.sync; +import org.apache.hc.client5.http.ClientProtocolException; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.IdleConnectionEvictor; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMalformedServerResponse.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMalformedServerResponse.java index e4fd3cb04..385adc664 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMalformedServerResponse.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMalformedServerResponse.java @@ -29,10 +29,10 @@ import java.io.IOException; import java.net.Socket; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java index 61baafaf1..0c9a56dda 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java @@ -31,9 +31,9 @@ import java.util.Locale; import java.util.Set; -import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java index bd610755f..08ff315c7 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java @@ -32,16 +32,16 @@ import java.util.Arrays; import java.util.List; +import org.apache.hc.client5.http.CircularRedirectException; +import org.apache.hc.client5.http.ClientProtocolException; +import org.apache.hc.client5.http.RedirectException; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.CookieStore; import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; -import org.apache.hc.client5.http.protocol.CircularRedirectException; -import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.RedirectException; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; import org.apache.hc.client5.http.utils.URIUtils; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java index adea0f5c6..7e0d7f9dc 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java @@ -33,11 +33,11 @@ import org.apache.hc.client5.http.auth.AuthSchemeProvider; import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.Credentials; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.AuthSchemes; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.SPNegoScheme; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java index a31b039f1..cadf7681b 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java @@ -29,10 +29,10 @@ import java.io.IOException; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; +import org.apache.hc.client5.http.UserTokenHandler; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.UserTokenHandler; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.EndpointDetails; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestWindowsNegotiateScheme.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestWindowsNegotiateScheme.java index a1079e537..d6ecb47e2 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestWindowsNegotiateScheme.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestWindowsNegotiateScheme.java @@ -30,13 +30,13 @@ import org.apache.hc.client5.http.auth.AuthScheme; import org.apache.hc.client5.http.auth.AuthSchemeProvider; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.AuthSchemes; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.win.WinHttpClients; import org.apache.hc.client5.http.impl.win.WindowsNegotiateSchemeGetTokenFail; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java b/httpclient5-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java index 7612fde37..eb08429ff 100644 --- a/httpclient5-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java +++ b/httpclient5-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java @@ -27,10 +27,10 @@ package org.apache.hc.client5.http.examples.client.win; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.win.WinHttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.io.entity.EntityUtils; /** diff --git a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java index 40698b030..f5db1e900 100644 --- a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java +++ b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java @@ -32,15 +32,15 @@ import org.apache.hc.client5.http.config.AuthSchemes; import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.core5.http.config.Registry; import org.apache.hc.core5.http.config.RegistryBuilder; import com.sun.jna.platform.win32.Sspi; /** - * Factory methods for {@link org.apache.hc.client5.http.impl.sync.CloseableHttpClient} instances configured to use integrated + * Factory methods for {@link org.apache.hc.client5.http.impl.classic.CloseableHttpClient} instances configured to use integrated * Windows authentication by default. * * @since 4.4 diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientAuthentication.java index d81342d0e..ac5468bff 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientAuthentication.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientAuthentication.java @@ -34,7 +34,7 @@ import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.io.ShutdownType; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java index 97297f2fa..68ddad186 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java @@ -38,9 +38,9 @@ import org.apache.hc.client5.http.async.AsyncExecChainHandler; import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; +import org.apache.hc.client5.http.impl.ChainElements; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; -import org.apache.hc.client5.http.impl.sync.ChainElements; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.EntityDetails; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientMessageTrailers.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientMessageTrailers.java index 5b42d08ab..0af66f939 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientMessageTrailers.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientMessageTrailers.java @@ -36,9 +36,9 @@ import org.apache.hc.client5.http.async.methods.AsyncRequestBuilder; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.async.methods.SimpleResponseConsumer; +import org.apache.hc.client5.http.impl.ChainElements; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; -import org.apache.hc.client5.http.impl.sync.ChainElements; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java index 6dee77b4f..d1ca62f76 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java @@ -27,10 +27,10 @@ package org.apache.hc.client5.http.examples; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; /** * This example demonstrates how to abort an HTTP method before its normal completion. diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java index e9c53d31e..3e2b89ab0 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java @@ -28,11 +28,11 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.io.entity.EntityUtils; /** diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java index 77b085ef0..070642359 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java @@ -29,10 +29,10 @@ import java.io.File; import java.io.FileInputStream; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.http.io.entity.InputStreamEntity; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java index 5fa54a99d..8fcd99674 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java @@ -39,23 +39,23 @@ import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.SystemDefaultDnsResolver; import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.AuthSchemes; import org.apache.hc.client5.http.config.CookieSpecs; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.CookieStore; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; import org.apache.hc.client5.http.io.ManagedHttpClientConnection; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.socket.ConnectionSocketFactory; import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory; import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java index 51663b6a6..4f6fe1e50 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java @@ -30,10 +30,10 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.HttpEntity; /** diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java index 9ec06aac5..189ee2351 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java @@ -29,14 +29,14 @@ import java.util.List; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.Cookie; import org.apache.hc.client5.http.cookie.CookieStore; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.io.entity.EntityUtils; /** diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java index b3321c1e1..78727c5f4 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java @@ -28,19 +28,19 @@ import java.net.URL; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.CookieSpecs; import org.apache.hc.client5.http.cookie.CookieSpecProvider; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.cookie.RFC6265CookieSpecProvider; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.client5.http.psl.PublicSuffixMatcher; import org.apache.hc.client5.http.psl.PublicSuffixMatcherLoader; import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier; import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.config.Lookup; import org.apache.hc.core5.http.config.RegistryBuilder; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java index f141bc208..b5b5598e1 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java @@ -32,14 +32,14 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.ssl.SSLContexts; import org.apache.hc.core5.ssl.TrustStrategy; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java index 4125ed8be..b2a062768 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java @@ -26,11 +26,11 @@ */ package org.apache.hc.client5.http.examples; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.pool.PoolStats; import org.apache.hc.core5.util.TimeValue; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java index 179b1c670..90cb2c86b 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java @@ -27,11 +27,11 @@ package org.apache.hc.client5.http.examples; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java index a86a8b17f..7cb7813dd 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java @@ -34,13 +34,13 @@ import java.net.SocketTimeoutException; import org.apache.hc.client5.http.ConnectTimeoutException; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.socket.ConnectionSocketFactory; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.config.Registry; import org.apache.hc.core5.http.config.RegistryBuilder; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java index f199994ff..b427104ef 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java @@ -29,13 +29,13 @@ import java.net.URI; import java.util.List; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.RequestBuilder; import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.Cookie; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.RequestBuilder; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientInterceptors.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientInterceptors.java index b54e3ba35..4eb606319 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientInterceptors.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientInterceptors.java @@ -30,13 +30,13 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; -import org.apache.hc.client5.http.impl.sync.ChainElements; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.ChainElements; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentType; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java index 694f920e7..67a7f0547 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java @@ -26,11 +26,11 @@ */ package org.apache.hc.client5.http.examples; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.http.protocol.BasicHttpContext; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java index f6ecaa269..c449b1968 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java @@ -28,13 +28,13 @@ import java.io.File; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.entity.mime.FileBody; import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder; import org.apache.hc.client5.http.entity.mime.StringBody; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpPost; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java index 4b9fcffe6..e2999af05 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java @@ -27,12 +27,12 @@ package org.apache.hc.client5.http.examples; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.auth.BasicScheme; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java index 8e968e220..412d0e2aa 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java @@ -28,13 +28,13 @@ import org.apache.hc.client5.http.auth.AuthCache; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.auth.BasicAuthCache; import org.apache.hc.client5.http.impl.auth.DigestScheme; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java index caafd4461..7186fb466 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java @@ -28,12 +28,12 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java index 716af8558..d0458b66d 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java @@ -32,14 +32,14 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.FutureRequestExecutionService; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.HttpRequestFutureTask; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.FutureRequestExecutionService; -import org.apache.hc.client5.http.impl.sync.HttpClientBuilder; -import org.apache.hc.client5.http.impl.sync.HttpRequestFutureTask; import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpStatus; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java index 38b9aa99c..8dca3829d 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java @@ -29,10 +29,10 @@ import java.io.IOException; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.ClientProtocolException; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpStatus; diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java index c82ff208e..b0dc51a44 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java @@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.sync.ProxyClient; +import org.apache.hc.client5.http.impl.classic.ProxyClient; import org.apache.hc.core5.http.HttpHost; /** diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java index 15e2a75a4..d0522fccf 100644 --- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java +++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java @@ -29,12 +29,12 @@ import java.util.ArrayList; import java.util.List; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.entity.UrlEncodedFormEntity; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.sync.HttpClients; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.NameValuePair; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/AuthenticationStrategy.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/AuthenticationStrategy.java index 7432a4343..e5371caa0 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/AuthenticationStrategy.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.protocol; +package org.apache.hc.client5.http; import java.util.List; import java.util.Map; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/CircularRedirectException.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/CircularRedirectException.java index e864a8192..91508de2c 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/CircularRedirectException.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.protocol; +package org.apache.hc.client5.http; /** * Signals a circular redirect diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ClientProtocolException.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ClientProtocolException.java index 860c3df72..e9e93f9d8 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ClientProtocolException.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.protocol; +package org.apache.hc.client5.http; import java.io.IOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRequestRetryHandler.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/HttpRequestRetryHandler.java index fda0c72e5..85371b048 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRequestRetryHandler.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http; import java.io.IOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpResponseException.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/HttpResponseException.java index 831fb29a6..4d9b8edac 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpResponseException.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.protocol; +package org.apache.hc.client5.http; /** * Signals a non 2xx HTTP response. diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/NonRepeatableRequestException.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/NonRepeatableRequestException.java index 7f8fc073b..90287df67 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/NonRepeatableRequestException.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.protocol; +package org.apache.hc.client5.http; import org.apache.hc.core5.http.ProtocolException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/RedirectException.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/RedirectException.java index 8151b940d..2e7b825be 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/RedirectException.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.protocol; +package org.apache.hc.client5.http; import org.apache.hc.core5.http.ProtocolException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ServiceUnavailableRetryStrategy.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ServiceUnavailableRetryStrategy.java index 6de9cefba..c6aa96821 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ServiceUnavailableRetryStrategy.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.protocol.HttpContext; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/UserTokenHandler.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/UserTokenHandler.java index 497763d25..32781a72c 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/UserTokenHandler.java @@ -25,9 +25,8 @@ * */ -package org.apache.hc.client5.http.protocol; +package org.apache.hc.client5.http; -import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.core5.http.protocol.HttpContext; /** diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/BackoffManager.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/BackoffManager.java index 93acc3a3f..2e4b8bf9f 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/BackoffManager.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http.classic; import org.apache.hc.client5.http.HttpRoute; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/ConnectionBackoffStrategy.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/ConnectionBackoffStrategy.java index 9028334fc..059ac26b6 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/ConnectionBackoffStrategy.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http.classic; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecChain.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecChain.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecChain.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecChain.java index f73f6c73a..30ecc4772 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecChain.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecChain.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http.classic; import java.io.IOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecChainHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecChainHandler.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecChainHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecChainHandler.java index 3f55a9281..b4f1a6163 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecChainHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecChainHandler.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http.classic; import java.io.IOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecRuntime.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecRuntime.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecRuntime.java index 17ff1de21..8faed9e52 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ExecRuntime.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecRuntime.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http.classic; import java.io.IOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/HttpClient.java similarity index 99% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/HttpClient.java index befa7aef3..a63818b4f 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/HttpClient.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http.classic; import java.io.IOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpDelete.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpDelete.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpDelete.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpDelete.java index 0f28e0baf..916b8bbbd 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpDelete.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpDelete.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpExecutionAware.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpExecutionAware.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpExecutionAware.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpExecutionAware.java index 28b933670..f6a6700e2 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpExecutionAware.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpExecutionAware.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import org.apache.hc.core5.concurrent.Cancellable; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpGet.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpGet.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpGet.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpGet.java index ed1c6c47a..ab7f8bb8e 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpGet.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpGet.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpHead.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpHead.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpHead.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpHead.java index 028837bc9..57ee9f65d 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpHead.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpHead.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpOptions.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpOptions.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpOptions.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpOptions.java index ea830e568..a74deb5e3 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpOptions.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpOptions.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; import java.util.HashSet; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPatch.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPatch.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPatch.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPatch.java index 00403ffce..5cbe3b205 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPatch.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPatch.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPost.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPost.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPost.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPost.java index fcac1ffe0..7a8fbd2af 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPost.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPost.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPut.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPut.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPut.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPut.java index aa5487781..476da12c4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPut.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpPut.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpTrace.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpTrace.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpTrace.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpTrace.java index 105c575fc..ada666fb4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpTrace.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpTrace.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequest.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpUriRequest.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequest.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpUriRequest.java index 2a3cbf4bc..1c3064b5c 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequest.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpUriRequest.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequestBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpUriRequestBase.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequestBase.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpUriRequestBase.java index beb616cbe..bcc8bfc3a 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequestBase.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/HttpUriRequestBase.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/RequestBuilder.java similarity index 99% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/RequestBuilder.java index c34973a2b..4e18c89e3 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/RequestBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.io.IOException; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/package-info.java similarity index 95% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/package-info.java index d6e1e8442..e0c25d2d3 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/package-info.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/package-info.java @@ -28,4 +28,4 @@ /** * Standard HTTP method implementations. */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/package-info.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/sync/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/classic/package-info.java index a42c4e385..53fc06904 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/sync/package-info.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/package-info.java @@ -28,4 +28,4 @@ /** * Client HTTP communication APIs. */ -package org.apache.hc.client5.http.sync; +package org.apache.hc.client5.http.classic; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ChainElements.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/ChainElements.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ChainElements.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/ChainElements.java index 743db7482..d570a4b9b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ChainElements.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/ChainElements.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl; public enum ChainElements { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/CookieSpecRegistries.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/CookieSpecRegistries.java index e7d1b569f..c114e05b4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/CookieSpecRegistries.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl; import org.apache.hc.client5.http.config.CookieSpecs; import org.apache.hc.client5.http.cookie.CookieSpecProvider; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java index 9193b5a53..89233614f 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.protocol; +package org.apache.hc.client5.http.impl; import java.util.ArrayList; import java.util.Arrays; @@ -35,13 +35,13 @@ import java.util.Locale; import java.util.Map; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.auth.AuthChallenge; import org.apache.hc.client5.http.auth.AuthScheme; import org.apache.hc.client5.http.auth.AuthSchemeProvider; import org.apache.hc.client5.http.auth.ChallengeType; import org.apache.hc.client5.http.config.AuthSchemes; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryHandler.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryHandler.java index e23f024f2..ca9cce0cc 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultHttpRequestRetryHandler.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl; import java.io.IOException; import java.io.InterruptedIOException; @@ -41,8 +41,8 @@ import javax.net.ssl.SSLException; -import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; -import org.apache.hc.client5.http.sync.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.HttpRequestRetryHandler; +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java index e94a21c7a..75c3cdaea 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.protocol; +package org.apache.hc.client5.http.impl; import java.net.URI; import java.net.URISyntaxException; @@ -33,8 +33,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.apache.hc.client5.http.CircularRedirectException; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.protocol.CircularRedirectException; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.protocol.RedirectLocations; import org.apache.hc.client5.http.protocol.RedirectStrategy; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultServiceUnavailableRetryStrategy.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultServiceUnavailableRetryStrategy.java index 13d4e5b28..b5b0cc238 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultServiceUnavailableRetryStrategy.java @@ -25,11 +25,11 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl; import java.util.Date; -import org.apache.hc.client5.http.sync.ServiceUnavailableRetryStrategy; +import org.apache.hc.client5.http.ServiceUnavailableRetryStrategy; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultUserTokenHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultUserTokenHandler.java index c3be5bda4..481d91582 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultUserTokenHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultUserTokenHandler.java @@ -31,10 +31,10 @@ import javax.net.ssl.SSLSession; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.UserTokenHandler; import org.apache.hc.client5.http.auth.AuthExchange; import org.apache.hc.client5.http.auth.AuthScheme; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.UserTokenHandler; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.protocol.HttpContext; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/NoopUserTokenHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/NoopUserTokenHandler.java index 7c3b0f883..332796e85 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/NoopUserTokenHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/NoopUserTokenHandler.java @@ -27,7 +27,7 @@ package org.apache.hc.client5.http.impl; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.protocol.UserTokenHandler; +import org.apache.hc.client5.http.UserTokenHandler; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.protocol.HttpContext; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/TunnelRefusedException.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/TunnelRefusedException.java index fe78cd7ac..188dbfc3a 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/TunnelRefusedException.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java index c2dea3624..e10b3c068 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java @@ -30,6 +30,7 @@ import java.io.IOException; import java.io.InterruptedIOException; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.RouteTracker; import org.apache.hc.client5.http.async.AsyncExecCallback; @@ -39,10 +40,9 @@ import org.apache.hc.client5.http.auth.AuthExchange; import org.apache.hc.client5.http.auth.ChallengeType; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.TunnelRefusedException; import org.apache.hc.client5.http.impl.auth.HttpAuthenticator; import org.apache.hc.client5.http.impl.routing.BasicRouteDirector; -import org.apache.hc.client5.http.impl.sync.TunnelRefusedException; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.routing.HttpRouteDirector; import org.apache.hc.core5.annotation.Contract; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncMainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncMainClientExec.java index f015d6228..d3f7fde71 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncMainClientExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncMainClientExec.java @@ -34,12 +34,12 @@ import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.UserTokenHandler; import org.apache.hc.client5.http.async.AsyncExecCallback; import org.apache.hc.client5.http.async.AsyncExecChain; import org.apache.hc.client5.http.async.AsyncExecChainHandler; import org.apache.hc.client5.http.async.AsyncExecRuntime; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.UserTokenHandler; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java index bf2000520..decf267b5 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java @@ -32,6 +32,7 @@ import java.util.Iterator; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.StandardMethods; import org.apache.hc.client5.http.async.AsyncExecCallback; @@ -42,10 +43,9 @@ import org.apache.hc.client5.http.auth.ChallengeType; import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.CredentialsStore; -import org.apache.hc.client5.http.impl.AuthSupport; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.AuthSupport; import org.apache.hc.client5.http.impl.auth.HttpAuthenticator; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.utils.URIUtils; import org.apache.hc.core5.annotation.Contract; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java index 9cbb234e7..0f13a0792 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java @@ -31,6 +31,7 @@ import java.util.List; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.RedirectException; import org.apache.hc.client5.http.StandardMethods; import org.apache.hc.client5.http.async.AsyncExecCallback; import org.apache.hc.client5.http.async.AsyncExecChain; @@ -39,7 +40,6 @@ import org.apache.hc.client5.http.auth.AuthScheme; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.RedirectException; import org.apache.hc.client5.http.protocol.RedirectStrategy; import org.apache.hc.client5.http.routing.HttpRoutePlanner; import org.apache.hc.client5.http.utils.URIUtils; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java index e6cd13d2e..162915ebb 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java @@ -28,13 +28,13 @@ import java.io.IOException; +import org.apache.hc.client5.http.HttpRequestRetryHandler; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.async.AsyncExecCallback; import org.apache.hc.client5.http.async.AsyncExecChain; import org.apache.hc.client5.http.async.AsyncExecChainHandler; import org.apache.hc.client5.http.impl.ExecSupport; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java index 61b6abb5e..514b2d03a 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java @@ -38,9 +38,12 @@ import java.util.List; import java.util.concurrent.ThreadFactory; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; +import org.apache.hc.client5.http.HttpRequestRetryHandler; import org.apache.hc.client5.http.SchemePortResolver; import org.apache.hc.client5.http.SystemDefaultDnsResolver; +import org.apache.hc.client5.http.UserTokenHandler; import org.apache.hc.client5.http.async.AsyncExecChainHandler; import org.apache.hc.client5.http.auth.AuthSchemeProvider; import org.apache.hc.client5.http.auth.CredentialsProvider; @@ -49,11 +52,17 @@ import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.CookieSpecProvider; import org.apache.hc.client5.http.cookie.CookieStore; +import org.apache.hc.client5.http.impl.ChainElements; +import org.apache.hc.client5.http.impl.CookieSpecRegistries; +import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy; import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy; +import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryHandler; +import org.apache.hc.client5.http.impl.DefaultRedirectStrategy; import org.apache.hc.client5.http.impl.DefaultSchemePortResolver; import org.apache.hc.client5.http.impl.DefaultUserTokenHandler; import org.apache.hc.client5.http.impl.IdleConnectionEvictor; import org.apache.hc.client5.http.impl.NoopUserTokenHandler; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; import org.apache.hc.client5.http.impl.auth.CredSspSchemeFactory; import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory; @@ -62,26 +71,17 @@ import org.apache.hc.client5.http.impl.auth.SPNegoSchemeFactory; import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder; -import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy; -import org.apache.hc.client5.http.impl.protocol.DefaultRedirectStrategy; import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner; import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner; import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.sync.ChainElements; -import org.apache.hc.client5.http.impl.sync.CookieSpecRegistries; -import org.apache.hc.client5.http.impl.sync.DefaultHttpRequestRetryHandler; import org.apache.hc.client5.http.nio.AsyncClientConnectionManager; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.RedirectStrategy; import org.apache.hc.client5.http.protocol.RequestAddCookies; import org.apache.hc.client5.http.protocol.RequestAuthCache; import org.apache.hc.client5.http.protocol.RequestDefaultHeaders; import org.apache.hc.client5.http.protocol.RequestExpectContinue; import org.apache.hc.client5.http.protocol.ResponseProcessCookies; -import org.apache.hc.client5.http.protocol.UserTokenHandler; import org.apache.hc.client5.http.routing.HttpRoutePlanner; -import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; import org.apache.hc.core5.annotation.Internal; import org.apache.hc.core5.concurrent.DefaultThreadFactory; import org.apache.hc.core5.function.Callback; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicCredentialsProvider.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicCredentialsProvider.java index 9466be841..26465ca0a 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicCredentialsProvider.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.auth; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java index c475c4a44..98d2d438e 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java @@ -34,6 +34,7 @@ import java.util.Map; import java.util.Queue; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.auth.AuthCache; import org.apache.hc.client5.http.auth.AuthChallenge; import org.apache.hc.client5.http.auth.AuthExchange; @@ -43,7 +44,6 @@ import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.MalformedChallengeException; import org.apache.hc.client5.http.config.AuthSchemes; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.FormattedHeader; import org.apache.hc.core5.http.Header; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java index eb43dbecc..e0aa8bb8b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java @@ -42,7 +42,6 @@ import org.apache.hc.client5.http.auth.NTCredentials; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.config.AuthSchemes; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/AIMDBackoffManager.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/AIMDBackoffManager.java index 9e2f84b69..cec7453f9 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/AIMDBackoffManager.java @@ -24,13 +24,13 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.util.HashMap; import java.util.Map; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.sync.BackoffManager; +import org.apache.hc.client5.http.classic.BackoffManager; import org.apache.hc.core5.pool.ConnPoolControl; import org.apache.hc.core5.util.Args; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractHttpClientResponseHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/AbstractHttpClientResponseHandler.java similarity index 92% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractHttpClientResponseHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/AbstractHttpClientResponseHandler.java index 8bceb6d26..9cec146fa 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractHttpClientResponseHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/AbstractHttpClientResponseHandler.java @@ -25,11 +25,11 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; -import org.apache.hc.client5.http.protocol.HttpResponseException; +import org.apache.hc.client5.http.HttpResponseException; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; @@ -44,8 +44,8 @@ * body is consumed and an {@link HttpResponseException} is thrown. *

* If this is used with - * {@link org.apache.hc.client5.http.sync.HttpClient#execute(org.apache.hc.core5.http.ClassicHttpRequest, - * HttpClientResponseHandler)}, + * {@link org.apache.hc.client5.http.classic.HttpClient#execute( + * org.apache.hc.core5.http.ClassicHttpRequest, HttpClientResponseHandler)}, * HttpClient may handle redirects (3xx responses) internally. *

* diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/BackoffStrategyExec.java similarity index 91% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/BackoffStrategyExec.java index 231c31e17..9733b4068 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/BackoffStrategyExec.java @@ -25,15 +25,15 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.sync.BackoffManager; -import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; +import org.apache.hc.client5.http.classic.BackoffManager; +import org.apache.hc.client5.http.classic.ConnectionBackoffStrategy; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicHttpClientResponseHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/BasicHttpClientResponseHandler.java similarity index 82% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicHttpClientResponseHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/BasicHttpClientResponseHandler.java index f4110069c..189cbcdf1 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicHttpClientResponseHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/BasicHttpClientResponseHandler.java @@ -25,11 +25,11 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; -import org.apache.hc.client5.http.protocol.ClientProtocolException; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; @@ -38,13 +38,15 @@ import org.apache.hc.core5.http.io.entity.EntityUtils; /** - * A {@link org.apache.hc.core5.http.io.HttpClientResponseHandler} that returns the response body as a String - * for successful (2xx) responses. If the response code was >= 300, the response - * body is consumed and an {@link org.apache.hc.client5.http.protocol.HttpResponseException} is thrown. + * A {@link org.apache.hc.core5.http.io.HttpClientResponseHandler} that returns + * the response body as a String for successful (2xx) responses. If the response + * code was >= 300, the response body is consumed + * and an {@link org.apache.hc.client5.http.HttpResponseException} is thrown. *

* If this is used with - * {@link org.apache.hc.client5.http.sync.HttpClient#execute( - * org.apache.hc.core5.http.ClassicHttpRequest, org.apache.hc.core5.http.io.HttpClientResponseHandler)}, + * {@link org.apache.hc.client5.http.classic.HttpClient#execute( + * org.apache.hc.core5.http.ClassicHttpRequest, + * org.apache.hc.core5.http.io.HttpClientResponseHandler)}, * HttpClient may handle redirects (3xx responses) internally. *

* diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/Clock.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/Clock.java index e370f6fed..06b7ff452 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/Clock.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; /** * Interface used to enable easier testing of time-related behavior. diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java index 17f47771e..28fa83320 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java @@ -25,15 +25,15 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.Closeable; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.apache.hc.client5.http.protocol.ClientProtocolException; -import org.apache.hc.client5.http.sync.HttpClient; +import org.apache.hc.client5.http.ClientProtocolException; +import org.apache.hc.client5.http.classic.HttpClient; import org.apache.hc.client5.http.utils.URIUtils; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpResponse.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpResponse.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpResponse.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpResponse.java index fd9e0f13a..146b2d7b7 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpResponse.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpResponse.java @@ -25,13 +25,13 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.util.Iterator; import java.util.Locale; -import org.apache.hc.client5.http.sync.ExecRuntime; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpEntity; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java index 9836ee295..1fb5900fd 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java @@ -25,23 +25,24 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.RouteTracker; import org.apache.hc.client5.http.auth.AuthExchange; import org.apache.hc.client5.http.auth.ChallengeType; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.TunnelRefusedException; import org.apache.hc.client5.http.impl.auth.HttpAuthenticator; import org.apache.hc.client5.http.impl.routing.BasicRouteDirector; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.routing.HttpRouteDirector; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.ExecRuntime; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ContentCompressionExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ContentCompressionExec.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ContentCompressionExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ContentCompressionExec.java index df6638cbd..75df9fcbe 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ContentCompressionExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ContentCompressionExec.java @@ -25,21 +25,21 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Locale; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.entity.DecompressingEntity; import org.apache.hc.client5.http.entity.DeflateInputStreamFactory; import org.apache.hc.client5.http.entity.GZIPInputStreamFactory; import org.apache.hc.client5.http.entity.InputStreamFactory; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/DefaultBackoffStrategy.java similarity index 94% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/DefaultBackoffStrategy.java index a968cd752..7f2ab149e 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/DefaultBackoffStrategy.java @@ -24,12 +24,12 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.net.ConnectException; import java.net.SocketTimeoutException; -import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy; +import org.apache.hc.client5.http.classic.ConnectionBackoffStrategy; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpStatus; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ExecChainElement.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ExecChainElement.java similarity index 93% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ExecChainElement.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ExecChainElement.java index c5a26388b..ff13e9f0d 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ExecChainElement.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ExecChainElement.java @@ -25,12 +25,12 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ExecRuntimeImpl.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ExecRuntimeImpl.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ExecRuntimeImpl.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ExecRuntimeImpl.java index e80956f1e..b9a0666f3 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ExecRuntimeImpl.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ExecRuntimeImpl.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.util.concurrent.ExecutionException; @@ -34,12 +34,12 @@ import org.apache.hc.client5.http.CancellableAware; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.io.ConnectionEndpoint; import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.client5.http.io.LeaseRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecRuntime; import org.apache.hc.core5.concurrent.Cancellable; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/FutureRequestExecutionMetrics.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/FutureRequestExecutionMetrics.java index f348c2363..4c88dacec 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/FutureRequestExecutionMetrics.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.util.concurrent.atomic.AtomicLong; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/FutureRequestExecutionService.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/FutureRequestExecutionService.java index acd3f4934..82b5f7b30 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/FutureRequestExecutionService.java @@ -24,14 +24,14 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.Closeable; import java.io.IOException; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hc.client5.http.sync.HttpClient; +import org.apache.hc.client5.http.classic.HttpClient; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.concurrent.FutureCallback; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java index 113d10766..c5beb8bb6 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.Closeable; import java.io.IOException; @@ -38,22 +38,35 @@ import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; +import org.apache.hc.client5.http.HttpRequestRetryHandler; import org.apache.hc.client5.http.SchemePortResolver; +import org.apache.hc.client5.http.ServiceUnavailableRetryStrategy; import org.apache.hc.client5.http.SystemDefaultDnsResolver; +import org.apache.hc.client5.http.UserTokenHandler; import org.apache.hc.client5.http.auth.AuthSchemeProvider; import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.classic.BackoffManager; +import org.apache.hc.client5.http.classic.ConnectionBackoffStrategy; +import org.apache.hc.client5.http.classic.ExecChainHandler; import org.apache.hc.client5.http.config.AuthSchemes; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.CookieSpecProvider; import org.apache.hc.client5.http.cookie.CookieStore; import org.apache.hc.client5.http.entity.InputStreamFactory; +import org.apache.hc.client5.http.impl.ChainElements; +import org.apache.hc.client5.http.impl.CookieSpecRegistries; +import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy; import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy; +import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryHandler; +import org.apache.hc.client5.http.impl.DefaultRedirectStrategy; import org.apache.hc.client5.http.impl.DefaultSchemePortResolver; import org.apache.hc.client5.http.impl.DefaultUserTokenHandler; import org.apache.hc.client5.http.impl.IdleConnectionEvictor; import org.apache.hc.client5.http.impl.NoopUserTokenHandler; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; import org.apache.hc.client5.http.impl.auth.CredSspSchemeFactory; import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory; @@ -62,13 +75,10 @@ import org.apache.hc.client5.http.impl.auth.SPNegoSchemeFactory; import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; -import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy; -import org.apache.hc.client5.http.impl.protocol.DefaultRedirectStrategy; import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner; import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner; import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner; import org.apache.hc.client5.http.io.HttpClientConnectionManager; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.RedirectStrategy; import org.apache.hc.client5.http.protocol.RequestAddCookies; import org.apache.hc.client5.http.protocol.RequestAuthCache; @@ -76,13 +86,7 @@ import org.apache.hc.client5.http.protocol.RequestDefaultHeaders; import org.apache.hc.client5.http.protocol.RequestExpectContinue; import org.apache.hc.client5.http.protocol.ResponseProcessCookies; -import org.apache.hc.client5.http.protocol.UserTokenHandler; import org.apache.hc.client5.http.routing.HttpRoutePlanner; -import org.apache.hc.client5.http.sync.BackoffManager; -import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; -import org.apache.hc.client5.http.sync.ServiceUnavailableRetryStrategy; import org.apache.hc.core5.annotation.Internal; import org.apache.hc.core5.http.ConnectionReuseStrategy; import org.apache.hc.core5.http.Header; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClients.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClients.java index bb2323ebb..5bd30f629 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClients.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; import org.apache.hc.client5.http.io.HttpClientConnectionManager; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpRequestFutureTask.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpRequestFutureTask.java index b4e9b6228..048593c89 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpRequestFutureTask.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.util.concurrent.FutureTask; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpRequestTaskCallable.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpRequestTaskCallable.java index ac7696b26..eef7aa1d7 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpRequestTaskCallable.java @@ -24,12 +24,12 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hc.client5.http.sync.HttpClient; +import org.apache.hc.client5.http.classic.HttpClient; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.io.HttpClientResponseHandler; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java index a2df7f1d9..b75980918 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java @@ -25,27 +25,27 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.Closeable; import java.io.IOException; import java.util.List; import org.apache.hc.client5.http.CancellableAware; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.auth.AuthSchemeProvider; import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.cookie.CookieSpecProvider; import org.apache.hc.client5.http.cookie.CookieStore; import org.apache.hc.client5.http.impl.ExecSupport; import org.apache.hc.client5.http.io.HttpClientConnectionManager; -import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.routing.HttpRoutePlanner; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java similarity index 95% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java index 51f86fcd3..661139d3b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java @@ -25,19 +25,19 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.io.InterruptedIOException; import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.UserTokenHandler; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.impl.ConnectionShutdownException; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.UserTokenHandler; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.ExecRuntime; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java index 57b348bdb..e335abdf7 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java @@ -25,22 +25,22 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.io.InterruptedIOException; import org.apache.hc.client5.http.CancellableAware; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.ConnectionShutdownException; import org.apache.hc.client5.http.impl.DefaultSchemePortResolver; import org.apache.hc.client5.http.io.HttpClientConnectionManager; -import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.protocol.RequestClientConnControl; -import org.apache.hc.client5.http.sync.ExecRuntime; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/NullBackoffStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/NullBackoffStrategy.java similarity index 93% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/NullBackoffStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/NullBackoffStrategy.java index 5ae3ebefa..36440aaa9 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/NullBackoffStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/NullBackoffStrategy.java @@ -24,9 +24,9 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; -import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy; +import org.apache.hc.client5.http.classic.ConnectionBackoffStrategy; import org.apache.hc.core5.http.HttpResponse; /** diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java index 0d230d15f..39ffcefad 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java @@ -25,28 +25,28 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.Iterator; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.NonRepeatableRequestException; import org.apache.hc.client5.http.StandardMethods; import org.apache.hc.client5.http.auth.AuthExchange; import org.apache.hc.client5.http.auth.ChallengeType; import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.CredentialsStore; -import org.apache.hc.client5.http.impl.AuthSupport; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.AuthSupport; import org.apache.hc.client5.http.impl.auth.HttpAuthenticator; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.NonRepeatableRequestException; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.ExecRuntime; import org.apache.hc.client5.http.utils.URIUtils; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java index c7d2e63c1..d044a640e 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java @@ -25,11 +25,12 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.net.Socket; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.RouteInfo.LayerType; import org.apache.hc.client5.http.RouteInfo.TunnelType; @@ -41,6 +42,9 @@ import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.config.AuthSchemes; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy; +import org.apache.hc.client5.http.impl.TunnelRefusedException; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory; import org.apache.hc.client5.http.impl.auth.HttpAuthenticator; @@ -48,9 +52,7 @@ import org.apache.hc.client5.http.impl.auth.NTLMSchemeFactory; import org.apache.hc.client5.http.impl.auth.SPNegoSchemeFactory; import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory; -import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy; import org.apache.hc.client5.http.io.ManagedHttpClientConnection; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.protocol.RequestClientConnControl; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java index d666c0131..556c9df06 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java @@ -25,25 +25,25 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.net.URI; import java.util.List; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.RedirectException; import org.apache.hc.client5.http.StandardMethods; import org.apache.hc.client5.http.auth.AuthExchange; import org.apache.hc.client5.http.auth.AuthScheme; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.RequestBuilder; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.RedirectException; import org.apache.hc.client5.http.protocol.RedirectStrategy; import org.apache.hc.client5.http.routing.HttpRoutePlanner; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.RequestBuilder; import org.apache.hc.client5.http.utils.URIUtils; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestAbortedException.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestAbortedException.java index 4cca93a7b..d2703542d 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestAbortedException.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.InterruptedIOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestEntityProxy.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestEntityProxy.java index 8f837a3f7..d2c45378c 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestEntityProxy.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.io.InputStream; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestFailedException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestFailedException.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestFailedException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestFailedException.java index cd084ab0f..85462e567 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestFailedException.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestFailedException.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.InterruptedIOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ResponseEntityProxy.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ResponseEntityProxy.java index 88a4c885e..c521bdb2c 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ResponseEntityProxy.java @@ -25,14 +25,14 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.SocketException; -import org.apache.hc.client5.http.sync.ExecRuntime; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.EofSensorInputStream; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java similarity index 94% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java index 09d0d1a45..cd80c54e5 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java @@ -25,17 +25,17 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; +import org.apache.hc.client5.http.HttpRequestRetryHandler; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.NonRepeatableRequestException; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; import org.apache.hc.client5.http.impl.ExecSupport; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.NonRepeatableRequestException; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java similarity index 95% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java index 721f98db1..970f96840 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java @@ -25,16 +25,16 @@ * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.io.InterruptedIOException; +import org.apache.hc.client5.http.ServiceUnavailableRetryStrategy; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; import org.apache.hc.client5.http.impl.ExecSupport; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.ServiceUnavailableRetryStrategy; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/SystemClock.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/SystemClock.java index 7c5d21003..0ec51d776 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/SystemClock.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; /** * The actual system clock. diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/package-info.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/package-info.java index 92326c386..20c017ddc 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/package-info.java @@ -49,4 +49,4 @@ * } * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpOptions.java b/httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestHttpOptions.java similarity index 97% rename from httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpOptions.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestHttpOptions.java index 7ac4cf247..373ce5fd0 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpOptions.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestHttpOptions.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.util.Set; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpRequestBase.java b/httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestHttpRequestBase.java similarity index 97% rename from httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpRequestBase.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestHttpRequestBase.java index 82c170d0f..d68cdd509 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpRequestBase.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestHttpRequestBase.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestRequestBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestRequestBuilder.java similarity index 87% rename from httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestRequestBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestRequestBuilder.java index a979670b0..69c7112ae 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestRequestBuilder.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/classic/methods/TestRequestBuilder.java @@ -25,9 +25,12 @@ * */ -package org.apache.hc.client5.http.sync.methods; +package org.apache.hc.client5.http.classic.methods; import java.net.URI; +import java.net.URLEncoder; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.List; import org.apache.hc.client5.http.config.Configurable; @@ -252,4 +255,36 @@ public void testCopyNull() throws Exception { RequestBuilder.copy(null); } + @Test + public void testBuildGETwithUTF8() throws Exception { + assertBuild(StandardCharsets.UTF_8); + } + + @Test + public void testBuildGETwithISO88591() throws Exception { + assertBuild(StandardCharsets.ISO_8859_1); + } + + private void assertBuild(final Charset charset) throws Exception { + final RequestBuilder requestBuilder = RequestBuilder.create("GET").setCharset(charset); + requestBuilder.setUri("https://somehost.com/stuff"); + requestBuilder.addParameters(createParameters()); + + final String encodedData1 = URLEncoder.encode("\"1\u00aa position\"", charset.displayName()); + final String encodedData2 = URLEncoder.encode("Jos\u00e9 Abra\u00e3o", charset.displayName()); + + final String uriExpected = String.format("https://somehost.com/stuff?parameter1=value1¶meter2=%s¶meter3=%s", encodedData1, encodedData2); + + final ClassicHttpRequest request = requestBuilder.build(); + Assert.assertEquals(uriExpected, request.getUri().toString()); + } + + private NameValuePair[] createParameters() { + final NameValuePair parameters[] = new NameValuePair[3]; + parameters[0] = new BasicNameValuePair("parameter1", "value1"); + parameters[1] = new BasicNameValuePair("parameter2", "\"1\u00aa position\""); + parameters[2] = new BasicNameValuePair("parameter3", "Jos\u00e9 Abra\u00e3o"); + return parameters; + } + } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAuthenticationStrategy.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAuthenticationStrategy.java index 35de8330a..91a4d4c69 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAuthenticationStrategy.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.protocol; +package org.apache.hc.client5.http.impl; import java.util.Arrays; import java.util.Collections; @@ -40,11 +40,11 @@ import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.config.AuthSchemes; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicScheme; import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; import org.apache.hc.client5.http.impl.auth.DigestScheme; import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.config.Registry; import org.apache.hc.core5.http.config.RegistryBuilder; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultHttpRequestRetryHandler.java similarity index 96% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultHttpRequestRetryHandler.java index e771ca269..db823d03e 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultHttpRequestRetryHandler.java @@ -24,13 +24,13 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl; import java.io.IOException; import java.net.UnknownHostException; import org.apache.hc.client5.http.ConnectTimeoutException; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.Assert; import org.junit.Test; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultRedirectStrategy.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultRedirectStrategy.java index 1f79e790a..1fc2eb289 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultRedirectStrategy.java @@ -24,15 +24,15 @@ * . * */ -package org.apache.hc.client5.http.impl.protocol; +package org.apache.hc.client5.http.impl; import java.net.URI; import java.util.List; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultServiceUnavailableRetryStrategy.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultServiceUnavailableRetryStrategy.java index 51759639e..daa8725a1 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultServiceUnavailableRetryStrategy.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl; import java.util.Date; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java index 96cdc0c62..cf5a5c15c 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java @@ -29,7 +29,6 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.core5.http.HttpHost; import org.junit.Assert; import org.junit.Test; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java index 4df6697a1..28e7589af 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java @@ -39,7 +39,6 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.ChallengeType; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.ParseException; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java index 8d52c71b7..b464d9cbe 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java @@ -45,7 +45,6 @@ import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.MalformedChallengeException; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.HeaderElement; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java index 27ddcf863..778d5f174 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java @@ -39,7 +39,7 @@ import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy; +import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java index 0052705a9..29dbc37e1 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java @@ -32,7 +32,6 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.protocol.RequestAuthCache; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java index 0e6586e25..f0853c59d 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java @@ -34,7 +34,7 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.Credentials; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.core5.http.protocol.HttpCoreContext; import org.junit.Assert; import org.junit.Test; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/MockClock.java similarity index 96% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/MockClock.java index 4b1238c1a..10d4ff823 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/MockClock.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; public class MockClock implements Clock { diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/MockConnPoolControl.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/MockConnPoolControl.java index f055c2c4e..24e17ba17 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/MockConnPoolControl.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestAIMDBackoffManager.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestAIMDBackoffManager.java index ff1d23510..cb00a9766 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestAIMDBackoffManager.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -32,7 +32,7 @@ import java.util.Random; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.sync.BackoffManager; +import org.apache.hc.client5.http.classic.BackoffManager; import org.apache.hc.core5.http.HttpHost; import org.junit.Before; import org.junit.Test; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAbstractHttpClientResponseHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestAbstractHttpClientResponseHandler.java similarity index 92% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAbstractHttpClientResponseHandler.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestAbstractHttpClientResponseHandler.java index 44a48ba2a..24b297571 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAbstractHttpClientResponseHandler.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestAbstractHttpClientResponseHandler.java @@ -25,14 +25,12 @@ * */ -package org.apache.hc.client5.http.impl; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.io.InputStream; -import org.apache.hc.client5.http.impl.sync.AbstractHttpClientResponseHandler; -import org.apache.hc.client5.http.impl.sync.BasicHttpClientResponseHandler; -import org.apache.hc.client5.http.protocol.HttpResponseException; +import org.apache.hc.client5.http.HttpResponseException; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestBasicResponseHandler.java similarity index 94% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestBasicResponseHandler.java index f8d5abbdf..08ac384e4 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestBasicResponseHandler.java @@ -25,12 +25,11 @@ * */ -package org.apache.hc.client5.http.impl; +package org.apache.hc.client5.http.impl.classic; import java.io.InputStream; -import org.apache.hc.client5.http.impl.sync.BasicHttpClientResponseHandler; -import org.apache.hc.client5.http.protocol.HttpResponseException; +import org.apache.hc.client5.http.HttpResponseException; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.StringEntity; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestCloseableHttpClient.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestCloseableHttpClient.java index 99687d6e9..f75a394ea 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestCloseableHttpClient.java @@ -24,12 +24,12 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.io.InputStream; -import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestConnectExec.java similarity index 97% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestConnectExec.java index 8410aa7ae..4f5d8bec2 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestConnectExec.java @@ -24,13 +24,14 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.Collections; import java.util.Map; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.RouteInfo; import org.apache.hc.client5.http.auth.AuthChallenge; @@ -38,13 +39,14 @@ import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.ChallengeType; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.entity.EntityBuilder; +import org.apache.hc.client5.http.impl.TunnelRefusedException; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicScheme; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ConnectionReuseStrategy; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestContentCompressionExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestContentCompressionExec.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestContentCompressionExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestContentCompressionExec.java index d3e1bfda6..950b6fb3c 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestContentCompressionExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestContentCompressionExec.java @@ -24,16 +24,16 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.StandardMethods; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.entity.DecompressingEntity; import org.apache.hc.client5.http.entity.GzipDecompressingEntity; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCookieIdentityComparator.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestCookieIdentityComparator.java similarity index 99% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCookieIdentityComparator.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestCookieIdentityComparator.java index a9893967e..ceeff4f7f 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCookieIdentityComparator.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestCookieIdentityComparator.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import org.apache.hc.client5.http.cookie.CookieIdentityComparator; import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestDefaultBackoffStrategy.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestDefaultBackoffStrategy.java index 6e314656f..f8614ded4 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestDefaultBackoffStrategy.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestExecRuntimeImpl.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestExecRuntimeImpl.java similarity index 99% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestExecRuntimeImpl.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestExecRuntimeImpl.java index 63e51a8e9..2e53cd118 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestExecRuntimeImpl.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestExecRuntimeImpl.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestFutureRequestExecutionService.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestFutureRequestExecutionService.java index 24cdffeea..461cb341d 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestFutureRequestExecutionService.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.util.LinkedList; @@ -39,10 +39,10 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalHttpClient.java similarity index 96% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalHttpClient.java index 2b1a878ad..3612ef4a6 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalHttpClient.java @@ -24,25 +24,25 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.Closeable; import java.io.IOException; import java.util.Arrays; +import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.auth.AuthSchemeProvider; import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecChainHandler; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.cookie.CookieSpecProvider; import org.apache.hc.client5.http.cookie.CookieStore; import org.apache.hc.client5.http.io.HttpClientConnectionManager; -import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.routing.HttpRoutePlanner; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecChainHandler; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestMainClientExec.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestMainClientExec.java index a59e55924..10313d116 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestMainClientExec.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -32,13 +32,13 @@ import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.UserTokenHandler; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.entity.EntityBuilder; import org.apache.hc.client5.http.impl.ConnectionShutdownException; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.UserTokenHandler; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ConnectionReuseStrategy; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestNullBackoffStrategy.java similarity index 97% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestNullBackoffStrategy.java index 578442064..9c7411ac4 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestNullBackoffStrategy.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import static org.junit.Assert.assertFalse; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProtocolExec.java similarity index 97% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProtocolExec.java index a9ca4a59e..881af3452 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProtocolExec.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,7 +34,9 @@ import java.util.Collections; import java.util.Map; +import org.apache.hc.client5.http.AuthenticationStrategy; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.NonRepeatableRequestException; import org.apache.hc.client5.http.auth.AuthChallenge; import org.apache.hc.client5.http.auth.AuthExchange; import org.apache.hc.client5.http.auth.AuthScheme; @@ -43,16 +45,15 @@ import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.entity.EntityBuilder; +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicScheme; import org.apache.hc.client5.http.impl.auth.NTLMScheme; -import org.apache.hc.client5.http.protocol.AuthenticationStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.NonRepeatableRequestException; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.EntityDetails; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRedirectExec.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRedirectExec.java index 05ba193f1..0346ead34 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRedirectExec.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -33,18 +33,18 @@ import java.util.List; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.RedirectException; import org.apache.hc.client5.http.auth.AuthExchange; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.entity.EntityBuilder; import org.apache.hc.client5.http.impl.auth.BasicScheme; import org.apache.hc.client5.http.impl.auth.NTLMScheme; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.RedirectException; import org.apache.hc.client5.http.protocol.RedirectStrategy; import org.apache.hc.client5.http.routing.HttpRoutePlanner; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestResponseEntityWrapper.java similarity index 98% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestResponseEntityWrapper.java index a853240ab..46250cf7e 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestResponseEntityWrapper.java @@ -24,14 +24,14 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.SocketException; -import org.apache.hc.client5.http.sync.ExecRuntime; +import org.apache.hc.client5.http.classic.ExecRuntime; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.junit.Assert; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRetryExec.java similarity index 94% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRetryExec.java index 45a6385a4..d21a022e7 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRetryExec.java @@ -24,22 +24,22 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import org.apache.hc.client5.http.HttpRequestRetryHandler; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.NonRepeatableRequestException; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.entity.EntityBuilder; import org.apache.hc.client5.http.impl.ExecSupport; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.protocol.NonRepeatableRequestException; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestServiceUnavailableRetryExec.java similarity index 94% rename from httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestServiceUnavailableRetryExec.java index 1ce49208a..f6ab7b3c0 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestServiceUnavailableRetryExec.java @@ -24,18 +24,18 @@ * . * */ -package org.apache.hc.client5.http.impl.sync; +package org.apache.hc.client5.http.impl.classic; import java.io.ByteArrayInputStream; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.ServiceUnavailableRetryStrategy; +import org.apache.hc.client5.http.classic.ExecChain; +import org.apache.hc.client5.http.classic.ExecRuntime; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.entity.EntityBuilder; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.http.sync.ExecChain; -import org.apache.hc.client5.http.sync.ExecRuntime; -import org.apache.hc.client5.http.sync.ServiceUnavailableRetryStrategy; -import org.apache.hc.client5.http.sync.methods.HttpGet; -import org.apache.hc.client5.http.sync.methods.HttpPost; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java deleted file mode 100644 index e6e3019fe..000000000 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ -package org.apache.hc.client5.http.utils; - - -import java.net.URLEncoder; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; - -import org.apache.hc.client5.http.sync.methods.RequestBuilder; -import org.apache.hc.core5.http.ClassicHttpRequest; -import org.apache.hc.core5.http.NameValuePair; -import org.apache.hc.core5.http.message.BasicNameValuePair; -import org.junit.Assert; -import org.junit.Test; - -public class TestRequestBuilder { - - @Test - public void testBuildGETwithUTF8() throws Exception { - assertBuild(StandardCharsets.UTF_8); - } - - @Test - public void testBuildGETwithISO88591() throws Exception { - assertBuild(StandardCharsets.ISO_8859_1); - } - - private void assertBuild(final Charset charset) throws Exception { - final RequestBuilder requestBuilder = RequestBuilder.create("GET").setCharset(charset); - requestBuilder.setUri("https://somehost.com/stuff"); - requestBuilder.addParameters(createParameters()); - - final String encodedData1 = URLEncoder.encode("\"1\u00aa position\"", charset.displayName()); - final String encodedData2 = URLEncoder.encode("Jos\u00e9 Abra\u00e3o", charset.displayName()); - - final String uriExpected = String.format("https://somehost.com/stuff?parameter1=value1¶meter2=%s¶meter3=%s", encodedData1, encodedData2); - - final ClassicHttpRequest request = requestBuilder.build(); - Assert.assertEquals(uriExpected, request.getUri().toString()); - } - - private NameValuePair[] createParameters() { - final NameValuePair parameters[] = new NameValuePair[3]; - parameters[0] = new BasicNameValuePair("parameter1", "value1"); - parameters[1] = new BasicNameValuePair("parameter2", "\"1\u00aa position\""); - parameters[2] = new BasicNameValuePair("parameter3", "Jos\u00e9 Abra\u00e3o"); - return parameters; - } -}