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 2022/06/21 09:34:30 UTC

[juneau] branch master updated: Regenerate fluent setters

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 f9abfa29a Regenerate fluent setters
f9abfa29a is described below

commit f9abfa29aa9fc9853568874f24e803c30fb23e4b
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Tue Jun 21 05:34:07 2022 -0400

    Regenerate fluent setters
---
 .../main/java/org/apache/juneau/config/Config.java |  9 ++-
 .../apache/juneau/config/store/ClasspathStore.java |  9 ++-
 .../apache/juneau/config/store/ConfigStore.java    |  9 ++-
 .../org/apache/juneau/config/store/FileStore.java  |  9 ++-
 .../apache/juneau/config/store/MemoryStore.java    |  9 ++-
 .../main/java/org/apache/juneau/dto/html5/A.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Abbr.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Address.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Area.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Article.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Aside.java    |  4 ++
 .../java/org/apache/juneau/dto/html5/Audio.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/B.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Base.java     |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Bdi.java |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Bdo.java |  4 ++
 .../org/apache/juneau/dto/html5/Blockquote.java    |  4 ++
 .../java/org/apache/juneau/dto/html5/Body.java     |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Br.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Button.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Canvas.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Caption.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Cite.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Code.java     |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Col.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Colgroup.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Data.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Datalist.java |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Dd.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Del.java |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Dfn.java |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Div.java |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Dl.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Dt.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Em.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Embed.java    |  4 ++
 .../java/org/apache/juneau/dto/html5/Fieldset.java |  4 ++
 .../org/apache/juneau/dto/html5/Figcaption.java    |  4 ++
 .../java/org/apache/juneau/dto/html5/Figure.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Footer.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Form.java     |  4 ++
 .../main/java/org/apache/juneau/dto/html5/H1.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/H2.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/H3.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/H4.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/H5.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/H6.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Head.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Header.java   |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Hr.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Html.java     |  4 ++
 .../org/apache/juneau/dto/html5/HtmlElement.java   | 68 +++++++++++++++++++++-
 .../juneau/dto/html5/HtmlElementContainer.java     |  6 ++
 .../apache/juneau/dto/html5/HtmlElementMixed.java  |  6 ++
 .../juneau/dto/html5/HtmlElementRawText.java       |  6 ++
 .../apache/juneau/dto/html5/HtmlElementText.java   |  6 ++
 .../apache/juneau/dto/html5/HtmlElementVoid.java   |  4 ++
 .../main/java/org/apache/juneau/dto/html5/I.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Iframe.java   |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Img.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Input.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Ins.java |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Kbd.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Keygen.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Label.java    |  4 ++
 .../java/org/apache/juneau/dto/html5/Legend.java   |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Li.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Link.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Main.java     |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Map.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Mark.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Meta.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Meter.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Nav.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Noscript.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Object_.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Ol.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Optgroup.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Option.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Output.java   |  4 ++
 .../main/java/org/apache/juneau/dto/html5/P.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Param.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Pre.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Progress.java |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Q.java   |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Rb.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Rp.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Rt.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Rtc.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Ruby.java     |  4 ++
 .../main/java/org/apache/juneau/dto/html5/S.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Samp.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Script.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Section.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Select.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Small.java    |  4 ++
 .../java/org/apache/juneau/dto/html5/Source.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Span.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Strong.java   |  4 ++
 .../java/org/apache/juneau/dto/html5/Style.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Sub.java |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Sup.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Table.java    |  4 ++
 .../java/org/apache/juneau/dto/html5/Tbody.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Td.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Template.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Textarea.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Tfoot.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Th.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Thead.java    |  4 ++
 .../java/org/apache/juneau/dto/html5/Time.java     |  4 ++
 .../java/org/apache/juneau/dto/html5/Title.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Tr.java  |  4 ++
 .../java/org/apache/juneau/dto/html5/Track.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/U.java   |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Ul.java  |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Var.java |  4 ++
 .../java/org/apache/juneau/dto/html5/Video.java    |  4 ++
 .../main/java/org/apache/juneau/dto/html5/Wbr.java |  4 ++
 .../java/org/apache/juneau/jena/RdfParser.java     | 20 ++++---
 .../java/org/apache/juneau/jena/RdfSerializer.java | 20 ++++---
 .../main/java/org/apache/juneau/BeanContext.java   |  8 ++-
 .../java/org/apache/juneau/BeanContextable.java    |  8 ++-
 .../org/apache/juneau/BeanTraverseContext.java     | 14 ++++-
 .../main/java/org/apache/juneau/csv/CsvParser.java | 20 ++++---
 .../java/org/apache/juneau/csv/CsvSerializer.java  | 20 ++++---
 .../org/apache/juneau/html/HtmlDocSerializer.java  | 20 ++++---
 .../java/org/apache/juneau/html/HtmlParser.java    | 20 ++++---
 .../juneau/html/HtmlSchemaDocSerializer.java       | 14 ++++-
 .../apache/juneau/html/HtmlSchemaSerializer.java   | 20 ++++---
 .../org/apache/juneau/html/HtmlSerializer.java     | 20 ++++---
 .../juneau/html/HtmlStrippedDocSerializer.java     | 20 ++++---
 .../http/entity/SerializedEntityBuilder.java       | 12 ++--
 .../java/org/apache/juneau/json/JsonParser.java    | 20 ++++---
 .../apache/juneau/json/JsonSchemaSerializer.java   | 20 ++++---
 .../org/apache/juneau/json/JsonSerializer.java     | 20 ++++---
 .../juneau/jsonschema/JsonSchemaGenerator.java     | 10 +++-
 .../org/apache/juneau/msgpack/MsgPackParser.java   | 20 ++++---
 .../apache/juneau/msgpack/MsgPackSerializer.java   | 20 ++++---
 .../java/org/apache/juneau/oapi/OpenApiParser.java | 20 ++++---
 .../org/apache/juneau/oapi/OpenApiSerializer.java  | 20 ++++---
 .../apache/juneau/parser/InputStreamParser.java    | 14 ++++-
 .../main/java/org/apache/juneau/parser/Parser.java | 14 ++++-
 .../org/apache/juneau/parser/ReaderParser.java     | 14 ++++-
 .../apache/juneau/plaintext/PlainTextParser.java   | 20 ++++---
 .../juneau/plaintext/PlainTextSerializer.java      | 20 ++++---
 .../org/apache/juneau/reflect/ConstructorInfo.java |  1 +
 .../juneau/serializer/OutputStreamSerializer.java  | 14 ++++-
 .../org/apache/juneau/serializer/Serializer.java   | 14 ++++-
 .../apache/juneau/serializer/WriterSerializer.java | 14 ++++-
 .../org/apache/juneau/soap/SoapXmlSerializer.java  | 20 ++++---
 .../main/java/org/apache/juneau/uon/UonParser.java | 20 ++++---
 .../java/org/apache/juneau/uon/UonSerializer.java  | 20 ++++---
 .../juneau/urlencoding/UrlEncodingParser.java      | 20 ++++---
 .../juneau/urlencoding/UrlEncodingSerializer.java  | 20 ++++---
 .../main/java/org/apache/juneau/xml/XmlParser.java | 20 ++++---
 .../java/org/apache/juneau/xml/XmlSerializer.java  | 20 ++++---
 .../org/apache/juneau/rest/client/RestClient.java  | 14 ++++-
 .../apache/juneau/rest/mock/MockRestClient.java    | 20 ++++++-
 .../java/org/apache/juneau/rest/RestContext.java   |  9 ++-
 .../java/org/apache/juneau/rest/RestOpContext.java |  9 ++-
 161 files changed, 1073 insertions(+), 203 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 64f260c06..28675fc10 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
