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 e69b0ec1ea Commons improvements
e69b0ec1ea is described below
commit e69b0ec1ea6140355829aab8086bc30b5b267b73
Author: James Bognar <[email protected]>
AuthorDate: Wed Dec 17 11:37:17 2025 -0500
Commons improvements
---
.../main/java/org/apache/juneau/config/Config.java | 19 +--
.../org/apache/juneau/config/store/FileStore.java | 10 +-
.../org/apache/juneau/jena/RdfParserSession.java | 2 +-
.../apache/juneau/jena/RdfSerializerSession.java | 2 +-
.../java/org/apache/juneau/BeanContextable.java | 4 +-
.../main/java/org/apache/juneau/BeanSession.java | 8 +-
.../org/apache/juneau/BeanTraverseContext.java | 6 +-
.../org/apache/juneau/BeanTraverseSession.java | 4 +-
.../java/org/apache/juneau/ContextSession.java | 8 +-
.../org/apache/juneau/csv/CsvParserSession.java | 3 -
.../apache/juneau/csv/CsvSerializerSession.java | 3 -
.../juneau/html/HtmlDocSerializerSession.java | 2 +-
.../org/apache/juneau/html/HtmlParserSession.java | 2 +-
.../html/HtmlSchemaDocSerializerSession.java | 2 +-
.../juneau/html/HtmlSchemaSerializerSession.java | 2 +-
.../org/apache/juneau/html/HtmlSerializer.java | 9 +-
.../apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../html/HtmlStrippedDocSerializerSession.java | 3 -
.../java/org/apache/juneau/json/JsonParser.java | 2 +-
.../org/apache/juneau/json/JsonParserSession.java | 2 +-
.../juneau/json/JsonSchemaSerializerSession.java | 2 +-
.../org/apache/juneau/json/JsonSerializer.java | 4 +-
.../apache/juneau/json/JsonSerializerSession.java | 2 +-
.../juneau/jsonschema/JsonSchemaGenerator.java | 17 ++-
.../jsonschema/JsonSchemaGeneratorSession.java | 2 +-
.../juneau/msgpack/MsgPackParserSession.java | 3 -
.../apache/juneau/msgpack/MsgPackSerializer.java | 2 +-
.../juneau/msgpack/MsgPackSerializerSession.java | 2 +-
.../apache/juneau/oapi/OpenApiParserSession.java | 2 +-
.../juneau/oapi/OpenApiSerializerSession.java | 10 +-
.../apache/juneau/parser/InputStreamParser.java | 2 +-
.../juneau/parser/InputStreamParserSession.java | 2 +-
.../main/java/org/apache/juneau/parser/Parser.java | 11 +-
.../org/apache/juneau/parser/ParserSession.java | 8 +-
.../org/apache/juneau/parser/ReaderParser.java | 3 +-
.../apache/juneau/parser/ReaderParserSession.java | 8 +-
.../juneau/plaintext/PlainTextParserSession.java | 3 -
.../plaintext/PlainTextSerializerSession.java | 3 -
.../juneau/serializer/OutputStreamSerializer.java | 2 +-
.../serializer/OutputStreamSerializerSession.java | 2 +-
.../org/apache/juneau/serializer/Serializer.java | 20 ++-
.../juneau/serializer/SerializerSession.java | 10 +-
.../apache/juneau/serializer/WriterSerializer.java | 10 +-
.../juneau/serializer/WriterSerializerSession.java | 10 +-
.../org/apache/juneau/soap/SoapXmlSerializer.java | 2 +-
.../juneau/soap/SoapXmlSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/uon/UonParser.java | 3 +-
.../org/apache/juneau/uon/UonParserSession.java | 4 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 7 +-
.../apache/juneau/uon/UonSerializerSession.java | 15 +-
.../urlencoding/UrlEncodingParserSession.java | 2 +-
.../urlencoding/UrlEncodingSerializerSession.java | 8 +-
.../apache/juneau/xml/XmlDocSerializerSession.java | 3 -
.../main/java/org/apache/juneau/xml/XmlParser.java | 9 +-
.../org/apache/juneau/xml/XmlParserSession.java | 2 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 12 +-
.../apache/juneau/xml/XmlSerializerSession.java | 2 +-
.../org/apache/juneau/rest/client/RestClient.java | 49 ++++---
.../java/org/apache/juneau/rest/RestContext.java | 155 +++++++--------------
.../java/org/apache/juneau/rest/RestOpContext.java | 52 +++----
.../java/org/apache/juneau/rest/RestOpSession.java | 4 +-
.../java/org/apache/juneau/rest/RestSession.java | 14 +-
.../org/apache/juneau/rest/annotation/Rest.java | 14 --
.../juneau/rest/annotation/RestAnnotation.java | 22 +--
.../apache/juneau/rest/config/DefaultConfig.java | 3 +-
.../apache/juneau/rest/rrpc/RrpcRestOpSession.java | 2 +-
.../rest/annotation/RestAnnotation_Test.java | 8 +-
67 files changed, 264 insertions(+), 365 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 321e6a471b..a6c97d3d68 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -61,15 +61,16 @@ public class Config extends Context implements
ConfigEventListener {
*/
public static class Builder extends Context.Builder {
- String name;
- ConfigStore store;
- WriterSerializer serializer;
- ReaderParser parser;
- Map<Character,Mod> mods;
- VarResolver varResolver;
- int binaryLineLength;
- BinaryFormat binaryFormat;
- boolean multiLineValuesOnSeparateLines, readOnly;
+ private BinaryFormat binaryFormat;
+ private boolean multiLineValuesOnSeparateLines;
+ private boolean readOnly;
+ private ConfigStore store;
+ private int binaryLineLength;
+ private Map<Character,Mod> mods;
+ private ReaderParser parser;
+ private String name;
+ private VarResolver varResolver;
+ private WriterSerializer serializer;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
index 192c7be32c..9b82cba571 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
@@ -55,10 +55,12 @@ public class FileStore extends ConfigStore {
*/
public static class Builder extends ConfigStore.Builder {
- String directory, extensions;
- Charset charset;
- boolean enableWatcher, updateOnWrite;
- WatcherSensitivity watcherSensitivity;
+ private Charset charset;
+ private boolean enableWatcher;
+ private boolean updateOnWrite;
+ private String directory;
+ private String extensions;
+ private WatcherSensitivity watcherSensitivity;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 4c8590f434..9e22acc04d 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -59,7 +59,7 @@ public class RdfParserSession extends ReaderParserSession {
*/
public static class Builder extends ReaderParserSession.Builder {
- RdfParser ctx;
+ private RdfParser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 01bb4921a8..3c2ec9149a 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -61,7 +61,7 @@ public class RdfSerializerSession extends
WriterSerializerSession {
*/
public static class Builder extends WriterSerializerSession.Builder {
- RdfSerializer ctx;
+ private RdfSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
index 31e4572f95..6ad69965fc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
@@ -53,8 +53,8 @@ public abstract class BeanContextable extends Context {
*/
public abstract static class Builder extends Context.Builder {
- BeanContext.Builder bcBuilder;
- BeanContext bc;
+ private BeanContext.Builder bcBuilder;
+ private BeanContext bc;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index cb60252301..ebf009f9b8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -58,10 +58,10 @@ public class BeanSession extends ContextSession {
*/
public static class Builder extends ContextSession.Builder {
- BeanContext ctx;
- TimeZone timeZone;
- Locale locale;
- MediaType mediaType;
+ private BeanContext ctx;
+ private Locale locale;
+ private MediaType mediaType;
+ private TimeZone timeZone;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index 84973c441c..66ffc91967 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -45,8 +45,10 @@ public abstract class BeanTraverseContext extends
BeanContextable {
*/
public abstract static class Builder extends BeanContextable.Builder {
- boolean detectRecursions, ignoreRecursions;
- int initialDepth, maxDepth;
+ private boolean detectRecursions;
+ private boolean ignoreRecursions;
+ private int initialDepth;
+ private int maxDepth;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index 44fe6965e5..d87c6e52db 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -53,8 +53,8 @@ public class BeanTraverseSession extends BeanSession {
*/
public static abstract class Builder extends BeanSession.Builder {
- BeanTraverseContext ctx;
- int initialDepth;
+ private BeanTraverseContext ctx;
+ private int initialDepth;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
index c5ceaa2d52..7efc0c73ea 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
@@ -44,10 +44,10 @@ public abstract class ContextSession {
* Builder class.
*/
public static abstract class Builder {
- Context ctx;
- JsonMap properties;
- boolean unmodifiable;
- Boolean debug;
+ private Boolean debug;
+ private boolean unmodifiable;
+ private Context ctx;
+ private JsonMap properties;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
index 3e52f675ed..16a668a4b4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
@@ -40,8 +40,6 @@ public class CsvParserSession extends ReaderParserSession {
*/
public static class Builder extends ReaderParserSession.Builder {
- CsvParser ctx;
-
/**
* Constructor
*
@@ -49,7 +47,6 @@ public class CsvParserSession extends ReaderParserSession {
*/
protected Builder(CsvParser ctx) {
super(ctx);
- this.ctx = ctx;
}
@Override /* Overridden from Builder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index f87e8ca72e..de38490d23 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -48,8 +48,6 @@ public class CsvSerializerSession extends
WriterSerializerSession {
*/
public static class Builder extends WriterSerializerSession.Builder {
- CsvSerializer ctx;
-
/**
* Constructor
*
@@ -58,7 +56,6 @@ public class CsvSerializerSession extends
WriterSerializerSession {
*/
protected Builder(CsvSerializer ctx) {
super(assertArgNotNull("ctx", ctx));
- this.ctx = ctx;
}
@Override /* Overridden from Builder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
index 2b92c4f085..853f45ec41 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
@@ -49,7 +49,7 @@ public class HtmlDocSerializerSession extends
HtmlStrippedDocSerializerSession {
*/
public static class Builder extends
HtmlStrippedDocSerializerSession.Builder {
- HtmlDocSerializer ctx;
+ private HtmlDocSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 3bcb7d7864..5bfb28e430 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -60,7 +60,7 @@ public class HtmlParserSession extends XmlParserSession {
*/
public static class Builder extends XmlParserSession.Builder {
- HtmlParser ctx;
+ private HtmlParser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
index a4b1882314..cf02077bd7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
@@ -45,7 +45,7 @@ public class HtmlSchemaDocSerializerSession extends
HtmlDocSerializerSession {
*/
public static class Builder extends HtmlDocSerializerSession.Builder {
- HtmlSchemaDocSerializer ctx;
+ private HtmlSchemaDocSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
index bb452a4fa0..572e6e531c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
@@ -45,7 +45,7 @@ public class HtmlSchemaSerializerSession extends
HtmlSerializerSession {
*/
public static class Builder extends HtmlSerializerSession.Builder {
- HtmlSchemaSerializer ctx;
+ private HtmlSchemaSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index fe7d8f62fb..04225c2214 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -155,9 +155,12 @@ public class HtmlSerializer extends XmlSerializer
implements HtmlMetaProvider {
private static final Cache<HashKey,HtmlSerializer> CACHE =
Cache.of(HashKey.class, HtmlSerializer.class).build();
- boolean addBeanTypesHtml, addKeyValueTableHeaders,
disableDetectLabelParameters, disableDetectLinksInStrings;
- String labelParameter;
- AnchorText uriAnchorText;
+ private boolean addBeanTypesHtml;
+ private boolean addKeyValueTableHeaders;
+ private boolean disableDetectLabelParameters;
+ private boolean disableDetectLinksInStrings;
+ private String labelParameter;
+ private AnchorText uriAnchorText;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 8b079b979d..aad41c836c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -60,7 +60,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
*/
public static class Builder extends XmlSerializerSession.Builder {
- HtmlSerializer ctx;
+ private HtmlSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
index 33ad3bce3b..5178e3ec92 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
@@ -47,8 +47,6 @@ public class HtmlStrippedDocSerializerSession extends
HtmlSerializerSession {
*/
public static class Builder extends HtmlSerializerSession.Builder {
- HtmlStrippedDocSerializer ctx;
-
/**
* Constructor
*
@@ -56,7 +54,6 @@ public class HtmlStrippedDocSerializerSession extends
HtmlSerializerSession {
*/
protected Builder(HtmlStrippedDocSerializer ctx) {
super(ctx);
- this.ctx = ctx;
}
@Override /* Overridden from Builder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index 9a160f288b..fe03adff23 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -132,7 +132,7 @@ public class JsonParser extends ReaderParser implements
JsonMetaProvider {
private static final Cache<HashKey,JsonParser> CACHE =
Cache.of(HashKey.class, JsonParser.class).build();
- boolean validateEnd;
+ private boolean validateEnd;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index 32a34d57c8..9cabf7ca1d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -54,7 +54,7 @@ public class JsonParserSession extends ReaderParserSession {
*/
public static class Builder extends ReaderParserSession.Builder {
- JsonParser ctx;
+ private JsonParser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
index a20134ee02..c07a9e84aa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
@@ -45,7 +45,7 @@ public class JsonSchemaSerializerSession extends
JsonSerializerSession {
*/
public static class Builder extends JsonSerializerSession.Builder {
- JsonSchemaSerializer ctx;
+ private JsonSchemaSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 457a034238..b169504e07 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -118,7 +118,9 @@ public class JsonSerializer extends WriterSerializer
implements JsonMetaProvider
private static final Cache<HashKey,JsonSerializer> CACHE =
Cache.of(HashKey.class, JsonSerializer.class).build();
- boolean addBeanTypesJson, escapeSolidus, simpleAttrs;
+ private boolean addBeanTypesJson;
+ private boolean escapeSolidus;
+ private boolean simpleAttrs;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index 51c833d43f..0c75def03f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -50,7 +50,7 @@ public class JsonSerializerSession extends
WriterSerializerSession {
*/
public static class Builder extends WriterSerializerSession.Builder {
- JsonSerializer ctx;
+ private JsonSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index 3060755f46..c1a954c89a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -57,13 +57,16 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
private static final Cache<HashKey,JsonSchemaGenerator> CACHE =
Cache.of(HashKey.class, JsonSchemaGenerator.class).build();
- final JsonSerializer.Builder jsonSerializerBuilder;
- final JsonParser.Builder jsonParserBuilder;
-
- SortedSet<TypeCategory> addDescriptionsTo, addExamplesTo;
- boolean allowNestedDescriptions, allowNestedExamples,
useBeanDefs;
- Class<? extends BeanDefMapper> beanDefMapper;
- SortedSet<String> ignoreTypes;
+ protected final JsonParser.Builder jsonParserBuilder;
+ protected final JsonSerializer.Builder jsonSerializerBuilder;
+
+ private boolean allowNestedDescriptions;
+ private boolean allowNestedExamples;
+ private boolean useBeanDefs;
+ private Class<? extends BeanDefMapper> beanDefMapper;
+ private SortedSet<TypeCategory> addDescriptionsTo;
+ private SortedSet<TypeCategory> addExamplesTo;
+ private SortedSet<String> ignoreTypes;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index f185b9cc59..0723efe22f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -51,7 +51,7 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
*/
public static class Builder extends BeanTraverseSession.Builder {
- JsonSchemaGenerator ctx;
+ private JsonSchemaGenerator ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
index 9542c31e97..5e96e49185 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
@@ -51,8 +51,6 @@ public class MsgPackParserSession extends
InputStreamParserSession {
*/
public static class Builder extends InputStreamParserSession.Builder {
- MsgPackParser ctx;
-
/**
* Constructor
*
@@ -61,7 +59,6 @@ public class MsgPackParserSession extends
InputStreamParserSession {
*/
protected Builder(MsgPackParser ctx) {
super(assertArgNotNull("ctx", ctx));
- this.ctx = ctx;
}
@Override /* Overridden from Builder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index 9d7e77372a..f33a5b6ed1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -71,7 +71,7 @@ public class MsgPackSerializer extends OutputStreamSerializer
implements MsgPack
private static final Cache<HashKey,MsgPackSerializer> CACHE =
Cache.of(HashKey.class, MsgPackSerializer.class).build();
- boolean addBeanTypesMsgPack;
+ private boolean addBeanTypesMsgPack;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index 342475b7ab..728aa548d8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -50,7 +50,7 @@ public class MsgPackSerializerSession extends
OutputStreamSerializerSession {
*/
public static class Builder extends
OutputStreamSerializerSession.Builder {
- MsgPackSerializer ctx;
+ private MsgPackSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
index aa3d5968c9..2a267b0d58 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
@@ -58,7 +58,7 @@ public class OpenApiParserSession extends UonParserSession {
*/
public static class Builder extends UonParserSession.Builder {
- OpenApiParser ctx;
+ private OpenApiParser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
index 6cd14e2c04..f62c0db9d1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
@@ -57,7 +57,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
*/
public static class Builder extends UonSerializerSession.Builder {
- OpenApiSerializer ctx;
+ private OpenApiSerializer ctx;
/**
* Constructor
@@ -86,12 +86,6 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
return this;
}
- @Override /* Overridden from Builder */
- public Builder encoding(boolean value) {
- super.encoding(value);
- return this;
- }
-
@Override /* Overridden from Builder */
public Builder fileCharset(Charset value) {
super.fileCharset(value);
@@ -285,7 +279,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
* @param builder The builder for this object.
*/
protected OpenApiSerializerSession(Builder builder) {
- super(builder.encoding(false));
+ super(builder);
ctx = builder.ctx;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
index 44955f02ba..ad7ad8c7ae 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
@@ -55,7 +55,7 @@ public class InputStreamParser extends Parser {
*/
public static class Builder extends Parser.Builder {
- BinaryFormat binaryFormat;
+ private BinaryFormat binaryFormat;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
index 060c808228..cca353e23d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
@@ -43,7 +43,7 @@ public class InputStreamParserSession extends ParserSession {
*/
public static class Builder extends ParserSession.Builder {
- InputStreamParser ctx;
+ private InputStreamParser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index 936f2f8d92..d93048ba84 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -146,10 +146,13 @@ public class Parser extends BeanContextable {
*/
public static class Builder extends BeanContextable.Builder {
- boolean autoCloseStreams, strict, trimStrings, unbuffered;
- String consumes;
- int debugOutputLines;
- Class<? extends ParserListener> listener;
+ private boolean autoCloseStreams;
+ private boolean strict;
+ private boolean trimStrings;
+ private boolean unbuffered;
+ private Class<? extends ParserListener> listener;
+ private int debugOutputLines;
+ private String consumes;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index 04f99a1ea1..e84e4098de 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -55,10 +55,10 @@ public class ParserSession extends BeanSession {
*/
public static class Builder extends BeanSession.Builder {
- Parser ctx;
- Method javaMethod;
- Object outer;
- HttpPartSchema schema;
+ private HttpPartSchema schema;
+ private Method javaMethod;
+ private Object outer;
+ private Parser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
index c0ab895d7e..c6b6ac3578 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -57,7 +57,8 @@ public class ReaderParser extends Parser {
*/
public static class Builder extends Parser.Builder {
- Charset fileCharset, streamCharset;
+ private Charset fileCharset;
+ private Charset streamCharset;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
index 1043ccc6a3..feeefd0ff5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
@@ -45,8 +45,9 @@ public class ReaderParserSession extends ParserSession {
*/
public static class Builder extends ParserSession.Builder {
- ReaderParser ctx;
- Charset fileCharset, streamCharset;
+ private Charset fileCharset;
+ private Charset streamCharset;
+ private ReaderParser ctx;
/**
* Constructor
@@ -213,7 +214,8 @@ public class ReaderParserSession extends ParserSession {
}
private final ReaderParser ctx;
- private final Charset fileCharset, streamCharset;
+ private final Charset fileCharset;
+ private final Charset streamCharset;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
index c41676a93d..2c7a03e7d5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
@@ -44,8 +44,6 @@ public class PlainTextParserSession extends
ReaderParserSession {
*/
public static class Builder extends ReaderParserSession.Builder {
- PlainTextParser ctx;
-
/**
* Constructor
*
@@ -53,7 +51,6 @@ public class PlainTextParserSession extends
ReaderParserSession {
*/
protected Builder(PlainTextParser ctx) {
super(ctx);
- this.ctx = ctx;
}
@Override /* Overridden from Builder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
index f013bee176..11c125ab9c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
@@ -44,8 +44,6 @@ public class PlainTextSerializerSession extends
WriterSerializerSession {
*/
public static class Builder extends WriterSerializerSession.Builder {
- PlainTextSerializer ctx;
-
/**
* Constructor
*
@@ -54,7 +52,6 @@ public class PlainTextSerializerSession extends
WriterSerializerSession {
*/
protected Builder(PlainTextSerializer ctx) {
super(assertArgNotNull("ctx", ctx));
- this.ctx = ctx;
}
@Override /* Overridden from Builder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index 6753e329bd..357a277eef 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -47,7 +47,7 @@ public class OutputStreamSerializer extends Serializer {
*/
public static class Builder extends Serializer.Builder {
- BinaryFormat binaryFormat;
+ private BinaryFormat binaryFormat;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
index 28f975b00e..fde307d428 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
@@ -53,7 +53,7 @@ public class OutputStreamSerializerSession extends
SerializerSession {
*/
public static class Builder extends SerializerSession.Builder {
- OutputStreamSerializer ctx;
+ private OutputStreamSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index e3cf855c8a..685a321d75 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -78,12 +78,20 @@ public class Serializer extends BeanTraverseContext {
*/
public static class Builder extends BeanTraverseContext.Builder {
- boolean addBeanTypes, addRootType, keepNullProperties,
sortCollections, sortMaps, trimEmptyCollections, trimEmptyMaps, trimStrings;
- String produces, accept;
- UriContext uriContext;
- UriRelativity uriRelativity;
- UriResolution uriResolution;
- Class<? extends SerializerListener> listener;
+ private boolean addBeanTypes;
+ private boolean addRootType;
+ private boolean keepNullProperties;
+ private boolean sortCollections;
+ private boolean sortMaps;
+ private boolean trimEmptyCollections;
+ private boolean trimEmptyMaps;
+ private boolean trimStrings;
+ private Class<? extends SerializerListener> listener;
+ private String accept;
+ private String produces;
+ private UriContext uriContext;
+ private UriRelativity uriRelativity;
+ private UriResolution uriResolution;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 3a53cafacb..aa302d55c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -70,11 +70,11 @@ public class SerializerSession extends BeanTraverseSession {
*/
public static class Builder extends BeanTraverseSession.Builder {
- Serializer ctx;
- Method javaMethod;
- VarResolverSession resolver;
- UriContext uriContext;
- HttpPartSchema schema;
+ private HttpPartSchema schema;
+ private Method javaMethod;
+ private Serializer ctx;
+ private UriContext uriContext;
+ private VarResolverSession resolver;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index a866eb5a76..769dd98104 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -50,10 +50,12 @@ public class WriterSerializer extends Serializer {
*/
public static class Builder extends Serializer.Builder {
- boolean useWhitespace;
- Charset fileCharset, streamCharset;
- int maxIndent;
- Character quoteChar, quoteCharOverride;
+ private boolean useWhitespace;
+ private Character quoteChar;
+ private Character quoteCharOverride;
+ private Charset fileCharset;
+ private Charset streamCharset;
+ private int maxIndent;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
index 9b1b0475c7..070b84aa73 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
@@ -56,9 +56,10 @@ public class WriterSerializerSession extends
SerializerSession {
*/
public static class Builder extends SerializerSession.Builder {
- WriterSerializer ctx;
- boolean useWhitespace;
- Charset fileCharset, streamCharset;
+ private boolean useWhitespace;
+ private Charset fileCharset;
+ private Charset streamCharset;
+ private WriterSerializer ctx;
/**
* Constructor
@@ -252,7 +253,8 @@ public class WriterSerializerSession extends
SerializerSession {
private final WriterSerializer ctx;
private final boolean useWhitespace;
- private final Charset streamCharset, fileCharset;
+ private final Charset fileCharset;
+ private final Charset streamCharset;
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index f1dd2eeae2..daa56e15d5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -57,7 +57,7 @@ public class SoapXmlSerializer extends XmlSerializer
implements SoapXmlMetaProvi
private static final Cache<HashKey,SoapXmlSerializer> CACHE =
Cache.of(HashKey.class, SoapXmlSerializer.class).build();
- String soapAction;
+ private String soapAction;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
index 0e5c4160e2..f0318afbb2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
@@ -46,7 +46,7 @@ public class SoapXmlSerializerSession extends
XmlSerializerSession {
*/
public static class Builder extends XmlSerializerSession.Builder {
- SoapXmlSerializer ctx;
+ private SoapXmlSerializer ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index ade41db97f..4347086390 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -62,7 +62,8 @@ public class UonParser extends ReaderParser implements
HttpPartParser, UonMetaPr
private static final Cache<HashKey,UonParser> CACHE =
Cache.of(HashKey.class, UonParser.class).build();
- boolean decoding, validateEnd;
+ private boolean decoding;
+ private boolean validateEnd;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index c6466c0b75..55eb53cbbb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -55,8 +55,8 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
*/
public static class Builder extends ReaderParserSession.Builder {
- UonParser ctx;
- boolean decoding;
+ private boolean decoding;
+ private UonParser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index 7f66bcf3be..01a3494380 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -147,9 +147,10 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
private static final Cache<HashKey,UonSerializer> CACHE =
Cache.of(HashKey.class, UonSerializer.class).build();
- boolean addBeanTypesUon, encoding;
- ParamFormat paramFormat;
- Character quoteCharUon;
+ private boolean addBeanTypesUon;
+ private boolean encoding;
+ private ParamFormat paramFormat;
+ private Character quoteCharUon;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index 0d2ca13a4a..4bb4f12423 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -53,8 +53,7 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
*/
public static class Builder extends WriterSerializerSession.Builder {
- UonSerializer ctx;
- boolean encoding;
+ private UonSerializer ctx;
/**
* Constructor
@@ -65,7 +64,6 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
protected Builder(UonSerializer ctx) {
super(assertArgNotNull("ctx", ctx));
this.ctx = ctx;
- encoding = ctx.encoding;
}
@Override /* Overridden from Builder */
@@ -85,17 +83,6 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
return this;
}
- /**
- * Overrides the encoding setting for this session.
- *
- * @param value The new value for this setting.
- * @return This object.
- */
- public Builder encoding(boolean value) {
- encoding = value;
- return this;
- }
-
@Override /* Overridden from Builder */
public Builder fileCharset(Charset value) {
super.fileCharset(value);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index d9ba3b908b..af3b7c4d60 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -52,7 +52,7 @@ public class UrlEncodingParserSession extends
UonParserSession {
*/
public static class Builder extends UonParserSession.Builder {
- UrlEncodingParser ctx;
+ private UrlEncodingParser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index b38c6587bf..dd8a554d7f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -50,7 +50,7 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
*/
public static class Builder extends UonSerializerSession.Builder {
- UrlEncodingSerializer ctx;
+ private UrlEncodingSerializer ctx;
/**
* Constructor
@@ -79,12 +79,6 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
return this;
}
- @Override /* Overridden from Builder */
- public Builder encoding(boolean value) {
- super.encoding(value);
- return this;
- }
-
@Override /* Overridden from Builder */
public Builder fileCharset(Charset value) {
super.fileCharset(value);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
index f8b6db4cd8..93b41cdda6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
@@ -46,8 +46,6 @@ public class XmlDocSerializerSession extends
XmlSerializerSession {
*/
public static class Builder extends XmlSerializerSession.Builder {
- XmlDocSerializer ctx;
-
/**
* Constructor
*
@@ -56,7 +54,6 @@ public class XmlDocSerializerSession extends
XmlSerializerSession {
*/
protected Builder(XmlDocSerializer ctx) {
super(assertArgNotNull("ctx", ctx));
- this.ctx = ctx;
}
@Override /* Overridden from Builder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index e35e44cd49..aa6f7d8fd8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -65,10 +65,11 @@ public class XmlParser extends ReaderParser implements
XmlMetaProvider {
private static final Cache<HashKey,XmlParser> CACHE =
Cache.of(HashKey.class, XmlParser.class).build();
- boolean preserveRootElement, validating;
- Class<? extends XMLEventAllocator> eventAllocator;
- Class<? extends XMLReporter> reporter;
- Class<? extends XMLResolver> resolver;
+ private boolean preserveRootElement;
+ private boolean validating;
+ private Class<? extends XMLEventAllocator> eventAllocator;
+ private Class<? extends XMLReporter> reporter;
+ private Class<? extends XMLResolver> resolver;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
index 0f9ba9d36f..64d3970183 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
@@ -58,7 +58,7 @@ public class XmlParserSession extends ReaderParserSession {
*/
public static class Builder extends ReaderParserSession.Builder {
- XmlParser ctx;
+ private XmlParser ctx;
/**
* Constructor
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index d03d559398..ad2ea15248 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -144,10 +144,14 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
private static final Cache<HashKey,XmlSerializer> CACHE =
Cache.of(HashKey.class, XmlSerializer.class).build();
- boolean addBeanTypesXml, addNamespaceUrisToRoot,
disableAutoDetectNamespaces, disableJsonTags, enableNamespaces;
- Namespace defaultNamespace;
- List<Namespace> namespaces;
- String textNodeDelimiter;
+ private boolean addBeanTypesXml;
+ private boolean addNamespaceUrisToRoot;
+ private boolean disableAutoDetectNamespaces;
+ private boolean disableJsonTags;
+ private boolean enableNamespaces;
+ private Namespace defaultNamespace;
+ private List<Namespace> namespaces;
+ private String textNodeDelimiter;
/**
* Constructor, default settings.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 15d1f0f44f..0965b77d01 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -57,7 +57,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
*/
public static class Builder extends WriterSerializerSession.Builder {
- XmlSerializer ctx;
+ private XmlSerializer ctx;
/**
* Constructor
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 06caf32e9a..a6282b278a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -1056,32 +1056,37 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
*/
public static class Builder extends BeanContextable.Builder {
- BeanStore beanStore = BeanStore.create().build();
-
- private HttpClientBuilder httpClientBuilder;
+ private BeanCreator<RestCallHandler> callHandler;
+ private BeanStore beanStore = BeanStore.create().build();
+ private BiPredicate<RestRequest,RestResponse>
logRequestsPredicate;
+ private boolean detectLeaks;
+ private boolean executorServiceShutdownOnClose;
+ private boolean ignoreErrors;
+ private boolean keepHttpClientOpen;
+ private boolean logToConsole;
+ private boolean pooled;
+ private boolean skipEmptyFormData;
+ private boolean skipEmptyHeaderData;
+ private boolean skipEmptyQueryData;
private CloseableHttpClient httpClient;
-
+ private DetailLevel logRequests;
+ private ExecutorService executorService;
private HeaderList headerData;
- private PartList queryData, formData, pathData;
- private BeanCreator<RestCallHandler> callHandler;
- private SerializerSet.Builder serializers;
- private ParserSet.Builder parsers;
- private HttpPartSerializer.Creator partSerializer;
+ private HttpClientBuilder httpClientBuilder;
+ private HttpClientConnectionManager connectionManager;
private HttpPartParser.Creator partParser;
+ private HttpPartSerializer.Creator partSerializer;
+ private Level logRequestsLevel;
+ private Logger logger;
+ private PartList formData;
+ private PartList pathData;
+ private PartList queryData;
+ private ParserSet.Builder parsers;
+ private Predicate<Integer> errorCodes = x -> x <= 0 || x >= 400;
+ private PrintStream console;
+ private SerializerSet.Builder serializers;
+ private String rootUrl;
private UrlEncodingSerializer.Builder urlEncodingSerializer;
-
- private boolean pooled;
-
- String rootUrl;
- boolean skipEmptyHeaderData, skipEmptyFormData,
skipEmptyQueryData, executorServiceShutdownOnClose, ignoreErrors,
keepHttpClientOpen, detectLeaks, logToConsole;
- Logger logger;
- DetailLevel logRequests;
- Level logRequestsLevel;
- BiPredicate<RestRequest,RestResponse> logRequestsPredicate;
- Predicate<Integer> errorCodes = x -> x <= 0 || x >= 400;
- HttpClientConnectionManager connectionManager;
- PrintStream console;
- ExecutorService executorService;
List<RestCallInterceptor> interceptors;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 3087d13ccb..13548dfef9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -225,66 +225,64 @@ public class RestContext extends Context {
return nn(x) && x.methodScope().length == 0 &&
x.name().equals(name);
}
+ private BeanContext.Builder beanContext;
+ private BeanCreator<CallLogger> callLogger;
+ private BeanCreator<DebugEnablement> debugEnablement;
+ private BeanCreator<StaticFiles> staticFiles;
+ private BeanCreator<SwaggerProvider> swaggerProvider;
+ private BeanStore beanStore;
+ private BeanStore rootBeanStore;
+ private boolean disableContentParam =
env("RestContext.disableContentParam", false);
private boolean initialized;
- ResourceSupplier resource;
- ServletContext servletContext;
-
- final ServletConfig inner;
- final Class<?> resourceClass;
-
- final RestContext parentContext;
+ private boolean renderResponseStackTraces =
env("RestContext.renderResponseStackTraces", false);
+ private Charset defaultCharset =
env("RestContext.defaultCharset").map(Charset::forName).orElse(UTF8);
+ private Class<? extends RestChildren> childrenClass =
RestChildren.class;
+ private Class<? extends RestOpContext> opContextClass =
RestOpContext.class;
+ private final Class<?> resourceClass;
+ private Config config;
private DefaultClassList defaultClasses;
private DefaultSettingsMap defaultSettings;
- private BeanStore rootBeanStore, beanStore;
- private Config config;
- private VarResolver.Builder varResolver;
+ private EncoderSet.Builder encoders;
+ private HeaderList defaultRequestHeaders;
+ private HeaderList defaultResponseHeaders;
+ private HttpPartParser.Creator partParser;
+ private HttpPartSerializer.Creator partSerializer;
+ private JsonSchemaGenerator.Builder jsonSchemaGenerator;
+ private List<MediaType> consumes;
+ private List<MediaType> produces;
+ private List<Object> children = list();
private Logger logger;
- private ThrownStore.Builder thrownStore;
+ private long maxInput =
env("RestContext.maxInput").map(StringUtils::parseLongWithSuffix).orElse(100_000_000l);
private MethodExecStore.Builder methodExecStore;
+ private MethodList destroyMethods;
+ private MethodList endCallMethods;
+ private MethodList postCallMethods;
+ private MethodList postInitChildFirstMethods;
+ private MethodList postInitMethods;
+ private MethodList preCallMethods;
+ private MethodList startCallMethods;
private Messages.Builder messages;
- private ResponseProcessorList.Builder responseProcessors;
- private BeanCreator<CallLogger> callLogger;
- private HttpPartSerializer.Creator partSerializer;
- private HttpPartParser.Creator partParser;
- private JsonSchemaGenerator.Builder jsonSchemaGenerator;
- private BeanCreator<StaticFiles> staticFiles;
- private HeaderList defaultRequestHeaders,
defaultResponseHeaders;
private NamedAttributeMap defaultRequestAttributes;
+ private ParserSet.Builder parsers;
+ private final RestContext parentContext;
+ private RestChildren.Builder restChildren;
private RestOpArgList.Builder restOpArgs;
- private BeanCreator<DebugEnablement> debugEnablement;
- private MethodList startCallMethods, endCallMethods,
postInitMethods, postInitChildFirstMethods, destroyMethods, preCallMethods,
postCallMethods;
private RestOperations.Builder restOperations;
- private RestChildren.Builder restChildren;
- private BeanCreator<SwaggerProvider> swaggerProvider;
- private BeanContext.Builder beanContext;
-
- private EncoderSet.Builder encoders;
+ private ResponseProcessorList.Builder responseProcessors;
+ private ResourceSupplier resource;
private SerializerSet.Builder serializers;
- private ParserSet.Builder parsers;
- String allowedHeaderParams =
env("RestContext.allowedHeaderParams", "Accept,Content-Type");
- String allowedMethodHeaders =
env("RestContext.allowedMethodHeaders", "");
- String allowedMethodParams =
env("RestContext.allowedMethodParams", "HEAD,OPTIONS");
- String clientVersionHeader =
env("RestContext.clientVersionHeader", "Client-Version");
- String debugOn = env("RestContext.debugOn").orElse(null);
- String path = null;
- String uriAuthority =
env("RestContext.uriAuthority").orElse(null);
- String uriContext = env("RestContext.uriContext").orElse(null);
- UriRelativity uriRelativity = env("RestContext.uriRelativity",
UriRelativity.RESOURCE);
- UriResolution uriResolution = env("RestContext.uriResolution",
UriResolution.ROOT_RELATIVE);
- Charset defaultCharset =
env("RestContext.defaultCharset").map(Charset::forName).orElse(UTF8);
- long maxInput =
env("RestContext.maxInput").map(StringUtils::parseLongWithSuffix).orElse(100_000_000l);
-
- List<MediaType> consumes, produces;
- boolean disableContentParam =
env("RestContext.disableContentParam", false);
- boolean renderResponseStackTraces =
env("RestContext.renderResponseStackTraces", false);
-
- Class<? extends RestChildren> childrenClass =
RestChildren.class;
-
- Class<? extends RestOpContext> opContextClass =
RestOpContext.class;
-
- Class<? extends RestOperations> operationsClass =
RestOperations.class;
-
- List<Object> children = list();
+ private final ServletConfig inner;
+ private String allowedHeaderParams =
env("RestContext.allowedHeaderParams", "Accept,Content-Type");
+ private String allowedMethodHeaders =
env("RestContext.allowedMethodHeaders", "");
+ private String allowedMethodParams =
env("RestContext.allowedMethodParams", "HEAD,OPTIONS");
+ private String clientVersionHeader =
env("RestContext.clientVersionHeader", "Client-Version");
+ private String path = null;
+ private String uriAuthority =
env("RestContext.uriAuthority").orElse(null);
+ private String uriContext =
env("RestContext.uriContext").orElse(null);
+ private ThrownStore.Builder thrownStore;
+ private UriRelativity uriRelativity =
env("RestContext.uriRelativity", UriRelativity.RESOURCE);
+ private UriResolution uriResolution =
env("RestContext.uriResolution", UriResolution.ROOT_RELATIVE);
+ private VarResolver.Builder varResolver;
/**
* Constructor.
@@ -3079,63 +3077,6 @@ public class RestContext extends Context {
return restOperations;
}
- /**
- * REST operations class.
- *
- * <p>
- * Allows you to extend the {@link RestOperations} class to
modify how any of the methods are implemented.
- *
- * <p>
- * The subclass must have a public constructor that takes in
any of the following arguments:
- * <ul>
- * <li>{@link RestOperations.Builder} - The builder for
the object.
- * <li>Any beans found in the specified bean store.
- * <li>Any {@link Optional} beans that may or may not be
found in the specified bean store.
- * </ul>
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bjava'>
- * <jc>// Our extended context class</jc>
- * <jk>public</jk> MyRestOperations <jk>extends</jk>
RestOperations {
- * <jk>public</jk>
MyRestOperations(RestOperations.Builder <jv>builder</jv>, ARequiredSpringBean
<jv>bean1</jv>, Optional<AnOptionalSpringBean> <jv>bean2</jv>) {
- * <jk>super</jk>(<jv>builder</jv>);
- * }
- *
- * <jc>// Override any methods.</jc>
- *
- * <ja>@Override</ja>
- * <jk>public</jk> RestOpContext
findMethod(RestCall <jv>call</jv>) <jk>throws</jk> MethodNotAllowed,
PreconditionFailed, NotFound {
- * String <jv>path</jv> =
<jv>call</jv>.getPathInfo();
- * <jk>if</jk>
(<jv>path</jv>.endsWith(<js>"/foo"</js>)) {
- * <jc>// Do our own special
handling.</jc>
- * }
- * <jk>return
super</jk>.findMethod(<jv>call</jv>);
- * }
- * }
- * </p>
- * <p class='bjava'>
- * <jc>// Option #1 - Defined via annotation.</jc>
- *
<ja>@Rest</ja>(restMethodsClass=MyRestOperations.<jk>class</jk>)
- * <jk>public class</jk> MyResource {
- * ...
- *
- * <jc>// Option #2 - Defined via builder passed
in through init method.</jc>
- * <ja>@RestInit</ja>
- * <jk>public void</jk> init(RestContext.Builder
<jv>builder</jv>) <jk>throws</jk> Exception {
- *
<jv>builder</jv>.restMethodsClass(MyRestOperations.<jk>class</jk>);
- * }
- * }
- * </p>
- *
- * @param value The new value for this setting.
- * <br>Cannot be <jk>null</jk>.
- * @return This object.
- */
- public Builder restOperationsClass(Class<? extends
RestOperations> value) {
- operationsClass = assertArgNotNull("value", value);
- return this;
- }
-
/**
* Returns the root bean store.
*
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index d3778ff967..5c555a0b64 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -90,36 +90,36 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*/
public static class Builder extends Context.Builder {
- RestContext restContext;
- RestContext.Builder parent;
- Method restMethod;
- String httpMethod, clientVersion;
- Enablement debug;
- List<String> path;
-
- private RestConverterList.Builder converters;
private BeanContext.Builder beanContext;
- private RestGuardList.Builder guards;
+ private BeanStore beanStore;
+ private boolean dotAll;
+ private Charset defaultCharset;
private EncoderSet.Builder encoders;
- private SerializerSet.Builder serializers;
- private ParserSet.Builder parsers;
- private HttpPartSerializer.Creator partSerializer;
+ private Enablement debug;
+ private HeaderList defaultRequestHeaders;
+ private HeaderList defaultResponseHeaders;
private HttpPartParser.Creator partParser;
- private RestMatcherList.Builder matchers;
+ private HttpPartSerializer.Creator partSerializer;
private JsonSchemaGenerator.Builder jsonSchemaGenerator;
-
- PartList defaultRequestFormData, defaultRequestQueryData;
- NamedAttributeMap defaultRequestAttributes;
- HeaderList defaultRequestHeaders, defaultResponseHeaders;
- RestMatcherList.Builder restMatchers;
- List<MediaType> produces, consumes;
- Set<String> roleGuard, rolesDeclared;
- boolean dotAll;
-
- Charset defaultCharset;
- Long maxInput;
-
- private BeanStore beanStore;
+ private List<MediaType> consumes;
+ private List<MediaType> produces;
+ private List<String> path;
+ private Long maxInput;
+ private Method restMethod;
+ private NamedAttributeMap defaultRequestAttributes;
+ private ParserSet.Builder parsers;
+ private PartList defaultRequestFormData;
+ private PartList defaultRequestQueryData;
+ private RestContext restContext;
+ private RestContext.Builder parent;
+ private RestConverterList.Builder converters;
+ private RestGuardList.Builder guards;
+ private RestMatcherList.Builder matchers;
+ private SerializerSet.Builder serializers;
+ private Set<String> roleGuard;
+ private Set<String> rolesDeclared;
+ private String clientVersion;
+ private String httpMethod;
Builder(java.lang.reflect.Method method, RestContext context) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpSession.java
index 2deee6911d..89d37133bf 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpSession.java
@@ -44,8 +44,8 @@ public class RestOpSession extends ContextSession {
*/
public static class Builder extends ContextSession.Builder {
- final RestOpContext ctx;
- final RestSession session;
+ protected final RestOpContext ctx;
+ protected final RestSession session;
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
index 34e2bcb905..ba3a4560f8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
@@ -49,13 +49,13 @@ public class RestSession extends ContextSession {
*/
public static class Builder extends ContextSession.Builder {
- RestContext ctx;
- Object resource;
- HttpServletRequest req;
- HttpServletResponse res;
- CallLogger logger;
- String pathInfoUndecoded;
- UrlPath urlPath;
+ private CallLogger logger;
+ private HttpServletRequest req;
+ private HttpServletResponse res;
+ private Object resource;
+ private RestContext ctx;
+ private String pathInfoUndecoded;
+ private UrlPath urlPath;
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
index 9982532829..4eb13f1b71 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
@@ -1188,20 +1188,6 @@ public @interface Rest {
*/
Class<? extends RestOpArg>[] restOpArgs() default {};
- /**
- * REST methods class.
- *
- * <p>
- * Allows you to extend the {@link RestOperations} class to modify how
any of the methods are implemented.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.RestContext.Builder#restOperationsClass(Class)}
- * </ul>
- *
- * @return The annotation value.
- */
- Class<? extends RestOperations> restOperationsClass() default
RestOperations.Void.class;
-
/**
* Role guard.
*
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 9982396a39..8f188cf2d0 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
@@ -73,7 +73,6 @@ public class RestAnnotation {
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 = {};
@@ -482,17 +481,6 @@ public class RestAnnotation {
return this;
}
- /**
- * Sets the {@link Rest#restOperationsClass()} property on this
annotation.
- *
- * @param value The new value for this property.
- * @return This object.
- */
- public Builder restOperationsClass(Class<? extends
RestOperations> value) {
- restOperationsClass = value;
- return this;
- }
-
/**
* Sets the {@link Rest#roleGuard()} property on this
annotation.
*
@@ -642,7 +630,7 @@ public class RestAnnotation {
super.onClass(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderT */
public Builder on(ClassInfo...value) {
super.on(value);
@@ -701,7 +689,6 @@ public class RestAnnotation {
type(a.callLogger()).ifPresent(x ->
b.callLogger().type(x));
type(a.swaggerProvider()).ifPresent(x ->
b.swaggerProvider(x));
type(a.restChildrenClass()).ifPresent(x ->
b.restChildrenClass(x));
- type(a.restOperationsClass()).ifPresent(x ->
b.restOperationsClass(x));
type(a.debugEnablement()).ifPresent(x ->
b.debugEnablement().type(x));
string(a.disableContentParam()).map(Boolean::parseBoolean).ifPresent(x ->
b.disableContentParam(x));
string(a.allowedHeaderParams()).ifPresent(x ->
b.allowedHeaderParams(x));
@@ -755,7 +742,6 @@ public class RestAnnotation {
private final Class<? extends RestOpArg>[] restOpArgs;
private final Class<? extends BeanStore> beanStore;
private final Class<? extends RestChildren> restChildrenClass;
- private final Class<? extends RestOperations>
restOperationsClass;
private final Class<? extends DebugEnablement> debugEnablement;
private final Class<? extends Serializer>[] serializers;
private final Class<?>[] children, parsers;
@@ -803,7 +789,6 @@ public class RestAnnotation {
renderResponseStackTraces = b.renderResponseStackTraces;
responseProcessors = copyOf(b.responseProcessors);
restChildrenClass = b.restChildrenClass;
- restOperationsClass = b.restOperationsClass;
restOpArgs = copyOf(b.restOpArgs);
roleGuard = b.roleGuard;
rolesDeclared = b.rolesDeclared;
@@ -1008,11 +993,6 @@ public class RestAnnotation {
return restOpArgs;
}
- @Override /* Overridden from Rest */
- public Class<? extends RestOperations> restOperationsClass() {
- return restOperationsClass;
- }
-
@Override /* Overridden from Rest */
public String roleGuard() {
return roleGuard;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java
index 2e39b1d6bb..3c0805f497 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java
@@ -129,8 +129,7 @@ import org.apache.juneau.serializer.annotation.*;
swaggerProvider=SwaggerProvider.Void.class, // Defaults to
BasicSwaggerProvider.
// Overridable context classes.
- restChildrenClass=RestChildren.class,
- restOperationsClass=RestOperations.class
+ restChildrenClass=RestChildren.class
)
@BeanConfig(
// When parsing generated beans, ignore unknown properties that may
only exist as getters and not setters.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
index 6453f40f22..575eaf2bc9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
@@ -47,7 +47,7 @@ public class RrpcRestOpSession extends RestOpSession {
*/
public static class Builder extends RestOpSession.Builder {
- RrpcRestOpContext ctx;
+ private RrpcRestOpContext ctx;
/**
* Constructor.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
index 8edfa34644..671aa04700 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
@@ -82,7 +82,6 @@ class RestAnnotation_Test extends TestBase {
.responseProcessors(ResponseProcessor.class)
.restChildrenClass(RestChildren.class)
.restOpArgs(RestOpArg.class)
- .restOperationsClass(RestOperations.class)
.roleGuard("w")
.rolesDeclared("x")
.serializers(Serializer.class)
@@ -134,7 +133,6 @@ class RestAnnotation_Test extends TestBase {
.responseProcessors(ResponseProcessor.class)
.restChildrenClass(RestChildren.class)
.restOpArgs(RestOpArg.class)
- .restOperationsClass(RestOperations.class)
.roleGuard("w")
.rolesDeclared("x")
.serializers(Serializer.class)
@@ -151,8 +149,8 @@ class RestAnnotation_Test extends TestBase {
@Test void a01_basic() {
assertBean(a1,
-
"allowedHeaderParams,allowedMethodHeaders,allowedMethodParams,beanStore,callLogger,children,clientVersionHeader,config,consumes,converters,debug,debugEnablement,debugOn,defaultAccept,defaultCharset,defaultContentType,defaultRequestAttributes,defaultRequestHeaders,defaultResponseHeaders,description,disableContentParam,encoders,guards,maxInput,messages,on,onClass,parsers,partParser,partSerializer,path,produces,renderResponseStackTraces,responseProcessors,restChildrenClass,restOpArgs,res
[...]
-
"b,c,d,BeanStore,CallLogger,[RestAnnotation_Test],e,f,[g],[RestConverter],h,DebugEnablement,i,j,k,l,[m],[n],[o],[p],a,[Encoder],[RestGuard],q,r,[s],[RestAnnotation_Test],[Parser],HttpPartParser,HttpPartSerializer,t,[u],v,[ResponseProcessor],RestChildren,[RestOpArg],RestOperations,w,x,[Serializer],y,StaticFiles,{{[],,,},[],{[],},{[],,},[],[],[],[],},BasicSwaggerProvider,[z],aa,bb,cc,dd");
+
"allowedHeaderParams,allowedMethodHeaders,allowedMethodParams,beanStore,callLogger,children,clientVersionHeader,config,consumes,converters,debug,debugEnablement,debugOn,defaultAccept,defaultCharset,defaultContentType,defaultRequestAttributes,defaultRequestHeaders,defaultResponseHeaders,description,disableContentParam,encoders,guards,maxInput,messages,on,onClass,parsers,partParser,partSerializer,path,produces,renderResponseStackTraces,responseProcessors,restChildrenClass,restOpArgs,rol
[...]
+
"b,c,d,BeanStore,CallLogger,[RestAnnotation_Test],e,f,[g],[RestConverter],h,DebugEnablement,i,j,k,l,[m],[n],[o],[p],a,[Encoder],[RestGuard],q,r,[s],[RestAnnotation_Test],[Parser],HttpPartParser,HttpPartSerializer,t,[u],v,[ResponseProcessor],RestChildren,[RestOpArg],w,x,[Serializer],y,StaticFiles,{{[],,,},[],{[],},{[],,},[],[],[],[],},BasicSwaggerProvider,[z],aa,bb,cc,dd");
}
@Test void a02_testEquivalency() {
@@ -233,7 +231,6 @@ class RestAnnotation_Test extends TestBase {
responseProcessors=ResponseProcessor.class,
restChildrenClass=RestChildren.class,
restOpArgs=RestOpArg.class,
- restOperationsClass=RestOperations.class,
roleGuard="w",
rolesDeclared="x",
serializers=Serializer.class,
@@ -287,7 +284,6 @@ class RestAnnotation_Test extends TestBase {
responseProcessors=ResponseProcessor.class,
restChildrenClass=RestChildren.class,
restOpArgs=RestOpArg.class,
- restOperationsClass=RestOperations.class,
roleGuard="w",
rolesDeclared="x",
serializers=Serializer.class,
