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 67c624e REST refactoring.
67c624e is described below
commit 67c624e851316e75a4d0e16d08639838b8c46a47
Author: JamesBognar <[email protected]>
AuthorDate: Thu Mar 4 09:32:03 2021 -0500
REST refactoring.
---
TODO.txt | 2 ++
.../src/main/java/org/apache/juneau/encoders/EncoderGroup.java | 2 +-
.../juneau/http/{part/StandardHttpParts.java => HttpEntities.java} | 4 ++--
.../http/{header/StandardHttpHeaders.java => HttpHeaders.java} | 6 ++++--
.../juneau/http/{part/StandardHttpParts.java => HttpParts.java} | 4 ++--
.../{response/StandardHttpResponses.java => HttpResponses.java} | 6 ++++--
.../src/main/java/org/apache/juneau/parser/ParserGroup.java | 2 +-
.../src/main/java/org/apache/juneau/serializer/SerializerGroup.java | 2 +-
.../src/main/java/org/apache/juneau/rest/client/RestClient.java | 2 +-
.../main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java | 2 +-
.../main/java/org/apache/juneau/rest/mock/MockServletRequest.java | 2 +-
.../src/main/java/org/apache/juneau/rest/BasicStaticFiles.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestContext.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestContextBuilder.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestOperationContext.java | 2 +-
.../java/org/apache/juneau/rest/RestOperationContextBuilder.java | 2 +-
.../src/main/java/org/apache/juneau/rest/RestResponse.java | 2 +-
.../main/java/org/apache/juneau/rest/annotation/RestAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestDeleteAnnotation.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestGetAnnotation.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestOpAnnotation.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestPostAnnotation.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestPutAnnotation.java | 2 +-
.../java/org/apache/juneau/rest/reshandlers/DefaultHandler.java | 2 +-
.../src/test/java/org/apache/juneau/http/BasicHeader_Test.java | 2 +-
.../test/java/org/apache/juneau/http/BasicHttpResource_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/BasicPart_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java | 2 +-
.../java/org/apache/juneau/http/MediaRanges_FindMatch_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/SerializedHeader_Test.java | 2 +-
.../test/java/org/apache/juneau/http/header/AcceptCharset_Test.java | 3 +--
.../java/org/apache/juneau/http/header/AcceptEncoding_Test.java | 3 +--
.../java/org/apache/juneau/http/header/AcceptLanguage_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/AcceptRanges_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Accept_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/header/Age_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Allow_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/Authorization_Test.java | 3 +--
.../org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java | 2 +-
.../java/org/apache/juneau/http/header/BasicDateHeader_Test.java | 2 +-
.../apache/juneau/http/header/BasicEntityTagArrayHeader_Test.java | 4 +---
.../org/apache/juneau/http/header/BasicEntityTagHeader_Test.java | 2 +-
.../java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java | 2 +-
.../java/org/apache/juneau/http/header/BasicLongHeader_Test.java | 2 +-
.../apache/juneau/http/header/BasicMediaRangeArrayHeader_Test.java | 2 +-
.../org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java | 2 +-
.../java/org/apache/juneau/http/header/BasicStringHeader_Test.java | 4 +---
.../apache/juneau/http/header/BasicStringRangeArrayHeader_Test.java | 2 +-
.../java/org/apache/juneau/http/header/BasicUriHeader_Test.java | 2 +-
.../test/java/org/apache/juneau/http/header/CacheControl_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/ClientVersion_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/Connection_Test.java | 3 +--
.../java/org/apache/juneau/http/header/ContentDisposition_Test.java | 3 +--
.../java/org/apache/juneau/http/header/ContentEncoding_Test.java | 3 +--
.../java/org/apache/juneau/http/header/ContentLanguage_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/ContentLength_Test.java | 3 +--
.../java/org/apache/juneau/http/header/ContentLocation_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/ContentRange_Test.java | 3 +--
.../java/org/apache/juneau/http/header/ContentType_Match_Test.java | 2 +-
.../java/org/apache/juneau/http/header/ContentType_Other_Test.java | 2 +-
.../test/java/org/apache/juneau/http/header/ContentType_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/header/Date_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/ETag_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/header/Expect_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Expires_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Forwarded_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/From_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Host_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/IfMatch_Test.java | 3 +--
.../java/org/apache/juneau/http/header/IfModifiedSince_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/IfNoneMatch_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/IfRange_Test.java | 2 +-
.../java/org/apache/juneau/http/header/IfUnmodifiedSince_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/LastModified_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Location_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/MaxForwards_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/NoTrace_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Origin_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Pragma_Test.java | 3 +--
.../java/org/apache/juneau/http/header/ProxyAuthenticate_Test.java | 3 +--
.../java/org/apache/juneau/http/header/ProxyAuthorization_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Range_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Referer_Test.java | 3 +--
.../test/java/org/apache/juneau/http/header/RetryAfter_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Server_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/TE_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Trailer_Test.java | 3 +--
.../java/org/apache/juneau/http/header/TransferEncoding_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Upgrade_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/UserAgent_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Vary_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Via_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/header/Warning_Test.java | 3 +--
.../java/org/apache/juneau/http/header/WwwAuthenticate_Test.java | 3 +--
.../org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java | 4 ++--
.../org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/remote/Remote_Test.java | 3 ++-
.../test/java/org/apache/juneau/http/response/Accepted_Test.java | 2 +-
.../java/org/apache/juneau/http/response/AlreadyReported_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/BadRequest_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/Conflict_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/Continue_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/response/Created_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/EarlyHints_Test.java | 2 +-
.../org/apache/juneau/http/response/ExpectationFailed_Test.java | 2 +-
.../java/org/apache/juneau/http/response/FailedDependency_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/Forbidden_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/response/Found_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/response/Gone_Test.java | 2 +-
.../java/org/apache/juneau/http/response/HttpException_Test.java | 2 +-
.../apache/juneau/http/response/HttpVersionNotSupported_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/response/IMUsed_Test.java | 2 +-
.../org/apache/juneau/http/response/InsufficentStorage_Test.java | 2 +-
.../org/apache/juneau/http/response/InternalServerError_Test.java | 2 +-
.../java/org/apache/juneau/http/response/LengthRequired_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/response/Locked_Test.java | 2 +-
.../java/org/apache/juneau/http/response/LoopDetected_Test.java | 2 +-
.../java/org/apache/juneau/http/response/MethodNotAllowed_Test.java | 2 +-
.../org/apache/juneau/http/response/MisdirectedRequest_Test.java | 2 +-
.../java/org/apache/juneau/http/response/MovedPermanently_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/MultiStatus_Test.java | 2 +-
.../java/org/apache/juneau/http/response/MultipleChoices_Test.java | 2 +-
.../juneau/http/response/NetworkAuthenticationRequired_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/NoContent_Test.java | 2 +-
.../juneau/http/response/NonAuthoritativeInformation_Test.java | 2 +-
.../java/org/apache/juneau/http/response/NotAcceptable_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/NotExtended_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/NotFound_Test.java | 2 +-
.../java/org/apache/juneau/http/response/NotImplemented_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/NotModified_Test.java | 2 +-
.../src/test/java/org/apache/juneau/http/response/Ok_Test.java | 2 +-
.../java/org/apache/juneau/http/response/PartialContent_Test.java | 2 +-
.../java/org/apache/juneau/http/response/PayloadTooLarge_Test.java | 2 +-
.../org/apache/juneau/http/response/PermanentRedirect_Test.java | 2 +-
.../org/apache/juneau/http/response/PreconditionFailed_Test.java | 2 +-
.../org/apache/juneau/http/response/PreconditionRequired_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/Processing_Test.java | 2 +-
.../org/apache/juneau/http/response/RangeNotSatisfiable_Test.java | 2 +-
.../juneau/http/response/RequestHeaderFieldsTooLarge_Test.java | 2 +-
.../java/org/apache/juneau/http/response/ResetContent_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/SeeOther_Test.java | 2 +-
.../org/apache/juneau/http/response/ServiceUnavailable_Test.java | 2 +-
.../org/apache/juneau/http/response/SwitchingProtocols_Test.java | 2 +-
.../org/apache/juneau/http/response/TemporaryRedirect_Test.java | 2 +-
.../java/org/apache/juneau/http/response/TooManyRequests_Test.java | 2 +-
.../java/org/apache/juneau/http/response/Unauthorized_Test.java | 2 +-
.../juneau/http/response/UnavailableForLegalReasons_Test.java | 2 +-
.../org/apache/juneau/http/response/UnprocessableEntity_Test.java | 2 +-
.../org/apache/juneau/http/response/UnsupportedMediaType_Test.java | 2 +-
.../java/org/apache/juneau/http/response/UpgradeRequired_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/UriTooLong_Test.java | 2 +-
.../test/java/org/apache/juneau/http/response/UseProxy_Test.java | 2 +-
.../org/apache/juneau/http/response/VariantAlsoNegotiates_Test.java | 2 +-
.../src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java | 3 +--
.../juneau/rest/client/BasicHttpRequestRetryHandler_Test.java | 2 +-
.../java/org/apache/juneau/rest/client/RestClient_Body_Test.java | 2 +-
.../juneau/rest/client/RestClient_Config_RestClient_Test.java | 2 +-
.../java/org/apache/juneau/rest/client/RestClient_Headers_Test.java | 3 +--
.../apache/juneau/rest/client/RestClient_Response_Body_Test.java | 2 +-
.../apache/juneau/rest/client/RestClient_Response_Headers_Test.java | 2 +-
.../org/apache/juneau/rest/client/RestClient_Response_Test.java | 2 +-
.../test/java/org/apache/juneau/rest/client/RestClient_Test.java | 4 ++--
162 files changed, 174 insertions(+), 220 deletions(-)
diff --git a/TODO.txt b/TODO.txt
index 430ad64..5d3bc3b 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -14,3 +14,5 @@ Can HeaderGroup be used universally?
@ResponseBody and @ResponseHeaders shouldn't be required on HttpResponse
objects.
HttpRuntimeException?
Add ExceptionHeader
+REST query/formdata/path parts should extend from PartGroup class.
+Eliminate PartSupplier and HeaderSupplier?
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
index 2d05a81..24f9500 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.encoders;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.util.*;
import java.util.concurrent.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/StandardHttpParts.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java
similarity index 95%
copy from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/StandardHttpParts.java
copy to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java
index 6d2f59c..43d30f6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/StandardHttpParts.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http.part;
+package org.apache.juneau.http;
/**
* Standard predefined HTTP headers.
*/
-public class StandardHttpParts {
+public class HttpEntities {
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StandardHttpHeaders.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpHeaders.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StandardHttpHeaders.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpHeaders.java
index 39f96b1..07a72c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StandardHttpHeaders.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpHeaders.java
@@ -10,18 +10,20 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http.header;
+package org.apache.juneau.http;
import java.time.*;
import java.util.*;
import java.util.function.*;
import org.apache.http.*;
+import org.apache.juneau.http.header.*;
+import org.apache.juneau.http.header.Date;
/**
* Standard predefined HTTP headers.
*/
-public class StandardHttpHeaders {
+public class HttpHeaders {
//-----------------------------------------------------------------------------------------------------------------
// Standard HTTP headers
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/StandardHttpParts.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
similarity index 95%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/StandardHttpParts.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
index 6d2f59c..1da1e73 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/StandardHttpParts.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http.part;
+package org.apache.juneau.http;
/**
* Standard predefined HTTP headers.
*/
-public class StandardHttpParts {
+public class HttpParts {
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/StandardHttpResponses.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResponses.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/StandardHttpResponses.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResponses.java
index b34446d..401e5a7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/StandardHttpResponses.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResponses.java
@@ -10,12 +10,14 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http.response;
+package org.apache.juneau.http;
+
+import org.apache.juneau.http.response.*;
/**
* Standard predefined HTTP responses.
*/
-public class StandardHttpResponses {
+public class HttpResponses {
/**
* A synonym for {@link Accepted#INSTANCE}.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
index c57a008..8b286af 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.parser;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.util.*;
import java.util.concurrent.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
index a80e841..a1f891d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.serializer;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.util.*;
import java.util.concurrent.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index e4569cd..63c36a4 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -16,11 +16,11 @@ import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.AddFlag.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.http.HttpMethod.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static java.util.logging.Level.*;
import static org.apache.juneau.internal.StateMachineState.*;
import static java.lang.Character.*;
import static java.util.Collections.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.lang.reflect.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
index 79cf130..37e8120 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.client.remote;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.lang.reflect.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index bc29b2c..dcccfac 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.mock;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.security.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicStaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicStaticFiles.java
index 7462b40..ea03af9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicStaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicStaticFiles.java
@@ -12,9 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.FileUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index a3dfdd6..f39260a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -14,13 +14,13 @@ package org.apache.juneau.rest;
import static javax.servlet.http.HttpServletResponse.*;
import static org.apache.juneau.internal.ObjectUtils.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.IOUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.rest.HttpRuntimeException.*;
import static org.apache.juneau.rest.logging.RestLoggingDetail.*;
import static java.util.Collections.*;
import static java.util.logging.Level.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.lang.reflect.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index afc80c3..9dbc023 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -12,12 +12,12 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.parser.Parser.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.HttpRuntimeException.*;
import static org.apache.juneau.serializer.Serializer.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import static java.util.Arrays.*;
import java.lang.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
index 8e12138..b5cae19 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
@@ -16,12 +16,12 @@ import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.StringUtils.firstNonEmpty;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.util.RestUtils.*;
import static org.apache.juneau.rest.HttpRuntimeException.*;
import static java.util.Collections.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.lang.annotation.*;
import java.lang.reflect.Method;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
index bb03886..1f49025 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
@@ -13,9 +13,9 @@
package org.apache.juneau.rest;
import static java.util.Arrays.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.rest.HttpRuntimeException.*;
import static org.apache.juneau.rest.RestOperationContext.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.lang.annotation.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index c6960a0..03897b0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -13,9 +13,9 @@
package org.apache.juneau.rest;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static java.util.Optional.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.nio.charset.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index 2a1cf0f..ff660cb 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -12,11 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.util.RestUtils.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.lang.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index 6db86ed..8111c02 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -12,11 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.RestOperationContext.*;
import static org.apache.juneau.rest.util.RestUtils.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.lang.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index ac9f62f..ae33143 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -12,11 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.RestOperationContext.*;
import static org.apache.juneau.rest.util.RestUtils.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.lang.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index c713f69..11a401d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -12,11 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.RestOperationContext.*;
import static org.apache.juneau.rest.util.RestUtils.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.lang.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 16e259d..454d6a6 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -12,11 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.RestOperationContext.*;
import static org.apache.juneau.rest.util.RestUtils.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.lang.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index 639a9d4..e9efde9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -12,11 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.rest.RestOperationContext.*;
import static org.apache.juneau.rest.util.RestUtils.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.lang.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
index 14a1d59..baa75a3 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
@@ -13,8 +13,8 @@
package org.apache.juneau.rest.reshandlers;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.httppart.HttpPartType.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.lang.reflect.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
index 6882444..b31f20e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
@@ -13,9 +13,9 @@
package org.apache.juneau.http;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.util.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
index 4fadca8..f479ad5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
@@ -14,8 +14,8 @@ package org.apache.juneau.http;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.BasicHttpResource.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java
index f9415b3..7dbd920 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java
@@ -13,9 +13,9 @@
package org.apache.juneau.http;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.util.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
index 41e5a7c..4d96cff 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/HeaderSupplier_Test.java
@@ -13,8 +13,8 @@
package org.apache.juneau.http;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import org.apache.http.*;
import org.apache.juneau.collections.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_FindMatch_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_FindMatch_Test.java
index 0eec376..54d3eab 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_FindMatch_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_FindMatch_Test.java
@@ -13,8 +13,8 @@
package org.apache.juneau.http;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
index 16f24d2..f43dd18 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.http;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.util.*;
@@ -25,6 +24,7 @@ import org.apache.juneau.oapi.*;
import org.apache.juneau.serializer.*;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.httppart.HttpPartDataType.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptCharset_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptCharset_Test.java
index 77a558e..1b9efcf 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptCharset_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptCharset_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java
index 7f21bec..78218a9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java
index fd28f73..6aa8d42 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptRanges_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptRanges_Test.java
index 6622bfb..6d72d4b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptRanges_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptRanges_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
index fddc5c8..5069da7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
@@ -14,7 +14,7 @@ package org.apache.juneau.http.header;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Age_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Age_Test.java
index 4d3e9b1..92a9f69 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Age_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Age_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Allow_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Allow_Test.java
index e2f3985..4cba934 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Allow_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Allow_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Authorization_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Authorization_Test.java
index 99425cd..4909ab1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Authorization_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Authorization_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java
index 8d1e066..5c124ee 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvArrayHeader_Test.java
@@ -25,7 +25,7 @@ import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicDateHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicDateHeader_Test.java
index e6fbdec..2c09027 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicDateHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicDateHeader_Test.java
@@ -27,7 +27,7 @@ import org.apache.juneau.rest.mock.*;
import org.apache.juneau.testutils.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagArrayHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagArrayHeader_Test.java
index 7ba010b..6bd1358 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagArrayHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagArrayHeader_Test.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
import java.io.*;
@@ -23,9 +24,6 @@ import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
-
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagHeader_Test.java
index ea8f212..0f4e2c7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagHeader_Test.java
@@ -14,7 +14,7 @@ package org.apache.juneau.http.header;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java
index 944d5c6..69814a9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
index 103a6a8..79a9d86 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaRangeArrayHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaRangeArrayHeader_Test.java
index b59a662..25cfadb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaRangeArrayHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaRangeArrayHeader_Test.java
@@ -13,7 +13,6 @@
package org.apache.juneau.http.header;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.util.function.*;
@@ -26,6 +25,7 @@ import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
index 7683cbd..c7ebcb5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringHeader_Test.java
index b52f267..2103cda 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringHeader_Test.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
import java.io.*;
@@ -22,9 +23,6 @@ import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
-
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangeArrayHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangeArrayHeader_Test.java
index d2733e8..6950737 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangeArrayHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangeArrayHeader_Test.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicUriHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicUriHeader_Test.java
index 5f82cf8..41cfecc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicUriHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicUriHeader_Test.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/CacheControl_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/CacheControl_Test.java
index 76da754..379c990 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/CacheControl_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/CacheControl_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ClientVersion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ClientVersion_Test.java
index c3260b2..fbfb7b1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ClientVersion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ClientVersion_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Connection_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Connection_Test.java
index f9da804..cbe4e95 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Connection_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Connection_Test.java
@@ -12,11 +12,10 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentDisposition_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentDisposition_Test.java
index 9179e50..f353fff 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentDisposition_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentDisposition_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentEncoding_Test.java
index 99174d5..a18589b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentEncoding_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLanguage_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLanguage_Test.java
index 8fead01..bdcbee2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLanguage_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLanguage_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
index 0a243c7..859ce87 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLength_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLocation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLocation_Test.java
index c8346ec..d97851a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLocation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentLocation_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentRange_Test.java
index 505527e..f3f579a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentRange_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentRange_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Match_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Match_Test.java
index 11d4983..ce7d1eb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Match_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Match_Test.java
@@ -13,8 +13,8 @@
package org.apache.juneau.http.header;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Other_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Other_Test.java
index cbf4078..3e9c381 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Other_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Other_Test.java
@@ -12,9 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Test.java
index 2d20237..5dddf05 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentType_Test.java
@@ -14,7 +14,7 @@ package org.apache.juneau.http.header;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Date_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Date_Test.java
index b75ceb1..a49866e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Date_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Date_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
index c7d2d8a..936464b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
@@ -14,7 +14,7 @@ package org.apache.juneau.http.header;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Expect_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Expect_Test.java
index d3e8665..c961a62 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Expect_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Expect_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Expires_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Expires_Test.java
index 1cf8756..d22c2de 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Expires_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Expires_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Forwarded_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Forwarded_Test.java
index f7d60b2..a1f2c42 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Forwarded_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Forwarded_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/From_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/From_Test.java
index fb0f235..3f21adf 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/From_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/From_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Host_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Host_Test.java
index f4a0bd2..4ae0a53 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Host_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Host_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfMatch_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfMatch_Test.java
index 35fcb0f..043c58d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfMatch_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfMatch_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfModifiedSince_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfModifiedSince_Test.java
index 55685e1..143a80b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfModifiedSince_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfModifiedSince_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfNoneMatch_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfNoneMatch_Test.java
index 601eea1..4117955 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfNoneMatch_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfNoneMatch_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
index 1442709..9052ca2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
@@ -15,7 +15,7 @@ package org.apache.juneau.http.header;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.io.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfUnmodifiedSince_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfUnmodifiedSince_Test.java
index e25498c..372f47d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfUnmodifiedSince_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfUnmodifiedSince_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/LastModified_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/LastModified_Test.java
index 8f58948..24dd8f2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/LastModified_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/LastModified_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Location_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Location_Test.java
index 0d69d6c..40d7b93 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Location_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Location_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/MaxForwards_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/MaxForwards_Test.java
index ae2f108..d8cf1ca 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/MaxForwards_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/MaxForwards_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/NoTrace_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/NoTrace_Test.java
index 903c2b9..52e2326 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/NoTrace_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/NoTrace_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Origin_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Origin_Test.java
index c7f0d50..1b7c9dc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Origin_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Origin_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Pragma_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Pragma_Test.java
index aa61751..6de3b02 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Pragma_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Pragma_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ProxyAuthenticate_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ProxyAuthenticate_Test.java
index 6ff382e..d7fbddc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ProxyAuthenticate_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ProxyAuthenticate_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ProxyAuthorization_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ProxyAuthorization_Test.java
index cda22b1..5b27973 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ProxyAuthorization_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ProxyAuthorization_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Range_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Range_Test.java
index c700c9e..0fe6a92 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Range_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Range_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Referer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Referer_Test.java
index c842ea7..549f69c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Referer_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Referer_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
index b9a2093..6e19014 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
@@ -14,8 +14,7 @@ package org.apache.juneau.http.header;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
-
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import java.io.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Server_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Server_Test.java
index da31333..7648257 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Server_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Server_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java
index a8c1bb3..9063321 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Trailer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Trailer_Test.java
index d4c28e1..2017dc4 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Trailer_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Trailer_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/TransferEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/TransferEncoding_Test.java
index 0cdadca..dca0349 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/TransferEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/TransferEncoding_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Upgrade_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Upgrade_Test.java
index 88431b6..8d91de5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Upgrade_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Upgrade_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/UserAgent_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/UserAgent_Test.java
index c7d01df..d00946e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/UserAgent_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/UserAgent_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Vary_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Vary_Test.java
index 7c1caac..5cb98f3 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Vary_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Vary_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Via_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Via_Test.java
index 2b9e710..e888e9a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Via_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Via_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Warning_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Warning_Test.java
index d68b753..9cdcbd9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Warning_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Warning_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/WwwAuthenticate_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/WwwAuthenticate_Test.java
index f7f3603..6a60665 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/WwwAuthenticate_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/WwwAuthenticate_Test.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
-
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
index f07cbc8..d5dde09 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
@@ -13,8 +13,8 @@
package org.apache.juneau.http.remote;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
+import static org.apache.juneau.http.HttpHeaders.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
index 6f6d3dc..546ff5b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
@@ -13,10 +13,10 @@
package org.apache.juneau.http.remote;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.math.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index fa88d0c..bb60ff9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -15,8 +15,9 @@ package org.apache.juneau.http.remote;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
+
import java.util.concurrent.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Accepted_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Accepted_Test.java
index 5298c55..bee9110 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Accepted_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Accepted_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/AlreadyReported_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/AlreadyReported_Test.java
index 678e27d..3bf51d9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/AlreadyReported_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/AlreadyReported_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 8b521ca..4d55177 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.BadRequest.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 0b3c2f2..121d984 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.Conflict.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Continue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Continue_Test.java
index 19b085f..7c72559 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Continue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Continue_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Created_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Created_Test.java
index 38d668c..280daf5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Created_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Created_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/EarlyHints_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/EarlyHints_Test.java
index 1ff627f..13450f2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/EarlyHints_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/EarlyHints_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 fb7f55f..695d817 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.ExpectationFailed.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 b1932b7..31b01c3 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.FailedDependency.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 3f6ce25..7862c53 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.Forbidden.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Found_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Found_Test.java
index 0014507..49ccf73 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/response/Found_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/response/Found_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 a5ad471..2441b06 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.Gone.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 faa5188..1bc2a69 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
@@ -13,7 +13,7 @@
package org.apache.juneau.http.response;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import java.lang.reflect.*;
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 b597a40..f335d7e 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.HttpVersionNotSupported.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/IMUsed_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/IMUsed_Test.java
index 677dbf5..fea2c19 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/IMUsed_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/IMUsed_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 36a2288..fb6063e 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.InsufficientStorage.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 b10e32d..ea70e5e 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.InternalServerError.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 d12602f..daadbda 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.LengthRequired.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 83825dd..e7ce5b3 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.Locked.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 74b88ea..575cc83 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.LoopDetected.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 58b4f45..9fcd163 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.MethodNotAllowed.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 2a98af7..731a278 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.MisdirectedRequest.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MovedPermanently_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MovedPermanently_Test.java
index 3e2e0bf..4cfa687 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MovedPermanently_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MovedPermanently_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MultiStatus_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MultiStatus_Test.java
index 672835c..0e62e3d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MultiStatus_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MultiStatus_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MultipleChoices_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MultipleChoices_Test.java
index 589f01a..1283037 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/MultipleChoices_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/MultipleChoices_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 acf404a..ab83a77 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.NetworkAuthenticationRequired.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NoContent_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NoContent_Test.java
index f8c181d..6c6cc2f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NoContent_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NoContent_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NonAuthoritativeInformation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NonAuthoritativeInformation_Test.java
index 15c9db4..dbb6d0f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NonAuthoritativeInformation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NonAuthoritativeInformation_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 638e244..88cb47c 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.NotAcceptable.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 888bcdd..c04efb6 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.NotExtended.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 c15f339..9344755 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.NotFound.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 293ec26..8e044d2 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.NotImplemented.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotModified_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotModified_Test.java
index 10147ff..d455302 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/NotModified_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/NotModified_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Ok_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Ok_Test.java
index fe28948..853445a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/response/Ok_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/response/Ok_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PartialContent_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PartialContent_Test.java
index 591c808..7520328 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PartialContent_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PartialContent_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 c20c9f3..585b576 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.PayloadTooLarge.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PermanentRedirect_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PermanentRedirect_Test.java
index 5437798..9a4309c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/PermanentRedirect_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/PermanentRedirect_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 4e1296e..3194b10 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.PreconditionFailed.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 0aaf85f..590e92d 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.PreconditionRequired.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Processing_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Processing_Test.java
index 646d202..427f705 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/Processing_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/Processing_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 20af556..33f3eb9 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.RangeNotSatisfiable.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
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 cec5fcc..39902f3 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.RequestHeaderFieldsTooLarge.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/ResetContent_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/ResetContent_Test.java
index 684e17d..4d20f60 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/ResetContent_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/ResetContent_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/SeeOther_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/SeeOther_Test.java
index efcff94..a5f9872 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/SeeOther_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/SeeOther_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 f5f1083..eb840bc 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.ServiceUnavailable.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/SwitchingProtocols_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/SwitchingProtocols_Test.java
index e8f432b..5311960 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/SwitchingProtocols_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/SwitchingProtocols_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/TemporaryRedirect_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/TemporaryRedirect_Test.java
index ecbc423..e4f6d2c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/TemporaryRedirect_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/TemporaryRedirect_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 4b0034d..45f7341 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.TooManyRequests.*;
import static org.junit.runners.MethodSorters.*;
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 4ba0357..7c19287 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.Unauthorized.*;
import static org.junit.runners.MethodSorters.*;
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 ba3b619..5d2a777 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.UnavailableForLegalReasons.*;
import static org.junit.runners.MethodSorters.*;
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 2cfdf61..df1b759 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.UnprocessableEntity.*;
import static org.junit.runners.MethodSorters.*;
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 9be75ad..bc565ad 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.UnsupportedMediaType.*;
import static org.junit.runners.MethodSorters.*;
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 d2904f3..e962d7d 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.UpgradeRequired.*;
import static org.junit.runners.MethodSorters.*;
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 b54de73..cff22e0 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.UriTooLong.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UseProxy_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UseProxy_Test.java
index e75d179..e13c24f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/UseProxy_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/UseProxy_Test.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
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 0de4136..ed57095 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.response;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.http.response.VariantAlsoNegotiates.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
index 0806522..110e041 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Returns_Test.java
@@ -12,9 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.rest.testutils.TestUtils.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
-
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java
index b916121..cdd3f92 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/BasicHttpRequestRetryHandler_Test.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import java.io.*;
import java.net.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
index a555e7a..9a819ef 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
@@ -13,8 +13,8 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index 87505d9..9dd2be7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.rest.client.RestClient.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
index 0f9a161..97fceab 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
@@ -13,14 +13,13 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.AddFlag.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.util.*;
-import org.apache.http.*;
import org.apache.http.Header;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.header.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
index 5b96daf..18a57fa 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
@@ -13,9 +13,9 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
index 6aa5a5e..28fbf16 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
@@ -13,9 +13,9 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.util.*;
import java.util.regex.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
index 28914df..161ea4b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Test.java
@@ -13,9 +13,9 @@
package org.apache.juneau.rest.client;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.time.temporal.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
index 92aeffc..1e50488 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
@@ -15,9 +15,9 @@ package org.apache.juneau.rest.client;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.response.StandardHttpResponses.*;
+import static org.apache.juneau.http.HttpHeaders.*;
+import static org.apache.juneau.http.HttpResponses.*;
import static org.apache.juneau.rest.client.RestClient.*;
-import static org.apache.juneau.http.header.StandardHttpHeaders.*;
import java.io.*;
import java.util.concurrent.*;
