From 0b4b06d08082795939e62ee290dd869c783b5d64 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Fri, 21 Jun 2024 11:11:36 +0200 Subject: [PATCH] Moved test extension classes --- .../AbstractHttpAsyncClientAuthenticationTest.java | 6 +++--- .../async/AbstractHttpAsyncFundamentalsTest.java | 6 +++--- .../async/AbstractHttpAsyncRedirectsTest.java | 10 +++++----- .../AbstractHttpReactiveFundamentalsTest.java | 6 +++--- .../testing/async/AbstractIntegrationTestBase.java | 14 +++++++------- .../hc/client5/testing/async/TestH2Async.java | 4 ++-- .../client5/testing/async/TestH2AsyncMinimal.java | 4 ++-- .../client5/testing/async/TestH2AsyncRedirect.java | 4 ++-- .../testing/async/TestH2ClientAuthentication.java | 4 ++-- .../hc/client5/testing/async/TestH2Reactive.java | 4 ++-- .../testing/async/TestH2ReactiveMinimal.java | 4 ++-- .../hc/client5/testing/async/TestHttp1Async.java | 6 +++--- .../testing/async/TestHttp1AsyncMinimal.java | 4 ++-- .../testing/async/TestHttp1AsyncRedirects.java | 6 +++--- .../TestHttp1AsyncStatefulConnManagement.java | 6 +++--- .../async/TestHttp1ClientAuthentication.java | 6 +++--- .../client5/testing/async/TestHttp1Reactive.java | 6 +++--- .../testing/async/TestHttp1ReactiveMinimal.java | 4 ++-- .../testing/async/TestHttp1RequestReExecution.java | 6 +++--- .../async/TestHttpAsyncMinimalTlsHandshake.java | 4 ++-- .../testing/async/TestHttpAsyncProtocolPolicy.java | 6 +++--- .../async}/ClientProtocolLevel.java | 2 +- .../async}/H2OnlyMinimalTestClientBuilder.java | 2 +- .../async}/H2OnlyTestClientBuilder.java | 2 +- .../async}/MinimalTestClientBuilder.java | 2 +- .../async}/ServerProtocolLevel.java | 2 +- .../async}/StandardTestClientBuilder.java | 2 +- .../async}/TestAsyncClient.java | 2 +- .../async}/TestAsyncClientBuilder.java | 2 +- .../async}/TestAsyncResources.java | 4 ++-- .../async}/TestAsyncServer.java | 2 +- .../async}/TestAsyncServerBootstrap.java | 2 +- .../sync}/ClientProtocolLevel.java | 2 +- .../sync}/MinimalTestClientBuilder.java | 2 +- .../sync}/StandardTestClientBuilder.java | 2 +- .../extension => extension/sync}/TestClient.java | 2 +- .../sync}/TestClientBuilder.java | 2 +- .../sync}/TestClientResources.java | 2 +- .../extension => extension/sync}/TestServer.java | 2 +- .../sync}/TestServerBootstrap.java | 2 +- .../hc/client5/testing/fluent/TestFluent.java | 6 +++--- .../testing/sync/AbstractIntegrationTestBase.java | 12 ++++++------ .../testing/sync/TestBasicConnectionManager.java | 4 ++-- .../testing/sync/TestClientAuthentication.java | 6 +++--- .../testing/sync/TestClientRequestExecution.java | 4 ++-- .../testing/sync/TestConnectionManagement.java | 4 ++-- .../client5/testing/sync/TestConnectionReuse.java | 4 ++-- .../client5/testing/sync/TestContentCodings.java | 4 ++-- .../testing/sync/TestCookieVirtualHost.java | 4 ++-- .../sync/TestHttpClientBuilderInterceptors.java | 4 ++-- .../testing/sync/TestIdleConnectionEviction.java | 4 ++-- .../sync/TestMinimalClientRequestExecution.java | 4 ++-- .../hc/client5/testing/sync/TestRedirects.java | 4 ++-- .../testing/sync/TestStatefulConnManagement.java | 4 ++-- 54 files changed, 114 insertions(+), 114 deletions(-) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/ClientProtocolLevel.java (95%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/H2OnlyMinimalTestClientBuilder.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/H2OnlyTestClientBuilder.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/MinimalTestClientBuilder.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/ServerProtocolLevel.java (95%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/StandardTestClientBuilder.java (99%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/TestAsyncClient.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/TestAsyncClientBuilder.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/TestAsyncResources.java (97%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/TestAsyncServer.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{async/extension => extension/async}/TestAsyncServerBootstrap.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{sync/extension => extension/sync}/ClientProtocolLevel.java (95%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{sync/extension => extension/sync}/MinimalTestClientBuilder.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{sync/extension => extension/sync}/StandardTestClientBuilder.java (99%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{sync/extension => extension/sync}/TestClient.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{sync/extension => extension/sync}/TestClientBuilder.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{sync/extension => extension/sync}/TestClientResources.java (98%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{sync/extension => extension/sync}/TestServer.java (97%) rename httpclient5-testing/src/test/java/org/apache/hc/client5/testing/{sync/extension => extension/sync}/TestServerBootstrap.java (98%) diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java index 75a27f582..db433d369 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java @@ -55,11 +55,11 @@ import org.apache.hc.client5.http.impl.auth.BasicScheme; import org.apache.hc.client5.http.impl.auth.CredentialsProviderBuilder; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.testing.BasicTestAuthenticator; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; import org.apache.hc.client5.testing.auth.Authenticator; import org.apache.hc.client5.testing.auth.BearerAuthenticationHandler; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java index 4b0d40ac9..f8488b24f 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java @@ -41,9 +41,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java index 4d4b0952d..5cb0a4699 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java @@ -44,11 +44,11 @@ import org.apache.hc.client5.http.cookie.CookieStore; import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.testing.OldPathRedirectResolver; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; -import org.apache.hc.client5.testing.async.extension.TestAsyncServer; -import org.apache.hc.client5.testing.async.extension.TestAsyncServerBootstrap; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.TestAsyncServer; +import org.apache.hc.client5.testing.extension.async.TestAsyncServerBootstrap; import org.apache.hc.client5.testing.redirect.Redirect; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java index 1d2df6cd3..58fd9e0eb 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java @@ -52,9 +52,9 @@ import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.schedulers.Schedulers; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractIntegrationTestBase.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractIntegrationTestBase.java index 09867e97a..0dc5ca4cc 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractIntegrationTestBase.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractIntegrationTestBase.java @@ -30,13 +30,13 @@ package org.apache.hc.client5.testing.async; import java.net.InetSocketAddress; import java.util.function.Consumer; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; -import org.apache.hc.client5.testing.async.extension.TestAsyncClientBuilder; -import org.apache.hc.client5.testing.async.extension.TestAsyncResources; -import org.apache.hc.client5.testing.async.extension.TestAsyncServer; -import org.apache.hc.client5.testing.async.extension.TestAsyncServerBootstrap; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.TestAsyncClientBuilder; +import org.apache.hc.client5.testing.extension.async.TestAsyncResources; +import org.apache.hc.client5.testing.extension.async.TestAsyncServer; +import org.apache.hc.client5.testing.extension.async.TestAsyncServerBootstrap; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.URIScheme; import org.apache.hc.core5.util.Timeout; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Async.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Async.java index 148df77a7..2774b1d08 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Async.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Async.java @@ -26,8 +26,8 @@ */ package org.apache.hc.client5.testing.async; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.URIScheme; public abstract class TestH2Async extends AbstractHttpAsyncFundamentalsTest { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncMinimal.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncMinimal.java index 0b1c1cea8..c4045cf18 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncMinimal.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncMinimal.java @@ -26,8 +26,8 @@ */ package org.apache.hc.client5.testing.async; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.URIScheme; public abstract class TestH2AsyncMinimal extends AbstractHttpAsyncFundamentalsTest { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncRedirect.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncRedirect.java index b2a08ad7c..b3d93c769 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncRedirect.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncRedirect.java @@ -26,8 +26,8 @@ */ package org.apache.hc.client5.testing.async; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.URIScheme; public abstract class TestH2AsyncRedirect extends AbstractHttpAsyncRedirectsTest { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ClientAuthentication.java index f5ffb8742..178030bf8 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ClientAuthentication.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ClientAuthentication.java @@ -26,8 +26,8 @@ */ package org.apache.hc.client5.testing.async; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.URIScheme; public abstract class TestH2ClientAuthentication extends AbstractHttpAsyncClientAuthenticationTest { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Reactive.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Reactive.java index 81b748e3c..7d4cb7d0d 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Reactive.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Reactive.java @@ -26,8 +26,8 @@ */ package org.apache.hc.client5.testing.async; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.URIScheme; public abstract class TestH2Reactive extends AbstractHttpReactiveFundamentalsTest { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ReactiveMinimal.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ReactiveMinimal.java index 8fe7ce12b..56da02d9f 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ReactiveMinimal.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ReactiveMinimal.java @@ -26,8 +26,8 @@ */ package org.apache.hc.client5.testing.async; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.URIScheme; public abstract class TestH2ReactiveMinimal extends AbstractHttpReactiveFundamentalsTest { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java index 9c85e4421..9e4b52566 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java @@ -40,9 +40,9 @@ import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.http.HeaderElements; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java index 7d6302a57..081f97b3e 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java @@ -36,8 +36,8 @@ import java.util.concurrent.TimeUnit; import org.apache.hc.client5.http.impl.async.MinimalHttpAsyncClient; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncRedirects.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncRedirects.java index 4a143a75d..597dcacda 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncRedirects.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncRedirects.java @@ -34,9 +34,9 @@ import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.testing.OldPathRedirectResolver; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.client5.testing.redirect.Redirect; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpHeaders; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java index 56ab02303..fa3292969 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java @@ -34,9 +34,9 @@ import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.EndpointDetails; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ClientAuthentication.java index 6489d11bc..0d5a72fbb 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ClientAuthentication.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ClientAuthentication.java @@ -36,9 +36,9 @@ import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.testing.BasicTestAuthenticator; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.http.HeaderElements; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java index 7e9864374..460ab77bc 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java @@ -36,9 +36,9 @@ import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.http.HeaderElements; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java index 18caa1cd2..07f490b28 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java @@ -36,8 +36,8 @@ import java.util.concurrent.TimeUnit; import org.apache.hc.client5.http.impl.async.MinimalHttpAsyncClient; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java index c877ed8c4..8a59b9d99 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java @@ -34,9 +34,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryStrategy; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.function.Resolver; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncMinimalTlsHandshake.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncMinimalTlsHandshake.java index ae3133ccf..91bb36d82 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncMinimalTlsHandshake.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncMinimalTlsHandshake.java @@ -35,8 +35,8 @@ import javax.net.ssl.SSLException; import org.apache.hc.client5.http.impl.async.MinimalHttpAsyncClient; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager; import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.URIScheme; import org.apache.hc.core5.http.nio.AsyncClientEndpoint; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java index 743d21f0a..d9f631223 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java @@ -34,9 +34,9 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.config.TlsConfig; -import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel; -import org.apache.hc.client5.testing.async.extension.TestAsyncClient; +import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel; +import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolVersion; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/ClientProtocolLevel.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/ClientProtocolLevel.java similarity index 95% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/ClientProtocolLevel.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/ClientProtocolLevel.java index 8e439efec..561ee28eb 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/ClientProtocolLevel.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/ClientProtocolLevel.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; public enum ClientProtocolLevel { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/H2OnlyMinimalTestClientBuilder.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/H2OnlyMinimalTestClientBuilder.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/H2OnlyMinimalTestClientBuilder.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/H2OnlyMinimalTestClientBuilder.java index e90f5e87c..7cfae6424 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/H2OnlyMinimalTestClientBuilder.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/H2OnlyMinimalTestClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/H2OnlyTestClientBuilder.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/H2OnlyTestClientBuilder.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/H2OnlyTestClientBuilder.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/H2OnlyTestClientBuilder.java index e70452d63..53bd966a6 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/H2OnlyTestClientBuilder.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/H2OnlyTestClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import java.util.Collection; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/MinimalTestClientBuilder.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/MinimalTestClientBuilder.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/MinimalTestClientBuilder.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/MinimalTestClientBuilder.java index 2c939ee1c..a56ee0f40 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/MinimalTestClientBuilder.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/MinimalTestClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.TlsConfig; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/ServerProtocolLevel.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/ServerProtocolLevel.java similarity index 95% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/ServerProtocolLevel.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/ServerProtocolLevel.java index 3a5690727..803cb9fba 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/ServerProtocolLevel.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/ServerProtocolLevel.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; public enum ServerProtocolLevel { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/StandardTestClientBuilder.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/StandardTestClientBuilder.java similarity index 99% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/StandardTestClientBuilder.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/StandardTestClientBuilder.java index 88807d1cb..24f29dd67 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/StandardTestClientBuilder.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/StandardTestClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import java.util.Collection; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncClient.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncClient.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncClient.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncClient.java index 41543fd6a..7de2e4aca 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncClient.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncClient.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import java.io.IOException; import java.util.concurrent.Future; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncClientBuilder.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncClientBuilder.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncClientBuilder.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncClientBuilder.java index 43276ec2f..1768d1040 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncClientBuilder.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import java.util.Collection; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncResources.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncResources.java similarity index 97% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncResources.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncResources.java index 115d353a5..86ee12467 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncResources.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncResources.java @@ -25,11 +25,11 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import java.util.function.Consumer; -import org.apache.hc.client5.testing.sync.extension.TestClientResources; +import org.apache.hc.client5.testing.extension.sync.TestClientResources; import org.apache.hc.core5.http.URIScheme; import org.apache.hc.core5.io.CloseMode; import org.apache.hc.core5.util.Asserts; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncServer.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncServer.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncServer.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncServer.java index 27c134e87..5d3562685 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncServer.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncServer.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import java.net.InetSocketAddress; import java.util.Set; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncServerBootstrap.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncServerBootstrap.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncServerBootstrap.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncServerBootstrap.java index 2e518112f..3bb742a6d 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/extension/TestAsyncServerBootstrap.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncServerBootstrap.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.async.extension; +package org.apache.hc.client5.testing.extension.async; import java.util.ArrayList; import java.util.List; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/ClientProtocolLevel.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/ClientProtocolLevel.java similarity index 95% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/ClientProtocolLevel.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/ClientProtocolLevel.java index 53000d5cd..5123cb5ef 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/ClientProtocolLevel.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/ClientProtocolLevel.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.sync.extension; +package org.apache.hc.client5.testing.extension.sync; public enum ClientProtocolLevel { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/MinimalTestClientBuilder.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/MinimalTestClientBuilder.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/MinimalTestClientBuilder.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/MinimalTestClientBuilder.java index bc7686eb9..bcf84d5a4 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/MinimalTestClientBuilder.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/MinimalTestClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.sync.extension; +package org.apache.hc.client5.testing.extension.sync; import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.impl.classic.HttpClients; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/StandardTestClientBuilder.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/StandardTestClientBuilder.java similarity index 99% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/StandardTestClientBuilder.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/StandardTestClientBuilder.java index aac369e70..f75c81b79 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/StandardTestClientBuilder.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/StandardTestClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.sync.extension; +package org.apache.hc.client5.testing.extension.sync; import java.util.Collection; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClient.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClient.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClient.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClient.java index e17e845c7..86aceec1f 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClient.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClient.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.sync.extension; +package org.apache.hc.client5.testing.extension.sync; import java.io.IOException; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClientBuilder.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientBuilder.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClientBuilder.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientBuilder.java index 7dec1ff92..4489b265f 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClientBuilder.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientBuilder.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.sync.extension; +package org.apache.hc.client5.testing.extension.sync; import java.util.Collection; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClientResources.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientResources.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClientResources.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientResources.java index 64758f58b..2a32ad148 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestClientResources.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientResources.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.sync.extension; +package org.apache.hc.client5.testing.extension.sync; import java.util.function.Consumer; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestServer.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestServer.java similarity index 97% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestServer.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestServer.java index 7c0f69421..d09e23170 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestServer.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestServer.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.sync.extension; +package org.apache.hc.client5.testing.extension.sync; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestServerBootstrap.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestServerBootstrap.java similarity index 98% rename from httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestServerBootstrap.java rename to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestServerBootstrap.java index 51de842ab..870948398 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/extension/TestServerBootstrap.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestServerBootstrap.java @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.testing.sync.extension; +package org.apache.hc.client5.testing.extension.sync; import java.util.ArrayList; import java.util.List; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/fluent/TestFluent.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/fluent/TestFluent.java index c97aefbde..9eefe100c 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/fluent/TestFluent.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/fluent/TestFluent.java @@ -35,9 +35,9 @@ import org.apache.hc.client5.http.ClientProtocolException; import org.apache.hc.client5.http.HttpResponseException; import org.apache.hc.client5.http.fluent.Content; import org.apache.hc.client5.http.fluent.Request; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClientResources; -import org.apache.hc.client5.testing.sync.extension.TestServer; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClientResources; +import org.apache.hc.client5.testing.extension.sync.TestServer; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpHost; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/AbstractIntegrationTestBase.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/AbstractIntegrationTestBase.java index 85bf42774..72d21b442 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/AbstractIntegrationTestBase.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/AbstractIntegrationTestBase.java @@ -30,12 +30,12 @@ package org.apache.hc.client5.testing.sync; import java.net.InetSocketAddress; import java.util.function.Consumer; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; -import org.apache.hc.client5.testing.sync.extension.TestClientBuilder; -import org.apache.hc.client5.testing.sync.extension.TestClientResources; -import org.apache.hc.client5.testing.sync.extension.TestServer; -import org.apache.hc.client5.testing.sync.extension.TestServerBootstrap; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; +import org.apache.hc.client5.testing.extension.sync.TestClientBuilder; +import org.apache.hc.client5.testing.extension.sync.TestClientResources; +import org.apache.hc.client5.testing.extension.sync.TestServer; +import org.apache.hc.client5.testing.extension.sync.TestServerBootstrap; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.URIScheme; import org.apache.hc.core5.util.Timeout; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestBasicConnectionManager.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestBasicConnectionManager.java index 3c7b13e04..18c1eeaef 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestBasicConnectionManager.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestBasicConnectionManager.java @@ -29,8 +29,8 @@ package org.apache.hc.client5.testing.sync; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; import org.apache.hc.client5.testing.classic.RandomHandler; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.URIScheme; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java index c52677eab..e49c25f0f 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java @@ -64,9 +64,9 @@ import org.apache.hc.client5.testing.auth.Authenticator; import org.apache.hc.client5.testing.auth.BearerAuthenticationHandler; import org.apache.hc.client5.testing.classic.AuthenticatingDecorator; import org.apache.hc.client5.testing.classic.EchoHandler; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; -import org.apache.hc.client5.testing.sync.extension.TestServerBootstrap; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; +import org.apache.hc.client5.testing.extension.sync.TestServerBootstrap; 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-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestExecution.java index 57bf594d2..a797d9114 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestExecution.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestExecution.java @@ -41,8 +41,8 @@ import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.http.protocol.RedirectLocations; import org.apache.hc.client5.http.utils.URIUtils; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionManagement.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionManagement.java index d77ca68ca..028d8e473 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionManagement.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionManagement.java @@ -38,8 +38,8 @@ import org.apache.hc.client5.http.io.ConnectionEndpoint; import org.apache.hc.client5.http.io.LeaseRequest; import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.client5.testing.classic.RandomHandler; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpException; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java index 37017a0f2..d056e10a9 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java @@ -39,8 +39,8 @@ import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; import org.apache.hc.client5.testing.classic.RandomHandler; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.EntityDetails; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java index 3127b245f..2e179ca9c 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java @@ -45,8 +45,8 @@ import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HeaderElement; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestCookieVirtualHost.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestCookieVirtualHost.java index ff63fe28d..965e90091 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestCookieVirtualHost.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestCookieVirtualHost.java @@ -34,8 +34,8 @@ 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.protocol.HttpClientContext; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.URIScheme; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestHttpClientBuilderInterceptors.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestHttpClientBuilderInterceptors.java index 1fda23f7a..160616e2d 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestHttpClientBuilderInterceptors.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestHttpClientBuilderInterceptors.java @@ -27,8 +27,8 @@ package org.apache.hc.client5.testing.sync; import org.apache.hc.client5.http.classic.methods.HttpPost; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; 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-testing/src/test/java/org/apache/hc/client5/testing/sync/TestIdleConnectionEviction.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestIdleConnectionEviction.java index 1b4e93205..0bf8777f3 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestIdleConnectionEviction.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestIdleConnectionEviction.java @@ -35,8 +35,8 @@ import org.apache.hc.client5.http.impl.IdleConnectionEvictor; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; import org.apache.hc.client5.testing.classic.RandomHandler; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.URIScheme; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java index 77c433285..0ab13d15f 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java @@ -33,8 +33,8 @@ import java.util.Set; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java index f576cf891..9545835ff 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java @@ -49,9 +49,9 @@ import org.apache.hc.client5.testing.OldPathRedirectResolver; import org.apache.hc.client5.testing.classic.EchoHandler; import org.apache.hc.client5.testing.classic.RandomHandler; import org.apache.hc.client5.testing.classic.RedirectingDecorator; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.client5.testing.redirect.Redirect; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; import org.apache.hc.core5.function.Decorator; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.Header; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java index d4451d5e5..cc8efd213 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java @@ -33,8 +33,8 @@ import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; import org.apache.hc.client5.http.protocol.HttpClientContext; -import org.apache.hc.client5.testing.sync.extension.ClientProtocolLevel; -import org.apache.hc.client5.testing.sync.extension.TestClient; +import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel; +import org.apache.hc.client5.testing.extension.sync.TestClient; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.EndpointDetails;