From 191183bf75b365097a5a36eb97456ac03cab13e7 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Thu, 23 Feb 2017 14:35:01 +0000 Subject: [PATCH] Moved sync HTTP method classes git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1784141 13f79535-47bb-0310-9956-ffa450edef68 --- .../cache/AsynchronousValidationRequest.java | 4 ++-- .../impl/cache/AsynchronousValidator.java | 4 ++-- .../client5/http/impl/cache/CachingExec.java | 4 ++-- .../impl/cache/ConditionalRequestBuilder.java | 4 ++-- .../impl/cache/RequestProtocolCompliance.java | 2 +- .../cache/ResponseProtocolCompliance.java | 2 +- .../http/impl/cache/AbstractProtocolTest.java | 4 ++-- .../client5/http/impl/cache/DummyBackend.java | 4 ++-- .../TestAsynchronousValidationRequest.java | 6 +++--- .../impl/cache/TestAsynchronousValidator.java | 6 +++--- .../http/impl/cache/TestBasicHttpCache.java | 12 +++++------ .../impl/cache/TestCacheKeyGenerator.java | 2 +- .../TestCachedHttpResponseGenerator.java | 2 +- .../http/impl/cache/TestCachingExec.java | 6 +++--- .../http/impl/cache/TestCachingExecChain.java | 10 +++++----- .../cache/TestConditionalRequestBuilder.java | 4 ++-- ...ponentialBackingOffSchedulingStrategy.java | 2 +- .../cache/TestHttpCacheJiraNumber1147.java | 6 +++--- .../cache/TestProtocolAllowedBehavior.java | 2 +- .../impl/cache/TestProtocolDeviations.java | 4 ++-- .../cache/TestProtocolRecommendations.java | 8 ++++---- .../impl/cache/TestProtocolRequirements.java | 4 ++-- .../impl/cache/TestRFC5861Compliance.java | 2 +- .../cache/TestRequestProtocolCompliance.java | 4 ++-- .../impl/cache/TestResponseCachingPolicy.java | 2 +- .../cache/TestResponseProtocolCompliance.java | 6 +++--- .../cache/TestSizeLimitedResponseReader.java | 2 +- ...leWhileRevalidationReleasesConnection.java | 2 +- .../hc/client5/http/fluent/Request.java | 20 +++++++++---------- .../http/osgi/impl/MimeExportedIT.java | 4 ++-- .../external/HttpClientCompatibilityTest.java | 4 ++-- .../examples/client/win/ClientWinAuth.java | 2 +- .../impl/win/TestWindowsNegotiateScheme.java | 4 ++-- .../http/examples/ClientAbortMethod.java | 4 ++-- .../http/examples/ClientAuthentication.java | 4 ++-- .../http/examples/ClientChunkEncodedPost.java | 4 ++-- .../http/examples/ClientConfiguration.java | 2 +- .../examples/ClientConnectionRelease.java | 4 ++-- .../http/examples/ClientCustomContext.java | 4 ++-- .../ClientCustomPublicSuffixList.java | 2 +- .../http/examples/ClientCustomSSL.java | 2 +- .../ClientEvictExpiredConnections.java | 4 ++-- .../http/examples/ClientExecuteProxy.java | 4 ++-- .../http/examples/ClientExecuteSOCKS.java | 4 ++-- .../http/examples/ClientFormLogin.java | 8 ++++---- .../ClientMultiThreadedExecution.java | 4 ++-- .../examples/ClientMultipartFormPost.java | 4 ++-- .../ClientPreemptiveBasicAuthentication.java | 4 ++-- .../ClientPreemptiveDigestAuthentication.java | 4 ++-- .../examples/ClientProxyAuthentication.java | 4 ++-- .../examples/ClientWithRequestFuture.java | 2 +- .../examples/ClientWithResponseHandler.java | 2 +- .../hc/client5/http/examples/QuickStart.java | 6 +++--- .../methods/DefaultAsyncRequestProducer.java | 2 +- .../{methods => config}/Configurable.java | 4 +--- .../impl/async/InternalHttpAsyncClient.java | 2 +- .../impl/async/MinimalHttpAsyncClient.java | 2 +- .../protocol/DefaultRedirectStrategy.java | 6 +++--- .../http/impl/sync/BackoffStrategyExec.java | 3 +-- .../http/impl/sync/ClientExecChain.java | 3 +-- .../sync/DefaultHttpRequestRetryHandler.java | 2 +- .../sync/FutureRequestExecutionService.java | 2 +- .../http/impl/sync/HttpRequestFutureTask.java | 2 +- .../impl/sync/HttpRequestTaskCallable.java | 2 +- .../http/impl/sync/InternalHttpClient.java | 5 ++--- .../http/impl/sync/MainClientExec.java | 5 ++--- .../http/impl/sync/MinimalClientExec.java | 5 ++--- .../http/impl/sync/MinimalHttpClient.java | 5 ++--- .../client5/http/impl/sync/ProtocolExec.java | 3 +-- .../client5/http/impl/sync/RedirectExec.java | 3 +-- .../hc/client5/http/impl/sync/RetryExec.java | 3 +-- .../sync}/RoutedHttpRequest.java | 2 +- .../sync/ServiceUnavailableRetryExec.java | 3 +-- .../http/protocol/RedirectStrategy.java | 2 +- .../http/{ => sync}/methods/HttpDelete.java | 2 +- .../methods/HttpExecutionAware.java | 2 +- .../http/{ => sync}/methods/HttpGet.java | 2 +- .../http/{ => sync}/methods/HttpHead.java | 2 +- .../http/{ => sync}/methods/HttpOptions.java | 4 ++-- .../http/{ => sync}/methods/HttpPatch.java | 2 +- .../http/{ => sync}/methods/HttpPost.java | 2 +- .../http/{ => sync}/methods/HttpPut.java | 2 +- .../http/{ => sync}/methods/HttpTrace.java | 2 +- .../{ => sync}/methods/HttpUriRequest.java | 2 +- .../methods/HttpUriRequestBase.java | 3 ++- .../{ => sync}/methods/RequestBuilder.java | 3 ++- .../http/{ => sync}/methods/package-info.java | 2 +- .../TestSystemDefaultCredentialsProvider.java | 2 +- .../TestBasicConnectionManager.java | 4 ++-- .../integration/TestClientAuthentication.java | 6 +++--- .../TestClientAuthenticationFakeNTLM.java | 2 +- .../TestClientAuthenticationFallBack.java | 2 +- .../TestClientReauthentication.java | 4 ++-- .../TestClientRequestExecution.java | 4 ++-- .../TestConnectionAutoRelease.java | 2 +- .../impl/integration/TestConnectionReuse.java | 2 +- .../impl/integration/TestContentCodings.java | 4 ++-- .../integration/TestCookieVirtualHost.java | 4 ++-- .../TestIdleConnectionEviction.java | 6 +++--- .../TestMalformedServerResponse.java | 4 ++-- .../TestMinimalClientRequestExecution.java | 2 +- .../http/impl/integration/TestRedirects.java | 4 ++-- .../impl/integration/TestSPNegoScheme.java | 2 +- .../TestStatefulConnManagement.java | 2 +- .../protocol/TestDefaultRedirectStrategy.java | 10 +++++----- .../impl/sync/TestCloseableHttpClient.java | 2 +- .../TestDefaultHttpRequestRetryHandler.java | 4 ++-- .../TestFutureRequestExecutionService.java | 2 +- .../impl/sync/TestInternalHttpClient.java | 3 +-- .../http/impl/sync/TestMainClientExec.java | 9 ++++----- .../http/impl/sync/TestMinimalClientExec.java | 5 ++--- .../http/impl/sync/TestProtocolExec.java | 5 ++--- .../http/impl/sync/TestRedirectExec.java | 5 ++--- .../client5/http/impl/sync/TestRetryExec.java | 7 +++---- .../sync/TestServiceUnavailableRetryExec.java | 5 ++--- .../{ => sync}/methods/TestHttpOptions.java | 2 +- .../methods/TestHttpRequestBase.java | 2 +- .../methods/TestRequestBuilder.java | 3 ++- .../http/utils/TestRequestBuilder.java | 4 ++-- 119 files changed, 217 insertions(+), 233 deletions(-) rename httpclient5/src/main/java/org/apache/hc/client5/http/{methods => config}/Configurable.java (93%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{methods => impl/sync}/RoutedHttpRequest.java (99%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpDelete.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpExecutionAware.java (96%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpGet.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpHead.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpOptions.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpPatch.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpPost.java (98%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpPut.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpTrace.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpUriRequest.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/HttpUriRequestBase.java (97%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/RequestBuilder.java (99%) rename httpclient5/src/main/java/org/apache/hc/client5/http/{ => sync}/methods/package-info.java (96%) rename httpclient5/src/test/java/org/apache/hc/client5/http/{ => sync}/methods/TestHttpOptions.java (97%) rename httpclient5/src/test/java/org/apache/hc/client5/http/{ => sync}/methods/TestHttpRequestBase.java (97%) rename httpclient5/src/test/java/org/apache/hc/client5/http/{ => sync}/methods/TestRequestBuilder.java (99%) 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 595f51d37..6a7380c78 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 @@ -32,9 +32,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hc.client5.http.cache.HeaderConstants; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpException; 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 e187d2c0a..fe82e7df3 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 @@ -36,9 +36,9 @@ import java.util.concurrent.RejectedExecutionException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; /** * Class used for asynchronous revalidations to be used when the "stale- 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 872116cb1..44dcd6c2f 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 @@ -44,9 +44,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.impl.sync.ClientExecChain; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; 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/ConditionalRequestBuilder.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java index 97b37a7b1..adcb26ff7 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java @@ -31,13 +31,13 @@ import java.util.Map; import org.apache.hc.client5.http.cache.HeaderConstants; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; -import org.apache.hc.core5.http.message.MessageSupport; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HeaderElement; import org.apache.hc.core5.http.ProtocolException; +import org.apache.hc.core5.http.message.MessageSupport; /** * @since 4.1 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 96e56cae7..e7c2360e8 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 @@ -32,8 +32,8 @@ import java.util.Iterator; import java.util.List; import org.apache.hc.client5.http.cache.HeaderConstants; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.ClientProtocolException; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; 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 816e38bbd..4e86ff233 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 @@ -32,8 +32,8 @@ import java.util.Date; import java.util.List; import org.apache.hc.client5.http.cache.HeaderConstants; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.ClientProtocolException; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; 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 9ee01daf2..b7842ab40 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 @@ -31,9 +31,9 @@ import java.util.HashMap; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HttpCacheContext; import org.apache.hc.client5.http.impl.sync.ClientExecChain; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpHost; 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 7ae212ab8..ac5886fdb 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 @@ -29,9 +29,9 @@ package org.apache.hc.client5.http.impl.cache; import java.io.IOException; import org.apache.hc.client5.http.impl.sync.ClientExecChain; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; 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 2ddc62723..d08f59410 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 java.io.IOException; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HeaderConstants; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; 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/TestAsynchronousValidator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java index ac24c540c..d8f3169d7 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 java.util.concurrent.TimeUnit; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HeaderConstants; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; 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 95dc2bcde..95e5c4cb6 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 java.util.Map; 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.methods.HttpDelete; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpHead; -import org.apache.hc.client5.http.methods.HttpOptions; -import org.apache.hc.client5.http.methods.HttpPost; -import org.apache.hc.client5.http.methods.HttpTrace; +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.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 808250e83..1732503a7 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.verify; import static org.mockito.Mockito.when; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.sync.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/TestCachedHttpResponseGenerator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java index 78a2a93a7..e031c0177 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java @@ -37,7 +37,7 @@ import java.util.HashMap; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; 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/TestCachingExec.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java index c71d71f3c..c1251f024 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 @@ -47,10 +47,10 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.hc.client5.http.cache.HttpCacheEntry; import org.apache.hc.client5.http.impl.sync.ClientExecChain; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HeaderElements; 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 118496b70..a3af4a8f8 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 @@ -54,13 +54,13 @@ 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.impl.sync.ClientExecChain; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpOptions; -import org.apache.hc.client5.http.methods.HttpUriRequest; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.sync.methods.HttpOptions; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; 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/TestConditionalRequestBuilder.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java index 976bcb0d2..45a7b77d0 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java @@ -34,9 +34,8 @@ import java.util.Map; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HeaderConstants; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.client5.http.utils.DateUtils; -import org.apache.hc.core5.http.message.MessageSupport; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HeaderElement; @@ -45,6 +44,7 @@ import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolException; import org.apache.hc.core5.http.message.BasicClassicHttpRequest; import org.apache.hc.core5.http.message.BasicHeader; +import org.apache.hc.core5.http.message.MessageSupport; import org.junit.Assert; import org.junit.Before; import org.junit.Test; 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 86105456a..0ccfaf036 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 @@ -35,8 +35,8 @@ import java.util.concurrent.TimeUnit; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.impl.sync.ClientExecChain; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.message.BasicClassicHttpRequest; import org.junit.Before; 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 d59c092af..dfadc0657 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 @@ -39,10 +39,10 @@ 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.impl.sync.ClientExecChain; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java index 276fa4e9a..5ef26a550 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java @@ -29,7 +29,7 @@ package org.apache.hc.client5.http.impl.cache; import java.net.SocketTimeoutException; import java.util.Date; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.client5.http.utils.DateUtils; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpStatus; 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 b69c871e3..b8c38b869 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 @@ -32,10 +32,10 @@ import java.util.Random; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HttpCacheContext; import org.apache.hc.client5.http.impl.sync.ClientExecChain; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; 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 1116f1ea8..04b231a0c 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,11 +38,11 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpPost; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +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.sync.RoutedHttpRequest; 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 e7b1b5469..e1a963611 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 @@ -37,10 +37,10 @@ import java.util.regex.Pattern; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.cache.HttpCacheEntry; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; 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/TestRFC5861Compliance.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java index 8f71ff26c..4ec02b6a3 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.util.Date; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; 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/TestRequestProtocolCompliance.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java index a6b21fa7f..772b2d0f4 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 @@ -33,8 +33,8 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.methods.HttpPut; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; +import org.apache.hc.client5.http.sync.methods.HttpPut; +import org.apache.hc.client5.http.impl.sync.RoutedHttpRequest; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpVersion; 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 096e8eb99..6bc5ae8a0 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 @@ package org.apache.hc.client5.http.impl.cache; import java.util.Date; import java.util.Random; -import org.apache.hc.client5.http.methods.HttpOptions; +import org.apache.hc.client5.http.sync.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 43043e79a..5c6e27aad 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 @@ -33,10 +33,10 @@ import java.io.ByteArrayInputStream; import java.util.Date; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpHead; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.impl.sync.RoutedHttpRequest; 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 bedab1fee..9c8b0dbf8 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 @@ package org.apache.hc.client5.http.impl.cache; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.sync.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 c56c6ed8c..9f1bf4f24 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 @@ -38,8 +38,8 @@ import org.apache.hc.client5.http.cache.HttpCacheContext; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.methods.HttpGet; 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-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 4a0f82ecd..52ef46336 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.List; import java.util.Locale; import java.util.TimeZone; +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.methods.Configurable; -import org.apache.hc.client5.http.methods.HttpDelete; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpHead; -import org.apache.hc.client5.http.methods.HttpOptions; -import org.apache.hc.client5.http.methods.HttpPatch; -import org.apache.hc.client5.http.methods.HttpPost; -import org.apache.hc.client5.http.methods.HttpPut; -import org.apache.hc.client5.http.methods.HttpTrace; -import org.apache.hc.client5.http.methods.HttpUriRequestBase; +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.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java b/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java index f060271ad..51d050ad2 100644 --- a/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java +++ b/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java @@ -41,9 +41,9 @@ import java.util.List; import org.apache.hc.client5.http.entity.mime.ByteArrayBody; import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder; import org.apache.hc.client5.http.entity.mime.StringBody; -import org.apache.hc.client5.http.methods.HttpPost; -import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.client5.http.sync.methods.HttpPost; import org.apache.hc.core5.http.ContentType; +import org.apache.hc.core5.http.HttpEntity; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; 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 dfba9893a..ab06982af 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 @@ -40,10 +40,10 @@ import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuil 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.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpOptions; 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-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 edca897d1..7612fde37 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 @@ -30,7 +30,7 @@ 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.impl.win.WinHttpClients; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.io.entity.EntityUtils; /** diff --git a/httpclient5-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java b/httpclient5-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java index 716c86d3d..c1ad717cc 100644 --- a/httpclient5-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java +++ b/httpclient5-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java @@ -32,10 +32,10 @@ import org.apache.hc.client5.http.auth.AuthScheme; import org.apache.hc.client5.http.auth.AuthSchemeProvider; 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.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +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/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java index 33cb670ea..bd07c3f20 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 @@ -28,9 +28,9 @@ package org.apache.hc.client5.http.examples; import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; -import org.apache.hc.client5.http.impl.sync.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.sync.methods.HttpGet; /** * 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 922c663c4..0d81ced34 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 @@ -30,9 +30,9 @@ 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +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; /** 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 f745f18f3..d8417c14d 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 @@ -30,9 +30,9 @@ 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpPost; +import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.sync.methods.HttpPost; 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 ad7deb701..e9445279e 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 @@ -51,11 +51,11 @@ 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.methods.HttpGet; 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 79f2d5aa3..06d73a24e 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 @@ -31,9 +31,9 @@ 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +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; /** 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 a9190b173..66b66bbd4 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 @@ -33,10 +33,10 @@ 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.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 4fc50c9bc..7a9e5b403 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 @@ -36,11 +36,11 @@ 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.methods.HttpGet; 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 409961ba2..adb0596ca 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 @@ -35,9 +35,9 @@ 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.methods.HttpGet; import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; import org.apache.hc.client5.http.ssl.TrustSelfSignedStrategy; +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; 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 94ca97af6..bf3ed6a93 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 @@ -30,9 +30,9 @@ import java.util.concurrent.TimeUnit; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +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; 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 e67a13c14..7e7f948a3 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 @@ -29,9 +29,9 @@ package org.apache.hc.client5.http.examples; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.HttpClients; +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/ClientExecuteSOCKS.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java index 64a25d876..b7744c643 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 @@ -36,11 +36,11 @@ import java.net.SocketTimeoutException; import org.apache.hc.client5.http.ConnectTimeoutException; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +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 b37a06e26..2b08b19e3 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 @@ -32,11 +32,11 @@ import java.util.List; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpUriRequest; -import org.apache.hc.client5.http.methods.RequestBuilder; +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.HttpUriRequest; +import org.apache.hc.client5.http.sync.methods.RequestBuilder; 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/ClientMultiThreadedExecution.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java index eac025025..7c41a9ec2 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 @@ -28,9 +28,9 @@ package org.apache.hc.client5.http.examples; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +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 a84706e79..e30093b6b 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 @@ -32,9 +32,9 @@ 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpPost; +import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.sync.methods.HttpPost; 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 86724955d..1e63ffedc 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 @@ -29,10 +29,10 @@ package org.apache.hc.client5.http.examples; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.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 12ac4ff94..04a12d14a 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 @@ -31,10 +31,10 @@ import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.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 11b682e3d..ea0165ee4 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 @@ -31,9 +31,9 @@ import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.impl.sync.HttpClients; +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/ClientWithRequestFuture.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java index 1db08bee8..d2baed415 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 @@ -38,8 +38,8 @@ 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.methods.HttpGet; 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 7e1905cb6..e8c58c9ee 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 @@ -31,8 +31,8 @@ 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.methods.HttpGet; import org.apache.hc.client5.http.protocol.ClientProtocolException; +import org.apache.hc.client5.http.sync.methods.HttpGet; 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/QuickStart.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java index 9edd9caac..f4c9adee9 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 @@ -31,10 +31,10 @@ import java.util.List; 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.HttpClients; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpPost; +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.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/async/methods/DefaultAsyncRequestProducer.java b/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/DefaultAsyncRequestProducer.java index ee921651a..b97de2f59 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/DefaultAsyncRequestProducer.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/DefaultAsyncRequestProducer.java @@ -28,8 +28,8 @@ package org.apache.hc.client5.http.async.methods; import java.io.IOException; +import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.methods.Configurable; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.nio.AsyncEntityProducer; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/Configurable.java b/httpclient5/src/main/java/org/apache/hc/client5/http/config/Configurable.java similarity index 93% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/Configurable.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/config/Configurable.java index e5b8bd96d..6614a194e 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/Configurable.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/config/Configurable.java @@ -25,9 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; - -import org.apache.hc.client5.http.config.RequestConfig; +package org.apache.hc.client5.http.config; /** * Configuration interface for HTTP requests. diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncClient.java index c7aa2c478..664763c73 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncClient.java @@ -40,9 +40,9 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.async.AsyncClientEndpoint; +import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.ConnPoolSupport; -import org.apache.hc.client5.http.methods.Configurable; import org.apache.hc.client5.http.nio.AsyncClientConnectionManager; import org.apache.hc.client5.http.nio.AsyncConnectionEndpoint; import org.apache.hc.client5.http.protocol.HttpClientContext; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java index 6be3d4c1e..a3b3a26dd 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java @@ -34,9 +34,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.async.AsyncClientEndpoint; +import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.ComplexFuture; -import org.apache.hc.client5.http.methods.Configurable; import org.apache.hc.client5.http.nio.AsyncClientConnectionManager; import org.apache.hc.client5.http.nio.AsyncConnectionEndpoint; import org.apache.hc.client5.http.protocol.HttpClientContext; 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/protocol/DefaultRedirectStrategy.java index e7b4bb470..99c2304c7 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/protocol/DefaultRedirectStrategy.java @@ -34,13 +34,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpUriRequest; -import org.apache.hc.client5.http.methods.RequestBuilder; 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; +import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; +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/BackoffStrategyExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java index 8d2af1298..01ba5b8f0 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/sync/BackoffStrategyExec.java @@ -31,11 +31,10 @@ import java.io.IOException; import java.lang.reflect.UndeclaredThrowableException; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.sync.BackoffManager; import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java index 146b23b66..85a8656e4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java @@ -29,9 +29,8 @@ package org.apache.hc.client5.http.impl.sync; import java.io.IOException; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; 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/DefaultHttpRequestRetryHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java index 4e7d61753..f8c51cd7b 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/sync/DefaultHttpRequestRetryHandler.java @@ -41,8 +41,8 @@ import java.util.concurrent.ConcurrentHashMap; import javax.net.ssl.SSLException; -import org.apache.hc.client5.http.methods.HttpUriRequest; import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; 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/sync/FutureRequestExecutionService.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java index c03e61566..9bc3dc12d 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/sync/FutureRequestExecutionService.java @@ -31,8 +31,8 @@ import java.io.IOException; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hc.client5.http.methods.HttpUriRequest; import org.apache.hc.client5.http.sync.HttpClient; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; 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/HttpRequestFutureTask.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java index 7edb3ae7e..5dbdd8e18 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/sync/HttpRequestFutureTask.java @@ -28,7 +28,7 @@ package org.apache.hc.client5.http.impl.sync; import java.util.concurrent.FutureTask; -import org.apache.hc.client5.http.methods.HttpUriRequest; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; /** * FutureTask implementation that wraps a HttpAsyncClientCallable and exposes various task 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/sync/HttpRequestTaskCallable.java index 563851df3..4a9ee8c64 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/sync/HttpRequestTaskCallable.java @@ -29,8 +29,8 @@ package org.apache.hc.client5.http.impl.sync; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hc.client5.http.methods.HttpUriRequest; import org.apache.hc.client5.http.sync.HttpClient; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.io.ResponseHandler; import org.apache.hc.core5.http.protocol.HttpContext; 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/sync/InternalHttpClient.java index 42c5be16b..a3829d5cc 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/sync/InternalHttpClient.java @@ -34,15 +34,14 @@ import java.util.List; 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.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.methods.Configurable; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.methods.HttpExecutionAware; 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/sync/MainClientExec.java index d4a4f60ae..fe8c84404 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/sync/MainClientExec.java @@ -39,19 +39,18 @@ 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.config.RequestConfig; -import org.apache.hc.client5.http.impl.auth.HttpAuthenticator; import org.apache.hc.client5.http.impl.ConnectionShutdownException; +import org.apache.hc.client5.http.impl.auth.HttpAuthenticator; import org.apache.hc.client5.http.impl.routing.BasicRouteDirector; 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.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.protocol.UserTokenHandler; import org.apache.hc.client5.http.routing.HttpRouteDirector; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; 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/MinimalClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java index 004e0ad92..5d9e0e70f 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java @@ -36,15 +36,14 @@ import java.util.concurrent.TimeoutException; import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy; import org.apache.hc.client5.http.impl.ConnectionShutdownException; +import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy; 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.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.protocol.RequestClientConnControl; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; 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/sync/MinimalHttpClient.java index 53b21e808..7e25e4d46 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/sync/MinimalHttpClient.java @@ -30,14 +30,13 @@ package org.apache.hc.client5.http.impl.sync; import java.io.IOException; import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy; import org.apache.hc.client5.http.io.HttpClientConnectionManager; -import org.apache.hc.client5.http.methods.Configurable; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.ClientProtocolException; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; 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/ProtocolExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java index 119bdd54c..f44ef224f 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/sync/ProtocolExec.java @@ -35,9 +35,8 @@ import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.CredentialsStore; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.config.AuthSchemes; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; 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/sync/RedirectExec.java index 30d58bcbd..c9849889a 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/sync/RedirectExec.java @@ -36,12 +36,11 @@ import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.auth.AuthExchange; import org.apache.hc.client5.http.auth.AuthScheme; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.methods.HttpExecutionAware; 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/RetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java index d5da58860..57800e7c4 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/sync/RetryExec.java @@ -30,11 +30,10 @@ package org.apache.hc.client5.http.impl.sync; import java.io.IOException; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.HttpExecutionAware; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/RoutedHttpRequest.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RoutedHttpRequest.java similarity index 99% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/RoutedHttpRequest.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RoutedHttpRequest.java index 9cdf5ac6b..dc34fe8c1 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/RoutedHttpRequest.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RoutedHttpRequest.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.impl.sync; import java.net.URI; import java.net.URISyntaxException; 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/sync/ServiceUnavailableRetryExec.java index c0eca4145..d31b5910a 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/sync/ServiceUnavailableRetryExec.java @@ -30,10 +30,9 @@ package org.apache.hc.client5.http.impl.sync; import java.io.IOException; import java.io.InterruptedIOException; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.sync.ServiceUnavailableRetryStrategy; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java index 283612eff..ef7c72778 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java @@ -27,7 +27,7 @@ package org.apache.hc.client5.http.protocol; -import org.apache.hc.client5.http.methods.HttpUriRequest; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; import org.apache.hc.core5.http.ClassicHttpRequest; 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/methods/HttpDelete.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpDelete.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpDelete.java index 3ed31e7bd..0f28e0baf 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpDelete.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpExecutionAware.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpExecutionAware.java index 7d2646b9c..28b933670 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpExecutionAware.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import org.apache.hc.core5.concurrent.Cancellable; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpGet.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpGet.java index 9bcc59120..ed1c6c47a 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpGet.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpHead.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpHead.java index 442d76dd8..028837bc9 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpHead.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpOptions.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpOptions.java index 71df7a11f..ea830e568 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpOptions.java @@ -25,16 +25,16 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.hc.core5.http.message.MessageSupport; import org.apache.hc.core5.http.HeaderElement; import org.apache.hc.core5.http.HttpResponse; +import org.apache.hc.core5.http.message.MessageSupport; import org.apache.hc.core5.util.Args; /** diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPatch.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPatch.java index 811b0d84c..00403ffce 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPatch.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPost.java similarity index 98% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPost.java index c8cd216c1..fcac1ffe0 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPost.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPut.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPut.java index 793a2011a..aa5487781 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpPut.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpTrace.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpTrace.java index 181eeab14..105c575fc 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpTrace.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequest.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequest.java index 01c39be16..2a3cbf4bc 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequest.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequestBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequestBase.java similarity index 97% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequestBase.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequestBase.java index c6542f94f..a91dfe07c 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequestBase.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/HttpUriRequestBase.java @@ -24,12 +24,13 @@ * . * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.core5.concurrent.Cancellable; import org.apache.hc.core5.http.message.BasicClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java similarity index 99% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java index a35eaafc5..c57b960e2 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.io.IOException; import java.net.URI; @@ -37,6 +37,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.entity.UrlEncodedFormEntity; import org.apache.hc.core5.http.ClassicHttpRequest; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/package-info.java similarity index 96% rename from httpclient5/src/main/java/org/apache/hc/client5/http/methods/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/package-info.java index 89df3913e..d6e1e8442 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/methods/package-info.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/package-info.java @@ -28,4 +28,4 @@ /** * Standard HTTP method implementations. */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; 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 8445b6156..1188b1777 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 java.net.URL; import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.Credentials; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.sync.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/integration/TestBasicConnectionManager.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java index 1b41e55df..fbf2d7409 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java @@ -27,9 +27,9 @@ package org.apache.hc.client5.http.impl.integration; import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +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/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java index 6945a47b0..1d4761c0d 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java @@ -51,12 +51,12 @@ import org.apache.hc.client5.http.localserver.BasicAuthTokenExtractor; import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.apache.hc.client5.http.localserver.RequestBasicAuth; import org.apache.hc.client5.http.localserver.ResponseBasicUnauthorized; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpPost; -import org.apache.hc.client5.http.methods.HttpPut; import org.apache.hc.client5.http.protocol.ClientProtocolException; 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.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HeaderElements; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java index fa0786fa6..64b6124dd 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java @@ -33,8 +33,8 @@ 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.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; 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/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java index 0c8f9222d..65d48ba78 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java @@ -35,8 +35,8 @@ import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.apache.hc.client5.http.localserver.RequestBasicAuth; -import org.apache.hc.client5.http.methods.HttpGet; 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.EntityDetails; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java index 096ee8ec4..cb3ac9c9b 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java @@ -40,11 +40,11 @@ import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.config.RequestConfig; 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.sync.CloseableHttpResponse; import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.apache.hc.client5.http.localserver.RequestBasicAuth; -import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; 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.EntityDetails; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java index cf0a66bc0..f6da910b2 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java @@ -32,12 +32,12 @@ import java.net.URI; import java.util.List; import org.apache.hc.client5.http.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpPost; import org.apache.hc.client5.http.protocol.ClientProtocolException; 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/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java index 56d5726d4..32c8ad187 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java @@ -37,7 +37,7 @@ import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.io.ConnectionEndpoint; import org.apache.hc.client5.http.io.LeaseRequest; import org.apache.hc.client5.http.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; +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/integration/TestConnectionReuse.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java index 23753a716..9054d8074 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java @@ -33,7 +33,7 @@ import java.net.URI; import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.apache.hc.client5.http.localserver.RandomHandler; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.sync.methods.HttpGet; 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/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java index 5003a5384..b208144b0 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java @@ -44,8 +44,7 @@ import java.util.zip.GZIPOutputStream; import org.apache.hc.client5.http.impl.sync.BasicResponseHandler; import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; import org.apache.hc.client5.http.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.core5.http.message.MessageSupport; +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.HeaderElement; @@ -56,6 +55,7 @@ import org.apache.hc.core5.http.io.HttpRequestHandler; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.http.io.entity.InputStreamEntity; import org.apache.hc.core5.http.io.entity.StringEntity; +import org.apache.hc.core5.http.message.MessageSupport; import org.apache.hc.core5.http.protocol.HttpContext; import org.junit.Assert; import org.junit.Ignore; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java index 58fdcf254..ac7873684 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java @@ -33,10 +33,10 @@ import java.util.List; 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.localserver.LocalServerTestBase; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; 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/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java index c5876976b..143316a60 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java @@ -29,12 +29,12 @@ package org.apache.hc.client5.http.impl.integration; import java.util.concurrent.TimeUnit; -import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; import org.apache.hc.client5.http.impl.IdleConnectionEvictor; +import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; import org.apache.hc.client5.http.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpUriRequest; 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.HttpUriRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java index 48252e1fd..fcc09044c 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java @@ -29,9 +29,9 @@ package org.apache.hc.client5.http.impl.integration; import java.io.IOException; import java.net.Socket; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.apache.hc.client5.http.impl.sync.CloseableHttpResponse; -import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +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/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java index dbfd2b90b..ec9d6b66d 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java @@ -33,8 +33,8 @@ import java.util.Set; import org.apache.hc.client5.http.impl.sync.HttpClients; import org.apache.hc.client5.http.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; 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/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java index fec5fe824..0613a2013 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java @@ -37,12 +37,12 @@ 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.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpPost; 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/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java index c68aa3a1d..ceaccc83e 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java @@ -38,7 +38,7 @@ 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.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; +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/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java index 84d3358f0..875f7bcd1 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java @@ -31,9 +31,9 @@ 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.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.methods.HttpGet; 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.HttpConnection; 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/protocol/TestDefaultRedirectStrategy.java index 13f82c86f..05a489d60 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/protocol/TestDefaultRedirectStrategy.java @@ -30,12 +30,12 @@ import java.net.URI; import java.util.List; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpHead; -import org.apache.hc.client5.http.methods.HttpPost; -import org.apache.hc.client5.http.methods.HttpTrace; -import org.apache.hc.client5.http.methods.HttpUriRequest; 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.HttpHead; +import org.apache.hc.client5.http.sync.methods.HttpPost; +import org.apache.hc.client5.http.sync.methods.HttpTrace; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHeaders; 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/sync/TestCloseableHttpClient.java index feeeb862e..7d8299c52 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/sync/TestCloseableHttpClient.java @@ -29,7 +29,7 @@ package org.apache.hc.client5.http.impl.sync; import java.io.IOException; import java.io.InputStream; -import org.apache.hc.client5.http.methods.HttpGet; +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/TestDefaultHttpRequestRetryHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java index 28a95c317..ec15b283c 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/sync/TestDefaultHttpRequestRetryHandler.java @@ -30,8 +30,8 @@ import java.io.IOException; import java.net.UnknownHostException; import org.apache.hc.client5.http.ConnectTimeoutException; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpUriRequest; +import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; import org.junit.Assert; import org.junit.Test; 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/sync/TestFutureRequestExecutionService.java index 5d5702596..c172bc172 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/sync/TestFutureRequestExecutionService.java @@ -41,8 +41,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; import org.apache.hc.client5.http.io.HttpClientConnectionManager; -import org.apache.hc.client5.http.methods.HttpGet; 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/sync/TestInternalHttpClient.java index c80b2510c..01aca4f4a 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/sync/TestInternalHttpClient.java @@ -36,11 +36,10 @@ import org.apache.hc.client5.http.auth.CredentialsProvider; 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.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.methods.HttpGet; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.config.Lookup; 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/sync/TestMainClientExec.java index e543dce52..16782754c 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/sync/TestMainClientExec.java @@ -47,20 +47,19 @@ import org.apache.hc.client5.http.auth.ChallengeType; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.entity.EntityBuilder; +import org.apache.hc.client5.http.impl.ConnectionShutdownException; import org.apache.hc.client5.http.impl.auth.BasicScheme; import org.apache.hc.client5.http.impl.auth.NTLMScheme; -import org.apache.hc.client5.http.impl.ConnectionShutdownException; 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.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpPost; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.protocol.UserTokenHandler; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; +import org.apache.hc.client5.http.sync.methods.HttpPost; 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/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java index 5b2529900..0532b9bde 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java @@ -40,10 +40,9 @@ import org.apache.hc.client5.http.impl.ConnectionShutdownException; 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.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; 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/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java index b1f494184..881b052ad 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/sync/TestProtocolExec.java @@ -33,10 +33,9 @@ import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.CredentialsProvider; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.HttpException; 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/sync/TestRedirectExec.java index 541d8fe06..07fe896c1 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/sync/TestRedirectExec.java @@ -36,13 +36,12 @@ 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.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; 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/sync/TestRetryExec.java index fd807600b..7749de641 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/sync/TestRetryExec.java @@ -32,13 +32,12 @@ import java.io.IOException; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.entity.EntityBuilder; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.HttpPost; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; 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.HttpExecutionAware; +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/sync/TestServiceUnavailableRetryExec.java index c28a86589..cdd73ac7d 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/sync/TestServiceUnavailableRetryExec.java @@ -27,11 +27,10 @@ package org.apache.hc.client5.http.impl.sync; import org.apache.hc.client5.http.HttpRoute; -import org.apache.hc.client5.http.methods.HttpExecutionAware; -import org.apache.hc.client5.http.methods.HttpGet; -import org.apache.hc.client5.http.methods.RoutedHttpRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.sync.ServiceUnavailableRetryStrategy; +import org.apache.hc.client5.http.sync.methods.HttpExecutionAware; +import org.apache.hc.client5.http.sync.methods.HttpGet; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java b/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpOptions.java similarity index 97% rename from httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpOptions.java index a0f986216..7ac4cf247 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpOptions.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.util.Set; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java b/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpRequestBase.java similarity index 97% rename from httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpRequestBase.java index a7c55905e..82c170d0f 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestHttpRequestBase.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestRequestBuilder.java similarity index 99% rename from httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestRequestBuilder.java index f71fbd60b..08274ad11 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/sync/methods/TestRequestBuilder.java @@ -25,11 +25,12 @@ * */ -package org.apache.hc.client5.http.methods; +package org.apache.hc.client5.http.sync.methods; import java.net.URI; import java.util.List; +import org.apache.hc.client5.http.config.Configurable; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.Header; 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 index e244d45f2..db2950f01 100644 --- 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 @@ -31,8 +31,8 @@ import java.net.URLEncoder; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import org.apache.hc.client5.http.methods.HttpUriRequest; -import org.apache.hc.client5.http.methods.RequestBuilder; +import org.apache.hc.client5.http.sync.methods.HttpUriRequest; +import org.apache.hc.client5.http.sync.methods.RequestBuilder; import org.apache.hc.core5.http.NameValuePair; import org.apache.hc.core5.http.message.BasicNameValuePair; import org.junit.Assert;