You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2026/06/02 11:02:58 UTC
(juneau) branch master updated: Complete TODO-149 CRTP builder conversion and land remote proxy parity suite
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 46da4ebd52 Complete TODO-149 CRTP builder conversion and land remote proxy parity suite
46da4ebd52 is described below
commit 46da4ebd52bd766dd2239e67360b8912670815fd
Author: James Bognar <ja...@apache.org>
AuthorDate: Tue Jun 2 07:02:52 2026 -0400
Complete TODO-149 CRTP builder conversion and land remote proxy parity suite
---
.../main/java/org/apache/juneau/config/Config.java | 62 +-
.../apache/juneau/config/store/ClasspathStore.java | 55 +-
.../apache/juneau/config/store/ConfigStore.java | 60 +-
.../org/apache/juneau/config/store/FileStore.java | 56 +-
.../apache/juneau/config/store/MemoryStore.java | 55 +-
.../java/org/apache/juneau/jena/JsonLdParser.java | 4 +-
.../org/apache/juneau/jena/JsonLdSerializer.java | 4 +-
.../main/java/org/apache/juneau/jena/N3Parser.java | 4 +-
.../java/org/apache/juneau/jena/N3Serializer.java | 4 +-
.../java/org/apache/juneau/jena/NQuadsParser.java | 4 +-
.../org/apache/juneau/jena/NQuadsSerializer.java | 4 +-
.../java/org/apache/juneau/jena/NTripleParser.java | 4 +-
.../org/apache/juneau/jena/NTripleSerializer.java | 4 +-
.../java/org/apache/juneau/jena/RdfJsonParser.java | 4 +-
.../org/apache/juneau/jena/RdfJsonSerializer.java | 4 +-
.../java/org/apache/juneau/jena/RdfParser.java | 647 ++--------
.../org/apache/juneau/jena/RdfParserSession.java | 97 +-
.../org/apache/juneau/jena/RdfProtoParser.java | 4 +-
.../org/apache/juneau/jena/RdfProtoSerializer.java | 4 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 833 ++-----------
.../apache/juneau/jena/RdfSerializerSession.java | 109 +-
.../org/apache/juneau/jena/RdfStreamParser.java | 63 +-
.../apache/juneau/jena/RdfStreamParserSession.java | 85 +-
.../apache/juneau/jena/RdfStreamSerializer.java | 69 +-
.../juneau/jena/RdfStreamSerializerSession.java | 2 +-
.../org/apache/juneau/jena/RdfThriftParser.java | 4 +-
.../apache/juneau/jena/RdfThriftSerializer.java | 4 +-
.../apache/juneau/jena/RdfXmlAbbrevSerializer.java | 4 +-
.../java/org/apache/juneau/jena/RdfXmlParser.java | 4 +-
.../org/apache/juneau/jena/RdfXmlSerializer.java | 4 +-
.../java/org/apache/juneau/jena/TriGParser.java | 4 +-
.../org/apache/juneau/jena/TriGSerializer.java | 4 +-
.../java/org/apache/juneau/jena/TriXParser.java | 4 +-
.../org/apache/juneau/jena/TriXSerializer.java | 4 +-
.../java/org/apache/juneau/jena/TurtleParser.java | 4 +-
.../org/apache/juneau/jena/TurtleSerializer.java | 4 +-
.../src/main/java/org/apache/juneau/Context.java | 55 +-
.../java/org/apache/juneau/ContextSession.java | 35 +-
.../java/org/apache/juneau/MarshallingContext.java | 52 +-
.../org/apache/juneau/MarshallingContextable.java | 364 +++---
.../java/org/apache/juneau/MarshallingSession.java | 65 +-
.../apache/juneau/MarshallingTraverseContext.java | 454 +------
.../apache/juneau/MarshallingTraverseSession.java | 67 +-
.../java/org/apache/juneau/bson/BsonParser.java | 14 +-
.../org/apache/juneau/bson/BsonParserSession.java | 2 +-
.../org/apache/juneau/bson/BsonSerializer.java | 14 +-
.../apache/juneau/bson/BsonSerializerSession.java | 2 +-
.../java/org/apache/juneau/cbor/CborParser.java | 20 +-
.../org/apache/juneau/cbor/CborParserSession.java | 85 +-
.../org/apache/juneau/cbor/CborSerializer.java | 20 +-
.../apache/juneau/cbor/CborSerializerSession.java | 91 +-
.../main/java/org/apache/juneau/csv/CsvParser.java | 493 +-------
.../org/apache/juneau/csv/CsvParserSession.java | 97 +-
.../java/org/apache/juneau/csv/CsvSerializer.java | 649 +---------
.../apache/juneau/csv/CsvSerializerSession.java | 103 +-
.../java/org/apache/juneau/hjson/HjsonParser.java | 19 +-
.../apache/juneau/hjson/HjsonParserSession.java | 2 +-
.../org/apache/juneau/hjson/HjsonSerializer.java | 14 +-
.../juneau/hjson/HjsonSerializerSession.java | 2 +-
.../java/org/apache/juneau/hocon/HoconParser.java | 14 +-
.../apache/juneau/hocon/HoconParserSession.java | 2 +-
.../org/apache/juneau/hocon/HoconSerializer.java | 14 +-
.../juneau/hocon/HoconSerializerSession.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 881 +------------
.../juneau/html/HtmlDocSerializerSession.java | 119 +-
.../java/org/apache/juneau/html/HtmlParser.java | 535 +-------
.../org/apache/juneau/html/HtmlParserSession.java | 97 +-
.../juneau/html/HtmlSchemaDocSerializer.java | 903 +-------------
.../html/HtmlSchemaDocSerializerSession.java | 109 +-
.../apache/juneau/html/HtmlSchemaSerializer.java | 775 +-----------
.../juneau/html/HtmlSchemaSerializerSession.java | 109 +-
.../org/apache/juneau/html/HtmlSerializer.java | 792 +-----------
.../apache/juneau/html/HtmlSerializerSession.java | 139 +--
.../juneau/html/HtmlStrippedDocSerializer.java | 798 +-----------
.../html/HtmlStrippedDocSerializerSession.java | 119 +-
.../apache/juneau/httppart/BaseHttpPartParser.java | 2 +-
.../juneau/httppart/BaseHttpPartSerializer.java | 2 +-
.../apache/juneau/httppart/SimplePartParser.java | 8 +-
.../juneau/httppart/SimplePartSerializer.java | 8 +-
.../main/java/org/apache/juneau/ini/IniParser.java | 14 +-
.../org/apache/juneau/ini/IniParserSession.java | 2 +-
.../java/org/apache/juneau/ini/IniSerializer.java | 14 +-
.../apache/juneau/ini/IniSerializerSession.java | 2 +-
.../java/org/apache/juneau/jcs/JcsSerializer.java | 2 +-
.../apache/juneau/jcs/JcsSerializerSession.java | 2 +-
.../java/org/apache/juneau/json/JsonParser.java | 539 +-------
.../org/apache/juneau/json/JsonParserSession.java | 111 +-
.../apache/juneau/json/JsonSchemaSerializer.java | 673 +---------
.../juneau/json/JsonSchemaSerializerSession.java | 109 +-
.../org/apache/juneau/json/JsonSerializer.java | 686 +----------
.../apache/juneau/json/JsonSerializerSession.java | 123 +-
.../java/org/apache/juneau/json5/Json5Parser.java | 505 +-------
.../apache/juneau/json5/Json5ParserSession.java | 2 +-
.../org/apache/juneau/json5/Json5Serializer.java | 675 +---------
.../juneau/json5/Json5SerializerSession.java | 2 +-
.../java/org/apache/juneau/jsonl/JsonlParser.java | 4 +-
.../apache/juneau/jsonl/JsonlParserSession.java | 2 +-
.../org/apache/juneau/jsonl/JsonlSerializer.java | 4 +-
.../juneau/jsonl/JsonlSerializerSession.java | 2 +-
.../juneau/jsonschema/JsonSchemaGenerator.java | 471 +------
.../jsonschema/JsonSchemaGeneratorSession.java | 61 +-
.../apache/juneau/markdown/MarkdownDocParser.java | 7 +-
.../juneau/markdown/MarkdownDocParserSession.java | 97 +-
.../juneau/markdown/MarkdownDocSerializer.java | 13 +-
.../markdown/MarkdownDocSerializerSession.java | 109 +-
.../org/apache/juneau/markdown/MarkdownParser.java | 520 +-------
.../juneau/markdown/MarkdownParserSession.java | 107 +-
.../apache/juneau/markdown/MarkdownSerializer.java | 668 +---------
.../juneau/markdown/MarkdownSerializerSession.java | 119 +-
.../org/apache/juneau/msgpack/MsgPackParser.java | 487 +-------
.../juneau/msgpack/MsgPackParserSession.java | 85 +-
.../apache/juneau/msgpack/MsgPackSerializer.java | 601 +--------
.../juneau/msgpack/MsgPackSerializerSession.java | 91 +-
.../java/org/apache/juneau/oapi/OpenApiParser.java | 517 +-------
.../apache/juneau/oapi/OpenApiParserSession.java | 103 +-
.../org/apache/juneau/oapi/OpenApiSerializer.java | 685 +----------
.../juneau/oapi/OpenApiSerializerSession.java | 109 +-
.../org/apache/juneau/parquet/ParquetParser.java | 14 +-
.../juneau/parquet/ParquetParserSession.java | 2 +-
.../apache/juneau/parquet/ParquetSerializer.java | 14 +-
.../juneau/parquet/ParquetSerializerSession.java | 2 +-
.../apache/juneau/parser/InputStreamParser.java | 500 +-------
.../juneau/parser/InputStreamParserSession.java | 95 +-
.../main/java/org/apache/juneau/parser/Parser.java | 592 +--------
.../org/apache/juneau/parser/ParserSession.java | 91 +-
.../org/apache/juneau/parser/ReaderParser.java | 508 +-------
.../apache/juneau/parser/ReaderParserSession.java | 103 +-
.../apache/juneau/plaintext/PlainTextParser.java | 493 +-------
.../juneau/plaintext/PlainTextParserSession.java | 97 +-
.../juneau/plaintext/PlainTextSerializer.java | 649 +---------
.../plaintext/PlainTextSerializerSession.java | 109 +-
.../java/org/apache/juneau/proto/ProtoParser.java | 14 +-
.../apache/juneau/proto/ProtoParserSession.java | 2 +-
.../org/apache/juneau/proto/ProtoSerializer.java | 14 +-
.../juneau/proto/ProtoSerializerSession.java | 2 +-
.../juneau/serializer/OutputStreamSerializer.java | 614 +--------
.../serializer/OutputStreamSerializerSession.java | 101 +-
.../org/apache/juneau/serializer/Serializer.java | 670 +---------
.../juneau/serializer/SerializerSession.java | 130 +-
.../apache/juneau/serializer/WriterSerializer.java | 665 +---------
.../juneau/serializer/WriterSerializerSession.java | 128 +-
.../org/apache/juneau/soap/SoapXmlSerializer.java | 715 +----------
.../juneau/soap/SoapXmlSerializerSession.java | 109 +-
.../main/java/org/apache/juneau/sse/SseParser.java | 2 +-
.../org/apache/juneau/sse/SseParserSession.java | 2 +-
.../java/org/apache/juneau/sse/SseSerializer.java | 2 +-
.../apache/juneau/sse/SseSerializerSession.java | 2 +-
.../java/org/apache/juneau/toml/TomlParser.java | 14 +-
.../org/apache/juneau/toml/TomlParserSession.java | 2 +-
.../org/apache/juneau/toml/TomlSerializer.java | 14 +-
.../apache/juneau/toml/TomlSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/uon/UonParser.java | 547 +-------
.../org/apache/juneau/uon/UonParserSession.java | 115 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 698 +----------
.../apache/juneau/uon/UonSerializerSession.java | 127 +-
.../juneau/urlencoding/UrlEncodingParser.java | 517 +-------
.../urlencoding/UrlEncodingParserSession.java | 97 +-
.../juneau/urlencoding/UrlEncodingSerializer.java | 685 +----------
.../urlencoding/UrlEncodingSerializerSession.java | 103 +-
.../org/apache/juneau/xml/XmlDocSerializer.java | 12 +-
.../apache/juneau/xml/XmlDocSerializerSession.java | 109 +-
.../main/java/org/apache/juneau/xml/XmlParser.java | 557 +--------
.../org/apache/juneau/xml/XmlParserSession.java | 115 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 726 +----------
.../apache/juneau/xml/XmlSerializerSession.java | 139 +--
.../java/org/apache/juneau/yaml/YamlParser.java | 493 +-------
.../org/apache/juneau/yaml/YamlParserSession.java | 97 +-
.../org/apache/juneau/yaml/YamlSerializer.java | 649 +---------
.../apache/juneau/yaml/YamlSerializerSession.java | 109 +-
.../examples/core/config/store/SqlStore.java | 2 +-
.../juneau/rest/client/classic/RestClient.java | 962 +++++----------
.../juneau/rest/mock/classic/MockRestClient.java | 1301 +-------------------
.../org/apache/juneau/ComboRoundTrip_Tester.java | 8 +-
.../org/apache/juneau/parser/ParserSet_Test.java | 16 +-
.../client/RemoteProxy_FeatureParity_Test.java | 820 ++++++++++++
.../classic/RestClient_Config_Context_Test.java | 2 +-
.../RestClient_Config_MarshallingContext_Test.java | 4 +-
.../classic/RestClient_Config_RestClient_Test.java | 4 +-
.../classic/RestClient_Response_Body_Test.java | 2 +-
.../client/classic/RestClient_Response_Test.java | 8 +-
.../rest/test/client/ThirdPartyProxy_Test.java | 2 +-
.../juneau/serializer/SerializerSet_Test.java | 22 +-
juneau-utest/test-run-history.tsv | 1 +
183 files changed, 2802 insertions(+), 31475 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 fc6a132c45..10548b4bfc 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
@@ -84,7 +84,7 @@ public class Config extends Context implements ConfigEventListener {
/**
* Builder class.
*/
- public static class Builder extends Context.Builder {
+ public static class Builder extends Context.Builder<Builder> {
private BinaryFormat binaryFormat;
private boolean multiLineValuesOnSeparateLines;
@@ -156,36 +156,6 @@ public class Config extends Context implements ConfigEventListener {
varResolver = copyFrom.varResolver;
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder annotations(List<Annotation> values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
/**
* Binary value format.
*
@@ -241,35 +211,11 @@ public class Config extends Context implements ConfigEventListener {
return build(Config.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
/**
* Configuration store.
*
@@ -449,12 +395,6 @@ public class Config extends Context implements ConfigEventListener {
return this;
}
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
-
/**
* SVL variable resolver.
*
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
index d356e70756..224d016b85 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ClasspathStore.java
@@ -52,7 +52,7 @@ public class ClasspathStore extends ConfigStore {
/**
* Builder class.
*/
- public static class Builder extends ConfigStore.Builder {
+ public static class Builder extends ConfigStore.Builder<Builder> {
/**
* Constructor, default settings.
@@ -80,69 +80,16 @@ public class ClasspathStore extends ConfigStore {
type(copyFrom.getClass());
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public ClasspathStore build() {
return build(ClasspathStore.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
}
/** Default memory store, all default values.*/
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
index 1d2be21193..6ce1b55efb 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
@@ -52,7 +52,7 @@ public abstract class ConfigStore extends Context implements Closeable {
/**
* Builder class.
*/
- public abstract static class Builder extends Context.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends Context.Builder<SELF> {
/**
* Constructor, default settings.
@@ -64,7 +64,7 @@ public abstract class ConfigStore extends Context implements Closeable {
*
* @param copyFrom The builder to copy from.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
super(copyFrom);
}
@@ -77,62 +77,6 @@ public abstract class ConfigStore extends Context implements Closeable {
super(copyFrom);
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
- @Override /* Overridden from Context.Builder */
- public abstract Builder copy();
-
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
}
private final ConcurrentHashMap<String,ConfigMap> configMaps = new ConcurrentHashMap<>();
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 f7cdcc6c8b..232b477a8c 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
@@ -65,7 +65,7 @@ public class FileStore extends ConfigStore {
/**
* Builder class.
*/
- public static class Builder extends ConfigStore.Builder {
+ public static class Builder extends ConfigStore.Builder<Builder> {
private Charset charset;
private boolean enableWatcher;
@@ -119,41 +119,11 @@ public class FileStore extends ConfigStore {
watcherSensitivity = copyFrom.watcherSensitivity;
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public FileStore build() {
return build(FileStore.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
/**
* Charset for external files.
*
@@ -181,18 +151,6 @@ public class FileStore extends ConfigStore {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
/**
* Local file system directory.
*
@@ -284,18 +242,6 @@ public class FileStore extends ConfigStore {
return this;
}
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
-
/**
* Update-on-write.
*
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/MemoryStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/MemoryStore.java
index ebf83017a5..c00dcd0245 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/MemoryStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/MemoryStore.java
@@ -48,7 +48,7 @@ public class MemoryStore extends ConfigStore {
/**
* Builder class.
*/
- public static class Builder extends ConfigStore.Builder {
+ public static class Builder extends ConfigStore.Builder<Builder> {
/**
* Constructor, default settings.
@@ -76,69 +76,16 @@ public class MemoryStore extends ConfigStore {
type(copyFrom.getClass());
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public MemoryStore build() {
return build(MemoryStore.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
}
/** Default memory store, all default values.*/
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java
index 3e7d8aaf5c..401a33d1c5 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java
@@ -76,7 +76,7 @@ public class JsonLdParser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().jsonLd();
}
@@ -85,7 +85,7 @@ public class JsonLdParser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public JsonLdParser(RdfParser.Builder builder) {
+ public JsonLdParser(RdfParser.Builder<?> builder) {
super(builder.jsonLd().consumes("application/ld+json"));
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java
index 1135ba1230..7c8f43fe1f 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java
@@ -72,7 +72,7 @@ public class JsonLdSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().jsonLd();
}
@@ -81,7 +81,7 @@ public class JsonLdSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public JsonLdSerializer(RdfSerializer.Builder builder) {
+ public JsonLdSerializer(RdfSerializer.Builder<?> builder) {
super(builder.jsonLd());
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
index 33ca5f77e9..4d29ad9716 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
@@ -72,7 +72,7 @@ public class N3Parser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().n3();
}
@@ -81,7 +81,7 @@ public class N3Parser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public N3Parser(RdfParser.Builder builder) {
+ public N3Parser(RdfParser.Builder<?> builder) {
super(builder.n3().consumes("text/n3"));
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
index 4cde1cb976..c318fdc043 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
@@ -72,7 +72,7 @@ public class N3Serializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().n3();
}
@@ -81,7 +81,7 @@ public class N3Serializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public N3Serializer(RdfSerializer.Builder builder) {
+ public N3Serializer(RdfSerializer.Builder<?> builder) {
super(builder.n3());
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java
index 7921410813..f37896ca95 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java
@@ -72,7 +72,7 @@ public class NQuadsParser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().nQuads();
}
@@ -81,7 +81,7 @@ public class NQuadsParser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public NQuadsParser(RdfParser.Builder builder) {
+ public NQuadsParser(RdfParser.Builder<?> builder) {
super(builder.nQuads().consumes("application/n-quads"));
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java
index b4b890d094..af28a1c849 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java
@@ -72,7 +72,7 @@ public class NQuadsSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().nQuads();
}
@@ -81,7 +81,7 @@ public class NQuadsSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public NQuadsSerializer(RdfSerializer.Builder builder) {
+ public NQuadsSerializer(RdfSerializer.Builder<?> builder) {
super(builder.nQuads());
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
index a326ae59ae..860766712d 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
@@ -76,7 +76,7 @@ public class NTripleParser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().ntriple();
}
@@ -85,7 +85,7 @@ public class NTripleParser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public NTripleParser(RdfParser.Builder builder) {
+ public NTripleParser(RdfParser.Builder<?> builder) {
super(builder.ntriple().consumes("text/n-triple"));
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
index e5cd538f9d..20f7bbb990 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
@@ -72,7 +72,7 @@ public class NTripleSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().ntriple();
}
@@ -81,7 +81,7 @@ public class NTripleSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public NTripleSerializer(RdfSerializer.Builder builder) {
+ public NTripleSerializer(RdfSerializer.Builder<?> builder) {
super(builder.ntriple());
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonParser.java
index d215e666b7..d482724650 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonParser.java
@@ -75,7 +75,7 @@ public class RdfJsonParser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().rdfJson();
}
@@ -84,7 +84,7 @@ public class RdfJsonParser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public RdfJsonParser(RdfParser.Builder builder) {
+ public RdfJsonParser(RdfParser.Builder<?> builder) {
super(builder.rdfJson().consumes("application/rdf+json"));
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonSerializer.java
index fe0946d284..bc2f1729e1 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonSerializer.java
@@ -70,7 +70,7 @@ public class RdfJsonSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().rdfJson();
}
@@ -79,7 +79,7 @@ public class RdfJsonSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public RdfJsonSerializer(RdfSerializer.Builder builder) {
+ public RdfJsonSerializer(RdfSerializer.Builder<?> builder) {
super(builder.rdfJson());
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 3c8ba6040d..29f1e5bdd9 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -82,7 +82,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends ReaderParser.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends ReaderParser.Builder<SELF> {
private static final Cache<HashKey,RdfParser> CACHE = Cache.of(HashKey.class, RdfParser.class).build();
@@ -117,7 +117,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* @param copyFrom The builder to copy from.
* <br>Cannot be <jk>null</jk>.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
collectionFormat = copyFrom.collectionFormat;
juneauBpNs = copyFrom.juneauBpNs;
@@ -145,209 +145,11 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
jenaSettings = new TreeMap<>(copyFrom.jenaSettings);
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder autoCloseStreams() {
- super.autoCloseStreams();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder autoCloseStreams(boolean value) {
- super.autoCloseStreams(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext.Builder value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanDictionary(java.lang.Class<?>...values) {
- super.beanDictionary(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanInterceptor(Class<?> on, Class<? extends org.apache.juneau.commons.bean.BeanInterceptor<?>> value) {
- super.beanInterceptor(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMethodVisibility(Visibility value) {
- super.beanMethodVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesReadOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Map<String,Object> values) {
- super.beanPropertiesReadOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(String beanClassName, String properties) {
- super.beanPropertiesReadOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesWriteOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Map<String,Object> values) {
- super.beanPropertiesWriteOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(String beanClassName, String properties) {
- super.beanPropertiesWriteOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSerializable() {
- super.beansRequireSerializable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public RdfParser build() {
return cache(CACHE).build(RdfParser.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
/**
* RDF format for representing collections and arrays.
*
@@ -368,105 +170,13 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder collectionFormat(RdfCollectionFormat value) {
+ public SELF collectionFormat(RdfCollectionFormat value) {
collectionFormat = assertArgNotNull(ARG_value, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder consumes(String value) {
- super.consumes(value);
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
- public Builder copy() {
- return new Builder(this);
- }
-
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debugOutputLines(int value) {
- super.debugOutputLines(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder dictionaryOn(Class<?> on, java.lang.Class<?>...values) {
- super.dictionaryOn(on, values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreMissingSetters() {
- super.disableIgnoreMissingSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreTransientFields() {
- super.disableIgnoreTransientFields();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreUnknownNullBeanProperties() {
- super.disableIgnoreUnknownNullBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableInterfaceProxies() {
- super.disableInterfaceProxies();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, String json) {
- super.example(pojoClass, json);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters() {
- super.findFluentSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters(Class<?> on) {
- super.findFluentSetters(on);
- return this;
- }
+ public abstract SELF copy();
@Override /* Overridden from Context.Builder */
public HashKey hashKey() {
@@ -484,60 +194,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
// @formatter:on
}
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnGetters() {
- super.ignoreInvocationExceptionsOnGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnSetters() {
- super.ignoreInvocationExceptionsOnSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownBeanProperties() {
- super.ignoreUnknownBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownEnumValues() {
- super.ignoreUnknownEnumValues();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
- super.implClass(interfaceClass, implClass);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClasses(Map<Class<?>,Class<?>> values) {
- super.implClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaceClass(Class<?> on, Class<?> value) {
- super.interfaceClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaces(java.lang.Class<?>...value) {
- super.interfaces(value);
- return this;
- }
-
/**
* Default XML namespace for bean properties.
*
@@ -547,9 +203,9 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder juneauBpNs(Namespace value) {
+ public SELF juneauBpNs(Namespace value) {
juneauBpNs = assertArgNotNull(ARG_value, value);
- return this;
+ return self();
}
/**
@@ -561,9 +217,9 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder juneauNs(Namespace value) {
+ public SELF juneauNs(Namespace value) {
juneauNs = assertArgNotNull(ARG_value, value);
- return this;
+ return self();
}
/**
@@ -610,21 +266,9 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder language(String value) {
+ public SELF language(String value) {
language = assertArgNotNull(ARG_value, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder listener(Class<? extends org.apache.juneau.parser.ParserListener> value) {
- super.listener(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
+ return self();
}
/**
@@ -676,7 +320,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder looseCollections() {
+ public SELF looseCollections() {
return looseCollections(true);
}
@@ -686,15 +330,9 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* @param value The new value for this property.
* @return This object.
*/
- public Builder looseCollections(boolean value) {
+ public SELF looseCollections(boolean value) {
looseCollections = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
+ return self();
}
/**
@@ -705,7 +343,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3() {
+ public SELF n3() {
return language(Constants.LANG_N3);
}
@@ -717,7 +355,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableAbbrevBaseUri() {
+ public SELF n3_disableAbbrevBaseUri() {
return n3_disableAbbrevBaseUri(true);
}
@@ -731,7 +369,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableAbbrevBaseUri(boolean value) {
+ public SELF n3_disableAbbrevBaseUri(boolean value) {
return jena("n3.disableAbbrevBaseUri", value);
}
@@ -743,7 +381,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableObjectLists() {
+ public SELF n3_disableObjectLists() {
return n3_disableObjectLists(true);
}
@@ -757,7 +395,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder n3_disableObjectLists(boolean value) {
+ public SELF n3_disableObjectLists(boolean value) {
return jena("n3.disableObjectLists", value);
}
@@ -769,7 +407,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableUseDoubles() {
+ public SELF n3_disableUseDoubles() {
return n3_disableUseDoubles(true);
}
@@ -783,7 +421,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableUseDoubles(boolean value) {
+ public SELF n3_disableUseDoubles(boolean value) {
return jena("n3.disableUseDoubles", value);
}
@@ -795,7 +433,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableUsePropertySymbols() {
+ public SELF n3_disableUsePropertySymbols() {
return n3_disableUsePropertySymbols(true);
}
@@ -809,7 +447,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableUsePropertySymbols(boolean value) {
+ public SELF n3_disableUsePropertySymbols(boolean value) {
return jena("n3.disableUsePropertySymbols", value);
}
@@ -821,7 +459,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableUseTripleQuotedStrings() {
+ public SELF n3_disableUseTripleQuotedStrings() {
return n3_disableUseTripleQuotedStrings(true);
}
@@ -835,7 +473,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableUseTripleQuotedStrings(boolean value) {
+ public SELF n3_disableUseTripleQuotedStrings(boolean value) {
return jena("n3.disableUseTripleQuotedStrings", value);
}
@@ -849,7 +487,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder n3_indentProperty(int value) {
+ public SELF n3_indentProperty(int value) {
return jena("n3.indentProperty", value);
}
@@ -863,7 +501,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder n3_minGap(int value) {
+ public SELF n3_minGap(int value) {
return jena("n3.minGap", value);
}
@@ -877,7 +515,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder n3_propertyColumn(int value) {
+ public SELF n3_propertyColumn(int value) {
return jena("n3.propertyColumn", value);
}
@@ -891,7 +529,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder n3_subjectColumn(int value) {
+ public SELF n3_subjectColumn(int value) {
return jena("n3.subjectColumn", value);
}
@@ -906,22 +544,10 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder n3_widePropertyLen(int value) {
+ public SELF n3_widePropertyLen(int value) {
return jena("n3.widePropertyLen", value);
}
- @Override /* Overridden from Builder */
- public Builder notBeanClasses(java.lang.Class<?>...values) {
- super.notBeanClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanPackages(String...values) {
- super.notBeanPackages(values);
- return this;
- }
-
/**
* RDF language.
*
@@ -930,22 +556,10 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder ntriple() {
+ public SELF ntriple() {
return language(Constants.LANG_NTRIPLE);
}
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<?> on, Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(value);
- return this;
- }
-
/**
* RDF/XML property: <c>allowBadURIs</c>.
*
@@ -954,7 +568,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfxml_allowBadUris() {
+ public SELF rdfxml_allowBadUris() {
return rdfxml_allowBadUris(true);
}
@@ -968,7 +582,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_allowBadUris(boolean value) {
+ public SELF rdfxml_allowBadUris(boolean value) {
return jena("rdfXml.allowBadURIs", value);
}
@@ -982,7 +596,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_attributeQuoteChar(char value) {
+ public SELF rdfxml_attributeQuoteChar(char value) {
return jena("rdfXml.attributeQuoteChar", value);
}
@@ -998,7 +612,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_blockRules(String value) {
+ public SELF rdfxml_blockRules(String value) {
return jena("rdfXml.blockRules", value);
}
@@ -1013,7 +627,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfxml_disableShowDoctypeDeclaration() {
+ public SELF rdfxml_disableShowDoctypeDeclaration() {
return rdfxml_disableShowDoctypeDeclaration(true);
}
@@ -1030,7 +644,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_disableShowDoctypeDeclaration(boolean value) {
+ public SELF rdfxml_disableShowDoctypeDeclaration(boolean value) {
return jena("rdfXml.disableShowDoctypeDeclaration", value);
}
@@ -1047,7 +661,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfxml_embedding() {
+ public SELF rdfxml_embedding() {
return rdfxml_embedding(true);
}
@@ -1066,7 +680,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_embedding(boolean value) {
+ public SELF rdfxml_embedding(boolean value) {
return jena("rdfXml.embedding", value);
}
@@ -1101,7 +715,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_errorMode(String value) {
+ public SELF rdfxml_errorMode(String value) {
return jena("rdfXml.error-mode", value);
}
@@ -1129,7 +743,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_iriRules(String value) {
+ public SELF rdfxml_iriRules(String value) {
return jena("rdfXml.iri-rules", value);
}
@@ -1142,7 +756,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfxml_longId() {
+ public SELF rdfxml_longId() {
return rdfxml_longId(true);
}
@@ -1157,7 +771,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_longId(boolean value) {
+ public SELF rdfxml_longId(boolean value) {
return jena("rdfXml.longId", value);
}
@@ -1193,7 +807,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_relativeUris(String value) {
+ public SELF rdfxml_relativeUris(String value) {
return jena("rdfXml.relativeURIs", value);
}
@@ -1215,7 +829,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_showXmlDeclaration(String value) {
+ public SELF rdfxml_showXmlDeclaration(String value) {
return jena("rdfXml.showXmlDeclaration", value);
}
@@ -1229,7 +843,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_tab(int value) {
+ public SELF rdfxml_tab(int value) {
return jena("rdfXml.tab", value);
}
@@ -1243,76 +857,10 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this property.
* @return This object.
*/
- public Builder rdfxml_xmlbase(String value) {
+ public SELF rdfxml_xmlbase(String value) {
return jena("rdfXml.xmlbase", value);
}
- @Override /* Overridden from Builder */
- public Builder unsortedProperties() {
- super.unsortedProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties(java.lang.Class<?>...on) {
- super.unsortedProperties(on);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder stopClass(Class<?> on, Class<?> value) {
- super.stopClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction) {
- super.swap(normalClass, swappedClass, swapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction, ThrowingFunction<S,T> unswapFunction) {
- super.swap(normalClass, swappedClass, swapFunction, unswapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Class<?>...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Object...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings() {
- super.trimStrings();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings(boolean value) {
- super.trimStrings(value);
- return this;
- }
-
/**
* Trim whitespace from text elements.
*
@@ -1331,7 +879,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder trimWhitespace() {
+ public SELF trimWhitespace() {
return trimWhitespace(true);
}
@@ -1342,9 +890,9 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder trimWhitespace(boolean value) {
+ public SELF trimWhitespace(boolean value) {
trimWhitespace = value;
- return this;
+ return self();
}
/**
@@ -1352,7 +900,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder turtle() {
+ public SELF turtle() {
return language(Constants.LANG_TURTLE);
}
@@ -1361,7 +909,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder jsonLd() {
+ public SELF jsonLd() {
return language(Constants.LANG_JSONLD);
}
@@ -1370,7 +918,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder nQuads() {
+ public SELF nQuads() {
return language(Constants.LANG_NQUADS);
}
@@ -1379,7 +927,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder triG() {
+ public SELF triG() {
return language(Constants.LANG_TRIG);
}
@@ -1388,7 +936,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder triX() {
+ public SELF triX() {
return language(Constants.LANG_TRIX);
}
@@ -1397,59 +945,17 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfJson() {
+ public SELF rdfJson() {
return language(Constants.LANG_RDFJSON);
}
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typeName(Class<?> on, String value) {
- super.typeName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(Class<?> on, String value) {
- super.typePropertyName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(String value) {
- super.typePropertyName(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unbuffered() {
- super.unbuffered();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unbuffered(boolean value) {
- super.unbuffered(value);
- return this;
- }
-
-
- @Override /* Overridden from Builder */
- public Builder useJavaBeanIntrospector() {
- super.useJavaBeanIntrospector();
- return this;
- }
/**
* Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>.
*
* @return This object.
*/
- public Builder xml() {
+ public SELF xml() {
return language(Constants.LANG_RDF_XML);
}
@@ -1458,13 +964,34 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder xmlabbrev() {
+ public SELF xmlabbrev() {
return language(Constants.LANG_RDF_XML_ABBREV);
}
- Builder jena(String key, Object value) {
+ SELF jena(String key, Object value) {
jenaSettings.put(key, value);
- return this;
+ return self();
+ }
+ }
+
+ /**
+ * Concrete default builder leaf for the non-subclassed {@link RdfParser#create()} / {@link RdfParser#copy()} path.
+ */
+ public static final class DefaultBuilder extends Builder<DefaultBuilder> {
+
+ DefaultBuilder() {}
+
+ DefaultBuilder(RdfParser copyFrom) {
+ super(copyFrom);
+ }
+
+ DefaultBuilder(Builder<?> copyFrom) {
+ super(copyFrom);
+ }
+
+ @Override /* Overridden from Context.Builder */
+ public DefaultBuilder copy() {
+ return new DefaultBuilder(this);
}
}
@@ -1473,11 +1000,11 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @return A new builder.
*/
- public static Builder create() {
- return new Builder();
+ public static Builder<?> create() {
+ return new DefaultBuilder();
}
- private static String getConsumes(Builder builder) {
+ private static String getConsumes(Builder<?> builder) {
if (nn(builder.getConsumes()))
return builder.getConsumes();
return switch (builder.language) {
@@ -1519,7 +1046,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
*
* @param builder The builder for this object.
*/
- public RdfParser(Builder builder) {
+ public RdfParser(Builder<?> builder) {
super(builder.consumes(getConsumes(builder)));
collectionFormat = builder.collectionFormat;
@@ -1532,8 +1059,8 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
}
@Override /* Overridden from Context */
- public Builder copy() {
- return new Builder(this);
+ public Builder<?> copy() {
+ return new DefaultBuilder(this);
}
@Override /* Overridden from Context */
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 05faebef32..8f63dcca97 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
@@ -68,7 +68,7 @@ public class RdfParserSession extends ReaderParserSession {
/**
* Builder class.
*/
- public static class Builder extends ReaderParserSession.Builder {
+ public static class Builder extends ReaderParserSession.Builder<Builder> {
private RdfParser ctx;
@@ -82,106 +82,11 @@ public class RdfParserSession extends ReaderParserSession {
this.ctx = ctx;
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
@Override
public RdfParserSession build() {
return new RdfParserSession(this);
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder javaMethod(Method value) {
- super.javaMethod(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder outer(Object value) {
- super.outer(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
- super.property(key, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schema(HttpPartSchema value) {
- super.schema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schemaDefault(HttpPartSchema value) {
- super.schemaDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
}
/**
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoParser.java
index edbc0ab8e3..a5ef1dfaa1 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoParser.java
@@ -69,7 +69,7 @@ public class RdfProtoParser extends RdfStreamParser {
*
* @return A new builder.
*/
- public static RdfStreamParser.Builder create() {
+ public static RdfStreamParser.Builder<?> create() {
return RdfStreamParser.create()
.language(Constants.LANG_RDFPROTO)
.consumes("application/vnd.apache.protobuf");
@@ -80,7 +80,7 @@ public class RdfProtoParser extends RdfStreamParser {
*
* @param builder The builder.
*/
- public RdfProtoParser(RdfStreamParser.Builder builder) {
+ public RdfProtoParser(RdfStreamParser.Builder<?> builder) {
super(builder);
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoSerializer.java
index 818fcc77f8..941b9665b7 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoSerializer.java
@@ -63,7 +63,7 @@ public class RdfProtoSerializer extends RdfStreamSerializer {
*
* @return A new builder.
*/
- public static RdfStreamSerializer.Builder create() {
+ public static RdfStreamSerializer.Builder<?> create() {
return RdfStreamSerializer.create()
.language(Constants.LANG_RDFPROTO)
.produces("application/vnd.apache.protobuf")
@@ -75,7 +75,7 @@ public class RdfProtoSerializer extends RdfStreamSerializer {
*
* @param builder The builder.
*/
- public RdfProtoSerializer(RdfStreamSerializer.Builder builder) {
+ public RdfProtoSerializer(RdfStreamSerializer.Builder<?> builder) {
super(builder);
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index e9f058c017..024423cf67 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -92,7 +92,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends WriterSerializer.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends WriterSerializer.Builder<SELF> {
private static final Cache<HashKey,RdfSerializer> CACHE = Cache.of(HashKey.class, RdfSerializer.class).build();
@@ -137,7 +137,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* @param copyFrom The builder to copy from.
* <br>Cannot be <jk>null</jk>.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
addBeanTypesRdf = copyFrom.addBeanTypesRdf;
addLiteralTypes = copyFrom.addLiteralTypes;
@@ -175,24 +175,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
jenaSettings = new TreeMap<>(copyFrom.jenaSettings);
}
- @Override /* Overridden from Builder */
- public Builder accept(String value) {
- super.accept(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypes() {
- super.addBeanTypes();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypes(boolean value) {
- super.addBeanTypes(value);
- return this;
- }
-
/**
* Add <js>"_type"</js> properties when needed.
*
@@ -206,7 +188,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder addBeanTypesRdf() {
+ public SELF addBeanTypesRdf() {
return addBeanTypesRdf(true);
}
@@ -216,9 +198,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* @param value The value for this setting.
* @return This object.
*/
- public Builder addBeanTypesRdf(boolean value) {
+ public SELF addBeanTypesRdf(boolean value) {
addBeanTypesRdf = value;
- return this;
+ return self();
}
/**
@@ -229,7 +211,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder addLiteralTypes() {
+ public SELF addLiteralTypes() {
return addLiteralTypes(true);
}
@@ -243,9 +225,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder addLiteralTypes(boolean value) {
+ public SELF addLiteralTypes(boolean value) {
addLiteralTypes = value;
- return this;
+ return self();
}
/**
@@ -262,7 +244,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder addRootProperty() {
+ public SELF addRootProperty() {
return addRootProperty(true);
}
@@ -282,201 +264,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder addRootProperty(boolean value) {
+ public SELF addRootProperty(boolean value) {
addRootProperty = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addRootType() {
- super.addRootType();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addRootType(boolean value) {
- super.addRootType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext.Builder value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanDictionary(java.lang.Class<?>...values) {
- super.beanDictionary(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanInterceptor(Class<?> on, Class<? extends org.apache.juneau.commons.bean.BeanInterceptor<?>> value) {
- super.beanInterceptor(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMethodVisibility(Visibility value) {
- super.beanMethodVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesReadOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Map<String,Object> values) {
- super.beanPropertiesReadOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(String beanClassName, String properties) {
- super.beanPropertiesReadOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesWriteOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Map<String,Object> values) {
- super.beanPropertiesWriteOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(String beanClassName, String properties) {
- super.beanPropertiesWriteOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSerializable() {
- super.beansRequireSerializable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
@@ -484,12 +274,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
return cache(CACHE).build(RdfSerializer.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
/**
* RDF format for representing collections and arrays.
*
@@ -512,45 +296,13 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder collectionFormat(RdfCollectionFormat value) {
+ public SELF collectionFormat(RdfCollectionFormat value) {
collectionFormat = assertArgNotNull(ARG_value, value);
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
- public Builder copy() {
- return new Builder(this);
- }
-
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder detectRecursions() {
- super.detectRecursions();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder detectRecursions(boolean value) {
- super.detectRecursions(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder dictionaryOn(Class<?> on, java.lang.Class<?>...values) {
- super.dictionaryOn(on, values);
- return this;
- }
+ public abstract SELF copy();
/**
* Disable auto-detect namespace usage.
@@ -564,7 +316,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder disableAutoDetectNamespaces() {
+ public SELF disableAutoDetectNamespaces() {
return disableAutoDetectNamespaces(true);
}
@@ -582,39 +334,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder disableAutoDetectNamespaces(boolean value) {
+ public SELF disableAutoDetectNamespaces(boolean value) {
disableAutoDetectNamespaces = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreMissingSetters() {
- super.disableIgnoreMissingSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreTransientFields() {
- super.disableIgnoreTransientFields();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreUnknownNullBeanProperties() {
- super.disableIgnoreUnknownNullBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableInterfaceProxies() {
- super.disableInterfaceProxies();
- return this;
+ return self();
}
/**
@@ -627,7 +349,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder disableUseXmlNamespaces() {
+ public SELF disableUseXmlNamespaces() {
return disableUseXmlNamespaces(true);
}
@@ -643,39 +365,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder disableUseXmlNamespaces(boolean value) {
+ public SELF disableUseXmlNamespaces(boolean value) {
disableUseXmlNamespaces = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, String json) {
- super.example(pojoClass, json);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters() {
- super.findFluentSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters(Class<?> on) {
- super.findFluentSetters(on);
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
@@ -699,78 +391,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
// @formatter:on
}
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnGetters() {
- super.ignoreInvocationExceptionsOnGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnSetters() {
- super.ignoreInvocationExceptionsOnSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreRecursions() {
- super.ignoreRecursions();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreRecursions(boolean value) {
- super.ignoreRecursions(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownBeanProperties() {
- super.ignoreUnknownBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownEnumValues() {
- super.ignoreUnknownEnumValues();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
- super.implClass(interfaceClass, implClass);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClasses(Map<Class<?>,Class<?>> values) {
- super.implClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder initialDepth(int value) {
- super.initialDepth(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaceClass(Class<?> on, Class<?> value) {
- super.interfaceClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaces(java.lang.Class<?>...value) {
- super.interfaces(value);
- return this;
- }
-
/**
* Default XML namespace for bean properties.
*
@@ -780,9 +400,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder juneauBpNs(Namespace value) {
+ public SELF juneauBpNs(Namespace value) {
juneauBpNs = assertArgNotNull(ARG_value, value);
- return this;
+ return self();
}
/**
@@ -794,21 +414,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder juneauNs(Namespace value) {
+ public SELF juneauNs(Namespace value) {
juneauNs = assertArgNotNull(ARG_value, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder keepNullProperties() {
- super.keepNullProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder keepNullProperties(boolean value) {
- super.keepNullProperties(value);
- return this;
+ return self();
}
/**
@@ -857,21 +465,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder language(String value) {
+ public SELF language(String value) {
language = assertArgNotNull(ARG_value, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder listener(Class<? extends org.apache.juneau.serializer.SerializerListener> value) {
- super.listener(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
+ return self();
}
/**
@@ -923,7 +519,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder looseCollections() {
+ public SELF looseCollections() {
return looseCollections(true);
}
@@ -978,27 +574,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder looseCollections(boolean value) {
+ public SELF looseCollections(boolean value) {
looseCollections = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder maxDepth(int value) {
- super.maxDepth(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder maxIndent(int value) {
- super.maxIndent(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
+ return self();
}
/**
@@ -1009,7 +587,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3() {
+ public SELF n3() {
return language(Constants.LANG_N3);
}
@@ -1021,7 +599,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableAbbrevBaseUri() {
+ public SELF n3_disableAbbrevBaseUri() {
return n3_disableAbbrevBaseUri(true);
}
@@ -1035,7 +613,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableAbbrevBaseUri(boolean value) {
+ public SELF n3_disableAbbrevBaseUri(boolean value) {
return jena("n3.disableAbbrevBaseUri", value);
}
@@ -1047,7 +625,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableObjectLists() {
+ public SELF n3_disableObjectLists() {
return n3_disableObjectLists(true);
}
@@ -1061,7 +639,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableObjectLists(boolean value) {
+ public SELF n3_disableObjectLists(boolean value) {
return jena("n3.disableObjectLists", value);
}
@@ -1073,7 +651,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableUseDoubles() {
+ public SELF n3_disableUseDoubles() {
return n3_disableUseDoubles(true);
}
@@ -1087,7 +665,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableUseDoubles(boolean value) {
+ public SELF n3_disableUseDoubles(boolean value) {
return jena("n3.disableUseDoubles", value);
}
@@ -1099,7 +677,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableUsePropertySymbols() {
+ public SELF n3_disableUsePropertySymbols() {
return n3_disableUsePropertySymbols(true);
}
@@ -1113,7 +691,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableUsePropertySymbols(boolean value) {
+ public SELF n3_disableUsePropertySymbols(boolean value) {
return jena("n3.disableUsePropertySymbols", value);
}
@@ -1125,7 +703,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder n3_disableUseTripleQuotedStrings() {
+ public SELF n3_disableUseTripleQuotedStrings() {
return n3_disableUseTripleQuotedStrings(true);
}
@@ -1139,7 +717,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_disableUseTripleQuotedStrings(boolean value) {
+ public SELF n3_disableUseTripleQuotedStrings(boolean value) {
return jena("n3.disableUseTripleQuotedStrings", value);
}
@@ -1153,7 +731,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_indentProperty(int value) {
+ public SELF n3_indentProperty(int value) {
return jena("n3.indentProperty", value);
}
@@ -1167,7 +745,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_minGap(int value) {
+ public SELF n3_minGap(int value) {
return jena("n3.minGap", value);
}
@@ -1181,7 +759,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_propertyColumn(int value) {
+ public SELF n3_propertyColumn(int value) {
return jena("n3.propertyColumn", value);
}
@@ -1195,7 +773,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_subjectColumn(int value) {
+ public SELF n3_subjectColumn(int value) {
return jena("n3.subjectColumn", value);
}
@@ -1210,7 +788,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder n3_widePropertyLen(int value) {
+ public SELF n3_widePropertyLen(int value) {
return jena("n3.widePropertyLen", value);
}
@@ -1224,22 +802,10 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* <br>Cannot contain <jk>null</jk> values (will throw {@link IllegalArgumentException}).
* @return This object.
*/
- public Builder namespaces(Namespace...values) {
+ public SELF namespaces(Namespace...values) {
assertArgNoNulls(ARG_values, values);
namespaces = addAll(namespaces, values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanClasses(java.lang.Class<?>...values) {
- super.notBeanClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanPackages(String...values) {
- super.notBeanPackages(values);
- return this;
+ return self();
}
/**
@@ -1250,40 +816,10 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder ntriple() {
+ public SELF ntriple() {
return language(Constants.LANG_NTRIPLE);
}
- @Override /* Overridden from Builder */
- public Builder produces(String value) {
- super.produces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<?> on, Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder quoteChar(char value) {
- super.quoteChar(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder quoteCharOverride(char value) {
- super.quoteCharOverride(value);
- return this;
- }
-
/**
* RDF/XML property: <c>allowBadURIs</c>.
*
@@ -1292,7 +828,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfxml_allowBadUris() {
+ public SELF rdfxml_allowBadUris() {
return rdfxml_allowBadUris(true);
}
@@ -1306,7 +842,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_allowBadUris(boolean value) {
+ public SELF rdfxml_allowBadUris(boolean value) {
return jena("rdfXml.allowBadURIs", value);
}
@@ -1320,7 +856,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_attributeQuoteChar(char value) {
+ public SELF rdfxml_attributeQuoteChar(char value) {
return jena("rdfXml.attributeQuoteChar", value);
}
@@ -1336,7 +872,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_blockRules(String value) {
+ public SELF rdfxml_blockRules(String value) {
return jena("rdfXml.blockRules", value);
}
@@ -1351,7 +887,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfxml_disableShowDoctypeDeclaration() {
+ public SELF rdfxml_disableShowDoctypeDeclaration() {
return rdfxml_disableShowDoctypeDeclaration(true);
}
@@ -1368,7 +904,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_disableShowDoctypeDeclaration(boolean value) {
+ public SELF rdfxml_disableShowDoctypeDeclaration(boolean value) {
return jena("rdfXml.disableShowDoctypeDeclaration", value);
}
@@ -1385,7 +921,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfxml_embedding() {
+ public SELF rdfxml_embedding() {
return rdfxml_embedding(true);
}
@@ -1404,7 +940,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_embedding(boolean value) {
+ public SELF rdfxml_embedding(boolean value) {
return jena("rdfXml.embedding", value);
}
@@ -1439,7 +975,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_errorMode(String value) {
+ public SELF rdfxml_errorMode(String value) {
return jena("rdfXml.error-mode", value);
}
@@ -1466,7 +1002,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_iriRules(String value) {
+ public SELF rdfxml_iriRules(String value) {
return jena("rdfXml.iri-rules", value);
}
@@ -1479,7 +1015,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfxml_longId() {
+ public SELF rdfxml_longId() {
return rdfxml_longId(true);
}
@@ -1494,7 +1030,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_longId(boolean value) {
+ public SELF rdfxml_longId(boolean value) {
return jena("rdfXml.longId", value);
}
@@ -1530,7 +1066,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_relativeUris(String value) {
+ public SELF rdfxml_relativeUris(String value) {
return jena("rdfXml.relativeURIs", value);
}
@@ -1552,7 +1088,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_showXmlDeclaration(String value) {
+ public SELF rdfxml_showXmlDeclaration(String value) {
return jena("rdfXml.showXmlDeclaration", value);
}
@@ -1566,7 +1102,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_tab(int value) {
+ public SELF rdfxml_tab(int value) {
return jena("rdfXml.tab", value);
}
@@ -1580,130 +1116,10 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* The new value for this setting.
* @return This object.
*/
- public Builder rdfxml_xmlbase(String value) {
+ public SELF rdfxml_xmlbase(String value) {
return jena("rdfXml.xmlbase", value);
}
- @Override /* Overridden from Builder */
- public Builder sortCollections() {
- super.sortCollections();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortMaps() {
- super.sortMaps();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortMaps(boolean value) {
- super.sortMaps(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties() {
- super.unsortedProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties(java.lang.Class<?>...on) {
- super.unsortedProperties(on);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sq() {
- super.sq();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder stopClass(Class<?> on, Class<?> value) {
- super.stopClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction) {
- super.swap(normalClass, swappedClass, swapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction, ThrowingFunction<S,T> unswapFunction) {
- super.swap(normalClass, swappedClass, swapFunction, unswapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Class<?>...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Object...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyCollections() {
- super.trimEmptyCollections();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyCollections(boolean value) {
- super.trimEmptyCollections(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyMaps() {
- super.trimEmptyMaps();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyMaps(boolean value) {
- super.trimEmptyMaps(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings() {
- super.trimStrings();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings(boolean value) {
- super.trimStrings(value);
- return this;
- }
-
/**
* RDF language.
*
@@ -1712,7 +1128,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder turtle() {
+ public SELF turtle() {
return language(Constants.LANG_TURTLE);
}
@@ -1724,7 +1140,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder jsonLd() {
+ public SELF jsonLd() {
return language(Constants.LANG_JSONLD);
}
@@ -1736,7 +1152,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder nQuads() {
+ public SELF nQuads() {
return language(Constants.LANG_NQUADS);
}
@@ -1748,7 +1164,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder triG() {
+ public SELF triG() {
return language(Constants.LANG_TRIG);
}
@@ -1760,7 +1176,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder triX() {
+ public SELF triX() {
return language(Constants.LANG_TRIX);
}
@@ -1772,76 +1188,10 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder rdfJson() {
+ public SELF rdfJson() {
return language(Constants.LANG_RDFJSON);
}
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typeName(Class<?> on, String value) {
- super.typeName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(Class<?> on, String value) {
- super.typePropertyName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(String value) {
- super.typePropertyName(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriContext(UriContext value) {
- super.uriContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriRelativity(UriRelativity value) {
- super.uriRelativity(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriResolution(UriResolution value) {
- super.uriResolution(value);
- return this;
- }
-
-
- @Override /* Overridden from Builder */
- public Builder useJavaBeanIntrospector() {
- super.useJavaBeanIntrospector();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder useWhitespace() {
- super.useWhitespace();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder useWhitespace(boolean value) {
- super.useWhitespace(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ws() {
- super.ws();
- return this;
- }
/**
* RDF language.
@@ -1851,7 +1201,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder xml() {
+ public SELF xml() {
return language(Constants.LANG_RDF_XML);
}
@@ -1863,13 +1213,34 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return This object.
*/
- public Builder xmlabbrev() {
+ public SELF xmlabbrev() {
return language(Constants.LANG_RDF_XML_ABBREV);
}
- Builder jena(String key, Object value) {
+ SELF jena(String key, Object value) {
jenaSettings.put(key, value);
- return this;
+ return self();
+ }
+ }
+
+ /**
+ * Concrete default builder leaf for the non-subclassed {@link RdfSerializer#create()} / {@link RdfSerializer#copy()} path.
+ */
+ public static final class DefaultBuilder extends Builder<DefaultBuilder> {
+
+ DefaultBuilder() {}
+
+ DefaultBuilder(RdfSerializer copyFrom) {
+ super(copyFrom);
+ }
+
+ DefaultBuilder(Builder<?> copyFrom) {
+ super(copyFrom);
+ }
+
+ @Override /* Overridden from Context.Builder */
+ public DefaultBuilder copy() {
+ return new DefaultBuilder(this);
}
}
@@ -1880,11 +1251,11 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
*
* @return A new builder.
*/
- public static Builder create() {
- return new Builder();
+ public static Builder<?> create() {
+ return new DefaultBuilder();
}
- private static String getAccept(Builder builder) {
+ private static String getAccept(Builder<?> builder) {
if (nn(builder.getAccept()))
return builder.getAccept();
return switch (builder.language) {
@@ -1905,7 +1276,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
};
}
- private static String getProduces(Builder builder) {
+ private static String getProduces(Builder<?> builder) {
if (nn(builder.getProduces()))
return builder.getProduces();
return switch (builder.language) {
@@ -1956,7 +1327,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* @param builder
* The builder for this object.
*/
- public RdfSerializer(Builder builder) {
+ public RdfSerializer(Builder<?> builder) {
super(builder.produces(getProduces(builder)).accept(getAccept(builder)));
addLiteralTypes = builder.addLiteralTypes;
addRootProperty = builder.addRootProperty;
@@ -1975,8 +1346,8 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
}
@Override /* Overridden from Context */
- public Builder copy() {
- return new Builder(this);
+ public Builder<?> copy() {
+ return new DefaultBuilder(this);
}
@Override /* Overridden from Context */
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 60b3b89249..42e3272963 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
@@ -72,7 +72,7 @@ public class RdfSerializerSession extends WriterSerializerSession {
/**
* Builder class.
*/
- public static class Builder extends WriterSerializerSession.Builder {
+ public static class Builder extends WriterSerializerSession.Builder<Builder> {
private RdfSerializer ctx;
@@ -87,118 +87,11 @@ public class RdfSerializerSession extends WriterSerializerSession {
this.ctx = ctx;
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
@Override
public RdfSerializerSession build() {
return new RdfSerializerSession(this);
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder javaMethod(Method value) {
- super.javaMethod(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
- super.property(key, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder resolver(VarResolverSession value) {
- super.resolver(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schema(HttpPartSchema value) {
- super.schema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schemaDefault(HttpPartSchema value) {
- super.schemaDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriContext(UriContext value) {
- super.uriContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder useWhitespace(Boolean value) {
- super.useWhitespace(value);
- return this;
- }
}
/**
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParser.java
index a358c0c978..1328a5890e 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParser.java
@@ -51,7 +51,7 @@ public class RdfStreamParser extends InputStreamParser implements RdfMetaProvide
/**
* Builder class.
*/
- public static class Builder extends InputStreamParser.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends InputStreamParser.Builder<SELF> {
private static final Cache<HashKey,RdfStreamParser> CACHE = Cache.of(HashKey.class, RdfStreamParser.class).build();
@@ -70,7 +70,7 @@ public class RdfStreamParser extends InputStreamParser implements RdfMetaProvide
*
* @param copyFrom The builder to copy from.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
language = copyFrom.language;
rdfParser = copyFrom.rdfParser;
@@ -93,22 +93,10 @@ public class RdfStreamParser extends InputStreamParser implements RdfMetaProvide
* @param value The RDF language.
* @return This object.
*/
- public Builder language(String value) {
+ public SELF language(String value) {
language = value;
rdfParser = null; // Rebuild on next get
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
+ return self();
}
@Override
@@ -117,15 +105,13 @@ public class RdfStreamParser extends InputStreamParser implements RdfMetaProvide
}
@Override
- public Builder consumes(String value) {
+ public SELF consumes(String value) {
super.consumes(value);
- return this;
+ return self();
}
- @Override
- public Builder copy() {
- return new Builder(this);
- }
+ @Override /* Overridden from Context.Builder */
+ public abstract SELF copy();
@Override
public HashKey hashKey() {
@@ -139,13 +125,34 @@ public class RdfStreamParser extends InputStreamParser implements RdfMetaProvide
}
}
+ /**
+ * Concrete default builder leaf for the non-subclassed {@link RdfStreamParser#create()} / {@link RdfStreamParser#copy()} path.
+ */
+ public static final class DefaultBuilder extends Builder<DefaultBuilder> {
+
+ DefaultBuilder() {}
+
+ DefaultBuilder(RdfStreamParser copyFrom) {
+ super(copyFrom);
+ }
+
+ DefaultBuilder(Builder<?> copyFrom) {
+ super(copyFrom);
+ }
+
+ @Override /* Overridden from Context.Builder */
+ public DefaultBuilder copy() {
+ return new DefaultBuilder(this);
+ }
+ }
+
/**
* Creates a new builder.
*
* @return A new builder.
*/
- public static Builder create() {
- return new Builder();
+ public static Builder<?> create() {
+ return new DefaultBuilder();
}
private final String language;
@@ -156,13 +163,13 @@ public class RdfStreamParser extends InputStreamParser implements RdfMetaProvide
*
* @param builder The builder for this object.
*/
- public RdfStreamParser(Builder builder) {
+ public RdfStreamParser(Builder<?> builder) {
super(assertArgNotNull(ARG_builder, builder).consumes(getConsumes(builder)));
language = builder.language;
rdfParser = builder.getRdfParser();
}
- private static String getConsumes(Builder builder) {
+ private static String getConsumes(Builder<?> builder) {
if (builder.getConsumes() != null)
return builder.getConsumes();
return switch (builder.language) {
@@ -173,8 +180,8 @@ public class RdfStreamParser extends InputStreamParser implements RdfMetaProvide
}
@Override
- public Builder copy() {
- return new Builder(this);
+ public Builder<?> copy() {
+ return new DefaultBuilder(this);
}
@Override
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParserSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParserSession.java
index 5a6134fc41..a5ed3c5c1e 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParserSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParserSession.java
@@ -70,7 +70,7 @@ public class RdfStreamParserSession extends InputStreamParserSession {
/**
* Builder class.
*/
- public static class Builder extends InputStreamParserSession.Builder {
+ public static class Builder extends InputStreamParserSession.Builder<Builder> {
private RdfStreamParser ctx;
@@ -85,94 +85,11 @@ public class RdfStreamParserSession extends InputStreamParserSession {
this.ctx = ctx;
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
@Override
public RdfStreamParserSession build() {
return new RdfStreamParserSession(this);
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder javaMethod(Method value) {
- super.javaMethod(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder outer(Object value) {
- super.outer(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
- super.property(key, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schema(HttpPartSchema value) {
- super.schema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schemaDefault(HttpPartSchema value) {
- super.schemaDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
}
/**
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializer.java
index 2b3fb57f10..c38b5660d0 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializer.java
@@ -50,7 +50,7 @@ public class RdfStreamSerializer extends OutputStreamSerializer implements RdfMe
/**
* Builder class.
*/
- public static class Builder extends OutputStreamSerializer.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends OutputStreamSerializer.Builder<SELF> {
private static final Cache<HashKey,RdfStreamSerializer> CACHE = Cache.of(HashKey.class, RdfStreamSerializer.class).build();
@@ -69,7 +69,7 @@ public class RdfStreamSerializer extends OutputStreamSerializer implements RdfMe
*
* @param copyFrom The builder to copy from.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
language = copyFrom.language;
rdfSerializer = copyFrom.rdfSerializer;
@@ -92,34 +92,22 @@ public class RdfStreamSerializer extends OutputStreamSerializer implements RdfMe
* @param value The RDF language.
* @return This object.
*/
- public Builder language(String value) {
+ public SELF language(String value) {
language = value;
rdfSerializer = null; // Rebuild on next get
- return this;
+ return self();
}
@Override
- public Builder produces(String value) {
+ public SELF produces(String value) {
super.produces(value);
- return this;
+ return self();
}
@Override
- public Builder accept(String value) {
+ public SELF accept(String value) {
super.accept(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
+ return self();
}
@Override
@@ -127,10 +115,8 @@ public class RdfStreamSerializer extends OutputStreamSerializer implements RdfMe
return cache(CACHE).build(RdfStreamSerializer.class);
}
- @Override
- public Builder copy() {
- return new Builder(this);
- }
+ @Override /* Overridden from Context.Builder */
+ public abstract SELF copy();
@Override
public HashKey hashKey() {
@@ -144,13 +130,34 @@ public class RdfStreamSerializer extends OutputStreamSerializer implements RdfMe
}
}
+ /**
+ * Concrete default builder leaf for the non-subclassed {@link RdfStreamSerializer#create()} / {@link RdfStreamSerializer#copy()} path.
+ */
+ public static final class DefaultBuilder extends Builder<DefaultBuilder> {
+
+ DefaultBuilder() {}
+
+ DefaultBuilder(RdfStreamSerializer copyFrom) {
+ super(copyFrom);
+ }
+
+ DefaultBuilder(Builder<?> copyFrom) {
+ super(copyFrom);
+ }
+
+ @Override /* Overridden from Context.Builder */
+ public DefaultBuilder copy() {
+ return new DefaultBuilder(this);
+ }
+ }
+
/**
* Creates a new builder.
*
* @return A new builder.
*/
- public static Builder create() {
- return new Builder();
+ public static Builder<?> create() {
+ return new DefaultBuilder();
}
private final String language;
@@ -161,19 +168,19 @@ public class RdfStreamSerializer extends OutputStreamSerializer implements RdfMe
*
* @param builder The builder.
*/
- public RdfStreamSerializer(Builder builder) {
+ public RdfStreamSerializer(Builder<?> builder) {
super(assertArgNotNull(ARG_builder, builder).produces(getProduces(builder)).accept(getAccept(builder)));
language = builder.language;
rdfSerializer = builder.getRdfSerializer();
}
- private static String getAccept(Builder builder) {
+ private static String getAccept(Builder<?> builder) {
if (builder.getAccept() != null)
return builder.getAccept();
return getProduces(builder);
}
- private static String getProduces(Builder builder) {
+ private static String getProduces(Builder<?> builder) {
if (builder.getProduces() != null)
return builder.getProduces();
return switch (builder.language) {
@@ -184,8 +191,8 @@ public class RdfStreamSerializer extends OutputStreamSerializer implements RdfMe
}
@Override
- public Builder copy() {
- return new Builder(this);
+ public Builder<?> copy() {
+ return new DefaultBuilder(this);
}
@Override
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializerSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializerSession.java
index d1c3a63c23..7f26a3b339 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializerSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializerSession.java
@@ -67,7 +67,7 @@ public class RdfStreamSerializerSession extends OutputStreamSerializerSession {
/**
* Builder class.
*/
- public static class Builder extends OutputStreamSerializerSession.Builder {
+ public static class Builder extends OutputStreamSerializerSession.Builder<Builder> {
private RdfStreamSerializer ctx;
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftParser.java
index 643b662acd..2a78529fe6 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftParser.java
@@ -69,7 +69,7 @@ public class RdfThriftParser extends RdfStreamParser {
*
* @return A new builder.
*/
- public static RdfStreamParser.Builder create() {
+ public static RdfStreamParser.Builder<?> create() {
return RdfStreamParser.create()
.language(Constants.LANG_RDFTHRIFT)
.consumes("application/vnd.apache.thrift.binary");
@@ -80,7 +80,7 @@ public class RdfThriftParser extends RdfStreamParser {
*
* @param builder The builder.
*/
- public RdfThriftParser(RdfStreamParser.Builder builder) {
+ public RdfThriftParser(RdfStreamParser.Builder<?> builder) {
super(builder);
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftSerializer.java
index 4725a6904f..ad90e5905f 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftSerializer.java
@@ -63,7 +63,7 @@ public class RdfThriftSerializer extends RdfStreamSerializer {
*
* @return A new builder.
*/
- public static RdfStreamSerializer.Builder create() {
+ public static RdfStreamSerializer.Builder<?> create() {
return RdfStreamSerializer.create()
.language(Constants.LANG_RDFTHRIFT)
.produces("application/vnd.apache.thrift.binary")
@@ -75,7 +75,7 @@ public class RdfThriftSerializer extends RdfStreamSerializer {
*
* @param builder The builder.
*/
- public RdfThriftSerializer(RdfStreamSerializer.Builder builder) {
+ public RdfThriftSerializer(RdfStreamSerializer.Builder<?> builder) {
super(builder);
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
index 4c4a3885ad..6f3df68ae8 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
@@ -82,7 +82,7 @@ public class RdfXmlAbbrevSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().xmlabbrev();
}
@@ -91,7 +91,7 @@ public class RdfXmlAbbrevSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public RdfXmlAbbrevSerializer(RdfSerializer.Builder builder) {
+ public RdfXmlAbbrevSerializer(RdfSerializer.Builder<?> builder) {
super(builder.xmlabbrev());
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
index 1b1c2e1fa7..0c22bbe74c 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
@@ -87,7 +87,7 @@ public class RdfXmlParser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().xml();
}
@@ -96,7 +96,7 @@ public class RdfXmlParser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public RdfXmlParser(RdfParser.Builder builder) {
+ public RdfXmlParser(RdfParser.Builder<?> builder) {
super(builder.xml().consumes("text/xml+rdf"));
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
index 5c408892c5..e91e76dead 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
@@ -83,7 +83,7 @@ public class RdfXmlSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().xml();
}
@@ -92,7 +92,7 @@ public class RdfXmlSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public RdfXmlSerializer(RdfSerializer.Builder builder) {
+ public RdfXmlSerializer(RdfSerializer.Builder<?> builder) {
super(builder.xml());
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGParser.java
index f49712dfe9..e483d8daa3 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGParser.java
@@ -72,7 +72,7 @@ public class TriGParser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().triG();
}
@@ -81,7 +81,7 @@ public class TriGParser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public TriGParser(RdfParser.Builder builder) {
+ public TriGParser(RdfParser.Builder<?> builder) {
super(builder.triG().consumes("application/trig"));
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGSerializer.java
index 24be669ada..c585bb6a52 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGSerializer.java
@@ -72,7 +72,7 @@ public class TriGSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().triG();
}
@@ -81,7 +81,7 @@ public class TriGSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public TriGSerializer(RdfSerializer.Builder builder) {
+ public TriGSerializer(RdfSerializer.Builder<?> builder) {
super(builder.triG());
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXParser.java
index 5424ac47c2..2fbea8887b 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXParser.java
@@ -75,7 +75,7 @@ public class TriXParser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().triX();
}
@@ -84,7 +84,7 @@ public class TriXParser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public TriXParser(RdfParser.Builder builder) {
+ public TriXParser(RdfParser.Builder<?> builder) {
super(builder.triX().consumes("application/trix+xml"));
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXSerializer.java
index 8801792d47..70b03a8fa5 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXSerializer.java
@@ -82,7 +82,7 @@ public class TriXSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().triX();
}
@@ -91,7 +91,7 @@ public class TriXSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public TriXSerializer(RdfSerializer.Builder builder) {
+ public TriXSerializer(RdfSerializer.Builder<?> builder) {
super(builder.triX());
}
}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
index 742237c922..edeb5da123 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
@@ -76,7 +76,7 @@ public class TurtleParser extends RdfParser {
*
* @return A new builder.
*/
- public static RdfParser.Builder create() {
+ public static RdfParser.Builder<?> create() {
return RdfParser.create().turtle();
}
@@ -85,7 +85,7 @@ public class TurtleParser extends RdfParser {
*
* @param builder The builder for this object.
*/
- public TurtleParser(RdfParser.Builder builder) {
+ public TurtleParser(RdfParser.Builder<?> builder) {
super(builder.turtle().consumes("text/turtle"));
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
index da32293abe..b3072e6022 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
@@ -73,7 +73,7 @@ public class TurtleSerializer extends RdfSerializer {
*
* @return A new builder.
*/
- public static RdfSerializer.Builder create() {
+ public static RdfSerializer.Builder<?> create() {
return RdfSerializer.create().turtle();
}
@@ -82,7 +82,7 @@ public class TurtleSerializer extends RdfSerializer {
*
* @param builder The builder for this object.
*/
- public TurtleSerializer(RdfSerializer.Builder builder) {
+ public TurtleSerializer(RdfSerializer.Builder<?> builder) {
super(builder.turtle());
}
}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index 1b34f5f04f..4e9315a64c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -107,7 +107,18 @@ public abstract class Context {
/**
* Builder class.
*/
- public abstract static class Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> {
+
+ /**
+ * Returns this object cast to the self (CRTP) type.
+ *
+ * @return This object.
+ */
+ @SuppressWarnings("unchecked") // CRTP self-type cast is safe by construction.
+ protected final SELF self() {
+ return (SELF)this;
+ }
+
private boolean debug;
private final AnnotationWorkList applied = AnnotationWorkList.create();
@@ -141,7 +152,7 @@ public abstract class Context {
* @param copyFrom The builder to copy from.
* <br>Cannot be <jk>null</jk>.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
assertArgNotNull(ARG_copyFrom, copyFrom);
annotations = copyOf(copyFrom.annotations);
debug = copyFrom.debug;
@@ -337,10 +348,10 @@ public abstract class Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder annotations(Annotation...values) {
+ public SELF annotations(Annotation...values) {
assertArgNoNulls(ARG_values, values);
annotations(l(values));
- return this;
+ return self();
}
/**
@@ -351,9 +362,9 @@ public abstract class Context {
* <br>Cannot be <jk>null</jk> or contain <jk>null</jk> values.
* @return This object.
*/
- public Builder annotations(List<Annotation> values) {
+ public SELF annotations(List<Annotation> values) {
annotations.addAll(assertArgNoNulls(ARG_values, values));
- return this;
+ return self();
}
/**
@@ -385,11 +396,11 @@ public abstract class Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder apply(AnnotationWorkList work) {
+ public SELF apply(AnnotationWorkList work) {
assertArgNotNull(ARG_work, work);
applied.addAll(work);
work.forEach(x -> builders.forEach(x::apply));
- return this;
+ return self();
}
/**
@@ -399,7 +410,7 @@ public abstract class Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder applyAnnotations(Class<?>...from) {
+ public SELF applyAnnotations(Class<?>...from) {
assertArgNoNulls(ARG_from, from);
return applyAnnotations((Object[])from);
}
@@ -499,7 +510,7 @@ public abstract class Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder applyAnnotations(Object...from) {
+ public SELF applyAnnotations(Object...from) {
assertArgNoNulls(ARG_from, from);
var work = AnnotationWorkList.create();
Arrays.stream(from).forEach(x -> traverse(work, x));
@@ -553,7 +564,7 @@ public abstract class Context {
* <br>Cannot be <jk>null</jk>.
* @return An {@link Optional} containing this builder cast to the subtype, or empty if not an instance.
*/
- public <T extends Builder> Optional<T> asSubtype(Class<T> subtype) {
+ public <T extends Builder<?>> Optional<T> asSubtype(Class<T> subtype) {
return opt(assertArgNotNull(ARG_subtype, subtype).isInstance(this) ? subtype.cast(this) : null);
}
@@ -599,9 +610,9 @@ public abstract class Context {
* <br>Can be <jk>null</jk> (disables caching, each build creates a new instance).
* @return This object.
*/
- public Builder cache(Cache<HashKey,? extends Context> value) {
+ public SELF cache(Cache<HashKey,? extends Context> value) {
cache = value;
- return this;
+ return self();
}
/**
@@ -620,7 +631,7 @@ public abstract class Context {
*
* @return A new mutable copy of this builder.
*/
- public abstract Builder copy();
+ public abstract SELF copy();
/**
* <i><l>Context</l> configuration property: </i> Debug mode.
@@ -669,7 +680,7 @@ public abstract class Context {
*
* @return This object.
*/
- public Builder debug() {
+ public SELF debug() {
return debug(true);
}
@@ -679,9 +690,9 @@ public abstract class Context {
* @param value The value for this setting.
* @return This object.
*/
- public Builder debug(boolean value) {
+ public SELF debug(boolean value) {
debug = value;
- return this;
+ return self();
}
/**
@@ -723,9 +734,9 @@ public abstract class Context {
* <br>Can be <jk>null</jk> (normal build process will continue).
* @return This object.
*/
- public Builder impl(Context value) {
+ public SELF impl(Context value) {
impl = value;
- return this;
+ return self();
}
/**
@@ -752,9 +763,9 @@ public abstract class Context {
* <br>Can be <jk>null</jk> (will cause {@link #build()} to throw an exception).
* @return This object.
*/
- public Builder type(Class<? extends Context> value) {
+ public SELF type(Class<? extends Context> value) {
type = value;
- return this;
+ return self();
}
/**
@@ -961,7 +972,7 @@ public abstract class Context {
*
* @return A new session builder.
*/
- public ContextSession.Builder createSession() {
+ public ContextSession.Builder<?> createSession() {
throw unsupportedOp();
}
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 853590397f..122cbf5298 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
@@ -62,7 +62,18 @@ public abstract class ContextSession {
/**
* Builder class.
*/
- public abstract static class Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> {
+
+ /**
+ * Returns this object cast to the self (CRTP) type.
+ *
+ * @return This object.
+ */
+ @SuppressWarnings("unchecked") // CRTP self-type cast is safe by construction.
+ protected final SELF self() {
+ return (SELF)this;
+ }
+
private Boolean debug;
private boolean unmodifiable;
private Context ctx;
@@ -101,10 +112,10 @@ public abstract class ContextSession {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ public <T> SELF apply(Class<T> type, Consumer<T> apply) {
if (assertArgNotNull(ARG_type, type).isInstance(this))
assertArgNotNull(ARG_apply, apply).accept(type.cast(this));
- return this;
+ return self();
}
/**
@@ -135,9 +146,9 @@ public abstract class ContextSession {
* <br>If <jk>null</jk>, defaults to {@link Context#isDebug()}.
* @return This object.
*/
- public Builder debug(Boolean value) {
+ public SELF debug(Boolean value) {
debug = value;
- return this;
+ return self();
}
/**
@@ -152,11 +163,11 @@ public abstract class ContextSession {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder properties(Map<String,Object> value) {
+ public SELF properties(Map<String,Object> value) {
assertArgNotNull(ARG_value, value);
properties.reset();
value.forEach(this::property);
- return this;
+ return self();
}
/**
@@ -173,7 +184,7 @@ public abstract class ContextSession {
* <br>Can be <jk>null</jk> (resets typed properties to their default; removes raw properties).
* @return This object.
*/
- public Builder property(String key, Object value) {
+ public SELF property(String key, Object value) {
assertArgNotNull(ARG_key, key);
switch (key) {
case PROP_debug, PROP_ContextSession_debug:
@@ -185,7 +196,7 @@ public abstract class ContextSession {
} else {
map.put(key, value);
}
- return this;
+ return self();
}
}
@@ -197,9 +208,9 @@ public abstract class ContextSession {
*
* @return This object.
*/
- public Builder unmodifiable() {
+ public SELF unmodifiable() {
unmodifiable = true;
- return this;
+ return self();
}
}
@@ -215,7 +226,7 @@ public abstract class ContextSession {
* @param builder The builder for this object.
* <br>Cannot be <jk>null</jk>.
*/
- protected ContextSession(Builder builder) {
+ protected ContextSession(Builder<?> builder) {
assertArgNotNull(ARG_builder, builder);
ctx = builder.ctx;
debug = opt(builder.debug).orElse(ctx.isDebug());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContext.java
index 071cf551c7..4566ebdfde 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContext.java
@@ -247,7 +247,7 @@ public class MarshallingContext extends Context implements ConversionFinder, Bea
/**
* Builder class.
*/
- public static class Builder extends Context.Builder {
+ public static class Builder extends Context.Builder<Builder> {
private static final Cache<HashKey,MarshallingContext> CACHE = Cache.of(HashKey.class, MarshallingContext.class).build();
@@ -471,30 +471,6 @@ public class MarshallingContext extends Context implements ConversionFinder, Bea
beanStore = copyFrom.beanStore;
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
/**
* Minimum bean class visibility.
*
@@ -1849,29 +1825,11 @@ public class MarshallingContext extends Context implements ConversionFinder, Bea
return cache(CACHE).build(MarshallingContext.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends Context> value) {
- super.cache(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
/**
* Bean dictionary.
*
@@ -2625,12 +2583,6 @@ public class MarshallingContext extends Context implements ConversionFinder, Bea
return this;
}
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
/**
* Implementation classes.
*
@@ -4183,7 +4135,7 @@ public class MarshallingContext extends Context implements ConversionFinder, Bea
}
@Override /* Overridden from Context */
- public MarshallingSession.Builder createSession() {
+ public MarshallingSession.Builder<?> createSession() {
return MarshallingSession.create(this);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContextable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContextable.java
index 79fc19b409..3fcaa751cf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContextable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContextable.java
@@ -80,7 +80,7 @@ public abstract class MarshallingContextable extends Context {
@SuppressWarnings({
"java:S115" // Constants use UPPER_snakeCase convention
})
- public abstract static class Builder extends Context.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends Context.Builder<SELF> {
private MarshallingContext.Builder bcBuilder;
private MarshallingContext bc;
@@ -111,7 +111,7 @@ public abstract class MarshallingContextable extends Context {
*
* @param copyFrom The builder to copy from.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
super(copyFrom);
this.bcBuilder = copyFrom.bcBuilder.copy();
this.bc = copyFrom.bc;
@@ -119,28 +119,10 @@ public abstract class MarshallingContextable extends Context {
}
@Override /* Overridden from Context.Builder */
- public Builder annotations(Annotation...value) {
+ public SELF annotations(Annotation...value) {
bcBuilder.annotations(value);
super.annotations(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
+ return self();
}
/**
@@ -186,9 +168,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanClassVisibility(Visibility value) {
+ public SELF beanClassVisibility(Visibility value) {
bcBuilder.beanClassVisibility(assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -235,9 +217,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanConstructorVisibility(Visibility value) {
+ public SELF beanConstructorVisibility(Visibility value) {
bcBuilder.beanConstructorVisibility(assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -261,9 +243,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder marshallingContext(MarshallingContext value) {
+ public SELF marshallingContext(MarshallingContext value) {
bc = assertArgNotNull(ARG_value, value);
- return this;
+ return self();
}
/**
@@ -278,9 +260,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder marshallingContext(MarshallingContext.Builder value) {
+ public SELF marshallingContext(MarshallingContext.Builder value) {
bcBuilder = assertArgNotNull(ARG_value, value);
- return this;
+ return self();
}
/**
@@ -293,7 +275,7 @@ public abstract class MarshallingContextable extends Context {
public final Builder marshallingContext(Consumer<MarshallingContext.Builder> operation) {
assertArgNotNull(ARG_operation, operation);
operation.accept(marshallingContext());
- return this;
+ return self();
}
/**
@@ -386,10 +368,10 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder beanDictionary(Class<?>...values) {
+ public SELF beanDictionary(Class<?>...values) {
assertArgNoNulls(ARG_values, values);
bcBuilder.beanDictionary(values);
- return this;
+ return self();
}
/**
@@ -445,9 +427,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanFieldVisibility(Visibility value) {
+ public SELF beanFieldVisibility(Visibility value) {
bcBuilder.beanFieldVisibility(assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -502,9 +484,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanInterceptor(Class<?> on, Class<? extends BeanInterceptor<?>> value) {
+ public SELF beanInterceptor(Class<?> on, Class<? extends BeanInterceptor<?>> value) {
bcBuilder.beanInterceptor(assertArgNotNull(ARG_on, on), assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -537,9 +519,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder beanMapPutReturnsOldValue() {
+ public SELF beanMapPutReturnsOldValue() {
bcBuilder.beanMapPutReturnsOldValue();
- return this;
+ return self();
}
/**
@@ -585,9 +567,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanMethodVisibility(Visibility value) {
+ public SELF beanMethodVisibility(Visibility value) {
bcBuilder.beanMethodVisibility(assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -646,9 +628,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanProperties(Class<?> beanClass, String properties) {
+ public SELF beanProperties(Class<?> beanClass, String properties) {
bcBuilder.beanProperties(beanClass, assertArgNotNull(ARG_properties, properties));
- return this;
+ return self();
}
/**
@@ -709,9 +691,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanProperties(Map<String,Object> values) {
+ public SELF beanProperties(Map<String,Object> values) {
bcBuilder.beanProperties(assertArgNotNull(ARG_values, values));
- return this;
+ return self();
}
/**
@@ -773,9 +755,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanProperties(String beanClassName, String properties) {
+ public SELF beanProperties(String beanClassName, String properties) {
bcBuilder.beanProperties(assertArgNotNull(ARG_beanClassName, beanClassName), assertArgNotNull(ARG_properties, properties));
- return this;
+ return self();
}
/**
@@ -826,9 +808,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesExcludes(Class<?> beanClass, String properties) {
+ public SELF beanPropertiesExcludes(Class<?> beanClass, String properties) {
bcBuilder.beanPropertiesExcludes(beanClass, assertArgNotNull(ARG_properties, properties));
- return this;
+ return self();
}
/**
@@ -881,9 +863,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesExcludes(Map<String,Object> values) {
+ public SELF beanPropertiesExcludes(Map<String,Object> values) {
bcBuilder.beanPropertiesExcludes(assertArgNotNull(ARG_values, values));
- return this;
+ return self();
}
/**
@@ -937,9 +919,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesExcludes(String beanClassName, String properties) {
+ public SELF beanPropertiesExcludes(String beanClassName, String properties) {
bcBuilder.beanPropertiesExcludes(assertArgNotNull(ARG_beanClassName, beanClassName), assertArgNotNull(ARG_properties, properties));
- return this;
+ return self();
}
/**
@@ -993,9 +975,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesReadOnly(Class<?> beanClass, String properties) {
+ public SELF beanPropertiesReadOnly(Class<?> beanClass, String properties) {
bcBuilder.beanPropertiesReadOnly(beanClass, assertArgNotNull(ARG_properties, properties));
- return this;
+ return self();
}
/**
@@ -1051,9 +1033,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesReadOnly(Map<String,Object> values) {
+ public SELF beanPropertiesReadOnly(Map<String,Object> values) {
bcBuilder.beanPropertiesReadOnly(assertArgNotNull(ARG_values, values));
- return this;
+ return self();
}
/**
@@ -1110,9 +1092,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesReadOnly(String beanClassName, String properties) {
+ public SELF beanPropertiesReadOnly(String beanClassName, String properties) {
bcBuilder.beanPropertiesReadOnly(assertArgNotNull(ARG_beanClassName, beanClassName), assertArgNotNull(ARG_properties, properties));
- return this;
+ return self();
}
/**
@@ -1165,9 +1147,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
+ public SELF beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
bcBuilder.beanPropertiesWriteOnly(beanClass, assertArgNotNull(ARG_properties, properties));
- return this;
+ return self();
}
/**
@@ -1222,9 +1204,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesWriteOnly(Map<String,Object> values) {
+ public SELF beanPropertiesWriteOnly(Map<String,Object> values) {
bcBuilder.beanPropertiesWriteOnly(assertArgNotNull(ARG_values, values));
- return this;
+ return self();
}
/**
@@ -1280,9 +1262,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder beanPropertiesWriteOnly(String beanClassName, String properties) {
+ public SELF beanPropertiesWriteOnly(String beanClassName, String properties) {
bcBuilder.beanPropertiesWriteOnly(assertArgNotNull(ARG_beanClassName, beanClassName), assertArgNotNull(ARG_properties, properties));
- return this;
+ return self();
}
/**
@@ -1333,9 +1315,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder beansRequireDefaultConstructor() {
+ public SELF beansRequireDefaultConstructor() {
bcBuilder.beansRequireDefaultConstructor();
- return this;
+ return self();
}
/**
@@ -1381,9 +1363,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder beansRequireSerializable() {
+ public SELF beansRequireSerializable() {
bcBuilder.beansRequireSerializable();
- return this;
+ return self();
}
/**
@@ -1427,25 +1409,19 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder beansRequireSettersForGetters() {
+ public SELF beansRequireSettersForGetters() {
bcBuilder.beansRequireSettersForGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends Context> value) {
- super.cache(value);
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
- public abstract Builder copy();
+ public abstract SELF copy();
@Override /* Overridden from Context.Builder */
- public Builder debug() {
+ public SELF debug() {
bcBuilder.debug();
super.debug();
- return this;
+ return self();
}
/**
@@ -1493,10 +1469,10 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder dictionaryOn(Class<?> on, Class<?>...values) {
+ public SELF dictionaryOn(Class<?> on, Class<?>...values) {
assertArgNoNulls(ARG_values, values);
bcBuilder.dictionaryOn(assertArgNotNull(ARG_on, on), values);
- return this;
+ return self();
}
/**
@@ -1537,9 +1513,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder disableBeansRequireSomeProperties() {
+ public SELF disableBeansRequireSomeProperties() {
bcBuilder.disableBeansRequireSomeProperties();
- return this;
+ return self();
}
/**
@@ -1579,9 +1555,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder disableIgnoreMissingSetters() {
+ public SELF disableIgnoreMissingSetters() {
bcBuilder.disableIgnoreMissingSetters();
- return this;
+ return self();
}
/**
@@ -1618,9 +1594,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder disableIgnoreTransientFields() {
+ public SELF disableIgnoreTransientFields() {
bcBuilder.disableIgnoreTransientFields();
- return this;
+ return self();
}
/**
@@ -1654,9 +1630,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder disableIgnoreUnknownNullBeanProperties() {
+ public SELF disableIgnoreUnknownNullBeanProperties() {
bcBuilder.disableIgnoreUnknownNullBeanProperties();
- return this;
+ return self();
}
/**
@@ -1674,9 +1650,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder disableInterfaceProxies() {
+ public SELF disableInterfaceProxies() {
bcBuilder.disableInterfaceProxies();
- return this;
+ return self();
}
/**
@@ -1725,9 +1701,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Can be <jk>null</jk> or empty (treated as no example).
* @return This object.
*/
- public <T> Builder example(Class<T> pojoClass, String json) {
+ public <T> SELF example(Class<T> pojoClass, String json) {
bcBuilder.example(assertArgNotNull(ARG_pojoClass, pojoClass), json);
- return this;
+ return self();
}
/**
@@ -1776,9 +1752,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Can be <jk>null</jk> (will be serialized as <js>"null"</js>).
* @return This object.
*/
- public <T> Builder example(Class<T> pojoClass, T o) {
+ public <T> SELF example(Class<T> pojoClass, T o) {
bcBuilder.example(assertArgNotNull(ARG_pojoClass, pojoClass), o);
- return this;
+ return self();
}
/**
@@ -1826,9 +1802,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder findFluentSetters() {
+ public SELF findFluentSetters() {
bcBuilder.findFluentSetters();
- return this;
+ return self();
}
/**
@@ -1867,9 +1843,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder findFluentSetters(Class<?> on) {
+ public SELF findFluentSetters(Class<?> on) {
bcBuilder.findFluentSetters(assertArgNotNull(ARG_on, on));
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
@@ -1916,9 +1892,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder ignoreInvocationExceptionsOnGetters() {
+ public SELF ignoreInvocationExceptionsOnGetters() {
bcBuilder.ignoreInvocationExceptionsOnGetters();
- return this;
+ return self();
}
/**
@@ -1954,9 +1930,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder ignoreInvocationExceptionsOnSetters() {
+ public SELF ignoreInvocationExceptionsOnSetters() {
bcBuilder.ignoreInvocationExceptionsOnSetters();
- return this;
+ return self();
}
/**
@@ -1990,9 +1966,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder ignoreUnknownBeanProperties() {
+ public SELF ignoreUnknownBeanProperties() {
bcBuilder.ignoreUnknownBeanProperties();
- return this;
+ return self();
}
/**
@@ -2035,9 +2011,9 @@ public abstract class MarshallingContextable extends Context {
* @return This object.
* @since 9.5.0
*/
- public Builder validateSchema() {
+ public SELF validateSchema() {
bcBuilder.validateSchema();
- return this;
+ return self();
}
/**
@@ -2047,9 +2023,9 @@ public abstract class MarshallingContextable extends Context {
* @return This object.
* @since 9.5.0
*/
- public Builder validateSchema(boolean value) {
+ public SELF validateSchema(boolean value) {
bcBuilder.validateSchema(value);
- return this;
+ return self();
}
/**
@@ -2065,15 +2041,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder ignoreUnknownEnumValues() {
+ public SELF ignoreUnknownEnumValues() {
bcBuilder.ignoreUnknownEnumValues();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
+ return self();
}
/**
@@ -2112,9 +2082,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
+ public SELF implClass(Class<?> interfaceClass, Class<?> implClass) {
bcBuilder.implClass(assertArgNotNull(ARG_interfaceClass, interfaceClass), assertArgNotNull(ARG_implClass, implClass));
- return this;
+ return self();
}
/**
@@ -2152,9 +2122,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder implClasses(Map<Class<?>,Class<?>> values) {
+ public SELF implClasses(Map<Class<?>,Class<?>> values) {
bcBuilder.implClasses(assertArgNotNull(ARG_values, values));
- return this;
+ return self();
}
/**
@@ -2200,9 +2170,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder interfaceClass(Class<?> on, Class<?> value) {
+ public SELF interfaceClass(Class<?> on, Class<?> value) {
bcBuilder.interfaceClass(assertArgNotNull(ARG_on, on), assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -2246,10 +2216,10 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder interfaces(Class<?>...value) {
+ public SELF interfaces(Class<?>...value) {
assertArgNoNulls(ARG_value, value);
bcBuilder.interfaces(value);
- return this;
+ return self();
}
/**
@@ -2291,9 +2261,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder locale(Locale value) {
+ public SELF locale(Locale value) {
bcBuilder.locale(assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -2335,9 +2305,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Can be <jk>null</jk> (no default media type will be set).
* @return This object.
*/
- public Builder mediaType(MediaType value) {
+ public SELF mediaType(MediaType value) {
bcBuilder.mediaType(value);
- return this;
+ return self();
}
/**
@@ -2395,10 +2365,10 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder notBeanClasses(Class<?>...values) {
+ public SELF notBeanClasses(Class<?>...values) {
assertArgNoNulls(ARG_values, values);
bcBuilder.notBeanClasses(values);
- return this;
+ return self();
}
/**
@@ -2442,10 +2412,10 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder notBeanPackages(String...values) {
+ public SELF notBeanPackages(String...values) {
assertArgNoNulls(ARG_values, values);
bcBuilder.notBeanPackages(values);
- return this;
+ return self();
}
/**
@@ -2485,9 +2455,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder propertyNamer(Class<?> on, Class<? extends PropertyNamer> value) {
+ public SELF propertyNamer(Class<?> on, Class<? extends PropertyNamer> value) {
bcBuilder.propertyNamer(assertArgNotNull(ARG_on, on), assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -2532,9 +2502,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder propertyNamer(Class<? extends PropertyNamer> value) {
+ public SELF propertyNamer(Class<? extends PropertyNamer> value) {
bcBuilder.propertyNamer(assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -2549,9 +2519,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder unsortedProperties() {
+ public SELF unsortedProperties() {
bcBuilder.unsortedProperties();
- return this;
+ return self();
}
/**
@@ -2566,10 +2536,10 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder unsortedProperties(Class<?>...on) {
+ public SELF unsortedProperties(Class<?>...on) {
assertArgNoNulls(ARG_on, on);
bcBuilder.unsortedProperties(on);
- return this;
+ return self();
}
/**
@@ -2614,9 +2584,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder stopClass(Class<?> on, Class<?> value) {
+ public SELF stopClass(Class<?> on, Class<?> value) {
bcBuilder.stopClass(assertArgNotNull(ARG_on, on), assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -2641,9 +2611,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction) {
+ public <T,S> SELF swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction) {
bcBuilder.swap(assertArgNotNull(ARG_normalClass, normalClass), assertArgNotNull(ARG_swappedClass, swappedClass), assertArgNotNull(ARG_swapFunction, swapFunction));
- return this;
+ return self();
}
/**
@@ -2670,9 +2640,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction, ThrowingFunction<S,T> unswapFunction) {
+ public <T,S> SELF swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction, ThrowingFunction<S,T> unswapFunction) {
bcBuilder.swap(assertArgNotNull(ARG_normalClass, normalClass), assertArgNotNull(ARG_swappedClass, swappedClass), assertArgNotNull(ARG_swapFunction, swapFunction), assertArgNotNull(ARG_unswapFunction, unswapFunction));
- return this;
+ return self();
}
/**
@@ -2688,10 +2658,10 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder swaps(Class<?>...values) {
+ public SELF swaps(Class<?>...values) {
assertArgNoNulls(ARG_values, values);
bcBuilder.swaps(values);
- return this;
+ return self();
}
/**
@@ -2780,10 +2750,10 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot contain <jk>null</jk> values.
* @return This object.
*/
- public Builder swaps(Object...values) {
+ public SELF swaps(Object...values) {
assertArgNoNulls(ARG_values, values);
bcBuilder.swaps(values);
- return this;
+ return self();
}
/**
@@ -2824,9 +2794,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Can be <jk>null</jk> (timezone will not be set, defaults to system timezone).
* @return This object.
*/
- public Builder timeZone(TimeZone value) {
+ public SELF timeZone(TimeZone value) {
bcBuilder.timeZone(value);
- return this;
+ return self();
}
/**
@@ -2835,9 +2805,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder durationFormat(DurationFormat value) {
+ public SELF durationFormat(DurationFormat value) {
bcBuilder.durationFormat(value);
- return this;
+ return self();
}
/**
@@ -2846,9 +2816,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder periodFormat(PeriodFormat value) {
+ public SELF periodFormat(PeriodFormat value) {
bcBuilder.periodFormat(value);
- return this;
+ return self();
}
/**
@@ -2857,9 +2827,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder calendarFormat(CalendarFormat value) {
+ public SELF calendarFormat(CalendarFormat value) {
bcBuilder.calendarFormat(value);
- return this;
+ return self();
}
/**
@@ -2868,9 +2838,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder dateFormat(DateFormat value) {
+ public SELF dateFormat(DateFormat value) {
bcBuilder.dateFormat(value);
- return this;
+ return self();
}
/**
@@ -2879,9 +2849,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder temporalFormat(TemporalFormat value) {
+ public SELF temporalFormat(TemporalFormat value) {
bcBuilder.temporalFormat(value);
- return this;
+ return self();
}
/**
@@ -2890,9 +2860,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder timeZoneFormat(TimeZoneFormat value) {
+ public SELF timeZoneFormat(TimeZoneFormat value) {
bcBuilder.timeZoneFormat(value);
- return this;
+ return self();
}
/**
@@ -2901,9 +2871,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder localeFormat(LocaleFormat value) {
+ public SELF localeFormat(LocaleFormat value) {
bcBuilder.localeFormat(value);
- return this;
+ return self();
}
/**
@@ -2912,9 +2882,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder binaryFormat(BinaryFormat value) {
+ public SELF binaryFormat(BinaryFormat value) {
bcBuilder.binaryFormat(value);
- return this;
+ return self();
}
/**
@@ -2923,9 +2893,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder enumFormat(EnumFormat value) {
+ public SELF enumFormat(EnumFormat value) {
bcBuilder.enumFormat(value);
- return this;
+ return self();
}
/**
@@ -2934,9 +2904,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder uuidFormat(UuidFormat value) {
+ public SELF uuidFormat(UuidFormat value) {
bcBuilder.uuidFormat(value);
- return this;
+ return self();
}
/**
@@ -2945,9 +2915,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder bigNumberFormat(BigNumberFormat value) {
+ public SELF bigNumberFormat(BigNumberFormat value) {
bcBuilder.bigNumberFormat(value);
- return this;
+ return self();
}
/**
@@ -2956,9 +2926,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder booleanFormat(BooleanFormat value) {
+ public SELF booleanFormat(BooleanFormat value) {
bcBuilder.booleanFormat(value);
- return this;
+ return self();
}
/**
@@ -2967,9 +2937,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder floatFormat(FloatFormat value) {
+ public SELF floatFormat(FloatFormat value) {
bcBuilder.floatFormat(value);
- return this;
+ return self();
}
/**
@@ -2978,9 +2948,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder currencyFormat(CurrencyFormat value) {
+ public SELF currencyFormat(CurrencyFormat value) {
bcBuilder.currencyFormat(value);
- return this;
+ return self();
}
/**
@@ -2989,9 +2959,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder classFormat(ClassFormat value) {
+ public SELF classFormat(ClassFormat value) {
bcBuilder.classFormat(value);
- return this;
+ return self();
}
/**
@@ -3000,15 +2970,9 @@ public abstract class MarshallingContextable extends Context {
* @param value The new value for this property.
* @return This object.
*/
- public Builder classLoader(ClassLoader value) {
+ public SELF classLoader(ClassLoader value) {
bcBuilder.classLoader(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends Context> value) {
- super.type(value);
- return this;
+ return self();
}
/**
@@ -3053,9 +3017,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder typeName(Class<?> on, String value) {
+ public SELF typeName(Class<?> on, String value) {
bcBuilder.typeName(on, assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -3100,9 +3064,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder typePropertyName(Class<?> on, String value) {
+ public SELF typePropertyName(Class<?> on, String value) {
bcBuilder.typePropertyName(on, assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -3158,9 +3122,9 @@ public abstract class MarshallingContextable extends Context {
* <br>Cannot be <jk>null</jk>.
* @return This object.
*/
- public Builder typePropertyName(String value) {
+ public SELF typePropertyName(String value) {
bcBuilder.typePropertyName(assertArgNotNull(ARG_value, value));
- return this;
+ return self();
}
/**
@@ -3185,9 +3149,9 @@ public abstract class MarshallingContextable extends Context {
*
* @return This object.
*/
- public Builder useJavaBeanIntrospector() {
+ public SELF useJavaBeanIntrospector() {
bcBuilder.useJavaBeanIntrospector();
- return this;
+ return self();
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingSession.java
index fefdb67741..edf2f4c8af 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingSession.java
@@ -75,7 +75,7 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
/**
* Builder class.
*/
- public static class Builder extends ContextSession.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends ContextSession.Builder<SELF> {
private MarshallingContext ctx;
private Locale locale;
@@ -95,12 +95,6 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
timeZone = ctx.getTimeZone();
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
/**
* Build the object.
*
@@ -111,12 +105,6 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
return new MarshallingSession(this);
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
/**
* The session locale.
*
@@ -136,9 +124,9 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
* <br>If <jk>null</jk> defaults to {@link MarshallingContext#getLocale()}
* @return This object.
*/
- public Builder locale(Locale value) {
+ public SELF locale(Locale value) {
locale = value;
- return this;
+ return self();
}
/**
@@ -160,9 +148,9 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
* <br>If <jk>null</jk> defaults to {@link MarshallingContext#getMediaType()}.
* @return This object.
*/
- public Builder mediaType(MediaType value) {
+ public SELF mediaType(MediaType value) {
mediaType = value;
- return this;
+ return self();
}
/**
@@ -173,23 +161,17 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
* <br>If <jk>null</jk>, then the locale defined on the context is used.
* @return This object.
*/
- public Builder mediaTypeDefault(MediaType value) {
+ public SELF mediaTypeDefault(MediaType value) {
if (mediaType == null)
mediaType = value;
- return this;
+ return self();
}
@Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
+ public SELF property(String key, Object value) {
if (key == null) {
super.property(key, value); // delegates null-key validation to base class
- return this;
+ return self();
}
switch (key) {
case PROP_locale, PROP_BeanSession_locale:
@@ -200,7 +182,7 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
return timeZone(cvt(value, TimeZone.class));
default:
super.property(key, value);
- return this;
+ return self();
}
}
@@ -223,9 +205,9 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
* <br>If <jk>null</jk> defaults to {@link MarshallingContext#getTimeZone()}.
* @return This object.
*/
- public Builder timeZone(TimeZone value) {
+ public SELF timeZone(TimeZone value) {
timeZone = value;
- return this;
+ return self();
}
/**
@@ -236,16 +218,21 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
* <br>If <jk>null</jk>, then the locale defined on the context is used.
* @return This object.
*/
- public Builder timeZoneDefault(TimeZone value) {
+ public SELF timeZoneDefault(TimeZone value) {
if (timeZone == null)
timeZone = value;
- return this;
+ return self();
}
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
+ }
+
+ /**
+ * Concrete default builder leaf for the non-subclassed {@code create()} path (CRTP terminal).
+ */
+ public static final class DefaultBuilder extends Builder<DefaultBuilder> {
+
+ DefaultBuilder(MarshallingContext ctx) {
+ super(ctx);
}
}
@@ -258,8 +245,8 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
* <br>Cannot be <jk>null</jk>.
* @return A new builder.
*/
- public static Builder create(MarshallingContext ctx) {
- return new Builder(assertArgNotNull(ARG_ctx, ctx));
+ public static Builder<?> create(MarshallingContext ctx) {
+ return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
}
/**
@@ -281,7 +268,7 @@ public class MarshallingSession extends ContextSession implements ConverterSessi
*
* @param builder The builder for this object.
*/
- protected MarshallingSession(Builder builder) {
+ protected MarshallingSession(Builder<?> builder) {
super(builder);
ctx = builder.ctx;
locale = opt(builder.locale).orElse(ctx.getLocale());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingTraverseContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingTraverseContext.java
index 699f09623f..fbd37c8736 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingTraverseContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingTraverseContext.java
@@ -52,7 +52,7 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
/**
* Builder class.
*/
- public abstract static class Builder extends MarshallingContextable.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends MarshallingContextable.Builder<SELF> {
private boolean detectRecursions;
private boolean ignoreRecursions;
@@ -87,7 +87,7 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
*
* @param copyFrom The builder to copy from.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
super(copyFrom);
detectRecursions = copyFrom.detectRecursions;
ignoreRecursions = copyFrom.ignoreRecursions;
@@ -95,195 +95,6 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
maxDepth = copyFrom.maxDepth;
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext.Builder value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanDictionary(java.lang.Class<?>...values) {
- super.beanDictionary(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanInterceptor(Class<?> on, Class<? extends org.apache.juneau.commons.bean.BeanInterceptor<?>> value) {
- super.beanInterceptor(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMethodVisibility(Visibility value) {
- super.beanMethodVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesReadOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Map<String,Object> values) {
- super.beanPropertiesReadOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(String beanClassName, String properties) {
- super.beanPropertiesReadOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesWriteOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Map<String,Object> values) {
- super.beanPropertiesWriteOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(String beanClassName, String properties) {
- super.beanPropertiesWriteOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSerializable() {
- super.beansRequireSerializable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends Context> value) {
- super.cache(value);
- return this;
- }
-
- @Override /* Overridden from Context.Builder */
- public abstract Builder copy();
-
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
/**
* Automatically detect POJO recursions.
*
@@ -321,7 +132,7 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
*
* @return This object.
*/
- public Builder detectRecursions() {
+ public SELF detectRecursions() {
return detectRecursions(true);
}
@@ -331,69 +142,9 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
* @param value The value for this setting.
* @return This object.
*/
- public Builder detectRecursions(boolean value) {
+ public SELF detectRecursions(boolean value) {
detectRecursions = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder dictionaryOn(Class<?> on, java.lang.Class<?>...values) {
- super.dictionaryOn(on, values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreMissingSetters() {
- super.disableIgnoreMissingSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreTransientFields() {
- super.disableIgnoreTransientFields();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreUnknownNullBeanProperties() {
- super.disableIgnoreUnknownNullBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableInterfaceProxies() {
- super.disableInterfaceProxies();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, String json) {
- super.example(pojoClass, json);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters() {
- super.findFluentSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters(Class<?> on) {
- super.findFluentSetters(on);
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
@@ -409,18 +160,6 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
// @formatter:on
}
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnGetters() {
- super.ignoreInvocationExceptionsOnGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnSetters() {
- super.ignoreInvocationExceptionsOnSetters();
- return this;
- }
-
/**
* Ignore recursion errors.
*
@@ -461,7 +200,7 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
*
* @return This object.
*/
- public Builder ignoreRecursions() {
+ public SELF ignoreRecursions() {
return ignoreRecursions(true);
}
@@ -471,51 +210,9 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
* @param value The value for this setting.
* @return This object.
*/
- public Builder ignoreRecursions(boolean value) {
+ public SELF ignoreRecursions(boolean value) {
ignoreRecursions = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownBeanProperties() {
- super.ignoreUnknownBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownEnumValues() {
- super.ignoreUnknownEnumValues();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
- super.implClass(interfaceClass, implClass);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClasses(Map<Class<?>,Class<?>> values) {
- super.implClasses(values);
- return this;
+ return self();
}
/**
@@ -545,27 +242,9 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
* <br>The default is <c>0</c>.
* @return This object.
*/
- public Builder initialDepth(int value) {
+ public SELF initialDepth(int value) {
initialDepth = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaceClass(Class<?> on, Class<?> value) {
- super.interfaceClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaces(java.lang.Class<?>...value) {
- super.interfaces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
+ return self();
}
/**
@@ -598,119 +277,12 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
* <br>The default is <c>100</c>.
* @return This object.
*/
- public Builder maxDepth(int value) {
+ public SELF maxDepth(int value) {
maxDepth = value;
- return this;
+ return self();
}
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanClasses(java.lang.Class<?>...values) {
- super.notBeanClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanPackages(String...values) {
- super.notBeanPackages(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<?> on, Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(value);
- return this;
- }
- @Override /* Overridden from Builder */
- public Builder unsortedProperties() {
- super.unsortedProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties(java.lang.Class<?>...on) {
- super.unsortedProperties(on);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder stopClass(Class<?> on, Class<?> value) {
- super.stopClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction) {
- super.swap(normalClass, swappedClass, swapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction, ThrowingFunction<S,T> unswapFunction) {
- super.swap(normalClass, swappedClass, swapFunction, unswapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Class<?>...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Object...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends Context> value) {
- super.type(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typeName(Class<?> on, String value) {
- super.typeName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(Class<?> on, String value) {
- super.typePropertyName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(String value) {
- super.typePropertyName(value);
- return this;
- }
-
-
- @Override /* Overridden from Builder */
- public Builder useJavaBeanIntrospector() {
- super.useJavaBeanIntrospector();
- return this;
- }
}
private final boolean detectRecursions;
@@ -736,7 +308,7 @@ public abstract class MarshallingTraverseContext extends MarshallingContextable
}
@Override /* Overridden from Context */
- public abstract Builder copy();
+ public abstract Builder<?> copy();
/**
* Initial depth.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingTraverseSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingTraverseSession.java
index bcef3b78d7..1df394aebc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingTraverseSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingTraverseSession.java
@@ -67,7 +67,7 @@ public class MarshallingTraverseSession extends MarshallingSession {
/**
* Builder class.
*/
- public abstract static class Builder extends MarshallingSession.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends MarshallingSession.Builder<SELF> {
private MarshallingTraverseContext ctx;
private int initialDepth;
@@ -84,42 +84,6 @@ public class MarshallingTraverseSession extends MarshallingSession {
initialDepth = ctx.getInitialDepth();
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
/**
* Initial depth.
@@ -127,43 +91,26 @@ public class MarshallingTraverseSession extends MarshallingSession {
* @param value The new value for this property.
* @return This object.
*/
- public Builder initialDepth(int value) {
+ public SELF initialDepth(int value) {
initialDepth = value;
- return this;
+ return self();
}
@Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
+ public SELF property(String key, Object value) {
if (key == null) {
super.property(key, value);
- return this;
+ return self();
}
switch (key) {
case PROP_initialDepth, PROP_BeanTraverseSession_initialDepth:
return initialDepth(cvt(value, Integer.class));
default:
super.property(key, value);
- return this;
+ return self();
}
}
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
}
private class StackElement {
@@ -207,7 +154,7 @@ public class MarshallingTraverseSession extends MarshallingSession {
*
* @param builder The builder for this object.
*/
- protected MarshallingTraverseSession(Builder builder) {
+ protected MarshallingTraverseSession(Builder<?> builder) {
super(builder);
ctx = builder.ctx;
indent = builder.initialDepth;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonParser.java
index c41416c0ea..32334df7eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonParser.java
@@ -99,7 +99,7 @@ public class BsonParser extends InputStreamParser implements BsonMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends InputStreamParser.Builder {
+ public static class Builder extends InputStreamParser.Builder<Builder> {
private static final Cache<HashKey,BsonParser> CACHE = Cache.of(HashKey.class, BsonParser.class).build();
@@ -166,18 +166,6 @@ public class BsonParser extends InputStreamParser implements BsonMetaProvider {
return this;
}
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
@Override /* Context.Builder */
public BsonParser build() {
return cache(CACHE).build(BsonParser.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonParserSession.java
index 73d3bd72d9..360cdd8f3d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonParserSession.java
@@ -57,7 +57,7 @@ public class BsonParserSession extends InputStreamParserSession {
/**
* Builder class.
*/
- public static class Builder extends InputStreamParserSession.Builder {
+ public static class Builder extends InputStreamParserSession.Builder<Builder> {
private final String nullKeyString;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonSerializer.java
index 24f3175fc7..291679f4c1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonSerializer.java
@@ -121,7 +121,7 @@ public class BsonSerializer extends OutputStreamSerializer implements BsonMetaPr
/**
* Builder class.
*/
- public static class Builder extends OutputStreamSerializer.Builder {
+ public static class Builder extends OutputStreamSerializer.Builder<Builder> {
private static final Cache<HashKey,BsonSerializer> CACHE = Cache.of(HashKey.class, BsonSerializer.class).build();
@@ -232,18 +232,6 @@ public class BsonSerializer extends OutputStreamSerializer implements BsonMetaPr
return this;
}
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
@Override /* Context.Builder */
public BsonSerializer build() {
return cache(CACHE).build(BsonSerializer.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonSerializerSession.java
index dade47be23..3c64ae01d8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/bson/BsonSerializerSession.java
@@ -59,7 +59,7 @@ public class BsonSerializerSession extends OutputStreamSerializerSession {
/**
* Builder class.
*/
- public static class Builder extends OutputStreamSerializerSession.Builder {
+ public static class Builder extends OutputStreamSerializerSession.Builder<Builder> {
private BsonSerializer ctx;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborParser.java
index 5e9de6562f..ccd5df992e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborParser.java
@@ -92,7 +92,7 @@ public class CborParser extends InputStreamParser implements CborMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends InputStreamParser.Builder {
+ public static class Builder extends InputStreamParser.Builder<Builder> {
private static final Cache<HashKey,CborParser> CACHE = Cache.of(HashKey.class, CborParser.class).build();
@@ -121,29 +121,11 @@ public class CborParser extends InputStreamParser implements CborMetaProvider {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
}
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public CborParser build() {
return cache(CACHE).build(CborParser.class);
}
- @Override /* Overridden from Builder */
- public Builder binaryFormat(BinaryFormat value) {
- super.binaryFormat(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborParserSession.java
index 1bbe5a678b..2022181af4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborParserSession.java
@@ -58,7 +58,7 @@ public class CborParserSession extends InputStreamParserSession {
/**
* Builder class.
*/
- public static class Builder extends InputStreamParserSession.Builder {
+ public static class Builder extends InputStreamParserSession.Builder<Builder> {
/**
* Constructor
@@ -70,94 +70,11 @@ public class CborParserSession extends InputStreamParserSession {
super(assertArgNotNull(ARG_ctx, ctx));
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
@Override
public CborParserSession build() {
return new CborParserSession(this);
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder javaMethod(Method value) {
- super.javaMethod(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder outer(Object value) {
- super.outer(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
- super.property(key, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schema(HttpPartSchema value) {
- super.schema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schemaDefault(HttpPartSchema value) {
- super.schemaDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborSerializer.java
index e18e47cf92..d2c295d195 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborSerializer.java
@@ -120,7 +120,7 @@ public class CborSerializer extends OutputStreamSerializer implements CborMetaPr
/**
* Builder class.
*/
- public static class Builder extends OutputStreamSerializer.Builder {
+ public static class Builder extends OutputStreamSerializer.Builder<Builder> {
private static final Cache<HashKey,CborSerializer> CACHE = Cache.of(HashKey.class, CborSerializer.class).build();
@@ -198,29 +198,11 @@ public class CborSerializer extends OutputStreamSerializer implements CborMetaPr
return this;
}
- @Override /* Overridden from Builder */
- public Builder binaryFormat(BinaryFormat value) {
- super.binaryFormat(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public CborSerializer build() {
return cache(CACHE).build(CborSerializer.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborSerializerSession.java
index 2607e497eb..91d7c1b3d8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cbor/CborSerializerSession.java
@@ -61,7 +61,7 @@ public class CborSerializerSession extends OutputStreamSerializerSession {
/**
* Builder class.
*/
- public static class Builder extends OutputStreamSerializerSession.Builder {
+ public static class Builder extends OutputStreamSerializerSession.Builder<Builder> {
/**
* Constructor
@@ -73,100 +73,11 @@ public class CborSerializerSession extends OutputStreamSerializerSession {
super(assertArgNotNull(ARG_ctx, ctx));
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
@Override
public CborSerializerSession build() {
return new CborSerializerSession(this);
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder javaMethod(Method value) {
- super.javaMethod(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
- super.property(key, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder resolver(VarResolverSession value) {
- super.resolver(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schema(HttpPartSchema value) {
- super.schema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schemaDefault(HttpPartSchema value) {
- super.schemaDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriContext(UriContext value) {
- super.uriContext(value);
- return this;
- }
}
private static class SimpleMapEntry {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index 72fc740cbb..d07b835703 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -89,7 +89,7 @@ public class CsvParser extends ReaderParser implements CsvMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends ReaderParser.Builder {
+ public static class Builder extends ReaderParser.Builder<Builder> {
private static final Cache<HashKey,CsvParser> CACHE = Cache.of(HashKey.class, CsvParser.class).build();
@@ -154,42 +154,6 @@ public class CsvParser extends ReaderParser implements CsvMetaProvider {
return this;
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder autoCloseStreams() {
- super.autoCloseStreams();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder autoCloseStreams(boolean value) {
- super.autoCloseStreams(value);
- return this;
- }
-
/**
* Format for parsing {@code byte[]} arrays from CSV cells.
*
@@ -204,150 +168,6 @@ public class CsvParser extends ReaderParser implements CsvMetaProvider {
return this;
}
- @Override /* Overridden from Builder */
- public Builder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext.Builder value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanDictionary(java.lang.Class<?>...values) {
- super.beanDictionary(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanInterceptor(Class<?> on, Class<? extends org.apache.juneau.commons.bean.BeanInterceptor<?>> value) {
- super.beanInterceptor(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMethodVisibility(Visibility value) {
- super.beanMethodVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesReadOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Map<String,Object> values) {
- super.beanPropertiesReadOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(String beanClassName, String properties) {
- super.beanPropertiesReadOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesWriteOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Map<String,Object> values) {
- super.beanPropertiesWriteOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(String beanClassName, String properties) {
- super.beanPropertiesWriteOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSerializable() {
- super.beansRequireSerializable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public HashKey hashKey() {
return HashKey.of(super.hashKey(), byteArrayFormat, allowNestedStructures, nullValue);
@@ -358,323 +178,12 @@ public class CsvParser extends ReaderParser implements CsvMetaProvider {
return cache(CACHE).build(CsvParser.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder consumes(String value) {
- super.consumes(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debugOutputLines(int value) {
- super.debugOutputLines(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder dictionaryOn(Class<?> on, java.lang.Class<?>...values) {
- super.dictionaryOn(on, values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreMissingSetters() {
- super.disableIgnoreMissingSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreTransientFields() {
- super.disableIgnoreTransientFields();
- return this;
- }
- @Override /* Overridden from Builder */
- public Builder disableIgnoreUnknownNullBeanProperties() {
- super.disableIgnoreUnknownNullBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableInterfaceProxies() {
- super.disableInterfaceProxies();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, String json) {
- super.example(pojoClass, json);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters() {
- super.findFluentSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters(Class<?> on) {
- super.findFluentSetters(on);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnGetters() {
- super.ignoreInvocationExceptionsOnGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnSetters() {
- super.ignoreInvocationExceptionsOnSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownBeanProperties() {
- super.ignoreUnknownBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownEnumValues() {
- super.ignoreUnknownEnumValues();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
- super.implClass(interfaceClass, implClass);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClasses(Map<Class<?>,Class<?>> values) {
- super.implClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaceClass(Class<?> on, Class<?> value) {
- super.interfaceClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaces(java.lang.Class<?>...value) {
- super.interfaces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder listener(Class<? extends org.apache.juneau.parser.ParserListener> value) {
- super.listener(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanClasses(java.lang.Class<?>...values) {
- super.notBeanClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanPackages(String...values) {
- super.notBeanPackages(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<?> on, Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties() {
- super.unsortedProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties(java.lang.Class<?>...on) {
- super.unsortedProperties(on);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder stopClass(Class<?> on, Class<?> value) {
- super.stopClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction) {
- super.swap(normalClass, swappedClass, swapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction, ThrowingFunction<S,T> unswapFunction) {
- super.swap(normalClass, swappedClass, swapFunction, unswapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Class<?>...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Object...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings() {
- super.trimStrings();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings(boolean value) {
- super.trimStrings(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typeName(Class<?> on, String value) {
- super.typeName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(Class<?> on, String value) {
- super.typePropertyName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(String value) {
- super.typePropertyName(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unbuffered() {
- super.unbuffered();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unbuffered(boolean value) {
- super.unbuffered(value);
- return this;
- }
-
-
- @Override /* Overridden from Builder */
- public Builder useJavaBeanIntrospector() {
- super.useJavaBeanIntrospector();
- return this;
- }
}
/** Default parser, all default settings.*/
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 fc1bb57d22..84a5a4985e 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
@@ -71,7 +71,7 @@ public class CsvParserSession extends ReaderParserSession {
/**
* Builder class.
*/
- public static class Builder extends ReaderParserSession.Builder {
+ public static class Builder extends ReaderParserSession.Builder<Builder> {
private CsvByteArrayCellFormat byteArrayFormat;
private boolean allowNestedStructures;
@@ -89,106 +89,11 @@ public class CsvParserSession extends ReaderParserSession {
nullValue = ctx.getNullValue();
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
@Override
public CsvParserSession build() {
return new CsvParserSession(this);
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder javaMethod(Method value) {
- super.javaMethod(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder outer(Object value) {
- super.outer(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
- super.property(key, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schema(HttpPartSchema value) {
- super.schema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schemaDefault(HttpPartSchema value) {
- super.schemaDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index cb6a6fa48a..d509a2264f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -90,7 +90,7 @@ public class CsvSerializer extends WriterSerializer implements CsvMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends WriterSerializer.Builder {
+ public static class Builder extends WriterSerializer.Builder<Builder> {
private static final Cache<HashKey,CsvSerializer> CACHE = Cache.of(HashKey.class, CsvSerializer.class).build();
@@ -158,36 +158,6 @@ public class CsvSerializer extends WriterSerializer implements CsvMetaProvider {
return this;
}
- @Override /* Overridden from Builder */
- public Builder accept(String value) {
- super.accept(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypes() {
- super.addBeanTypes();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypes(boolean value) {
- super.addBeanTypes(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addRootType() {
- super.addRootType();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addRootType(boolean value) {
- super.addRootType(value);
- return this;
- }
-
/**
* Format for serializing {@code byte[]} arrays in CSV cells.
*
@@ -202,174 +172,6 @@ public class CsvSerializer extends WriterSerializer implements CsvMetaProvider {
return this;
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext.Builder value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanDictionary(java.lang.Class<?>...values) {
- super.beanDictionary(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanInterceptor(Class<?> on, Class<? extends org.apache.juneau.commons.bean.BeanInterceptor<?>> value) {
- super.beanInterceptor(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMethodVisibility(Visibility value) {
- super.beanMethodVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesReadOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Map<String,Object> values) {
- super.beanPropertiesReadOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(String beanClassName, String properties) {
- super.beanPropertiesReadOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesWriteOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Map<String,Object> values) {
- super.beanPropertiesWriteOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(String beanClassName, String properties) {
- super.beanPropertiesWriteOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSerializable() {
- super.beansRequireSerializable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public HashKey hashKey() {
return HashKey.of(super.hashKey(), byteArrayFormat, allowNestedStructures, nullValue);
@@ -380,461 +182,12 @@ public class CsvSerializer extends WriterSerializer implements CsvMetaProvider {
return cache(CACHE).build(CsvSerializer.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder detectRecursions() {
- super.detectRecursions();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder detectRecursions(boolean value) {
- super.detectRecursions(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder dictionaryOn(Class<?> on, java.lang.Class<?>...values) {
- super.dictionaryOn(on, values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreMissingSetters() {
- super.disableIgnoreMissingSetters();
- return this;
- }
- @Override /* Overridden from Builder */
- public Builder disableIgnoreTransientFields() {
- super.disableIgnoreTransientFields();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreUnknownNullBeanProperties() {
- super.disableIgnoreUnknownNullBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableInterfaceProxies() {
- super.disableInterfaceProxies();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, String json) {
- super.example(pojoClass, json);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters() {
- super.findFluentSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters(Class<?> on) {
- super.findFluentSetters(on);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnGetters() {
- super.ignoreInvocationExceptionsOnGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnSetters() {
- super.ignoreInvocationExceptionsOnSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreRecursions() {
- super.ignoreRecursions();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreRecursions(boolean value) {
- super.ignoreRecursions(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownBeanProperties() {
- super.ignoreUnknownBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownEnumValues() {
- super.ignoreUnknownEnumValues();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
- super.implClass(interfaceClass, implClass);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClasses(Map<Class<?>,Class<?>> values) {
- super.implClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder initialDepth(int value) {
- super.initialDepth(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaceClass(Class<?> on, Class<?> value) {
- super.interfaceClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaces(java.lang.Class<?>...value) {
- super.interfaces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder keepNullProperties() {
- super.keepNullProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder keepNullProperties(boolean value) {
- super.keepNullProperties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder listener(Class<? extends org.apache.juneau.serializer.SerializerListener> value) {
- super.listener(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder maxDepth(int value) {
- super.maxDepth(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder maxIndent(int value) {
- super.maxIndent(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanClasses(java.lang.Class<?>...values) {
- super.notBeanClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanPackages(String...values) {
- super.notBeanPackages(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder produces(String value) {
- super.produces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<?> on, Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder quoteChar(char value) {
- super.quoteChar(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder quoteCharOverride(char value) {
- super.quoteCharOverride(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortCollections() {
- super.sortCollections();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortMaps() {
- super.sortMaps();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortMaps(boolean value) {
- super.sortMaps(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties() {
- super.unsortedProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties(java.lang.Class<?>...on) {
- super.unsortedProperties(on);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sq() {
- super.sq();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder stopClass(Class<?> on, Class<?> value) {
- super.stopClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction) {
- super.swap(normalClass, swappedClass, swapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction, ThrowingFunction<S,T> unswapFunction) {
- super.swap(normalClass, swappedClass, swapFunction, unswapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Class<?>...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Object...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyCollections() {
- super.trimEmptyCollections();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyCollections(boolean value) {
- super.trimEmptyCollections(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyMaps() {
- super.trimEmptyMaps();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyMaps(boolean value) {
- super.trimEmptyMaps(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings() {
- super.trimStrings();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings(boolean value) {
- super.trimStrings(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typeName(Class<?> on, String value) {
- super.typeName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(Class<?> on, String value) {
- super.typePropertyName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(String value) {
- super.typePropertyName(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriContext(UriContext value) {
- super.uriContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriRelativity(UriRelativity value) {
- super.uriRelativity(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriResolution(UriResolution value) {
- super.uriResolution(value);
- return this;
- }
-
-
- @Override /* Overridden from Builder */
- public Builder useJavaBeanIntrospector() {
- super.useJavaBeanIntrospector();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder useWhitespace() {
- super.useWhitespace();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder useWhitespace(boolean value) {
- super.useWhitespace(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ws() {
- super.ws();
- return this;
- }
}
/** Default serializer, all default settings.*/
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 68b693f1d1..2832ccb0da 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
@@ -82,7 +82,7 @@ public class CsvSerializerSession extends WriterSerializerSession {
@SuppressWarnings({
"java:S110" // Inheritance depth acceptable for builder hierarchy
})
- public static class Builder extends WriterSerializerSession.Builder {
+ public static class Builder extends WriterSerializerSession.Builder<Builder> {
private CsvByteArrayCellFormat byteArrayFormat;
private boolean allowNestedStructures;
@@ -112,12 +112,6 @@ public class CsvSerializerSession extends WriterSerializerSession {
return this;
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
@Override
public CsvSerializerSession build() {
return new CsvSerializerSession(this);
@@ -135,42 +129,6 @@ public class CsvSerializerSession extends WriterSerializerSession {
return this;
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder javaMethod(Method value) {
- super.javaMethod(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
/**
* Null value string.
*
@@ -182,12 +140,6 @@ public class CsvSerializerSession extends WriterSerializerSession {
return this;
}
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
@Override /* Overridden from Builder */
public Builder property(String key, Object value) {
if (key == null) {
@@ -207,59 +159,6 @@ public class CsvSerializerSession extends WriterSerializerSession {
}
}
- @Override /* Overridden from Builder */
- public Builder resolver(VarResolverSession value) {
- super.resolver(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schema(HttpPartSchema value) {
- super.schema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schemaDefault(HttpPartSchema value) {
- super.schemaDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriContext(UriContext value) {
- super.uriContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder useWhitespace(Boolean value) {
- super.useWhitespace(value);
- return this;
- }
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonParser.java
index 9bb0bfe9ea..612256b040 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonParser.java
@@ -129,7 +129,7 @@ public class HjsonParser extends ReaderParser implements HjsonMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends ReaderParser.Builder {
+ public static class Builder extends ReaderParser.Builder<Builder> {
protected Builder() {
consumes("application/hjson,application/hjson+json");
@@ -153,23 +153,6 @@ public class HjsonParser extends ReaderParser implements HjsonMetaProvider {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownBeanProperties() {
- super.ignoreUnknownBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
}
/** Default parser. */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonParserSession.java
index 500579ff75..d2caeb1d11 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonParserSession.java
@@ -46,7 +46,7 @@ public class HjsonParserSession extends ReaderParserSession {
/**
* Builder for Hjson parser session.
*/
- public static class Builder extends ReaderParserSession.Builder {
+ public static class Builder extends ReaderParserSession.Builder<Builder> {
protected Builder(HjsonParser ctx) {
super(assertArgNotNull(ARG_ctx, ctx));
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonSerializer.java
index 3cdacb93f0..f485cc556d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonSerializer.java
@@ -142,7 +142,7 @@ public class HjsonSerializer extends WriterSerializer implements HjsonMetaProvid
/**
* Builder class.
*/
- public static class Builder extends WriterSerializer.Builder {
+ public static class Builder extends WriterSerializer.Builder<Builder> {
private static final Cache<HashKey, HjsonSerializer> CACHE = Cache.of(HashKey.class, HjsonSerializer.class).build();
@@ -257,18 +257,6 @@ public class HjsonSerializer extends WriterSerializer implements HjsonMetaProvid
return useWhitespace();
}
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
@Override
public HjsonSerializer build() {
return cache(CACHE).build(HjsonSerializer.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonSerializerSession.java
index 32a7721991..045b990fa1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hjson/HjsonSerializerSession.java
@@ -46,7 +46,7 @@ public class HjsonSerializerSession extends WriterSerializerSession {
/**
* Builder for Hjson serializer session.
*/
- public static class Builder extends WriterSerializerSession.Builder {
+ public static class Builder extends WriterSerializerSession.Builder<Builder> {
private HjsonSerializer ctx;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconParser.java
index 262e238c86..46cdbdaa8e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconParser.java
@@ -79,7 +79,7 @@ public class HoconParser extends ReaderParser implements HoconMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends ReaderParser.Builder {
+ public static class Builder extends ReaderParser.Builder<Builder> {
private static final Cache<HashKey, HoconParser> CACHE = Cache.of(HashKey.class, HoconParser.class).build();
@@ -110,18 +110,6 @@ public class HoconParser extends ReaderParser implements HoconMetaProvider {
return this;
}
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
@Override
public HoconParser build() {
return cache(CACHE).build(HoconParser.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconParserSession.java
index bb91419746..b65d078428 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconParserSession.java
@@ -43,7 +43,7 @@ public class HoconParserSession extends ReaderParserSession {
/**
* Builder for HOCON parser session.
*/
- public static class Builder extends ReaderParserSession.Builder {
+ public static class Builder extends ReaderParserSession.Builder<Builder> {
private HoconParser hoconParser;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconSerializer.java
index 37e09dbfea..57586f9fd7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconSerializer.java
@@ -153,7 +153,7 @@ public class HoconSerializer extends WriterSerializer implements HoconMetaProvid
/**
* Builder class.
*/
- public static class Builder extends WriterSerializer.Builder {
+ public static class Builder extends WriterSerializer.Builder<Builder> {
private static final Cache<HashKey, HoconSerializer> CACHE = Cache.of(HashKey.class, HoconSerializer.class).build();
@@ -282,18 +282,6 @@ public class HoconSerializer extends WriterSerializer implements HoconMetaProvid
return useWhitespace();
}
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
@Override
public HoconSerializer build() {
return cache(CACHE).build(HoconSerializer.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconSerializerSession.java
index 7815e0ae39..e5ae41ec0a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/hocon/HoconSerializerSession.java
@@ -46,7 +46,7 @@ public class HoconSerializerSession extends WriterSerializerSession {
/**
* Builder for HOCON serializer session.
*/
- public static class Builder extends WriterSerializerSession.Builder {
+ public static class Builder extends WriterSerializerSession.Builder<Builder> {
private HoconSerializer ctx;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index f8a362e933..000ff354a1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -107,7 +107,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
/**
* Builder class.
*/
- public static class Builder extends HtmlStrippedDocSerializer.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends HtmlStrippedDocSerializer.Builder<SELF> {
private static final Cache<HashKey,HtmlDocSerializer> CACHE = Cache.of(HashKey.class, HtmlDocSerializer.class).build();
@@ -156,7 +156,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
*
* @param copyFrom The builder to copy from.
*/
- protected Builder(Builder copyFrom) {
+ protected Builder(Builder<?> copyFrom) {
super(copyFrom);
aside = copy(copyFrom.aside);
asideFloat = copyFrom.asideFloat;
@@ -199,108 +199,6 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
widgets = copy(copyFrom.widgets);
}
- @Override /* Overridden from Builder */
- public Builder accept(String value) {
- super.accept(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypes() {
- super.addBeanTypes();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypes(boolean value) {
- super.addBeanTypes(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypesHtml() {
- super.addBeanTypesHtml();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypesHtml(boolean value) {
- super.addBeanTypesHtml(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypesXml() {
- super.addBeanTypesXml();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addBeanTypesXml(boolean value) {
- super.addBeanTypesXml(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addKeyValueTableHeaders() {
- super.addKeyValueTableHeaders();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addKeyValueTableHeaders(boolean value) {
- super.addKeyValueTableHeaders(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addNamespaceUrisToRoot() {
- super.addNamespaceUrisToRoot();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addNamespaceUrisToRoot(boolean value) {
- super.addNamespaceUrisToRoot(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addRootType() {
- super.addRootType();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder addRootType(boolean value) {
- super.addRootType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
/**
* Returns the list of aside section contents.
*
@@ -364,9 +262,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder aside(String...value) {
+ public SELF aside(String...value) {
aside = merge(aside, value);
- return this;
+ return self();
}
/**
@@ -397,153 +295,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder asideFloat(AsideFloat value) {
+ public SELF asideFloat(AsideFloat value) {
asideFloat = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext.Builder value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanDictionary(java.lang.Class<?>...values) {
- super.beanDictionary(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanInterceptor(Class<?> on, Class<? extends org.apache.juneau.commons.bean.BeanInterceptor<?>> value) {
- super.beanInterceptor(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMethodVisibility(Visibility value) {
- super.beanMethodVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesReadOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Map<String,Object> values) {
- super.beanPropertiesReadOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(String beanClassName, String properties) {
- super.beanPropertiesReadOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesWriteOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Map<String,Object> values) {
- super.beanPropertiesWriteOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(String beanClassName, String properties) {
- super.beanPropertiesWriteOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSerializable() {
- super.beansRequireSerializable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
@@ -551,160 +305,8 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
return cache(CACHE).build(HtmlDocSerializer.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
- public Builder copy() {
- return new Builder(this);
- }
-
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder defaultNamespace(Namespace value) {
- super.defaultNamespace(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder detectRecursions() {
- super.detectRecursions();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder detectRecursions(boolean value) {
- super.detectRecursions(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder dictionaryOn(Class<?> on, java.lang.Class<?>...values) {
- super.dictionaryOn(on, values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableAutoDetectNamespaces() {
- super.disableAutoDetectNamespaces();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableAutoDetectNamespaces(boolean value) {
- super.disableAutoDetectNamespaces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableDetectLabelParameters() {
- super.disableDetectLabelParameters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableDetectLabelParameters(boolean value) {
- super.disableDetectLabelParameters(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableDetectLinksInStrings() {
- super.disableDetectLinksInStrings();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableDetectLinksInStrings(boolean value) {
- super.disableDetectLinksInStrings(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreMissingSetters() {
- super.disableIgnoreMissingSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreTransientFields() {
- super.disableIgnoreTransientFields();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreUnknownNullBeanProperties() {
- super.disableIgnoreUnknownNullBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableInterfaceProxies() {
- super.disableInterfaceProxies();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder enableNamespaces() {
- super.enableNamespaces();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder enableNamespaces(boolean value) {
- super.enableNamespaces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, String json) {
- super.example(pojoClass, json);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T> Builder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters() {
- super.findFluentSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder findFluentSetters(Class<?> on) {
- super.findFluentSetters(on);
- return this;
- }
+ public abstract SELF copy();
/**
* Returns the list of footer section contents.
@@ -744,9 +346,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder footer(String...value) {
+ public SELF footer(String...value) {
footer = merge(footer, value);
- return this;
+ return self();
}
@Override /* Overridden from Context.Builder */
@@ -808,9 +410,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder head(String...value) {
+ public SELF head(String...value) {
head = merge(head, value);
- return this;
+ return self();
}
/**
@@ -849,147 +451,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder header(String...value) {
+ public SELF header(String...value) {
header = merge(header, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnGetters() {
- super.ignoreInvocationExceptionsOnGetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreInvocationExceptionsOnSetters() {
- super.ignoreInvocationExceptionsOnSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreRecursions() {
- super.ignoreRecursions();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreRecursions(boolean value) {
- super.ignoreRecursions(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownBeanProperties() {
- super.ignoreUnknownBeanProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema() {
- super.validateSchema();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder validateSchema(boolean value) {
- super.validateSchema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ignoreUnknownEnumValues() {
- super.ignoreUnknownEnumValues();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder impl(Context value) {
- super.impl(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
- super.implClass(interfaceClass, implClass);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder implClasses(Map<Class<?>,Class<?>> values) {
- super.implClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder initialDepth(int value) {
- super.initialDepth(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaceClass(Class<?> on, Class<?> value) {
- super.interfaceClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder interfaces(java.lang.Class<?>...value) {
- super.interfaces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder keepNullProperties() {
- super.keepNullProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder keepNullProperties(boolean value) {
- super.keepNullProperties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder labelParameter(String value) {
- super.labelParameter(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder listener(Class<? extends org.apache.juneau.serializer.SerializerListener> value) {
- super.listener(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder maxDepth(int value) {
- super.maxDepth(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder maxIndent(int value) {
- super.maxIndent(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder namespaces(Namespace...values) {
- super.namespaces(values);
- return this;
+ return self();
}
/**
@@ -1031,9 +495,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder nav(String...value) {
+ public SELF nav(String...value) {
nav = merge(nav, value);
- return this;
+ return self();
}
/**
@@ -1092,9 +556,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder navlinks(String...value) {
+ public SELF navlinks(String...value) {
navlinks = mergeNavLinks(navlinks, value);
- return this;
+ return self();
}
/**
@@ -1118,21 +582,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder noResultsMessage(String value) {
+ public SELF noResultsMessage(String value) {
noResultsMessage = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanClasses(java.lang.Class<?>...values) {
- super.notBeanClasses(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder notBeanPackages(String...values) {
- super.notBeanPackages(values);
- return this;
+ return self();
}
/**
@@ -1143,7 +595,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
*
* @return This object.
*/
- public Builder nowrap() {
+ public SELF nowrap() {
return nowrap(true);
}
@@ -1155,45 +607,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* @return This object.
* @see #nowrap()
*/
- public Builder nowrap(boolean value) {
+ public SELF nowrap(boolean value) {
nowrap = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ns() {
- super.ns();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder produces(String value) {
- super.produces(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<?> on, Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder propertyNamer(Class<? extends org.apache.juneau.commons.bean.PropertyNamer> value) {
- super.propertyNamer(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder quoteChar(char value) {
- super.quoteChar(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder quoteCharOverride(char value) {
- super.quoteCharOverride(value);
- return this;
+ return self();
}
/**
@@ -1201,7 +617,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
*
* @return This object.
*/
- public Builder resolveBodyVars() {
+ public SELF resolveBodyVars() {
return resolveBodyVars(true);
}
@@ -1213,9 +629,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* @return This object.
* @see #nowrap()
*/
- public Builder resolveBodyVars(boolean value) {
+ public SELF resolveBodyVars(boolean value) {
resolveBodyVars = value;
- return this;
+ return self();
}
/**
@@ -1249,63 +665,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The value to add to this property.
* @return This object.
*/
- public Builder script(String...value) {
+ public SELF script(String...value) {
script = merge(script, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortCollections() {
- super.sortCollections();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortMaps() {
- super.sortMaps();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sortMaps(boolean value) {
- super.sortMaps(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties() {
- super.unsortedProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unsortedProperties(java.lang.Class<?>...on) {
- super.unsortedProperties(on);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder sq() {
- super.sq();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder stopClass(Class<?> on, Class<?> value) {
- super.stopClass(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
+ return self();
}
/**
@@ -1340,9 +702,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The value to add to this property.
* @return This object.
*/
- public Builder style(String...value) {
+ public SELF style(String...value) {
style = merge(style, value);
- return this;
+ return self();
}
/**
@@ -1370,33 +732,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The value to add to this property.
* @return This object.
*/
- public Builder stylesheet(String...value) {
+ public SELF stylesheet(String...value) {
stylesheet = merge(stylesheet, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction) {
- super.swap(normalClass, swappedClass, swapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public <T,S> Builder swap(Class<T> normalClass, Class<S> swappedClass, ThrowingFunction<T,S> swapFunction, ThrowingFunction<S,T> unswapFunction) {
- super.swap(normalClass, swappedClass, swapFunction, unswapFunction);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Class<?>...values) {
- super.swaps(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder swaps(Object...values) {
- super.swaps(values);
- return this;
+ return self();
}
/**
@@ -1421,119 +759,11 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The new value for this property.
* @return This object.
*/
- public Builder template(Class<? extends HtmlDocTemplate> value) {
+ public SELF template(Class<? extends HtmlDocTemplate> value) {
template = value;
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyCollections() {
- super.trimEmptyCollections();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyCollections(boolean value) {
- super.trimEmptyCollections(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyMaps() {
- super.trimEmptyMaps();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimEmptyMaps(boolean value) {
- super.trimEmptyMaps(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings() {
- super.trimStrings();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder trimStrings(boolean value) {
- super.trimStrings(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder type(Class<? extends org.apache.juneau.Context> value) {
- super.type(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typeName(Class<?> on, String value) {
- super.typeName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(Class<?> on, String value) {
- super.typePropertyName(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder typePropertyName(String value) {
- super.typePropertyName(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriAnchorText(AnchorText value) {
- super.uriAnchorText(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriContext(UriContext value) {
- super.uriContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder uriRelativity(UriRelativity value) {
- super.uriRelativity(value);
- return this;
+ return self();
}
- @Override /* Overridden from Builder */
- public Builder uriResolution(UriResolution value) {
- super.uriResolution(value);
- return this;
- }
-
-
- @Override /* Overridden from Builder */
- public Builder useJavaBeanIntrospector() {
- super.useJavaBeanIntrospector();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder useWhitespace() {
- super.useWhitespace();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder useWhitespace(boolean value) {
- super.useWhitespace(value);
- return this;
- }
/**
* Returns the list of page widgets.
@@ -1602,15 +832,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
@SuppressWarnings({
"unchecked" // Varargs method requires unchecked cast
})
- public Builder widgets(Class<? extends HtmlWidget>...values) {
+ public SELF widgets(Class<? extends HtmlWidget>...values) {
addAll(widgets(), values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder ws() {
- super.ws();
- return this;
+ return self();
}
private static List<String> merge(List<String> old, String[] newValues) {
@@ -1656,6 +880,27 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
}
}
+ /**
+ * Concrete default builder leaf for the non-subclassed {@link HtmlDocSerializer#create()} / {@link HtmlDocSerializer#copy()} path.
+ */
+ public static final class DefaultBuilder extends Builder<DefaultBuilder> {
+
+ DefaultBuilder() {}
+
+ DefaultBuilder(HtmlDocSerializer copyFrom) {
+ super(copyFrom);
+ }
+
+ DefaultBuilder(Builder<?> copyFrom) {
+ super(copyFrom);
+ }
+
+ @Override /* Overridden from Context.Builder */
+ public DefaultBuilder copy() {
+ return new DefaultBuilder(this);
+ }
+ }
+
private static final String[] EMPTY_ARRAY = {};
/** Default serializer, all default settings. */
@@ -1666,9 +911,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
*
* @return A new builder.
*/
- public static Builder create() {
- return new Builder();
-}
+ public static Builder<?> create() {
+ return new DefaultBuilder();
+ }
final String[] style;
final String[] stylesheet;
@@ -1697,7 +942,7 @@ final AsideFloat asideFloat;
*
* @param builder The builder for this object.
*/
- public HtmlDocSerializer(Builder builder) {
+ public HtmlDocSerializer(Builder<?> builder) {
super(builder);
aside = nn(builder.aside) ? toArray(builder.aside) : EMPTY_ARRAY;
asideFloat = builder.asideFloat;
@@ -1722,12 +967,12 @@ final AsideFloat asideFloat;
}
@Override /* Overridden from Context */
- public Builder copy() {
- return new Builder(this);
+ public Builder<?> copy() {
+ return new DefaultBuilder(this);
}
@Override /* Overridden from Context */
- public HtmlDocSerializerSession.Builder createSession() {
+ public HtmlDocSerializerSession.Builder<?> createSession() {
return HtmlDocSerializerSession.create(this);
}
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 15db35d723..bb836ea491 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
@@ -57,7 +57,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
/**
* Builder class.
*/
- public static class Builder extends HtmlStrippedDocSerializerSession.Builder {
+ public abstract static class Builder<SELF extends Builder<SELF>> extends HtmlStrippedDocSerializerSession.Builder<SELF> {
private HtmlDocSerializer ctx;
@@ -71,117 +71,20 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
this.ctx = ctx;
}
- @Override /* Overridden from Builder */
- public <T> Builder apply(Class<T> type, Consumer<T> apply) {
- super.apply(type, apply);
- return this;
- }
-
@Override
public HtmlDocSerializerSession build() {
return new HtmlDocSerializerSession(this);
}
- @Override /* Overridden from Builder */
- public Builder debug(Boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder fileCharset(Charset value) {
- super.fileCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder javaMethod(Method value) {
- super.javaMethod(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder locale(Locale value) {
- super.locale(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaType(MediaType value) {
- super.mediaType(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder mediaTypeDefault(MediaType value) {
- super.mediaTypeDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder properties(Map<String,Object> value) {
- super.properties(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder property(String key, Object value) {
- super.property(key, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder resolver(VarResolverSession value) {
- super.resolver(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schema(HttpPartSchema value) {
- super.schema(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder schemaDefault(HttpPartSchema value) {
- super.schemaDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder streamCharset(Charset value) {
- super.streamCharset(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZone(TimeZone value) {
- super.timeZone(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder timeZoneDefault(TimeZone value) {
- super.timeZoneDefault(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder unmodifiable() {
- super.unmodifiable();
- return this;
- }
+ }
- @Override /* Overridden from Builder */
- public Builder uriContext(UriContext value) {
- super.uriContext(value);
- return this;
- }
+ /**
+ * Concrete default builder leaf for the non-subclassed {@code create()} path (CRTP terminal).
+ */
+ public static final class DefaultBuilder extends Builder<DefaultBuilder> {
- @Override /* Overridden from Builder */
- public Builder useWhitespace(Boolean value) {
- super.useWhitespace(value);
- return this;
+ DefaultBuilder(HtmlDocSerializer ctx) {
+ super(ctx);
}
}
@@ -193,8 +96,8 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
* @param ctx The context creating this session.
* @return A new builder.
*/
- public static Builder create(HtmlDocSerializer ctx) {
- return new Builder(ctx);
+ public static Builder<?> create(HtmlDocSerializer ctx) {
+ return new DefaultBuilder(ctx);
}
private final HtmlDocSerializer ctx;
@@ -204,7 +107,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
*
* @param builder The builder for this object.
*/
- protected HtmlDocSerializerSession(Builder builder) {
+ protected HtmlDocSerializerSession(Builder<?> builder) {
super(builder);
ctx = builder.ctx;
addVarBean(HtmlWidgetMap.class, ctx.getWidgets());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index e19b89cd51..f4b17b1272 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -65,7 +65,7 @@ public class HtmlParser extends XmlParser implements HtmlMetaProvider {
/**
* Builder class.
*/
- public static class Builder extends XmlParser.Builder {
+ public static class Builder extends XmlParser.Builder<Builder> {
private static final Cache<HashKey,HtmlParser> CACHE = Cache.of(HashKey.class, HtmlParser.class).build();
@@ -96,550 +96,17 @@ public class HtmlParser extends XmlParser implements HtmlMetaProvider {
super(assertArgNotNull(ARG_copyFrom, copyFrom));
}
- @Override /* Overridden from Builder */
- public Builder annotations(Annotation...values) {
- super.annotations(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder apply(AnnotationWorkList work) {
- super.apply(work);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Class<?>...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder applyAnnotations(Object...from) {
- super.applyAnnotations(from);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder autoCloseStreams() {
- super.autoCloseStreams();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder autoCloseStreams(boolean value) {
- super.autoCloseStreams(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder marshallingContext(MarshallingContext.Builder value) {
- super.marshallingContext(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanDictionary(java.lang.Class<?>...values) {
- super.beanDictionary(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanInterceptor(Class<?> on, Class<? extends org.apache.juneau.commons.bean.BeanInterceptor<?>> value) {
- super.beanInterceptor(on, value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanMethodVisibility(Visibility value) {
- super.beanMethodVisibility(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Class<?> beanClass, String properties) {
- super.beanProperties(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(Map<String,Object> values) {
- super.beanProperties(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanProperties(String beanClassName, String properties) {
- super.beanProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Class<?> beanClass, String properties) {
- super.beanPropertiesExcludes(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(Map<String,Object> values) {
- super.beanPropertiesExcludes(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesExcludes(String beanClassName, String properties) {
- super.beanPropertiesExcludes(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesReadOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(Map<String,Object> values) {
- super.beanPropertiesReadOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesReadOnly(String beanClassName, String properties) {
- super.beanPropertiesReadOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Class<?> beanClass, String properties) {
- super.beanPropertiesWriteOnly(beanClass, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(Map<String,Object> values) {
- super.beanPropertiesWriteOnly(values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beanPropertiesWriteOnly(String beanClassName, String properties) {
- super.beanPropertiesWriteOnly(beanClassName, properties);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireDefaultConstructor() {
- super.beansRequireDefaultConstructor();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSerializable() {
- super.beansRequireSerializable();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder beansRequireSettersForGetters() {
- super.beansRequireSettersForGetters();
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public HtmlParser build() {
return cache(CACHE).build(HtmlParser.class);
}
- @Override /* Overridden from Builder */
- public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
- super.cache(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder consumes(String value) {
- super.consumes(value);
- return this;
- }
-
@Override /* Overridden from Context.Builder */
public Builder copy() {
return new Builder(this);
}
- @Override /* Overridden from Builder */
- public Builder debug() {
- super.debug();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debug(boolean value) {
- super.debug(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder debugOutputLines(int value) {
- super.debugOutputLines(value);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder dictionaryOn(Class<?> on, java.lang.Class<?>...values) {
- super.dictionaryOn(on, values);
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableBeansRequireSomeProperties() {
- super.disableBeansRequireSomeProperties();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreMissingSetters() {
- super.disableIgnoreMissingSetters();
- return this;
- }
-
- @Override /* Overridden from Builder */
- public Builder disableIgnoreTransientFields() {
- super.disableIgnoreTransientFields();
- return this;
... 34231 lines suppressed ...