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 1552fc7 Header beans should extend from HttpClient Header class.
1552fc7 is described below
commit 1552fc7479a2bf05319e1f484a31004ec8439530
Author: JamesBognar <[email protected]>
AuthorDate: Sun Apr 5 18:55:04 2020 -0400
Header beans should extend from HttpClient Header class.
---
.../src/main/java/org/apache/juneau/http/Accept.java | 2 +-
.../main/java/org/apache/juneau/http/AcceptCharset.java | 2 +-
.../main/java/org/apache/juneau/http/AcceptEncoding.java | 2 +-
.../main/java/org/apache/juneau/http/AcceptLanguage.java | 2 +-
.../main/java/org/apache/juneau/http/AcceptRanges.java | 2 +-
.../src/main/java/org/apache/juneau/http/Age.java | 2 +-
.../src/main/java/org/apache/juneau/http/Allow.java | 2 +-
.../main/java/org/apache/juneau/http/Authorization.java | 2 +-
...{SimpleNameValuePair.java => BasicNameValuePair.java} | 4 ++--
.../main/java/org/apache/juneau/http/CacheControl.java | 2 +-
.../main/java/org/apache/juneau/http/ClientVersion.java | 2 +-
.../src/main/java/org/apache/juneau/http/Connection.java | 2 +-
.../java/org/apache/juneau/http/ContentDisposition.java | 2 +-
.../java/org/apache/juneau/http/ContentEncoding.java | 2 +-
.../java/org/apache/juneau/http/ContentLanguage.java | 2 +-
.../main/java/org/apache/juneau/http/ContentLength.java | 2 +-
.../java/org/apache/juneau/http/ContentLocation.java | 2 +-
.../main/java/org/apache/juneau/http/ContentRange.java | 2 +-
.../src/main/java/org/apache/juneau/http/Date.java | 2 +-
.../src/main/java/org/apache/juneau/http/ETag.java | 2 +-
.../src/main/java/org/apache/juneau/http/Expect.java | 2 +-
.../src/main/java/org/apache/juneau/http/Expires.java | 2 +-
.../src/main/java/org/apache/juneau/http/Forwarded.java | 2 +-
.../src/main/java/org/apache/juneau/http/From.java | 2 +-
.../src/main/java/org/apache/juneau/http/Host.java | 2 +-
.../main/java/org/apache/juneau/http/HttpMethodName.java | 2 +-
.../src/main/java/org/apache/juneau/http/IfMatch.java | 2 +-
.../java/org/apache/juneau/http/IfModifiedSince.java | 2 +-
.../main/java/org/apache/juneau/http/IfNoneMatch.java | 2 +-
.../src/main/java/org/apache/juneau/http/IfRange.java | 2 +-
.../java/org/apache/juneau/http/IfUnmodifiedSince.java | 2 +-
.../main/java/org/apache/juneau/http/LastModified.java | 2 +-
.../src/main/java/org/apache/juneau/http/Location.java | 2 +-
.../main/java/org/apache/juneau/http/MaxForwards.java | 2 +-
.../main/java/org/apache/juneau/http/MediaTypeRange.java | 2 +-
.../main/java/org/apache/juneau/http/NameValuePairs.java | 10 +++++-----
.../src/main/java/org/apache/juneau/http/NoTrace.java | 2 +-
.../src/main/java/org/apache/juneau/http/Origin.java | 2 +-
.../src/main/java/org/apache/juneau/http/Pragma.java | 2 +-
.../java/org/apache/juneau/http/ProxyAuthenticate.java | 2 +-
.../java/org/apache/juneau/http/ProxyAuthorization.java | 2 +-
.../src/main/java/org/apache/juneau/http/Range.java | 2 +-
.../src/main/java/org/apache/juneau/http/Referer.java | 2 +-
.../src/main/java/org/apache/juneau/http/RetryAfter.java | 2 +-
.../java/org/apache/juneau/http/SerializedHeader.java | 2 +-
.../org/apache/juneau/http/SerializedHttpEntity.java | 2 +-
.../org/apache/juneau/http/SerializedNameValuePair.java | 2 +-
.../src/main/java/org/apache/juneau/http/Server.java | 2 +-
.../main/java/org/apache/juneau/http/StringRange.java | 2 +-
.../src/main/java/org/apache/juneau/http/TE.java | 2 +-
.../src/main/java/org/apache/juneau/http/Trailer.java | 2 +-
.../java/org/apache/juneau/http/TransferEncoding.java | 2 +-
.../src/main/java/org/apache/juneau/http/Upgrade.java | 2 +-
.../src/main/java/org/apache/juneau/http/UserAgent.java | 2 +-
.../src/main/java/org/apache/juneau/http/Vary.java | 2 +-
.../src/main/java/org/apache/juneau/http/Via.java | 2 +-
.../src/main/java/org/apache/juneau/http/Warning.java | 2 +-
.../java/org/apache/juneau/http/WwwAuthenticate.java | 2 +-
.../juneau/http/annotation/CollectionFormatType.java | 2 +-
.../org/apache/juneau/http/annotation/FormatType.java | 2 +-
.../org/apache/juneau/http/annotation/ParameterType.java | 2 +-
.../juneau/rest/client2/RestClientBuilderTest.java | 16 ++++++++--------
.../java/org/apache/juneau/rest/client2/RestClient.java | 2 +-
63 files changed, 75 insertions(+), 75 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
index deeed6e..c8415fe 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
@@ -143,7 +143,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Accept")
-public final class Accept extends BasicHeader {
+public class Accept extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
index a650082..5d73445 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
@@ -71,7 +71,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Accept-Charset")
-public final class AcceptCharset extends BasicRangeArrayHeader {
+public class AcceptCharset extends BasicRangeArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
index 73d8473..df0a3f4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
@@ -91,7 +91,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Accept-Encoding")
-public final class AcceptEncoding extends BasicRangeArrayHeader {
+public class AcceptEncoding extends BasicRangeArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
index 05622e5..46e5793 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
@@ -103,7 +103,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Accept-Language")
-public final class AcceptLanguage extends BasicRangeArrayHeader {
+public class AcceptLanguage extends BasicRangeArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
index 8aa72dc..35846b3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
@@ -61,7 +61,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Accept-Ranges")
-public final class AcceptRanges extends BasicHeader {
+public class AcceptRanges extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
index 24f786c..1dea77e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
@@ -56,7 +56,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Age")
-public final class Age extends BasicIntegerHeader {
+public class Age extends BasicIntegerHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
index 87e5426..36f8cfc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
@@ -69,7 +69,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Allow")
-public final class Allow extends BasicCsvArrayHeader {
+public class Allow extends BasicCsvArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
index 738dfec..48843ea 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
@@ -70,7 +70,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Authorization")
-public final class Authorization extends BasicHeader {
+public class Authorization extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SimpleNameValuePair.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
similarity index 93%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SimpleNameValuePair.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
index 5563136..c344723 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SimpleNameValuePair.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
@@ -22,7 +22,7 @@ import org.apache.http.*;
* The value is serialized using {@link Object#toString()} at the point of
reading. This allows the value to be modified
* periodically by overriding the method to return different values.
*/
-public final class SimpleNameValuePair implements NameValuePair {
+public class BasicNameValuePair implements NameValuePair {
private String name;
private Object value;
@@ -32,7 +32,7 @@ public final class SimpleNameValuePair implements
NameValuePair {
* @param name The parameter name.
* @param value The POJO to serialize to the parameter value.
*/
- public SimpleNameValuePair(String name, Object value) {
+ public BasicNameValuePair(String name, Object value) {
this.name = name;
this.value = value;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
index 0b1b2a9..c5346e3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
@@ -94,7 +94,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Cache-Control")
-public final class CacheControl extends BasicHeader {
+public class CacheControl extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ClientVersion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ClientVersion.java
index 52d2cee..2c3a6cf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ClientVersion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ClientVersion.java
@@ -21,7 +21,7 @@ import org.apache.juneau.internal.*;
* Represents a parsed <l>X-Client-Version</l> HTTP request header.
*/
@Header("X-Client-Version")
-public final class ClientVersion extends BasicHeader {
+public class ClientVersion extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
index f8b10fb..cf72e23 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
@@ -78,7 +78,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Connection")
-public final class Connection extends BasicHeader {
+public class Connection extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentDisposition.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentDisposition.java
index 4604114..d6832f6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentDisposition.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentDisposition.java
@@ -48,7 +48,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Content-Disposition")
-public final class ContentDisposition extends BasicHeader {
+public class ContentDisposition extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
index 368e3bd..d32c62a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
@@ -67,7 +67,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header(name="Content-Encoding",_enum={"gzip","compress","deflate","identity","other"})
-public final class ContentEncoding extends
BasicEnumHeader<ContentEncodingEnum> {
+public class ContentEncoding extends BasicEnumHeader<ContentEncodingEnum> {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
index fa9d276..3b6dee0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
@@ -71,7 +71,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Content-Language")
-public final class ContentLanguage extends BasicCsvArrayHeader {
+public class ContentLanguage extends BasicCsvArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
index cb6af1f..9b286d4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
@@ -59,7 +59,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Content-Length")
-public final class ContentLength extends BasicLongHeader {
+public class ContentLength extends BasicLongHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
index fa0b5ad..2fbaa89 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
@@ -65,7 +65,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Content-Location")
-public final class ContentLocation extends BasicUriHeader {
+public class ContentLocation extends BasicUriHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
index e6b87bc..b93a11b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
@@ -127,7 +127,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Content-Range")
-public final class ContentRange extends BasicHeader {
+public class ContentRange extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
index 45b93c4..5512628 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
@@ -80,7 +80,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Date")
-public final class Date extends BasicDateHeader {
+public class Date extends BasicDateHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
index 8467b73..bbe9abd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
@@ -48,7 +48,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("ETag")
-public final class ETag extends BasicHeader {
+public class ETag extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
index 2b98d9d..165554a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
@@ -67,7 +67,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Expect")
-public final class Expect extends BasicHeader {
+public class Expect extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
index fec7f5b..a1a448f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
@@ -81,7 +81,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Expires")
-public final class Expires extends BasicDateHeader {
+public class Expires extends BasicDateHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Forwarded.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Forwarded.java
index 0441a70..b86049e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Forwarded.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Forwarded.java
@@ -18,7 +18,7 @@ import org.apache.juneau.http.annotation.*;
* Represents a parsed <l>Forwarded</l> HTTP request header.
*/
@Header("Forwarded")
-public final class Forwarded extends BasicHeader {
+public class Forwarded extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
index dbfb5ea..926d339 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
@@ -65,7 +65,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("From")
-public final class From extends BasicHeader {
+public class From extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
index a4c31be..7c4d953 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
@@ -67,7 +67,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Host")
-public final class Host extends BasicHeader {
+public class Host extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
index 5e3dfd9..eba6885 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
@@ -19,7 +19,7 @@ package org.apache.juneau.http;
* <li class='extlink'>{@doc RFC2616}
* </ul>
*/
-public final class HttpMethodName {
+public class HttpMethodName {
/** {@doc RFC2616.section9#sec9.2 OPTIONS} */
public static final String OPTIONS = "OPTIONS";
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
index 453d90c..2bbaa6f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
@@ -89,7 +89,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("If-Match")
-public final class IfMatch extends BasicEntityValidatorArrayHeader {
+public class IfMatch extends BasicEntityValidatorArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
index a166253..4b0e63c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
@@ -92,7 +92,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("If-Modified-Since")
-public final class IfModifiedSince extends BasicDateHeader {
+public class IfModifiedSince extends BasicDateHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
index 3dfd00d..78deb65 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
@@ -92,7 +92,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("If-None-Match")
-public final class IfNoneMatch extends BasicEntityValidatorArrayHeader {
+public class IfNoneMatch extends BasicEntityValidatorArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
index 378773a..d1c7331 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
@@ -62,7 +62,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("If-Range")
-public final class IfRange extends BasicHeader {
+public class IfRange extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
index 653e67a..f094b62 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
@@ -64,7 +64,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("If-Unmodified-Since")
-public final class IfUnmodifiedSince extends BasicDateHeader {
+public class IfUnmodifiedSince extends BasicDateHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
index 43a600e..765e66a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
@@ -71,7 +71,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Last-Modified")
-public final class LastModified extends BasicDateHeader {
+public class LastModified extends BasicDateHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
index bc7bcf6..4763d07 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
@@ -54,7 +54,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Location")
-public final class Location extends BasicUriHeader {
+public class Location extends BasicUriHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
index 3a20972..d352a15 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
@@ -57,7 +57,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Max-Forwards")
-public final class MaxForwards extends BasicIntegerHeader {
+public class MaxForwards extends BasicIntegerHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
index 98cf332..72a4a4f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
@@ -29,7 +29,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@BeanIgnore
-public final class MediaTypeRange implements Comparable<MediaTypeRange> {
+public class MediaTypeRange implements Comparable<MediaTypeRange> {
private static final MediaTypeRange[] DEFAULT = new
MediaTypeRange[]{new MediaTypeRange("*/*")};
private static final boolean NOCACHE =
Boolean.getBoolean("juneau.nocache");
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NameValuePairs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NameValuePairs.java
index 3f2249f..832e915 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NameValuePairs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NameValuePairs.java
@@ -35,7 +35,7 @@ import org.apache.juneau.urlencoding.*;
* client.post(<jsf>URL</jsf>, params).execute();
* </p>
*/
-public final class NameValuePairs extends LinkedList<NameValuePair> {
+public class NameValuePairs extends LinkedList<NameValuePair> {
private static final long serialVersionUID = 1L;
@@ -70,7 +70,7 @@ public final class NameValuePairs extends
LinkedList<NameValuePair> {
* Constructor.
*
* <p>
- * Constructs a set of {@link SimpleNameValuePair} objects from a list
of key/value pairs.
+ * Constructs a set of {@link BasicNameValuePair} objects from a list
of key/value pairs.
*
* @param parameters
* Initial list of parameters.
@@ -81,7 +81,7 @@ public final class NameValuePairs extends
LinkedList<NameValuePair> {
if (parameters.length % 2 != 0)
throw new BasicRuntimeException("Odd number of
parameters passed into NameValuePairs(Object...)");
for (int i = 0; i < parameters.length; i+=2)
- add(new SimpleNameValuePair(stringify(parameters[i]),
parameters[i+1]));
+ add(new BasicNameValuePair(stringify(parameters[i]),
parameters[i+1]));
}
//------------------------------------------------------------------------------------------------------------------
@@ -149,14 +149,14 @@ public final class NameValuePairs extends
LinkedList<NameValuePair> {
* Appends the specified name/value pair to the end of this list.
*
* <p>
- * The pair is added as a {@link SimpleNameValuePair}.
+ * The pair is added as a {@link BasicNameValuePair}.
*
* @param name The pair name.
* @param value The pair value.
* @return This object (for method chaining).
*/
public NameValuePairs append(String name, Object value) {
- super.add(new SimpleNameValuePair(name, value));
+ super.add(new BasicNameValuePair(name, value));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NoTrace.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NoTrace.java
index 8f0d5ef..7c18bec 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NoTrace.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/NoTrace.java
@@ -18,7 +18,7 @@ import org.apache.juneau.http.annotation.*;
* Represents a parsed <l>No-Trace</l> HTTP request header.
*/
@Header("No-Trace")
-public final class NoTrace extends BasicHeader {
+public class NoTrace extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Origin.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Origin.java
index 66fb8b1..e3c309b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Origin.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Origin.java
@@ -18,7 +18,7 @@ import org.apache.juneau.http.annotation.*;
* Represents a parsed <l>Origin</l> HTTP request header.
*/
@Header("Origin")
-public final class Origin extends BasicHeader {
+public class Origin extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
index 27622e7..747a794 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
@@ -65,7 +65,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Pragma")
-public final class Pragma extends BasicHeader {
+public class Pragma extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
index a0de1a9..4bba037 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
@@ -48,7 +48,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Proxy-Authenticate")
-public final class ProxyAuthenticate extends BasicHeader {
+public class ProxyAuthenticate extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
index efcc7e3..ef833cc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
@@ -50,7 +50,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Proxy-Authorization")
-public final class ProxyAuthorization extends BasicHeader {
+public class ProxyAuthorization extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
index a895dad..244626d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
@@ -140,7 +140,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Range")
-public final class Range extends BasicHeader {
+public class Range extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
index 7e7c087..aa0172b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
@@ -56,7 +56,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Referer")
-public final class Referer extends BasicUriHeader {
+public class Referer extends BasicUriHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
index 709eb2e..daa17d7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
@@ -58,7 +58,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("Retry-After")
-public final class RetryAfter extends BasicHeader {
+public class RetryAfter extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
index 9e79e3e..1d6bb10 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
@@ -33,7 +33,7 @@ import org.apache.juneau.urlencoding.*;
* request.setEntity(<jk>new</jk> UrlEncodedFormEntity(params));
* </p>
*/
-public final class SerializedHeader extends BasicHeader {
+public class SerializedHeader extends BasicHeader {
private static final long serialVersionUID = 1L;
private Object value;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
index 374ed8d..0026a12 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
@@ -25,7 +25,7 @@ import org.apache.juneau.utils.*;
/**
* HttpEntity for serializing POJOs as the body of HTTP requests.
*/
-public final class SerializedHttpEntity extends BasicHttpEntity {
+public class SerializedHttpEntity extends BasicHttpEntity {
final Object output;
final Serializer serializer;
final HttpPartSchema schema;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
index d64b8de..f054feb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
@@ -33,7 +33,7 @@ import org.apache.juneau.urlencoding.*;
* request.setEntity(<jk>new</jk> UrlEncodedFormEntity(params));
* </p>
*/
-public final class SerializedNameValuePair implements NameValuePair {
+public class SerializedNameValuePair implements NameValuePair {
private String name;
private Object value;
private HttpPartType type;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
index f2fd79e..fd123ba 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
@@ -57,7 +57,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Server")
-public final class Server extends BasicHeader {
+public class Server extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
index d545611..20306bc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
@@ -35,7 +35,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@BeanIgnore
-public final class StringRange implements Comparable<StringRange> {
+public class StringRange implements Comparable<StringRange> {
private static final StringRange[] DEFAULT = new StringRange[]{new
StringRange("*")};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
index 4897a1e..2f7715c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
@@ -88,7 +88,7 @@ import org.apache.juneau.internal.*;
* </ul>
*/
@Header("TE")
-public final class TE extends BasicRangeArrayHeader {
+public class TE extends BasicRangeArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
index aa5ddc6..e08b01f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
@@ -57,7 +57,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Trailer")
-public final class Trailer extends BasicHeader {
+public class Trailer extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
index 8c87cb7..3e21e55 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
@@ -57,7 +57,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Transfer-Encoding")
-public final class TransferEncoding extends BasicHeader {
+public class TransferEncoding extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
index 10c9d9b..0d2e6c9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
@@ -80,7 +80,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Upgrade")
-public final class Upgrade extends BasicCsvArrayHeader {
+public class Upgrade extends BasicCsvArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
index 4ad39a5..8c0f53a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
@@ -50,7 +50,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("User-Agent")
-public final class UserAgent extends BasicHeader {
+public class UserAgent extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
index 6ab5074..6d0de1e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
@@ -70,7 +70,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Vary")
-public final class Vary extends BasicHeader {
+public class Vary extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
index 088b81a..1d4af18 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
@@ -116,7 +116,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Via")
-public final class Via extends BasicCsvArrayHeader {
+public class Via extends BasicCsvArrayHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
index ac692e9..375fac4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
@@ -124,7 +124,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("Warning")
-public final class Warning extends BasicHeader {
+public class Warning extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
index 457f6b8..ba8bba1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
@@ -46,7 +46,7 @@ import org.apache.juneau.http.annotation.*;
* </ul>
*/
@Header("WWW-Authenticate")
-public final class WwwAuthenticate extends BasicHeader {
+public class WwwAuthenticate extends BasicHeader {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/CollectionFormatType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/CollectionFormatType.java
index 4b9d894..e5873fe 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/CollectionFormatType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/CollectionFormatType.java
@@ -15,7 +15,7 @@ package org.apache.juneau.http.annotation;
/**
* Static strings used for Swagger parameter collection format types.
*/
-public final class CollectionFormatType {
+public class CollectionFormatType {
@SuppressWarnings("javadoc")
public static final String
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormatType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormatType.java
index 5ac31f9..d5045bb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormatType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormatType.java
@@ -15,7 +15,7 @@ package org.apache.juneau.http.annotation;
/**
* Static strings used for Swagger parameter format types.
*/
-public final class FormatType {
+public class FormatType {
@SuppressWarnings("javadoc")
public static final String
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ParameterType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ParameterType.java
index 841bee2..f78c304 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ParameterType.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ParameterType.java
@@ -15,7 +15,7 @@ package org.apache.juneau.http.annotation;
/**
* Static strings used for Swagger parameter formats.
*/
-public final class ParameterType {
+public class ParameterType {
@SuppressWarnings("javadoc")
public static final String
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientBuilderTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientBuilderTest.java
index 3c78e4d..e5ccd22 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientBuilderTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientBuilderTest.java
@@ -428,12 +428,12 @@ public class RestClientBuilderTest {
RestClient rc = MockRestClient
.create(A.class)
.simpleJson()
- .header(new SimpleNameValuePair("Foo", "bar"))
+ .header(new BasicNameValuePair("Foo", "bar"))
.header("Check", "Foo")
.build();
rc
.get("/checkHeader")
- .header(new SimpleNameValuePair("Foo", "baz"))
+ .header(new BasicNameValuePair("Foo", "baz"))
.run()
.getBody()
.assertValue("['bar','baz']");
@@ -524,12 +524,12 @@ public class RestClientBuilderTest {
RestClient rc = MockRestClient
.create(A.class)
.simpleJson()
- .headers(new SimpleNameValuePair("Foo","bar"))
+ .headers(new BasicNameValuePair("Foo","bar"))
.header("Check", "Foo")
.build();
rc
.get("/checkHeader")
- .headers(new SimpleNameValuePair("Foo","baz"))
+ .headers(new BasicNameValuePair("Foo","baz"))
.run()
.getBody()
.assertValue("['bar','baz']");
@@ -1726,11 +1726,11 @@ public class RestClientBuilderTest {
RestClient rc = MockRestClient
.create(A.class)
.simpleJson()
- .query(new SimpleNameValuePair("Foo","f1"))
+ .query(new BasicNameValuePair("Foo","f1"))
.query(OMap.of("Foo","f2"))
.query(AMap.of("Foo","f3"))
.query(NameValuePairs.of("Foo","f4","Foo","f5"))
- .query(new SimpleNameValuePair("Foo","f6"), new
SimpleNameValuePair("Foo","f7"))
+ .query(new BasicNameValuePair("Foo","f6"), new
BasicNameValuePair("Foo","f7"))
.build();
rc.get("/checkQuery").run().getBody().assertValue("Foo=f1&Foo=f2&Foo=f3&Foo=f4&Foo=f5&Foo=f6&Foo=f7");
}
@@ -1754,11 +1754,11 @@ public class RestClientBuilderTest {
RestClient rc = MockRestClient
.create(A.class)
.simpleJson()
- .formData(new SimpleNameValuePair("Foo","f1"))
+ .formData(new BasicNameValuePair("Foo","f1"))
.formData(OMap.of("Foo","f2"))
.formData(AMap.of("Foo","f3"))
.formData(NameValuePairs.of("Foo","f4","Foo","f5"))
- .formData(new SimpleNameValuePair("Foo","f6"), new
SimpleNameValuePair("Foo","f7"))
+ .formData(new BasicNameValuePair("Foo","f6"), new
BasicNameValuePair("Foo","f7"))
.build();
rc.post("/checkFormData").run().getBody().assertValue("Foo=f1&Foo=f2&Foo=f3&Foo=f4&Foo=f5&Foo=f6&Foo=f7");
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
index fc3ebf1..db0f2ca 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
@@ -2038,7 +2038,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable {
* @param parameters
* The parameters of the form post.
* <br>The parameters represent name/value pairs and must be an
even number of arguments.
- * <br>Parameters are converted to {@link SimpleNameValuePair}
objects.
+ * <br>Parameters are converted to {@link BasicNameValuePair}
objects.
* @return
* A {@link RestRequest} object that can be further tailored
before executing the request and getting the response
* as a parsed object.