@@ -35,6 +35,7 @@ import org.apache.juneau.json.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.svl.*;
+import org.apache.juneau.utils.*;
 
 /**
  * Main configuration API class.
@@ -496,6 +497,12 @@ public final class Config extends Context implements ConfigEventListener {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -515,7 +522,7 @@ public final class Config extends Context implements ConfigEventListener {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
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 a46c9ea80..08dbfecca 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
@@ -21,6 +21,7 @@ import java.util.concurrent.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.internal.*;
+import org.apache.juneau.utils.*;
 
 /**
  * Classpath-based storage location for configuration files.
@@ -133,6 +134,12 @@ public class ClasspathStore extends ConfigStore {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -152,7 +159,7 @@ public class ClasspathStore extends ConfigStore {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
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 ae44a12a5..7d6e05c63 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
@@ -23,6 +23,7 @@ import java.util.concurrent.*;
 import org.apache.juneau.*;
 import org.apache.juneau.config.internal.*;
 import org.apache.juneau.internal.*;
+import org.apache.juneau.utils.*;
 
 /**
  * Represents a storage location for configuration files.
@@ -112,6 +113,12 @@ public abstract class ConfigStore extends Context implements Closeable {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -131,7 +138,7 @@ public abstract class ConfigStore extends Context implements Closeable {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
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 13de2c1c3..6650e832e 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
@@ -30,6 +30,7 @@ import java.util.concurrent.*;
 import org.apache.juneau.*;
 import org.apache.juneau.collections.*;
 import org.apache.juneau.internal.*;
+import org.apache.juneau.utils.*;
 
 /**
  * Filesystem-based storage location for configuration files.
@@ -321,6 +322,12 @@ public class FileStore extends ConfigStore {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -340,7 +347,7 @@ public class FileStore extends ConfigStore {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
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 6b869fdab..67c026f96 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
@@ -21,6 +21,7 @@ import java.util.concurrent.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.internal.*;
+import org.apache.juneau.utils.*;
 
 /**
  * Filesystem-based storage location for configuration files.
@@ -130,6 +131,12 @@ public class MemoryStore extends ConfigStore {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -149,7 +156,7 @@ public class MemoryStore extends ConfigStore {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
index 249c71cda..d6ae42e8b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
@@ -174,4 +174,8 @@ public class A extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
index a891d7eb3..f58b7774b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
@@ -81,4 +81,8 @@ public class Abbr extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
index 5cfe7cc9c..0971f6817 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
@@ -73,4 +73,8 @@ public class Address extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
index c6fe46cf5..ed28b4cf9 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
@@ -206,4 +206,8 @@ public class Area extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
index 3461c2809..17fb52511 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
@@ -118,4 +118,8 @@ public class Article extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
index fe4c34746..b83eba966 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
@@ -73,4 +73,8 @@ public class Aside extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
index 4d83276ae..8dacdec3d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
@@ -212,4 +212,8 @@ public class Audio extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
index 634caf7bd..392b9622b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
@@ -73,4 +73,8 @@ public class B extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
index 9463daf17..b5aa5d675 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
@@ -103,4 +103,8 @@ public class Base extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
index a955dea8c..f5676243c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
@@ -67,4 +67,8 @@ public class Bdi extends HtmlElementText {
 		super.text(text);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
index b6ad22693..59ee1e893 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
@@ -80,4 +80,8 @@ public class Bdo extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
index b0988a078..b654f7340 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
@@ -89,4 +89,8 @@ public class Blockquote extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
index aea252d59..9ed8cab9c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
@@ -146,4 +146,8 @@ public class Body extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
index 65f05d90f..bf0bdb4ed 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
@@ -52,4 +52,8 @@ public class Br extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
index beebeccaf..b0da98068 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
@@ -270,4 +270,8 @@ public class Button extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
index 8755ef2f1..f0f5068e8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
@@ -108,4 +108,8 @@ public class Canvas extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
index 089137094..83b13d7ad 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
@@ -73,4 +73,8 @@ public class Caption extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
index d420f2389..0ec9cd866 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
@@ -73,4 +73,8 @@ public class Cite extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
index ecc1a5659..93c41593c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
@@ -73,4 +73,8 @@ public class Code extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
index a6a071972..7f1263de1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
@@ -78,4 +78,8 @@ public class Col extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
index 5f61cf0e2..0b18ea98c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
@@ -90,4 +90,8 @@ public class Colgroup extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
index bc341f6d5..940f02d45 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
@@ -92,4 +92,8 @@ public class Data extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
index 0987aaf8f..057b69c6c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
@@ -74,4 +74,8 @@ public class Datalist extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
index 66c268c0a..eb1dbba19 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
@@ -73,4 +73,8 @@ public class Dd extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
index 751e9c8cd..dff29f74f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
@@ -102,4 +102,8 @@ public class Del extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
index 343446c00..fbb43c01f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
@@ -73,4 +73,8 @@ public class Dfn extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
index f8fc2a1f6..e2f91b112 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
@@ -73,4 +73,8 @@ public class Div extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
index a90261cc6..bc9d32960 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
@@ -73,4 +73,8 @@ public class Dl extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
index 751fcf1d3..ec6831335 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
@@ -73,4 +73,8 @@ public class Dt extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
index 6bd96f34d..2bad1ec66 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
@@ -73,4 +73,8 @@ public class Em extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
index 5a2aeffaf..be6c43d67 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
@@ -135,4 +135,8 @@ public class Embed extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
index 8cee353aa..ef2041f08 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
@@ -118,4 +118,8 @@ public class Fieldset extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
index 29d57e883..b39a2c4e8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
@@ -73,4 +73,8 @@ public class Figcaption extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
index 2377257b4..bb27a0d79 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
@@ -73,4 +73,8 @@ public class Figure extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
index 3ae0b9954..62dbdce4a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
@@ -73,4 +73,8 @@ public class Footer extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
index 0f3774be0..32c4d509a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
@@ -210,4 +210,8 @@ public class Form extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
index 38c1f7208..ec41c1ccf 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
@@ -73,4 +73,8 @@ public class H1 extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
index 3f6d867ac..801f7f25d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
@@ -73,4 +73,8 @@ public class H2 extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
index 1483d8309..a27bfcbde 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
@@ -73,4 +73,8 @@ public class H3 extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
index e7491690e..700da4390 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
@@ -73,4 +73,8 @@ public class H4 extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
index 9997be649..e2494caf7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
@@ -73,4 +73,8 @@ public class H5 extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
index b8f415a2b..1310b0a7f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
@@ -73,4 +73,8 @@ public class H6 extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
index 652e7abc4..4d272fb9b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
@@ -73,4 +73,8 @@ public class Head extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
index 7ba8b5eba..16f0fdc65 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
@@ -73,4 +73,8 @@ public class Header extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
index e30ca87f5..1b36f301d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
@@ -52,4 +52,8 @@ public class Hr extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
index e130a69d7..acf925f98 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
@@ -88,4 +88,8 @@ public class Html extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
index ee4bd01ed..748254572 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
@@ -146,7 +146,8 @@ public abstract class HtmlElement {
 	 *
 	 * @param accesskey The new value for this attribute.
 	 * @return This object.
-	 */
+	 */
+	@FluentSetter
 	public HtmlElement accesskey(String accesskey) {
 		attr("accesskey", accesskey);
 		return this;
@@ -158,6 +159,7 @@ public abstract class HtmlElement {
 	 * @param _class The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement _class(String _class) {
 		attr("class", _class);
 		return this;
@@ -171,6 +173,7 @@ public abstract class HtmlElement {
 	 * Typically a {@link Boolean} or {@link String}.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement contenteditable(Object contenteditable) {
 		attr("contenteditable", contenteditable);
 		return this;
@@ -182,6 +185,7 @@ public abstract class HtmlElement {
 	 * @param dir The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement dir(String dir) {
 		attr("dir", dir);
 		return this;
@@ -195,6 +199,7 @@ public abstract class HtmlElement {
 	 * 	Typically a {@link Boolean} or {@link String}.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement hidden(Object hidden) {
 		attr("hidden", deminimize(hidden, "hidden"));
 		return this;
@@ -206,6 +211,7 @@ public abstract class HtmlElement {
 	 * @param id The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement id(String id) {
 		attr("id", id);
 		return this;
@@ -217,6 +223,7 @@ public abstract class HtmlElement {
 	 * @param lang The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement lang(String lang) {
 		attr("lang", lang);
 		return this;
@@ -228,6 +235,7 @@ public abstract class HtmlElement {
 	 * @param onabort The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onabort(String onabort) {
 		attr("onabort", onabort);
 		return this;
@@ -239,6 +247,7 @@ public abstract class HtmlElement {
 	 * @param onblur The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onblur(String onblur) {
 		attr("onblur", onblur);
 		return this;
@@ -250,6 +259,7 @@ public abstract class HtmlElement {
 	 * @param oncancel The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement oncancel(String oncancel) {
 		attr("oncancel", oncancel);
 		return this;
@@ -261,6 +271,7 @@ public abstract class HtmlElement {
 	 * @param oncanplay The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement oncanplay(String oncanplay) {
 		attr("oncanplay", oncanplay);
 		return this;
@@ -273,6 +284,7 @@ public abstract class HtmlElement {
 	 * @param oncanplaythrough The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement oncanplaythrough(String oncanplaythrough) {
 		attr("oncanplaythrough", oncanplaythrough);
 		return this;
@@ -284,6 +296,7 @@ public abstract class HtmlElement {
 	 * @param onchange The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onchange(String onchange) {
 		attr("onchange", onchange);
 		return this;
@@ -295,6 +308,7 @@ public abstract class HtmlElement {
 	 * @param onclick The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onclick(String onclick) {
 		attr("onclick", onclick);
 		return this;
@@ -307,6 +321,7 @@ public abstract class HtmlElement {
 	 * @param oncuechange The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement oncuechange(String oncuechange) {
 		attr("oncuechange", oncuechange);
 		return this;
@@ -318,6 +333,7 @@ public abstract class HtmlElement {
 	 * @param ondblclick The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement ondblclick(String ondblclick) {
 		attr("ondblclick", ondblclick);
 		return this;
@@ -330,6 +346,7 @@ public abstract class HtmlElement {
 	 * @param ondurationchange The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement ondurationchange(String ondurationchange) {
 		attr("ondurationchange", ondurationchange);
 		return this;
@@ -341,6 +358,7 @@ public abstract class HtmlElement {
 	 * @param onemptied The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onemptied(String onemptied) {
 		attr("onemptied", onemptied);
 		return this;
@@ -352,6 +370,7 @@ public abstract class HtmlElement {
 	 * @param onended The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onended(String onended) {
 		attr("onended", onended);
 		return this;
@@ -363,6 +382,7 @@ public abstract class HtmlElement {
 	 * @param onerror The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onerror(String onerror) {
 		attr("onerror", onerror);
 		return this;
@@ -374,6 +394,7 @@ public abstract class HtmlElement {
 	 * @param onfocus The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onfocus(String onfocus) {
 		attr("onfocus", onfocus);
 		return this;
@@ -385,6 +406,7 @@ public abstract class HtmlElement {
 	 * @param oninput The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement oninput(String oninput) {
 		attr("oninput", oninput);
 		return this;
@@ -396,6 +418,7 @@ public abstract class HtmlElement {
 	 * @param oninvalid The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement oninvalid(String oninvalid) {
 		attr("oninvalid", oninvalid);
 		return this;
@@ -407,6 +430,7 @@ public abstract class HtmlElement {
 	 * @param onkeydown The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onkeydown(String onkeydown) {
 		attr("onkeydown", onkeydown);
 		return this;
@@ -418,6 +442,7 @@ public abstract class HtmlElement {
 	 * @param onkeypress The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onkeypress(String onkeypress) {
 		attr("onkeypress", onkeypress);
 		return this;
@@ -429,6 +454,7 @@ public abstract class HtmlElement {
 	 * @param onkeyup The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onkeyup(String onkeyup) {
 		attr("onkeyup", onkeyup);
 		return this;
@@ -440,6 +466,7 @@ public abstract class HtmlElement {
 	 * @param onload The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onload(String onload) {
 		attr("onload", onload);
 		return this;
@@ -452,6 +479,7 @@ public abstract class HtmlElement {
 	 * @param onloadeddata The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onloadeddata(String onloadeddata) {
 		attr("onloadeddata", onloadeddata);
 		return this;
@@ -464,6 +492,7 @@ public abstract class HtmlElement {
 	 * @param onloadedmetadata The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onloadedmetadata(String onloadedmetadata) {
 		attr("onloadedmetadata", onloadedmetadata);
 		return this;
@@ -476,6 +505,7 @@ public abstract class HtmlElement {
 	 * @param onloadstart The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onloadstart(String onloadstart) {
 		attr("onloadstart", onloadstart);
 		return this;
@@ -488,6 +518,7 @@ public abstract class HtmlElement {
 	 * @param onmousedown The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onmousedown(String onmousedown) {
 		attr("onmousedown", onmousedown);
 		return this;
@@ -499,6 +530,7 @@ public abstract class HtmlElement {
 	 * @param onmouseenter The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onmouseenter(String onmouseenter) {
 		attr("onmouseenter", onmouseenter);
 		return this;
@@ -511,6 +543,7 @@ public abstract class HtmlElement {
 	 * @param onmouseleave The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onmouseleave(String onmouseleave) {
 		attr("onmouseleave", onmouseleave);
 		return this;
@@ -523,6 +556,7 @@ public abstract class HtmlElement {
 	 * @param onmousemove The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onmousemove(String onmousemove) {
 		attr("onmousemove", onmousemove);
 		return this;
@@ -534,6 +568,7 @@ public abstract class HtmlElement {
 	 * @param onmouseout The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onmouseout(String onmouseout) {
 		attr("onmouseout", onmouseout);
 		return this;
@@ -546,6 +581,7 @@ public abstract class HtmlElement {
 	 * @param onmouseover The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onmouseover(String onmouseover) {
 		attr("onmouseover", onmouseover);
 		return this;
@@ -557,6 +593,7 @@ public abstract class HtmlElement {
 	 * @param onmouseup The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onmouseup(String onmouseup) {
 		attr("onmouseup", onmouseup);
 		return this;
@@ -569,6 +606,7 @@ public abstract class HtmlElement {
 	 * @param onmousewheel The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onmousewheel(String onmousewheel) {
 		attr("onmousewheel", onmousewheel);
 		return this;
@@ -580,6 +618,7 @@ public abstract class HtmlElement {
 	 * @param onpause The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onpause(String onpause) {
 		attr("onpause", onpause);
 		return this;
@@ -591,6 +630,7 @@ public abstract class HtmlElement {
 	 * @param onplay The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onplay(String onplay) {
 		attr("onplay", onplay);
 		return this;
@@ -602,6 +642,7 @@ public abstract class HtmlElement {
 	 * @param onplaying The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onplaying(String onplaying) {
 		attr("onplaying", onplaying);
 		return this;
@@ -613,6 +654,7 @@ public abstract class HtmlElement {
 	 * @param onprogress The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onprogress(String onprogress) {
 		attr("onprogress", onprogress);
 		return this;
@@ -625,6 +667,7 @@ public abstract class HtmlElement {
 	 * @param onratechange The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onratechange(String onratechange) {
 		attr("onratechange", onratechange);
 		return this;
@@ -636,6 +679,7 @@ public abstract class HtmlElement {
 	 * @param onreset The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onreset(String onreset) {
 		attr("onreset", onreset);
 		return this;
@@ -647,6 +691,7 @@ public abstract class HtmlElement {
 	 * @param onresize The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onresize(String onresize) {
 		attr("onresize", onresize);
 		return this;
@@ -658,6 +703,7 @@ public abstract class HtmlElement {
 	 * @param onscroll The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onscroll(String onscroll) {
 		attr("onscroll", onscroll);
 		return this;
@@ -669,6 +715,7 @@ public abstract class HtmlElement {
 	 * @param onseeked The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onseeked(String onseeked) {
 		attr("onseeked", onseeked);
 		return this;
@@ -680,6 +727,7 @@ public abstract class HtmlElement {
 	 * @param onseeking The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onseeking(String onseeking) {
 		attr("onseeking", onseeking);
 		return this;
@@ -691,6 +739,7 @@ public abstract class HtmlElement {
 	 * @param onselect The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onselect(String onselect) {
 		attr("onselect", onselect);
 		return this;
@@ -702,6 +751,7 @@ public abstract class HtmlElement {
 	 * @param onshow The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onshow(String onshow) {
 		attr("onshow", onshow);
 		return this;
@@ -713,6 +763,7 @@ public abstract class HtmlElement {
 	 * @param onstalled The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onstalled(String onstalled) {
 		attr("onstalled", onstalled);
 		return this;
@@ -724,6 +775,7 @@ public abstract class HtmlElement {
 	 * @param onsubmit The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onsubmit(String onsubmit) {
 		attr("onsubmit", onsubmit);
 		return this;
@@ -735,6 +787,7 @@ public abstract class HtmlElement {
 	 * @param onsuspend The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onsuspend(String onsuspend) {
 		attr("onsuspend", onsuspend);
 		return this;
@@ -747,6 +800,7 @@ public abstract class HtmlElement {
 	 * @param ontimeupdate The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement ontimeupdate(String ontimeupdate) {
 		attr("ontimeupdate", ontimeupdate);
 		return this;
@@ -758,6 +812,7 @@ public abstract class HtmlElement {
 	 * @param ontoggle The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement ontoggle(String ontoggle) {
 		attr("ontoggle", ontoggle);
 		return this;
@@ -770,6 +825,7 @@ public abstract class HtmlElement {
 	 * @param onvolumechange The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onvolumechange(String onvolumechange) {
 		attr("onvolumechange", onvolumechange);
 		return this;
@@ -781,6 +837,7 @@ public abstract class HtmlElement {
 	 * @param onwaiting The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement onwaiting(String onwaiting) {
 		attr("onwaiting", onwaiting);
 		return this;
@@ -794,6 +851,7 @@ public abstract class HtmlElement {
 	 * 	Typically a {@link Boolean} or {@link String}.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement spellcheck(Object spellcheck) {
 		attr("spellcheck", spellcheck);
 		return this;
@@ -805,6 +863,7 @@ public abstract class HtmlElement {
 	 * @param style The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement style(String style) {
 		attr("style", style);
 		return this;
@@ -818,6 +877,7 @@ public abstract class HtmlElement {
 	 * 	Typically a {@link Number} or {@link String}.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement tabindex(Object tabindex) {
 		attr("tabindex", tabindex);
 		return this;
@@ -829,6 +889,7 @@ public abstract class HtmlElement {
 	 * @param title The new value for this attribute.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement title(String title) {
 		attr("title", title);
 		return this;
@@ -842,6 +903,7 @@ public abstract class HtmlElement {
 	 * 	Typically a {@link Number} or {@link String}.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement translate(Object translate) {
 		attr("translate", translate);
 		return this;
@@ -863,6 +925,10 @@ public abstract class HtmlElement {
 		return value;
 	}
 
+	// <FluentSetters>
+
+	// </FluentSetters>
+
 	@Override /* Object */
 	public String toString() {
 		return HtmlSerializer.DEFAULT_SQ.toString(this);
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
index cd6838903..b16e99514 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
@@ -117,6 +117,7 @@ public class HtmlElementContainer extends HtmlElement {
 	 * @param children The children to add as child elements.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement children(Object...children) {
 		if (children.length > 0) {
 			if (this.children == null)
@@ -133,10 +134,15 @@ public class HtmlElementContainer extends HtmlElement {
 	 * @param child The child to add as a child element.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement child(Object child) {
 		if (this.children == null)
 			this.children = new LinkedList<>();
 		this.children.add(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
index 68277d363..aaba23983 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
@@ -121,6 +121,7 @@ public class HtmlElementMixed extends HtmlElement {
 	 * 	Can also be containers of strings and elements.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement children(Object...children) {
 		if (children.length != 0)
 			for (Object c : children)
@@ -137,6 +138,7 @@ public class HtmlElementMixed extends HtmlElement {
 	 * 	Can also be a container of strings and elements.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement child(Object child) {
 		if (this.children == null)
 			this.children = new LinkedList<>();
@@ -146,4 +148,8 @@ public class HtmlElementMixed extends HtmlElement {
 			this.children.add(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
index 1c94316fd..1dffc835a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
@@ -13,6 +13,7 @@
 package org.apache.juneau.dto.html5;
 
 import org.apache.juneau.annotation.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.xml.annotation.*;
 
 /**
@@ -57,8 +58,13 @@ public class HtmlElementRawText extends HtmlElement {
 	 * @param text The text node to add to this element.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement text(Object text) {
 		this.text = text;
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
index b2573de7b..31eea869b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
@@ -13,6 +13,7 @@
 package org.apache.juneau.dto.html5;
 
 import org.apache.juneau.annotation.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.xml.annotation.*;
 
 /**
@@ -56,8 +57,13 @@ public class HtmlElementText extends HtmlElement {
 	 * @param text The text node to add to this element.
 	 * @return This object.
 	 */
+	@FluentSetter
 	public HtmlElement text(Object text) {
 		this.text = text;
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
index e4584b075..2badbceaf 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
@@ -29,4 +29,8 @@ import org.apache.juneau.xml.annotation.*;
  */
 @Xml(format=VOID)
 public class HtmlElementVoid extends HtmlElement {
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java
index 6fafd2c38..44946a038 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java
@@ -73,4 +73,8 @@ public class I extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
index 0de683ca4..871dd4f99 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
@@ -177,4 +177,8 @@ public class Iframe extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
index a8b0b0ed5..308edc4ea 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
@@ -181,4 +181,8 @@ public class Img extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
index 0eac57f3c..72b1163b0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
@@ -554,4 +554,8 @@ public class Input extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
index 4e58925dd..acd23f2c0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
@@ -102,4 +102,8 @@ public class Ins extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
index 3516defe1..956a3910c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
@@ -73,4 +73,8 @@ public class Kbd extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
index cc659ccc6..c32b63d8d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
@@ -141,4 +141,8 @@ public class Keygen extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
index 27e61bfc1..23542203d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
@@ -102,4 +102,8 @@ public class Label extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
index e54ffff57..f0d95a866 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
@@ -73,4 +73,8 @@ public class Legend extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
index a00033b13..7ecfc3488 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
@@ -73,4 +73,8 @@ public class Li extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
index feb7caba1..0fa3c0768 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
@@ -174,4 +174,8 @@ public class Link extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
index 63c290763..2bd2af813 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
@@ -73,4 +73,8 @@ public class Main extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
index e541de2a7..00c60a02a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
@@ -88,4 +88,8 @@ public class Map extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
index 757758c77..ba5293f04 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
@@ -73,4 +73,8 @@ public class Mark extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
index bcd783e86..d7f81c524 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
@@ -106,4 +106,8 @@ public class Meta extends HtmlElementVoid {
 		super.id(id);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
index 2d1ba152b..19633a6cc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
@@ -170,4 +170,8 @@ public class Meter extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
index cec8c7420..31ff561c5 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
@@ -73,4 +73,8 @@ public class Nav extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
index 3df37fa5c..01ab3d419 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
@@ -74,4 +74,8 @@ public class Noscript extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
index 81f576cb5..c904e3899 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
@@ -195,4 +195,8 @@ public class Object_ extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
index 422be1df4..b055735b0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
@@ -121,4 +121,8 @@ public class Ol extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
index bb62b171c..91ca2a907 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
@@ -104,4 +104,8 @@ public class Optgroup extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
index 1379c7a0f..7e68ba185 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
@@ -141,4 +141,8 @@ public class Option extends HtmlElementText {
 		super.text(text);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
index 93c61001e..f518e7500 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
@@ -116,4 +116,8 @@ public class Output extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
index c710c6098..64fa7c018 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
@@ -73,4 +73,8 @@ public class P extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
index a65ad2b36..8ff7a7c51 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
@@ -89,4 +89,8 @@ public class Param extends HtmlElementVoid {
 		super.id(id);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
index d9c09974f..fa355f52f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
@@ -85,4 +85,8 @@ public class Pre extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
index c1538e63f..d9d33d684 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
@@ -106,4 +106,8 @@ public class Progress extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
index b20e2eacf..a74967469 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
@@ -88,4 +88,8 @@ public class Q extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
index dfdca17fb..03260ec43 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
@@ -73,4 +73,8 @@ public class Rb extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
index be7f8ffab..38e621aaa 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
@@ -73,4 +73,8 @@ public class Rp extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
index e431e97de..63187c15a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
@@ -73,4 +73,8 @@ public class Rt extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
index 32958fe43..2ae8e01d1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
@@ -73,4 +73,8 @@ public class Rtc extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
index 0a80f9374..67374d788 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
@@ -73,4 +73,8 @@ public class Ruby extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
index 6078baff3..cb3f3f286 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
@@ -73,4 +73,8 @@ public class S extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
index 26d78bd35..2f3cb54ad 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
@@ -73,4 +73,8 @@ public class Samp extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
index 784a0ce38..1f30bef5a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
@@ -167,4 +167,8 @@ public class Script extends HtmlElementRawText {
 		super.text(text);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
index 43f73bd94..746bc66c1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
@@ -73,4 +73,8 @@ public class Section extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
index b09dd4dfb..20bc99ad1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
@@ -203,4 +203,8 @@ public class Select extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
index b059f0bfa..f1630736e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
@@ -73,4 +73,8 @@ public class Small extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
index f132cbe48..605934385 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
@@ -98,4 +98,8 @@ public class Source extends HtmlElementVoid {
 		super.id(id);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
index aaec36a9a..5da86089d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
@@ -73,4 +73,8 @@ public class Span extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
index fa4fbf593..2afbc1f74 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
@@ -73,4 +73,8 @@ public class Strong extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
index ae0193b16..d227fc959 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
@@ -109,4 +109,8 @@ public class Style extends HtmlElementRawText {
 		super.text(text);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
index d3dc5441d..591dc8105 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
@@ -73,4 +73,8 @@ public class Sub extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
index 4594d469b..933a3be22 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
@@ -73,4 +73,8 @@ public class Sup extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
index 8d49330e2..3a06dd289 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
@@ -87,4 +87,8 @@ public class Table extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
index 601e14bf3..a29b6579b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
@@ -73,4 +73,8 @@ public class Tbody extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
index e864bb1b3..f80c3e71c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
@@ -120,4 +120,8 @@ public class Td extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
index 4b2da9461..fb75929bb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
@@ -74,4 +74,8 @@ public class Template extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
index 4dfc6f836..184277d58 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
@@ -297,4 +297,8 @@ public class Textarea extends HtmlElementRawText {
 		super.text(text);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
index 5ce8b24fe..47bde7182 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
@@ -73,4 +73,8 @@ public class Tfoot extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
index 6f3aa5886..dfb0c141c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
@@ -162,4 +162,8 @@ public class Th extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
index bb4ec93b5..d2ec16202 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
@@ -73,4 +73,8 @@ public class Thead extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
index e6db0bcdb..1d6a3df04 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
@@ -89,4 +89,8 @@ public class Time extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
index e665063d7..f3d72d23b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
@@ -67,4 +67,8 @@ public class Title extends HtmlElementRawText {
 		super.text(text);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
index ec3469cef..b129ee474 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
@@ -73,4 +73,8 @@ public class Tr extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
index 14e0eb273..2023ca4a8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
@@ -142,4 +142,8 @@ public class Track extends HtmlElementVoid {
 		super.id(id);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
index 3cd65644f..6ad869ca9 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
@@ -73,4 +73,8 @@ public class U extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
index 06c2f6df4..2d48d9873 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
@@ -73,4 +73,8 @@ public class Ul extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
index 93bb1de3e..445922b78 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
@@ -73,4 +73,8 @@ public class Var extends HtmlElementMixed {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
index 3f4e06e81..efebb70bb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
@@ -260,4 +260,8 @@ public class Video extends HtmlElementContainer {
 		super.child(child);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
index d4b6ff9dd..bd42fb338 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
@@ -52,4 +52,8 @@ public class Wbr extends HtmlElementVoid {
 		super.style(style);
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
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 727acc020..65c81bc34 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
@@ -990,12 +990,12 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -1015,7 +1015,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -1242,6 +1242,12 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
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 02c6cfb98..46938a4b6 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
@@ -1218,12 +1218,12 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -1243,7 +1243,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -1470,6 +1470,12 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index cefbf9e3a..0e06fc467 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -3465,6 +3465,12 @@ public class BeanContext extends Context {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -3484,7 +3490,7 @@ public class BeanContext extends Context {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
index 62cd26636..6a751b282 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
@@ -2984,6 +2984,12 @@ public abstract class BeanContextable extends Context {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder impl(Context value) {
 			super.impl(value);
@@ -2991,7 +2997,7 @@ public abstract class BeanContextable extends Context {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index 2c2a613c7..9b0b106d3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -314,6 +314,12 @@ public abstract class BeanTraverseContext extends BeanContextable {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -333,7 +339,7 @@ public abstract class BeanTraverseContext extends BeanContextable {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -560,6 +566,12 @@ public abstract class BeanTraverseContext extends BeanContextable {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
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 caa5add66..298cfd5f2 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
@@ -136,12 +136,12 @@ public class CsvParser extends ReaderParser implements CsvMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -161,7 +161,7 @@ public class CsvParser extends ReaderParser implements CsvMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -388,6 +388,12 @@ public class CsvParser extends ReaderParser implements CsvMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
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 75d5a6e1f..e13334dd8 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
@@ -136,18 +136,18 @@ public final class CsvSerializer extends WriterSerializer implements CsvMetaProv
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug(boolean value) {
 			super.debug(value);
@@ -161,7 +161,7 @@ public final class CsvSerializer extends WriterSerializer implements CsvMetaProv
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -388,6 +388,12 @@ public final class CsvSerializer extends WriterSerializer implements CsvMetaProv
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
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 a36f2051d..bb86fc764 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
@@ -832,12 +832,12 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -857,7 +857,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -1084,6 +1084,12 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
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 90a0a6083..eb7cc5a57 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
@@ -147,12 +147,12 @@ public class HtmlParser extends XmlParser implements HtmlMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -172,7 +172,7 @@ public class HtmlParser extends XmlParser implements HtmlMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -399,6 +399,12 @@ public class HtmlParser extends XmlParser implements HtmlMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index 80cca69f8..5778fdba6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -284,6 +284,12 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -303,7 +309,7 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -530,6 +536,12 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index 1f0c13f17..e9db0134b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -352,12 +352,12 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -377,7 +377,7 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -604,6 +604,12 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index e65eb7673..d14e74a41 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -741,12 +741,12 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -766,7 +766,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -993,6 +993,12 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index 18b9d2065..3b5b3ccab 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -149,12 +149,12 @@ public class HtmlStrippedDocSerializer extends HtmlSerializer {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -174,7 +174,7 @@ public class HtmlStrippedDocSerializer extends HtmlSerializer {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -401,6 +401,12 @@ public class HtmlStrippedDocSerializer extends HtmlSerializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/SerializedEntityBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/SerializedEntityBuilder.java
index 42ca9e237..754fc3cac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/SerializedEntityBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/entity/SerializedEntityBuilder.java
@@ -132,6 +132,12 @@ public class SerializedEntityBuilder<T extends SerializedEntity> extends HttpEnt
 		return this;
 	}
 
+	@Override /* GENERATED - org.apache.juneau.http.entity.HttpEntityBuilder */
+	public SerializedEntityBuilder<T> content(Supplier<?> value) {
+		super.content(value);
+		return this;
+	}
+
 	@Override /* GENERATED - org.apache.juneau.http.entity.HttpEntityBuilder */
 	public SerializedEntityBuilder<T> contentEncoding(String value) {
 		super.contentEncoding(value);
@@ -150,12 +156,6 @@ public class SerializedEntityBuilder<T extends SerializedEntity> extends HttpEnt
 		return this;
 	}
 
-	@Override /* GENERATED - org.apache.juneau.http.entity.HttpEntityBuilder */
-	public SerializedEntityBuilder<T> content(Supplier<?> value) {
-		super.content(value);
-		return this;
-	}
-
 	@Override /* GENERATED - org.apache.juneau.http.entity.HttpEntityBuilder */
 	public SerializedEntityBuilder<T> contentType(String value) {
 		super.contentType(value);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index 9d5f66460..a59f28ba3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -285,12 +285,12 @@ public class JsonParser extends ReaderParser implements JsonMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -310,7 +310,7 @@ public class JsonParser extends ReaderParser implements JsonMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -537,6 +537,12 @@ public class JsonParser extends ReaderParser implements JsonMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index a301bf52c..2affd3022 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -344,12 +344,12 @@ public class JsonSchemaSerializer extends JsonSerializer implements JsonSchemaMe
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -369,7 +369,7 @@ public class JsonSchemaSerializer extends JsonSerializer implements JsonSchemaMe
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -596,6 +596,12 @@ public class JsonSchemaSerializer extends JsonSerializer implements JsonSchemaMe
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 8b094c64b..11fce0c9a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -435,12 +435,12 @@ public class JsonSerializer extends WriterSerializer implements JsonMetaProvider
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -460,7 +460,7 @@ public class JsonSerializer extends WriterSerializer implements JsonMetaProvider
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -687,6 +687,12 @@ public class JsonSerializer extends WriterSerializer implements JsonMetaProvider
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index a6367d9a7..6c423cf2f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -420,7 +420,7 @@ public class JsonSchemaGenerator extends BeanTraverseContext implements JsonSche
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
 			super.cache(value);
 			return this;
 		}
@@ -444,7 +444,7 @@ public class JsonSchemaGenerator extends BeanTraverseContext implements JsonSche
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -671,6 +671,12 @@ public class JsonSchemaGenerator extends BeanTraverseContext implements JsonSche
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index 6757c0537..fc23dc15a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -179,12 +179,12 @@ public class MsgPackParser extends InputStreamParser implements MsgPackMetaProvi
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -204,7 +204,7 @@ public class MsgPackParser extends InputStreamParser implements MsgPackMetaProvi
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -431,6 +431,12 @@ public class MsgPackParser extends InputStreamParser implements MsgPackMetaProvi
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index f5671c7cc..27e095c6e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -217,12 +217,12 @@ public class MsgPackSerializer extends OutputStreamSerializer implements MsgPack
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -242,7 +242,7 @@ public class MsgPackSerializer extends OutputStreamSerializer implements MsgPack
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -469,6 +469,12 @@ public class MsgPackSerializer extends OutputStreamSerializer implements MsgPack
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
index 38849d538..33a21d6f1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
@@ -254,12 +254,12 @@ public class OpenApiParser extends UonParser implements OpenApiMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -279,7 +279,7 @@ public class OpenApiParser extends UonParser implements OpenApiMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -506,6 +506,12 @@ public class OpenApiParser extends UonParser implements OpenApiMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index 373af3c44..7f953080e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -265,12 +265,12 @@ public class OpenApiSerializer extends UonSerializer implements OpenApiMetaProvi
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -290,7 +290,7 @@ public class OpenApiSerializer extends UonSerializer implements OpenApiMetaProvi
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -517,6 +517,12 @@ public class OpenApiSerializer extends UonSerializer implements OpenApiMetaProvi
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
index 5eb77a247..1ef38bfde 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
@@ -177,6 +177,12 @@ public class InputStreamParser extends Parser {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -196,7 +202,7 @@ public class InputStreamParser extends Parser {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -423,6 +429,12 @@ public class InputStreamParser extends Parser {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index 928b1a56b..46310fc8b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -613,6 +613,12 @@ public class Parser extends BeanContextable {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -632,7 +638,7 @@ public class Parser extends BeanContextable {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -859,6 +865,12 @@ public class Parser extends BeanContextable {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
index 76390b489..ed1589c75 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -215,6 +215,12 @@ public class ReaderParser extends Parser {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -234,7 +240,7 @@ public class ReaderParser extends Parser {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -461,6 +467,12 @@ public class ReaderParser extends Parser {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 4b649a85d..7213e7efa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -155,12 +155,12 @@ public class PlainTextParser extends ReaderParser implements PlainTextMetaProvid
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -180,7 +180,7 @@ public class PlainTextParser extends ReaderParser implements PlainTextMetaProvid
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -407,6 +407,12 @@ public class PlainTextParser extends ReaderParser implements PlainTextMetaProvid
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 121aae530..a34c77a16 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -151,12 +151,12 @@ public class PlainTextSerializer extends WriterSerializer implements PlainTextMe
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -176,7 +176,7 @@ public class PlainTextSerializer extends WriterSerializer implements PlainTextMe
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -403,6 +403,12 @@ public class PlainTextSerializer extends WriterSerializer implements PlainTextMe
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
index 29d695156..f6387b23c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
@@ -267,5 +267,6 @@ public final class ConstructorInfo extends ExecutableInfo implements Comparable<
 		super.accessible();
 		return this;
 	}
+
 	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index 5f5a09027..a5a57c64d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -171,6 +171,12 @@ public class OutputStreamSerializer extends Serializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -190,7 +196,7 @@ public class OutputStreamSerializer extends Serializer {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -417,6 +423,12 @@ public class OutputStreamSerializer extends Serializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 11025f5cf..fcbeb2669 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -863,6 +863,12 @@ public class Serializer extends BeanTraverseContext {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -882,7 +888,7 @@ public class Serializer extends BeanTraverseContext {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -1109,6 +1115,12 @@ public class Serializer extends BeanTraverseContext {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index ebe504602..32e45d0be 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -425,6 +425,12 @@ public class WriterSerializer extends Serializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -444,7 +450,7 @@ public class WriterSerializer extends Serializer {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -671,6 +677,12 @@ public class WriterSerializer extends Serializer {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index 6b0e0dc42..63aa7dd6a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -169,12 +169,12 @@ public class SoapXmlSerializer extends XmlSerializer implements SoapXmlMetaProvi
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -194,7 +194,7 @@ public class SoapXmlSerializer extends XmlSerializer implements SoapXmlMetaProvi
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -421,6 +421,12 @@ public class SoapXmlSerializer extends XmlSerializer implements SoapXmlMetaProvi
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index ca9101848..bc0996714 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -257,12 +257,12 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -282,7 +282,7 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -509,6 +509,12 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index 2d1a05ee7..8a75fceb6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -488,12 +488,12 @@ public class UonSerializer extends WriterSerializer implements HttpPartSerialize
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -513,7 +513,7 @@ public class UonSerializer extends WriterSerializer implements HttpPartSerialize
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -740,6 +740,12 @@ public class UonSerializer extends WriterSerializer implements HttpPartSerialize
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 6d69bac65..0c56ab844 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -216,12 +216,12 @@ public class UrlEncodingParser extends UonParser implements UrlEncodingMetaProvi
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -241,7 +241,7 @@ public class UrlEncodingParser extends UonParser implements UrlEncodingMetaProvi
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -468,6 +468,12 @@ public class UrlEncodingParser extends UonParser implements UrlEncodingMetaProvi
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index c6457941a..a3b4ff279 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -353,12 +353,12 @@ public class UrlEncodingSerializer extends UonSerializer implements UrlEncodingM
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -378,7 +378,7 @@ public class UrlEncodingSerializer extends UonSerializer implements UrlEncodingM
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -605,6 +605,12 @@ public class UrlEncodingSerializer extends UonSerializer implements UrlEncodingM
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index a83e816bb..3a001cfbb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -299,12 +299,12 @@ public class XmlParser extends ReaderParser implements XmlMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -324,7 +324,7 @@ public class XmlParser extends ReaderParser implements XmlMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -551,6 +551,12 @@ public class XmlParser extends ReaderParser implements XmlMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index f35366ead..992df80cc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -541,12 +541,12 @@ public class XmlSerializer extends WriterSerializer implements XmlMetaProvider {
 			return this;
 		}
 
-		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder cache(Cache<HashKey,? extends Context> value) {
-			super.cache(value);
-			return this;
-		}
-
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -566,7 +566,7 @@ public class XmlSerializer extends WriterSerializer implements XmlMetaProvider {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -793,6 +793,12 @@ public class XmlSerializer extends WriterSerializer implements XmlMetaProvider {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 3b6a5e553..6469d0768 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -5494,6 +5494,12 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder impl(Context value) {
 			super.impl(value);
@@ -5501,7 +5507,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -5710,6 +5716,12 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index 98d0b5400..eb7b383d3 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -613,6 +613,12 @@ public class MockRestClient extends RestClient implements HttpClientConnection {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder impl(Context value) {
 			super.impl(value);
@@ -620,7 +626,7 @@ public class MockRestClient extends RestClient implements HttpClientConnection {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
@@ -847,6 +853,12 @@ public class MockRestClient extends RestClient implements HttpClientConnection {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
+		public Builder ignoreUnknownEnumValues() {
+			super.ignoreUnknownEnumValues();
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.BeanContextable.Builder */
 		public Builder implClass(Class<?> interfaceClass, Class<?> implClass) {
 			super.implClass(interfaceClass, implClass);
@@ -1532,6 +1544,12 @@ public class MockRestClient extends RestClient implements HttpClientConnection {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.rest.client.RestClient.Builder */
+		public Builder proxyAuthenticationStrategy(AuthenticationStrategy proxyAuthStrategy) {
+			super.proxyAuthenticationStrategy(proxyAuthStrategy);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.rest.client.RestClient.Builder */
 		public Builder publicSuffixMatcher(PublicSuffixMatcher publicSuffixMatcher) {
 			super.publicSuffixMatcher(publicSuffixMatcher);
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index c06a1f899..d60b8d043 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -81,6 +81,7 @@ import org.apache.juneau.rest.vars.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.svl.*;
 import org.apache.juneau.svl.vars.*;
+import org.apache.juneau.utils.*;
 
 /**
  * Defines the initial configuration of a <c>RestServlet</c> or <c>@Rest</c> annotated object.
@@ -5728,6 +5729,12 @@ public class RestContext extends Context {
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -5747,7 +5754,7 @@ public class RestContext extends Context {
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 0ad08cf1f..9b2e91e76 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -62,6 +62,7 @@ import org.apache.juneau.rest.swagger.*;
 import org.apache.juneau.rest.util.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.svl.*;
+import org.apache.juneau.utils.*;
 
 /**
  * Represents a single Java servlet/resource method annotated with {@link RestOp @RestOp}.
@@ -2136,6 +2137,12 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
 			return this;
 		}
 
+		@Override /* GENERATED - org.apache.juneau.Context.Builder */
+		public Builder cache(Cache<HashKey,? extends org.apache.juneau.Context> value) {
+			super.cache(value);
+			return this;
+		}
+
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
 		public Builder debug() {
 			super.debug();
@@ -2155,7 +2162,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
 		}
 
 		@Override /* GENERATED - org.apache.juneau.Context.Builder */
-		public Builder type(Class<? extends Context> value) {
+		public Builder type(Class<? extends org.apache.juneau.Context> value) {
 			super.type(value);
 			return this;
 		}