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 fe9e9e0fab org.apache.juneau.common.reflect API improvements
fe9e9e0fab is described below
commit fe9e9e0fab0d1ed2963f538daf25bf72559d9818
Author: James Bognar <[email protected]>
AuthorDate: Mon Nov 24 09:25:06 2025 -0500
org.apache.juneau.common.reflect API improvements
---
.../juneau/common/annotation/AnnotationObject.java | 2 +-
.../juneau/jena/annotation/RdfAnnotation.java | 18 ++------
.../apache/juneau/annotation/BeanAnnotation.java | 18 ++++----
.../juneau/annotation/BeanIgnoreAnnotation.java | 2 +-
.../apache/juneau/annotation/BeancAnnotation.java | 4 +-
.../apache/juneau/annotation/BeanpAnnotation.java | 8 ++--
.../juneau/annotation/ExampleAnnotation.java | 4 +-
.../juneau/annotation/ExternalDocsAnnotation.java | 4 +-
.../apache/juneau/annotation/ItemsAnnotation.java | 12 +++---
.../juneau/annotation/MarshalledAnnotation.java | 6 +--
.../juneau/annotation/NamePropertyAnnotation.java | 2 +-
.../annotation/ParentPropertyAnnotation.java | 2 +-
.../apache/juneau/annotation/SchemaAnnotation.java | 21 +++++-----
.../juneau/annotation/SubItemsAnnotation.java | 10 ++---
.../apache/juneau/annotation/SwapAnnotation.java | 10 ++---
.../apache/juneau/annotation/UriAnnotation.java | 2 +-
.../juneau/csv/annotation/CsvAnnotation.java | 2 +-
.../juneau/html/annotation/HtmlAnnotation.java | 10 ++---
.../juneau/html/annotation/HtmlLinkAnnotation.java | 4 +-
.../juneau/http/annotation/ContactAnnotation.java | 4 +-
.../juneau/http/annotation/ContentAnnotation.java | 6 +--
.../juneau/http/annotation/FormDataAnnotation.java | 10 ++---
.../http/annotation/HasFormDataAnnotation.java | 4 +-
.../juneau/http/annotation/HasQueryAnnotation.java | 4 +-
.../juneau/http/annotation/HeaderAnnotation.java | 10 ++---
.../juneau/http/annotation/LicenseAnnotation.java | 4 +-
.../juneau/http/annotation/PathAnnotation.java | 10 ++---
.../http/annotation/PathRemainderAnnotation.java | 10 ++---
.../juneau/http/annotation/QueryAnnotation.java | 10 ++---
.../juneau/http/annotation/RequestAnnotation.java | 6 +--
.../juneau/http/annotation/ResponseAnnotation.java | 12 +++---
.../http/annotation/StatusCodeAnnotation.java | 4 +-
.../juneau/http/annotation/TagAnnotation.java | 6 +--
.../juneau/json/annotation/JsonAnnotation.java | 4 +-
.../msgpack/annotation/MsgPackAnnotation.java | 2 +-
.../juneau/oapi/annotation/OpenApiAnnotation.java | 2 +-
.../plaintext/annotation/PlainTextAnnotation.java | 2 +-
.../juneau/soap/annotation/SoapXmlAnnotation.java | 2 +-
.../juneau/uon/annotation/UonAnnotation.java | 2 +-
.../annotation/UrlEncodingAnnotation.java | 4 +-
.../juneau/xml/annotation/XmlAnnotation.java | 6 +--
.../rest/annotation/OpSwaggerAnnotation.java | 10 ++---
.../juneau/rest/annotation/RestAnnotation.java | 48 +++++++++++-----------
.../rest/annotation/RestDeleteAnnotation.java | 14 +++----
.../rest/annotation/RestDestroyAnnotation.java | 2 +-
.../rest/annotation/RestEndCallAnnotation.java | 2 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 18 ++++----
.../juneau/rest/annotation/RestInitAnnotation.java | 2 +-
.../rest/annotation/RestInjectAnnotation.java | 7 ++--
.../juneau/rest/annotation/RestOpAnnotation.java | 20 ++++-----
.../rest/annotation/RestOptionsAnnotation.java | 18 ++++----
.../rest/annotation/RestPatchAnnotation.java | 20 ++++-----
.../juneau/rest/annotation/RestPostAnnotation.java | 20 ++++-----
.../rest/annotation/RestPostCallAnnotation.java | 2 +-
.../rest/annotation/RestPostInitAnnotation.java | 4 +-
.../rest/annotation/RestPreCallAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 20 ++++-----
.../rest/annotation/RestStartCallAnnotation.java | 2 +-
.../juneau/rest/annotation/SwaggerAnnotation.java | 14 +++----
.../org/apache/juneau/rest/util/RestUtils.java | 36 ++++++++--------
60 files changed, 255 insertions(+), 271 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationObject.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationObject.java
index 09795dbaa4..a4e6afcc5a 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationObject.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/annotation/AnnotationObject.java
@@ -52,7 +52,7 @@ public class AnnotationObject implements Annotation {
*/
public static class Builder<B> {
- Class<? extends Annotation> annotationType;
+ private Class<? extends Annotation> annotationType;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
index a211c40916..4ee8266e0b 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
@@ -63,10 +63,9 @@ public class RdfAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- String namespace = "", prefix = "";
- boolean beanUri;
- RdfCollectionFormat collectionFormat =
RdfCollectionFormat.DEFAULT;
+ private String namespace = "", prefix = "";
+ private boolean beanUri;
+ private RdfCollectionFormat collectionFormat =
RdfCollectionFormat.DEFAULT;
/**
* Constructor.
@@ -95,17 +94,6 @@ public class RdfAnnotation {
return new Object(this);
}
- /**
- * Sets the description property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object.
- */
- public Builder description(String...value) {
- this.description = value;
- return this;
- }
-
/**
* Sets the {@link Rdf#collectionFormat} property on this
annotation.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
index d02cc58255..dcde9cf5a4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
@@ -82,15 +82,15 @@ public class BeanAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderT<Builder> {
- String[] description = {};
- Class<?>[] dictionary = new Class[0];
- Class<?> implClass = void.class;
- Class<?> interfaceClass = void.class;
- Class<?> stopClass = void.class;
- Class<? extends BeanInterceptor<?>> interceptor =
BeanInterceptor.Void.class;
- Class<? extends PropertyNamer> propertyNamer =
BasicPropertyNamer.class;
- String example = "", excludeProperties = "", p = "", properties
= "", readOnlyProperties = "", ro = "", typeName = "", typePropertyName = "",
wo = "", writeOnlyProperties = "", xp = "";
- boolean findFluentSetters, sort;
+ private String[] description = {};
+ private Class<?>[] dictionary = new Class[0];
+ private Class<?> implClass = void.class;
+ private Class<?> interfaceClass = void.class;
+ private Class<?> stopClass = void.class;
+ private Class<? extends BeanInterceptor<?>> interceptor =
BeanInterceptor.Void.class;
+ private Class<? extends PropertyNamer> propertyNamer =
BasicPropertyNamer.class;
+ private String example = "", excludeProperties = "", p = "",
properties = "", readOnlyProperties = "", ro = "", typeName = "",
typePropertyName = "", wo = "", writeOnlyProperties = "", xp = "";
+ private boolean findFluentSetters, sort;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
index 2d01a72a79..b663ce42fd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
@@ -81,7 +81,7 @@ public class BeanIgnoreAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMFC<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
index 4f7143fdf6..4220242bf2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
@@ -81,8 +81,8 @@ public class BeancAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderC<Builder> {
- String[] description = {};
- String properties = "";
+ private String[] description = {};
+ private String properties = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
index 5e001c52f3..2083cabb0c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
@@ -81,10 +81,10 @@ public class BeanpAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderMF<Builder> {
- String[] description = {};
- Class<?> type = void.class;
- Class<?>[] dictionary = new Class[0], params = new Class[0];
- String format = "", name = "", properties = "", ro = "", value
= "", wo = "";
+ private String[] description = {};
+ private Class<?> type = void.class;
+ private Class<?>[] dictionary = new Class[0], params = new
Class[0];
+ private String format = "", name = "", properties = "", ro =
"", value = "", wo = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
index 96d7df9dc7..0956885590 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
@@ -81,8 +81,8 @@ public class ExampleAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- String value = "";
+ private String[] description = {};
+ private String value = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
index 9895e75706..35123f19a2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocsAnnotation.java
@@ -42,8 +42,8 @@ public class ExternalDocsAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- String url = "";
+ private String[] description = {};
+ private String url = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
index c9f2a67bd6..4aab14e959 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
@@ -36,12 +36,12 @@ public class ItemsAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- boolean emax, emin, exclusiveMaximum, exclusiveMinimum, ui,
uniqueItems;
- long maxItems = -1, maxLength = -1, maxi = -1, maxl = -1,
minItems = -1, minLength = -1, mini = -1, minl = -1;
- String $ref = "", cf = "", collectionFormat = "", f = "",
format = "", max = "", maximum = "", min = "", minimum = "", mo = "",
multipleOf = "", p = "", pattern = "", t = "", type = "";
- String[] _default = {}, _enum = {}, df = {}, e = {};
- SubItems items = SubItemsAnnotation.DEFAULT;
+ private String[] description = {};
+ private boolean emax, emin, exclusiveMaximum, exclusiveMinimum,
ui, uniqueItems;
+ private long maxItems = -1, maxLength = -1, maxi = -1, maxl =
-1, minItems = -1, minLength = -1, mini = -1, minl = -1;
+ private String $ref = "", cf = "", collectionFormat = "", f =
"", format = "", max = "", maximum = "", min = "", minimum = "", mo = "",
multipleOf = "", p = "", pattern = "", t = "", type = "";
+ private String[] _default = {}, _enum = {}, df = {}, e = {};
+ private SubItems items = SubItemsAnnotation.DEFAULT;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
index 84e95d902e..399ecbc830 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
@@ -81,9 +81,9 @@ public class MarshalledAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderT<Builder> {
- String[] description = {};
- Class<?> implClass = void.class;
- String example = "";
+ private String[] description = {};
+ private Class<?> implClass = void.class;
+ private String example = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
index bfc9b07a54..fa368516c2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
@@ -81,7 +81,7 @@ public class NamePropertyAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
index e2174da493..37d44caf54 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
@@ -81,7 +81,7 @@ public class ParentPropertyAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
index 0af383c220..8a6cd6b0b4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
@@ -87,18 +87,17 @@ public class SchemaAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- boolean aev, allowEmptyValue, emax, emin, exclusiveMaximum,
exclusiveMinimum, ignore, r, readOnly, required, ro, sie, skipIfEmpty, ui,
uniqueItems;
- ExternalDocs externalDocs = ExternalDocsAnnotation.DEFAULT;
- Items items = ItemsAnnotation.DEFAULT;
- long maxi = -1, maxItems = -1, maxl = -1, maxLength = -1, maxp
= -1, maxProperties = -1, mini = -1, minItems = -1, minl = -1, minLength = -1,
minp = -1, minProperties = -1;
- String $ref = "", cf = "", collectionFormat = "", discriminator
= "", f = "", format = "", max = "", maximum = "", min = "", minimum = "", mo =
"", multipleOf = "", p = "", pattern = "",
+ private boolean aev, allowEmptyValue, emax, emin,
exclusiveMaximum, exclusiveMinimum, ignore, r, readOnly, required, ro, sie,
skipIfEmpty, ui, uniqueItems;
+ private ExternalDocs externalDocs =
ExternalDocsAnnotation.DEFAULT;
+ private Items items = ItemsAnnotation.DEFAULT;
+ private long maxi = -1, maxItems = -1, maxl = -1, maxLength =
-1, maxp = -1, maxProperties = -1, mini = -1, minItems = -1, minl = -1,
minLength = -1, minp = -1, minProperties = -1;
+ private String $ref = "", cf = "", collectionFormat = "",
discriminator = "", f = "", format = "", max = "", maximum = "", min = "",
minimum = "", mo = "", multipleOf = "", p = "", pattern = "",
t = "", title = "", type = "";
- String[] _default = {}, _enum = {}, additionalProperties = {},
allOf = {}, d = {}, description = {}, df = {}, e = {}, properties = {}, value =
{}, xml = {};
- // JSON Schema Draft 2020-12 properties
- boolean deprecatedProperty;
- String $id = "", contentMediaType = "", contentEncoding = "",
exclusiveMaximumValue = "", exclusiveMinimumValue = "";
- String[] _const = {}, examples = {}, $comment = {}, prefixItems
= {}, unevaluatedItems = {}, unevaluatedProperties = {}, dependentSchemas = {},
dependentRequired = {}, _if = {}, _then = {},
- _else = {}, $defs = {};
+ private String[] _default = {}, _enum = {},
additionalProperties = {}, allOf = {}, d = {}, description = {}, df = {}, e =
{}, properties = {}, value = {}, xml = {};
+ private boolean deprecatedProperty;
+ private String $id = "", contentMediaType = "", contentEncoding
= "", exclusiveMaximumValue = "", exclusiveMinimumValue = "";
+ private String[] _const = {}, examples = {}, $comment = {},
prefixItems = {}, unevaluatedItems = {}, unevaluatedProperties = {},
dependentSchemas = {}, dependentRequired = {}, _if = {},
+ _then = {}, _else = {}, $defs = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
index 87765597e2..7b8e07e20a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
@@ -42,11 +42,11 @@ public class SubItemsAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- String $ref = "", cf = "", collectionFormat = "", f = "",
format = "", max = "", maximum = "", min = "", minimum = "", mo = "",
multipleOf = "", p = "", pattern = "", t = "", type = "";
- long maxItems = -1, maxLength = -1, maxi = -1, maxl = -1,
minItems = -1, minLength = -1, mini = -1, minl = -1;
- boolean emax, emin, exclusiveMaximum, exclusiveMinimum, ui,
uniqueItems;
- String[] _default = {}, _enum = {}, df = {}, e = {}, items = {};
+ private String[] description = {};
+ private String $ref = "", cf = "", collectionFormat = "", f =
"", format = "", max = "", maximum = "", min = "", minimum = "", mo = "",
multipleOf = "", p = "", pattern = "", t = "", type = "";
+ private long maxItems = -1, maxLength = -1, maxi = -1, maxl =
-1, minItems = -1, minLength = -1, mini = -1, minl = -1;
+ private boolean emax, emin, exclusiveMaximum, exclusiveMinimum,
ui, uniqueItems;
+ private String[] _default = {}, _enum = {}, df = {}, e = {},
items = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
index 4594ddc1f0..27c9d211c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
@@ -81,11 +81,11 @@ public class SwapAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- Class<?> impl = void.class;
- Class<?> value = void.class;
- String template = "";
- String[] mediaTypes = {};
+ private String[] description = {};
+ private Class<?> impl = void.class;
+ private Class<?> value = void.class;
+ private String template = "";
+ private String[] mediaTypes = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
index 8ab305063d..4d09ecdb80 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
@@ -81,7 +81,7 @@ public class UriAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
index 6e30c0bfbc..a0b5acedc9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
@@ -81,7 +81,7 @@ public class CsvAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
index a1e46ee3de..3caa059d6d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
@@ -86,11 +86,11 @@ public class HtmlAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- String anchorText = "", link = "", style = "";
- HtmlFormat format = HtmlFormat.HTML;
- boolean noTableHeaders, noTables;
- Class<? extends HtmlRender> render = HtmlRender.class;
+ private String[] description = {};
+ private String anchorText = "", link = "", style = "";
+ private HtmlFormat format = HtmlFormat.HTML;
+ private boolean noTableHeaders, noTables;
+ private Class<? extends HtmlRender> render = HtmlRender.class;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
index e985ddb267..fcc63f08eb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
@@ -84,8 +84,8 @@ public class HtmlLinkAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderT<Builder> {
- String[] description = {};
- String nameProperty = "", uriProperty = "";
+ private String[] description = {};
+ private String nameProperty = "", uriProperty = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContactAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContactAnnotation.java
index fd10a02384..3822a316c6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContactAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContactAnnotation.java
@@ -36,8 +36,8 @@ public class ContactAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- String email = "", name = "", url = "";
+ private String[] description = {};
+ private String email = "", name = "", url = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContentAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContentAnnotation.java
index 84ad05ba15..c5f105fe47 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContentAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ContentAnnotation.java
@@ -82,9 +82,9 @@ public class ContentAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTM<Builder> {
- String def = "";
- String[] description = {};
- Schema schema = SchemaAnnotation.DEFAULT;
+ private String def = "";
+ private String[] description = {};
+ private Schema schema = SchemaAnnotation.DEFAULT;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
index de39c25ba6..02fb519a85 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
@@ -89,11 +89,11 @@ public class FormDataAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
- Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
- Schema schema = SchemaAnnotation.DEFAULT;
- String def = "", name = "", value = "";
+ private String[] description = {};
+ private Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
+ private Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
+ private Schema schema = SchemaAnnotation.DEFAULT;
+ private String def = "", name = "", value = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormDataAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormDataAnnotation.java
index 2eecf3771a..c6ebba2b27 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormDataAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormDataAnnotation.java
@@ -36,8 +36,8 @@ public class HasFormDataAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- String name = "", value = "";
+ private String[] description = {};
+ private String name = "", value = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQueryAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQueryAnnotation.java
index d85fd9c792..669aeeb772 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQueryAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQueryAnnotation.java
@@ -36,8 +36,8 @@ public class HasQueryAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- String name = "", value = "";
+ private String[] description = {};
+ private String name = "", value = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
index 86d73ad487..448d96fad0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
@@ -89,11 +89,11 @@ public class HeaderAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
- Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
- Schema schema = SchemaAnnotation.DEFAULT;
- String name = "", value = "", def = "";
+ private String[] description = {};
+ private Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
+ private Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
+ private Schema schema = SchemaAnnotation.DEFAULT;
+ private String name = "", value = "", def = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/LicenseAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/LicenseAnnotation.java
index 1472456a97..4f3cd18e96 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/LicenseAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/LicenseAnnotation.java
@@ -36,8 +36,8 @@ public class LicenseAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- String name = "", url = "";
+ private String[] description = {};
+ private String name = "", url = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
index 7340a75591..e6f644ae9e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
@@ -90,11 +90,11 @@ public class PathAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
- Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
- Schema schema = SchemaAnnotation.DEFAULT;
- String name = "", value = "", def = NONE;
+ private String[] description = {};
+ private Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
+ private Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
+ private Schema schema = SchemaAnnotation.DEFAULT;
+ private String name = "", value = "", def = NONE;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathRemainderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathRemainderAnnotation.java
index 036f833c0e..0a52fa734e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathRemainderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathRemainderAnnotation.java
@@ -94,11 +94,11 @@ public class PathRemainderAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
- String[] description = {};
- Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
- Schema schema = SchemaAnnotation.DEFAULT;
- String def = "";
+ private Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
+ private String[] description = {};
+ private Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
+ private Schema schema = SchemaAnnotation.DEFAULT;
+ private String def = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
index 083fc7c60c..33f2592ac0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
@@ -89,11 +89,11 @@ public class QueryAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
- Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
- Schema schema = SchemaAnnotation.DEFAULT;
- String name = "", value = "", def = "";
+ private String[] description = {};
+ private Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
+ private Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
+ private Schema schema = SchemaAnnotation.DEFAULT;
+ private String name = "", value = "", def = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
index 25c498e430..9343f009bc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
@@ -82,9 +82,9 @@ public class RequestAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderT<Builder> {
- String[] description = {};
- Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
- Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
+ private String[] description = {};
+ private Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
+ private Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
index f3b9a3c51b..f8ac7ee7b1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
@@ -83,12 +83,12 @@ public class ResponseAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTM<Builder> {
- String[] description = {};
- Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
- Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
- Header[] headers = {};
- Schema schema = SchemaAnnotation.DEFAULT;
- String[] examples = {};
+ private String[] description = {};
+ private Class<? extends HttpPartParser> parser =
HttpPartParser.Void.class;
+ private Class<? extends HttpPartSerializer> serializer =
HttpPartSerializer.Void.class;
+ private Header[] headers = {};
+ private Schema schema = SchemaAnnotation.DEFAULT;
+ private String[] examples = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java
index d6da8d0950..c158f7f9c9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCodeAnnotation.java
@@ -82,8 +82,8 @@ public class StatusCodeAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTM<Builder> {
- String[] description = {};
- int value[] = {};
+ private String[] description = {};
+ private int value[] = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
index 3bed24c37f..e37e9099a8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
@@ -37,9 +37,9 @@ public class TagAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- ExternalDocs externalDocs = ExternalDocsAnnotation.DEFAULT;
- String name = "";
+ private String[] description = {};
+ private ExternalDocs externalDocs =
ExternalDocsAnnotation.DEFAULT;
+ private String name = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
index eba65559d0..e277452c1d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
@@ -84,8 +84,8 @@ public class JsonAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- String wrapperAttr = "";
+ private String[] description = {};
+ private String wrapperAttr = "";
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
index 7bddf02289..870d55ee3a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
@@ -84,7 +84,7 @@ public class MsgPackAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
index 6f65f90b88..95c2207029 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
@@ -84,7 +84,7 @@ public class OpenApiAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
index c45716c21e..e485b43967 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
@@ -81,7 +81,7 @@ public class PlainTextAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
index af15b3f376..2acc713d73 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
@@ -81,7 +81,7 @@ public class SoapXmlAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
index 101ef011fb..11f1c44075 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
@@ -84,7 +84,7 @@ public class UonAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
index b7e07f1ec3..4c06cf30f2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
@@ -84,8 +84,8 @@ public class UrlEncodingAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- boolean expandedParams;
+ private String[] description = {};
+ private boolean expandedParams;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
index f699a4aec9..6858dcbcc2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
@@ -84,9 +84,9 @@ public class XmlAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderTMF<Builder> {
- String[] description = {};
- String childName = "", namespace = "", prefix = "";
- XmlFormat format = XmlFormat.DEFAULT;
+ private String[] description = {};
+ private String childName = "", namespace = "", prefix = "";
+ private XmlFormat format = XmlFormat.DEFAULT;
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java
index 6e581d1cdd..54032cc919 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation.java
@@ -40,12 +40,10 @@ public class OpSwaggerAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
-
- ExternalDocs externalDocs = ExternalDocsAnnotation.DEFAULT;
-
- String deprecated = "", operationId = "";
- String[] consumes = {}, parameters = {}, produces = {},
responses = {}, schemes = {}, summary = {}, tags = {}, value = {};
+ private String[] description = {};
+ private ExternalDocs externalDocs =
ExternalDocsAnnotation.DEFAULT;
+ private String deprecated = "", operationId = "";
+ private String[] consumes = {}, parameters = {}, produces = {},
responses = {}, schemes = {}, summary = {}, tags = {}, value = {};
/**
* Constructor.
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 93630369f8..f002773149 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
@@ -60,32 +60,32 @@ public class RestAnnotation {
@SuppressWarnings("unchecked")
public static class Builder extends
AppliedAnnotationObject.BuilderT<Builder> {
- String[] description = {};
- Class<? extends Encoder>[] encoders = new Class[0];
- Class<? extends HttpPartParser> partParser =
HttpPartParser.Void.class;
- Class<? extends HttpPartSerializer> partSerializer =
HttpPartSerializer.Void.class;
- Class<? extends StaticFiles> staticFiles =
StaticFiles.Void.class;
- Class<? extends ResponseProcessor>[] responseProcessors = new
Class[0];
- Class<? extends CallLogger> callLogger = CallLogger.Void.class;
- Class<? extends RestConverter>[] converters = new Class[0];
- Class<? extends RestGuard>[] guards = new Class[0];
- Class<? extends SwaggerProvider> swaggerProvider =
SwaggerProvider.Void.class;
- Class<? extends RestOpArg>[] restOpArgs = new Class[0];
- Class<? extends BeanStore> beanStore = BeanStore.Void.class;
- Class<? extends RestChildren> restChildrenClass =
RestChildren.Void.class;
- Class<? extends RestOperations> restOperationsClass =
RestOperations.Void.class;
- Class<? extends DebugEnablement> debugEnablement =
DebugEnablement.Void.class;
- Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] children = {}, parsers = {};
- Swagger swagger = SwaggerAnnotation.DEFAULT;
- String disableContentParam = "", allowedHeaderParams = "",
allowedMethodHeaders = "", allowedMethodParams = "", clientVersionHeader = "",
config = "", debug = "", debugOn = "",
+ private String[] description = {};
+ private Class<? extends Encoder>[] encoders = new Class[0];
+ private Class<? extends HttpPartParser> partParser =
HttpPartParser.Void.class;
+ private Class<? extends HttpPartSerializer> partSerializer =
HttpPartSerializer.Void.class;
+ private Class<? extends StaticFiles> staticFiles =
StaticFiles.Void.class;
+ private Class<? extends ResponseProcessor>[] responseProcessors
= new Class[0];
+ private Class<? extends CallLogger> callLogger =
CallLogger.Void.class;
+ private Class<? extends RestConverter>[] converters = new
Class[0];
+ private Class<? extends RestGuard>[] guards = new Class[0];
+ private Class<? extends SwaggerProvider> swaggerProvider =
SwaggerProvider.Void.class;
+ private Class<? extends RestOpArg>[] restOpArgs = new Class[0];
+ private Class<? extends BeanStore> beanStore =
BeanStore.Void.class;
+ private Class<? extends RestChildren> restChildrenClass =
RestChildren.Void.class;
+ private Class<? extends RestOperations> restOperationsClass =
RestOperations.Void.class;
+ private Class<? extends DebugEnablement> debugEnablement =
DebugEnablement.Void.class;
+ private Class<? extends Serializer>[] serializers = new
Class[0];
+ private Class<?>[] children = {}, parsers = {};
+ private Swagger swagger = SwaggerAnnotation.DEFAULT;
+ private String disableContentParam = "", allowedHeaderParams =
"", allowedMethodHeaders = "", allowedMethodParams = "", clientVersionHeader =
"", config = "", debug = "", debugOn = "",
defaultAccept = "", defaultCharset = "",
defaultContentType = "", maxInput = "", messages = "", path = "",
renderResponseStackTraces = "", roleGuard = "", rolesDeclared = "",
siteName = "", uriAuthority = "", uriContext = "",
uriRelativity = "", uriResolution = "";
- String[] consumes = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, produces = {}, title =
{};
- Query[] queryParams = new Query[0];
- Header[] headerParams = new Header[0];
- Path[] pathParams = new Path[0];
- FormData[] formDataParams = new FormData[0];
+ private String[] consumes = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, produces = {}, title =
{};
+ private Query[] queryParams = new Query[0];
+ private Header[] headerParams = new Header[0];
+ private Path[] pathParams = new Path[0];
+ private FormData[] formDataParams = new FormData[0];
/**
* Constructor.
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 3f4538a129..04fb260e7f 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
@@ -50,13 +50,13 @@ public class RestDeleteAnnotation {
@SuppressWarnings("unchecked")
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
- Class<? extends RestGuard>[] guards = new Class[0];
- Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends Encoder>[] encoders = new Class[0];
- OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
- String clientVersion = "", debug = "", defaultAccept = "",
defaultCharset = "", rolesDeclared = "", roleGuard = "", summary = "", value =
"";
- String[] defaultRequestQueryData = {}, defaultRequestAttributes
= {}, defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {};
+ private String[] description = {};
+ private Class<? extends RestGuard>[] guards = new Class[0];
+ private Class<? extends RestMatcher>[] matchers = new Class[0];
+ private Class<? extends Encoder>[] encoders = new Class[0];
+ private OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
+ private String clientVersion = "", debug = "", defaultAccept =
"", defaultCharset = "", rolesDeclared = "", roleGuard = "", summary = "",
value = "";
+ private String[] defaultRequestQueryData = {},
defaultRequestAttributes = {}, defaultRequestHeaders = {},
defaultResponseHeaders = {}, path = {};
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
index 4c3e56a4cd..b1692a3909 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
@@ -59,7 +59,7 @@ public class RestDestroyAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
index 4b35340c90..81551175f9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
@@ -59,7 +59,7 @@ public class RestEndCallAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
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 3df2060e59..d33bfa7345 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
@@ -52,15 +52,15 @@ public class RestGetAnnotation {
@SuppressWarnings("unchecked")
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
- Class<? extends RestConverter>[] converters = new Class[0];
- Class<? extends RestGuard>[] guards = new Class[0];
- Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends Encoder>[] encoders = new Class[0];
- Class<? extends Serializer>[] serializers = new Class[0];
- OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
- String clientVersion = "", debug = "", defaultAccept = "",
defaultCharset = "", rolesDeclared = "", roleGuard = "", summary = "", value =
"";
- String[] defaultRequestQueryData = {}, defaultRequestAttributes
= {}, defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {},
produces = {};
+ private String[] description = {};
+ private Class<? extends RestConverter>[] converters = new
Class[0];
+ private Class<? extends RestGuard>[] guards = new Class[0];
+ private Class<? extends RestMatcher>[] matchers = new Class[0];
+ private Class<? extends Encoder>[] encoders = new Class[0];
+ private Class<? extends Serializer>[] serializers = new
Class[0];
+ private OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
+ private String clientVersion = "", debug = "", defaultAccept =
"", defaultCharset = "", rolesDeclared = "", roleGuard = "", summary = "",
value = "";
+ private String[] defaultRequestQueryData = {},
defaultRequestAttributes = {}, defaultRequestHeaders = {},
defaultResponseHeaders = {}, path = {}, produces = {};
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
index 12d9038842..da0e55dcdc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
@@ -59,7 +59,7 @@ public class RestInitAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
index 9b47420eca..92dad03016 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
@@ -56,10 +56,9 @@ public class RestInjectAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
-
- String name, value;
- String[] methodScope;
+ private String[] description = {};
+ private String name, value;
+ private String[] methodScope;
/**
* Constructor.
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 8fbba4a42a..8e058025ef 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
@@ -55,17 +55,17 @@ public class RestOpAnnotation {
@SuppressWarnings("unchecked")
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
- Class<? extends RestConverter>[] converters = new Class[0];
- Class<? extends RestGuard>[] guards = new Class[0];
- Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends Encoder>[] encoders = new Class[0];
- Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] parsers = {};
- OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
- String clientVersion = "", debug = "", defaultAccept = "",
defaultCharset = "", defaultContentType = "", maxInput = "", method = "",
rolesDeclared = "", roleGuard = "", summary = "",
+ private String[] description = {};
+ private Class<? extends RestConverter>[] converters = new
Class[0];
+ private Class<? extends RestGuard>[] guards = new Class[0];
+ private Class<? extends RestMatcher>[] matchers = new Class[0];
+ private Class<? extends Encoder>[] encoders = new Class[0];
+ private Class<? extends Serializer>[] serializers = new
Class[0];
+ private Class<?>[] parsers = {};
+ private OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
+ private String clientVersion = "", debug = "", defaultAccept =
"", defaultCharset = "", defaultContentType = "", maxInput = "", method = "",
rolesDeclared = "", roleGuard = "", summary = "",
value = "";
- String[] consumes = {}, defaultRequestFormData = {},
defaultRequestQueryData = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {},
+ private String[] consumes = {}, defaultRequestFormData = {},
defaultRequestQueryData = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {},
produces = {};
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
index 7ca8b71e47..f11853e82f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
@@ -52,15 +52,15 @@ public class RestOptionsAnnotation {
@SuppressWarnings("unchecked")
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
- Class<? extends RestConverter>[] converters = new Class[0];
- Class<? extends RestGuard>[] guards = new Class[0];
- Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends Encoder>[] encoders = new Class[0];
- Class<? extends Serializer>[] serializers = new Class[0];
- OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
- String clientVersion = "", debug = "", defaultAccept = "",
defaultCharset = "", rolesDeclared = "", roleGuard = "", summary = "", value =
"";
- String[] defaultRequestQueryData = {}, defaultRequestAttributes
= {}, defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {},
produces = {};
+ private String[] description = {};
+ private Class<? extends RestConverter>[] converters = new
Class[0];
+ private Class<? extends RestGuard>[] guards = new Class[0];
+ private Class<? extends RestMatcher>[] matchers = new Class[0];
+ private Class<? extends Encoder>[] encoders = new Class[0];
+ private Class<? extends Serializer>[] serializers = new
Class[0];
+ private OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
+ private String clientVersion = "", debug = "", defaultAccept =
"", defaultCharset = "", rolesDeclared = "", roleGuard = "", summary = "",
value = "";
+ private String[] defaultRequestQueryData = {},
defaultRequestAttributes = {}, defaultRequestHeaders = {},
defaultResponseHeaders = {}, path = {}, produces = {};
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
index 3ee3eb89e6..99a7412800 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
@@ -52,16 +52,16 @@ public class RestPatchAnnotation {
@SuppressWarnings("unchecked")
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- Class<? extends RestConverter>[] converters = new Class[0];
- Class<? extends RestGuard>[] guards = new Class[0];
- Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends Encoder>[] encoders = new Class[0];
- Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] parsers = {};
- OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
- String clientVersion = "", debug = "", defaultAccept = "",
defaultCharset = "", defaultContentType = "", maxInput = "", rolesDeclared =
"", roleGuard = "", summary = "", value = "";
- String[] consumes = {}, defaultRequestFormData = {},
defaultRequestQueryData = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, description = {},
- path = {}, produces = {};
+ private Class<? extends RestConverter>[] converters = new
Class[0];
+ private Class<? extends RestGuard>[] guards = new Class[0];
+ private Class<? extends RestMatcher>[] matchers = new Class[0];
+ private Class<? extends Encoder>[] encoders = new Class[0];
+ private Class<? extends Serializer>[] serializers = new
Class[0];
+ private Class<?>[] parsers = {};
+ private OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
+ private String clientVersion = "", debug = "", defaultAccept =
"", defaultCharset = "", defaultContentType = "", maxInput = "", rolesDeclared
= "", roleGuard = "", summary = "", value = "";
+ private String[] consumes = {}, defaultRequestFormData = {},
defaultRequestQueryData = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {},
+ description = {}, path = {}, produces = {};
/**
* Constructor.
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 da6276aa1f..4c0a473b73 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
@@ -52,16 +52,16 @@ public class RestPostAnnotation {
@SuppressWarnings("unchecked")
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
- Class<? extends RestConverter>[] converters = new Class[0];
- Class<? extends RestGuard>[] guards = new Class[0];
- Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends Encoder>[] encoders = new Class[0];
- Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] parsers = {};
- OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
- String clientVersion = "", debug = "", defaultAccept = "",
defaultCharset = "", defaultContentType = "", maxInput = "", rolesDeclared =
"", roleGuard = "", summary = "", value = "";
- String[] consumes = {}, defaultRequestFormData = {},
defaultRequestQueryData = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {},
+ private String[] description = {};
+ private Class<? extends RestConverter>[] converters = new
Class[0];
+ private Class<? extends RestGuard>[] guards = new Class[0];
+ private Class<? extends RestMatcher>[] matchers = new Class[0];
+ private Class<? extends Encoder>[] encoders = new Class[0];
+ private Class<? extends Serializer>[] serializers = new
Class[0];
+ private Class<?>[] parsers = {};
+ private OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
+ private String clientVersion = "", debug = "", defaultAccept =
"", defaultCharset = "", defaultContentType = "", maxInput = "", rolesDeclared
= "", roleGuard = "", summary = "", value = "";
+ private String[] consumes = {}, defaultRequestFormData = {},
defaultRequestQueryData = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {},
produces = {};
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
index c8da64091e..d967aff03b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
@@ -59,7 +59,7 @@ public class RestPostCallAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
index 1ed477ef4e..901d7fe598 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
@@ -59,8 +59,8 @@ public class RestPostInitAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
- boolean childFirst;
+ private String[] description = {};
+ private boolean childFirst;
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
index 22bcf6b322..14b85c33fa 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
@@ -59,7 +59,7 @@ public class RestPreCallAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
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 e24a5d9733..19039e58fe 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
@@ -52,16 +52,16 @@ public class RestPutAnnotation {
@SuppressWarnings("unchecked")
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
- Class<? extends RestConverter>[] converters = new Class[0];
- Class<? extends RestGuard>[] guards = new Class[0];
- Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends Encoder>[] encoders = new Class[0];
- Class<? extends Serializer>[] serializers = new Class[0];
- Class<?>[] parsers = {};
- OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
- String clientVersion = "", debug = "", defaultAccept = "",
defaultCharset = "", defaultContentType = "", maxInput = "", rolesDeclared =
"", roleGuard = "", summary = "", value = "";
- String[] consumes = {}, defaultRequestFormData = {},
defaultRequestQueryData = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {},
+ private String[] description = {};
+ private Class<? extends RestConverter>[] converters = new
Class[0];
+ private Class<? extends RestGuard>[] guards = new Class[0];
+ private Class<? extends RestMatcher>[] matchers = new Class[0];
+ private Class<? extends Encoder>[] encoders = new Class[0];
+ private Class<? extends Serializer>[] serializers = new
Class[0];
+ private Class<?>[] parsers = {};
+ private OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
+ private String clientVersion = "", debug = "", defaultAccept =
"", defaultCharset = "", defaultContentType = "", maxInput = "", rolesDeclared
= "", roleGuard = "", summary = "", value = "";
+ private String[] consumes = {}, defaultRequestFormData = {},
defaultRequestQueryData = {}, defaultRequestAttributes = {},
defaultRequestHeaders = {}, defaultResponseHeaders = {}, path = {},
produces = {};
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
index 10d575ca56..bb7276e9d8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
@@ -59,7 +59,7 @@ public class RestStartCallAnnotation {
*/
public static class Builder extends
AppliedAnnotationObject.BuilderM<Builder> {
- String[] description = {};
+ private String[] description = {};
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java
index c0f6145a4b..a1877cf632 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/SwaggerAnnotation.java
@@ -41,13 +41,13 @@ public class SwaggerAnnotation {
*/
public static class Builder extends AnnotationObject.Builder<Builder> {
- String[] description = {};
- Contact contact = ContactAnnotation.DEFAULT;
- ExternalDocs externalDocs = ExternalDocsAnnotation.DEFAULT;
- License license = LicenseAnnotation.DEFAULT;
- String version = "";
- String[] termsOfService = {}, title = {}, value = {};
- Tag[] tags = {};
+ private String[] description = {};
+ private Contact contact = ContactAnnotation.DEFAULT;
+ private ExternalDocs externalDocs =
ExternalDocsAnnotation.DEFAULT;
+ private License license = LicenseAnnotation.DEFAULT;
+ private String version = "";
+ private String[] termsOfService = {}, title = {}, value = {};
+ private Tag[] tags = {};
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
index f9b29840c2..9811f36f43 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
@@ -264,24 +264,24 @@ public class RestUtils {
if (qs == null || ((qs instanceof CharSequence) &&
isEmpty(s(qs))))
return m;
- try (ParserPipe p = new ParserPipe(qs)) {
-
- // S1: Looking for attrName start.
- // S2: Found attrName start, looking for = or & or end.
- // S3: Found =, looking for valStart or &.
- // S4: Found valStart, looking for & or end.
-
- try (var r = new UonReader(p, true)) {
- int c = r.peekSkipWs();
- if (c == '?')
- r.read();
-
- var state = S1;
- var currAttr = (String)null;
- while (c != -1) {
- c = r.read();
- if (state == S1) {
- if (c != -1) {
+ try (ParserPipe p = new ParserPipe(qs)) {
+
+ // S1: Looking for attrName start.
+ // S2: Found attrName start, looking for = or &
or end.
+ // S3: Found =, looking for valStart or &.
+ // S4: Found valStart, looking for & or end.
+
+ try (var r = new UonReader(p, true)) {
+ int c = r.peekSkipWs();
+ if (c == '?')
+ r.read();
+
+ var state = S1;
+ var currAttr = (String)null;
+ while (c != -1) {
+ c = r.read();
+ if (state == S1) {
+ if (c != -1) {
r.unread();
r.mark();
state = S2;
