This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new a04f21b6f Test modernization
a04f21b6f is described below
commit a04f21b6f2d51d69cb9fad8a5d300fc80201a2f6
Author: James Bognar <[email protected]>
AuthorDate: Wed Aug 27 09:17:22 2025 -0400
Test modernization
---
juneau-utest/src/test/java/org/apache/juneau/TestUtils.java | 1 -
.../java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java | 2 --
.../src/test/java/org/apache/juneau/http/response/BadRequest_Test.java | 1 -
.../src/test/java/org/apache/juneau/http/response/Conflict_Test.java | 1 -
.../java/org/apache/juneau/http/response/ExpectationFailed_Test.java | 1 -
.../java/org/apache/juneau/http/response/FailedDependency_Test.java | 1 -
.../src/test/java/org/apache/juneau/http/response/Forbidden_Test.java | 1 -
.../src/test/java/org/apache/juneau/http/response/Gone_Test.java | 1 -
.../test/java/org/apache/juneau/http/response/HttpException_Test.java | 1 -
.../org/apache/juneau/http/response/HttpVersionNotSupported_Test.java | 1 -
.../java/org/apache/juneau/http/response/InsufficentStorage_Test.java | 1 -
.../java/org/apache/juneau/http/response/InternalServerError_Test.java | 1 -
.../test/java/org/apache/juneau/http/response/LengthRequired_Test.java | 1 -
.../src/test/java/org/apache/juneau/http/response/Locked_Test.java | 1 -
.../test/java/org/apache/juneau/http/response/LoopDetected_Test.java | 1 -
.../java/org/apache/juneau/http/response/MethodNotAllowed_Test.java | 1 -
.../java/org/apache/juneau/http/response/MisdirectedRequest_Test.java | 1 -
.../juneau/http/response/NetworkAuthenticationRequired_Test.java | 1 -
.../test/java/org/apache/juneau/http/response/NotAcceptable_Test.java | 1 -
.../test/java/org/apache/juneau/http/response/NotExtended_Test.java | 1 -
.../src/test/java/org/apache/juneau/http/response/NotFound_Test.java | 1 -
.../test/java/org/apache/juneau/http/response/NotImplemented_Test.java | 1 -
.../java/org/apache/juneau/http/response/PayloadTooLarge_Test.java | 1 -
.../java/org/apache/juneau/http/response/PreconditionFailed_Test.java | 1 -
.../org/apache/juneau/http/response/PreconditionRequired_Test.java | 1 -
.../java/org/apache/juneau/http/response/RangeNotSatisfiable_Test.java | 1 -
.../apache/juneau/http/response/RequestHeaderFieldsTooLarge_Test.java | 1 -
.../java/org/apache/juneau/http/response/ServiceUnavailable_Test.java | 1 -
.../java/org/apache/juneau/http/response/TooManyRequests_Test.java | 1 -
.../test/java/org/apache/juneau/http/response/Unauthorized_Test.java | 1 -
.../apache/juneau/http/response/UnavailableForLegalReasons_Test.java | 1 -
.../java/org/apache/juneau/http/response/UnprocessableEntity_Test.java | 1 -
.../org/apache/juneau/http/response/UnsupportedMediaType_Test.java | 1 -
.../java/org/apache/juneau/http/response/UpgradeRequired_Test.java | 1 -
.../src/test/java/org/apache/juneau/http/response/UriTooLong_Test.java | 1 -
.../org/apache/juneau/http/response/VariantAlsoNegotiates_Test.java | 1 -
.../test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java | 1 -
.../test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java | 3 ---
.../src/test/java/org/apache/juneau/rest/Header_Accept_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java | 1 -
juneau-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java | 1 -
.../test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java | 2 --
.../src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java | 2 --
.../src/test/java/org/apache/juneau/rest/annotation/Header_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/PathRemainder_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/annotation/Path_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/annotation/Query_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/annotation/Response_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/annotation/RestInit_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java | 1 -
.../org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java | 1 -
.../test/java/org/apache/juneau/rest/annotation/RestPostCall_Test.java | 1 -
.../test/java/org/apache/juneau/rest/annotation/RestPostInit_Test.java | 1 -
.../test/java/org/apache/juneau/rest/annotation/RestPreCall_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/RestStartCall_Test.java | 1 -
.../org/apache/juneau/rest/annotation/Rest_AllowContentParam_Test.java | 1 -
.../apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java | 1 -
.../apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java | 1 -
.../apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java | 1 -
.../apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java | 1 -
.../test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java | 1 -
.../juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java | 2 --
.../java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java | 1 -
.../test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java | 2 --
.../java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java | 1 -
.../test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java | 1 -
.../java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java | 1 -
.../src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java | 1 -
76 files changed, 83 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
index 96307b869..637e45700 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
@@ -31,7 +31,6 @@ import org.apache.juneau.common.utils.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock.*;
-import org.apache.juneau.rest.swagger.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.xml.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
index 87a51a9a8..02a917701 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
@@ -18,8 +18,6 @@ import static org.apache.juneau.TestUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.lang.annotation.*;
-import java.lang.reflect.*;
-
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.oapi.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/BadRequest_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/BadRequest_Test.java
index 0d7b665fd..bc3869a0e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/BadRequest_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/BadRequest_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.BadRequest.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Conflict_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Conflict_Test.java
index f7089da6b..6edf668cf 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Conflict_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Conflict_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.Conflict.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/ExpectationFailed_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/ExpectationFailed_Test.java
index 15dfb1847..b9b605dca 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/ExpectationFailed_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/ExpectationFailed_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.ExpectationFailed.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/FailedDependency_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/FailedDependency_Test.java
index c0ccb875b..31d829f1d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/FailedDependency_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/FailedDependency_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.FailedDependency.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Forbidden_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Forbidden_Test.java
index 61bb2894d..4cec6e857 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Forbidden_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Forbidden_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.Forbidden.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Gone_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Gone_Test.java
index 65b5ef2a7..38fd5cfe9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/response/Gone_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/response/Gone_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.Gone.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
index 4ce1648be..d7b49a5fd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
@@ -20,7 +20,6 @@ import java.lang.reflect.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpVersionNotSupported_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpVersionNotSupported_Test.java
index d136930bf..f5ab6a21b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpVersionNotSupported_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpVersionNotSupported_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.HttpVersionNotSupported.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/InsufficentStorage_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/InsufficentStorage_Test.java
index 13e4986fb..2b993deac 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/InsufficentStorage_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/InsufficentStorage_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.InsufficientStorage.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/InternalServerError_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/InternalServerError_Test.java
index 9c944706b..aab931aae 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/InternalServerError_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/InternalServerError_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.InternalServerError.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/LengthRequired_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/LengthRequired_Test.java
index cf4e12e37..ea3d54369 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/LengthRequired_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/LengthRequired_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.LengthRequired.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Locked_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Locked_Test.java
index e1e8b8613..9000766a5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Locked_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Locked_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.Locked.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/LoopDetected_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/LoopDetected_Test.java
index 10bddd9a4..66cfc7ef0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/LoopDetected_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/LoopDetected_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.LoopDetected.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MethodNotAllowed_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MethodNotAllowed_Test.java
index 3cda4e0ca..c593e1ef4 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MethodNotAllowed_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MethodNotAllowed_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.MethodNotAllowed.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MisdirectedRequest_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MisdirectedRequest_Test.java
index 19daf8db2..465a67592 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MisdirectedRequest_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MisdirectedRequest_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.MisdirectedRequest.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NetworkAuthenticationRequired_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NetworkAuthenticationRequired_Test.java
index 5d3c96442..240d762da 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NetworkAuthenticationRequired_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NetworkAuthenticationRequired_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.NetworkAuthenticationRequired.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotAcceptable_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotAcceptable_Test.java
index f3127b01d..cfdeba90c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotAcceptable_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotAcceptable_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.NotAcceptable.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotExtended_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotExtended_Test.java
index 04e25b568..50c25120e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotExtended_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotExtended_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.NotExtended.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotFound_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotFound_Test.java
index d48858acf..64308f277 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotFound_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotFound_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.NotFound.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotImplemented_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotImplemented_Test.java
index 977917833..5efa2f72f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotImplemented_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotImplemented_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.NotImplemented.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PayloadTooLarge_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PayloadTooLarge_Test.java
index d4dc8f8a1..057d5bf88 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PayloadTooLarge_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PayloadTooLarge_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.PayloadTooLarge.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PreconditionFailed_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PreconditionFailed_Test.java
index 2e6bb0591..db48af7e8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PreconditionFailed_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PreconditionFailed_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.PreconditionFailed.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PreconditionRequired_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PreconditionRequired_Test.java
index 023d303cb..115b6605a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PreconditionRequired_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PreconditionRequired_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.PreconditionRequired.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/RangeNotSatisfiable_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/RangeNotSatisfiable_Test.java
index 842809f40..394ee72c9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/RangeNotSatisfiable_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/RangeNotSatisfiable_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.RangeNotSatisfiable.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/RequestHeaderFieldsTooLarge_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/RequestHeaderFieldsTooLarge_Test.java
index c6c3bb47f..15d2ef2a4 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/RequestHeaderFieldsTooLarge_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/RequestHeaderFieldsTooLarge_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.RequestHeaderFieldsTooLarge.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/ServiceUnavailable_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/ServiceUnavailable_Test.java
index ae1594d87..4e7bbe1f1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/ServiceUnavailable_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/ServiceUnavailable_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.ServiceUnavailable.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/TooManyRequests_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/TooManyRequests_Test.java
index 3adf4a7d7..86ad5b021 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/TooManyRequests_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/TooManyRequests_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.TooManyRequests.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Unauthorized_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Unauthorized_Test.java
index ae17c38f0..d16159a34 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Unauthorized_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Unauthorized_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.Unauthorized.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UnavailableForLegalReasons_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UnavailableForLegalReasons_Test.java
index 14866594b..abe68cff5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UnavailableForLegalReasons_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UnavailableForLegalReasons_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.UnavailableForLegalReasons.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UnprocessableEntity_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UnprocessableEntity_Test.java
index 335b307f8..29b5b8c75 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UnprocessableEntity_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UnprocessableEntity_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.UnprocessableEntity.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UnsupportedMediaType_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UnsupportedMediaType_Test.java
index 203a3d324..97d83f7cf 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UnsupportedMediaType_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UnsupportedMediaType_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.UnsupportedMediaType.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UpgradeRequired_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UpgradeRequired_Test.java
index 76378dc10..9802dd991 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UpgradeRequired_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UpgradeRequired_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.UpgradeRequired.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UriTooLong_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UriTooLong_Test.java
index 26ec4330b..d7a07a4c5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UriTooLong_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UriTooLong_Test.java
@@ -17,7 +17,6 @@ import static org.apache.juneau.http.response.UriTooLong.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/VariantAlsoNegotiates_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/VariantAlsoNegotiates_Test.java
index 6754573a7..80d118583 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/VariantAlsoNegotiates_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/VariantAlsoNegotiates_Test.java
@@ -17,7 +17,6 @@ import static
org.apache.juneau.http.response.VariantAlsoNegotiates.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
index a72b5b69c..e99ae0ac0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
@@ -16,7 +16,6 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.plaintext.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.utest.utils.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
index 14d9120e8..f3116d06c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
@@ -14,14 +14,11 @@ package org.apache.juneau.rest;
import static org.junit.jupiter.api.Assertions.*;
-import java.io.*;
-
import org.apache.juneau.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_Accept_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_Accept_Test.java
index 33f4ec4e9..5fb46d506 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_Accept_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_Accept_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.utest.utils.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
index 955c1398e..4583d3fec 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
@@ -16,7 +16,6 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.utest.utils.*;
import org.junit.jupiter.api.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java
index a1d9343ce..de7fba9a3 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/Nls_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest;
import org.apache.juneau.*;
import org.apache.juneau.bean.swagger.Swagger;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.utest.utils.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
index 104b8d2a5..e327c32e7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
@@ -29,7 +29,6 @@ import org.apache.juneau.plaintext.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.arg.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
index 43b717634..b5bdb42b3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
@@ -19,7 +19,6 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
index 99bf7eaa3..0fd7a2063 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
@@ -22,7 +22,6 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
import org.apache.juneau.rest.RestRequest;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.testutils.pojos.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java
index 9b25d5d93..297b23fc1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/HasFormData_Test.java
@@ -15,8 +15,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.RestRequest;
-import org.apache.juneau.rest.client.*;
-import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
index 4bcb61241..3ad42ee4a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
@@ -15,8 +15,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.RestRequest;
-import org.apache.juneau.rest.client.*;
-import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
index cfa54e82e..791cde51e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
@@ -21,7 +21,6 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.testutils.pojos.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
index cbf823b49..695ead428 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
@@ -19,7 +19,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.testutils.pojos.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
index 17fc36631..f2c094a93 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
@@ -25,7 +25,6 @@ import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
import org.apache.juneau.rest.RestResponse;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.testutils.pojos.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
index 01d0d1deb..e56ee8c44 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
@@ -22,7 +22,6 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
import org.apache.juneau.rest.RestRequest;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.testutils.pojos.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
index 70bf945c1..18b53b8c6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseStatus_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
index 1c7961381..8993e5eba 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Response_Test.java
@@ -21,7 +21,6 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
import org.apache.juneau.oapi.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestInit_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestInit_Test.java
index b21b7d1ed..161ca723f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestInit_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestInit_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java
index 0c21b7707..5e86c0feb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java
index cea8c4ccc..16e5221f7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ClientVersion_Test.java
@@ -16,7 +16,6 @@ import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.*;
import org.apache.juneau.http.header.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java
index 295edd3c5..1ea535dca 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Guards_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.rest.RestRequest;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.guard.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java
index 74f4f4d77..02d8a5dfc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_Matchers_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest.annotation;
import static org.apache.juneau.TestUtils.*;
import org.apache.juneau.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.matcher.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java
index c44dcc291..3fae1b079 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_ReqHeaders_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostCall_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostCall_Test.java
index 95397c38d..95aec8468 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostCall_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostCall_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.http.header.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.RestResponse;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostInit_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostInit_Test.java
index 8735eaa78..ea8414ebb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostInit_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostInit_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPreCall_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPreCall_Test.java
index 130c39469..759554a20 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPreCall_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPreCall_Test.java
@@ -17,7 +17,6 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.RestResponse;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestStartCall_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestStartCall_Test.java
index 471912b9d..cec890183 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestStartCall_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestStartCall_Test.java
@@ -16,7 +16,6 @@ import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.RestResponse;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowContentParam_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowContentParam_Test.java
index 2864991e5..74d827fcd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowContentParam_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowContentParam_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
index d0d2c573c..1ce671800 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.http.header.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
index cadd7a3ce..78539e4ad 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
@@ -13,7 +13,6 @@
package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
index ae5bcdda5..b43dccced 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
@@ -13,7 +13,6 @@
package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
index 3ad479228..018cfa8e8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
index 20b1f1807..db20098b5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Debug_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.rest.RestRequest;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.config.*;
import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
index 804b13d20..c375540dd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
@@ -18,12 +18,10 @@ import static org.apache.juneau.TestUtils.*;
import java.util.*;
import org.apache.juneau.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.RestResponse;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.serializer.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
index 64de48ac1..428b48c92 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Encoders_Test.java
@@ -17,7 +17,6 @@ import org.apache.juneau.common.internal.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
index f520944af..04de9b685 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
@@ -15,9 +15,7 @@ package org.apache.juneau.rest.annotation;
import static java.lang.String.*;
import org.apache.juneau.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.rest.RestResponse;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.utest.utils.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
index b6b6336c5..b9cb4145c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
@@ -16,7 +16,6 @@ import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.RestRequest;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.utest.utils.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java
index f1b334dba..a0a7e21a3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Path_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java
index db091306e..6d01a2c55 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_ReqAttrs_Test.java
@@ -17,7 +17,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java
index 95bb5be26..b151c47e6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Serializers_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.rest.annotation;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.rest.RestResponse;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.utest.utils.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java
index 47c92ff04..e740c1ceb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/helper/Hyperlink_Test.java
@@ -17,7 +17,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.beans.*;
-import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.junit.jupiter.api.*;
