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 2021/02/22 00:20:03 UTC

[juneau] branch master updated: Cleanup 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 f628e29  Cleanup fluent setters.
f628e29 is described below

commit f628e295a07a6aa32a4b8a3e5b5f650d646f856a
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Sun Feb 21 19:19:45 2021 -0500

    Cleanup fluent setters.
---
 TODO.txt                                           |  9 ++++
 .../main/ConfigurablePropertyCodeGenerator.java    | 31 +++++++++++++-
 .../org/apache/juneau/config/ConfigBuilder.java    |  2 +
 .../config/store/ConfigClasspathStoreBuilder.java  |  2 +
 .../config/store/ConfigFileStoreBuilder.java       |  2 +
 .../config/store/ConfigMemoryStoreBuilder.java     |  2 +
 .../juneau/config/store/ConfigStoreBuilder.java    |  2 +
 .../org/apache/juneau/jena/RdfParserBuilder.java   |  1 +
 .../apache/juneau/jena/RdfSerializerBuilder.java   |  1 +
 .../org/apache/juneau/BasicRuntimeException.java   |  1 +
 .../java/org/apache/juneau/BeanContextBuilder.java |  1 +
 .../java/org/apache/juneau/BeanSessionArgs.java    |  1 +
 .../org/apache/juneau/BeanTraverseBuilder.java     |  1 +
 .../java/org/apache/juneau/ContextBuilder.java     |  1 +
 .../main/java/org/apache/juneau/SessionArgs.java   |  1 +
 .../juneau/annotation/AnnotationBuilder.java       |  3 ++
 .../annotation/TargetedAnnotationBuilder.java      |  1 +
 .../annotation/TargetedAnnotationCBuilder.java     |  1 +
 .../annotation/TargetedAnnotationMBuilder.java     |  1 +
 .../annotation/TargetedAnnotationMFBuilder.java    |  1 +
 .../annotation/TargetedAnnotationMFCBuilder.java   | 20 +++++++++
 .../annotation/TargetedAnnotationTBuilder.java     |  1 +
 .../annotation/TargetedAnnotationTMBuilder.java    |  1 +
 .../annotation/TargetedAnnotationTMFBuilder.java   |  1 +
 .../annotation/TargetedAnnotationTMFCBuilder.java  |  1 +
 .../org/apache/juneau/assertions/Assertion.java    |  1 +
 .../java/org/apache/juneau/cp/BeanFactory.java     |  2 +-
 .../org/apache/juneau/cp/BeanFactoryBuilder.java   |  5 +++
 .../org/apache/juneau/cp/FileFinderBuilder.java    |  2 +
 .../org/apache/juneau/csv/CsvParserBuilder.java    |  2 +
 .../apache/juneau/csv/CsvSerializerBuilder.java    |  2 +
 .../juneau/html/HtmlDocSerializerBuilder.java      |  1 +
 .../org/apache/juneau/html/HtmlParserBuilder.java  |  2 +
 .../juneau/html/HtmlSchemaSerializerBuilder.java   |  1 +
 .../apache/juneau/html/HtmlSerializerBuilder.java  |  1 +
 .../html/HtmlStrippedDocSerializerBuilder.java     |  2 +
 .../java/org/apache/juneau/http/BasicHeader.java   |  1 +
 .../org/apache/juneau/http/BasicHttpEntity.java    |  1 +
 .../org/apache/juneau/http/BasicHttpResource.java  |  1 +
 .../org/apache/juneau/http/BasicNameValuePair.java |  2 +
 .../org/apache/juneau/http/SerializedHeader.java   |  2 +
 .../apache/juneau/http/SerializedHttpEntity.java   |  1 +
 .../juneau/http/SerializedNameValuePair.java       |  2 +
 .../apache/juneau/http/exception/BadRequest.java   |  8 ++++
 .../org/apache/juneau/http/exception/Conflict.java |  8 ++++
 .../juneau/http/exception/ExpectationFailed.java   |  8 ++++
 .../juneau/http/exception/FailedDependency.java    |  8 ++++
 .../apache/juneau/http/exception/Forbidden.java    |  8 ++++
 .../org/apache/juneau/http/exception/Gone.java     |  8 ++++
 .../juneau/http/exception/HttpException.java       |  8 ++--
 .../http/exception/HttpVersionNotSupported.java    |  8 ++++
 .../juneau/http/exception/InsufficientStorage.java |  8 ++++
 .../juneau/http/exception/InternalServerError.java |  8 ++++
 .../juneau/http/exception/LengthRequired.java      |  8 ++++
 .../org/apache/juneau/http/exception/Locked.java   |  8 ++++
 .../apache/juneau/http/exception/LoopDetected.java |  8 ++++
 .../juneau/http/exception/MethodNotAllowed.java    |  8 ++++
 .../juneau/http/exception/MisdirectedRequest.java  |  8 ++++
 .../exception/NetworkAuthenticationRequired.java   |  8 ++++
 .../juneau/http/exception/NotAcceptable.java       |  8 ++++
 .../apache/juneau/http/exception/NotExtended.java  |  8 ++++
 .../org/apache/juneau/http/exception/NotFound.java |  8 ++++
 .../juneau/http/exception/NotImplemented.java      |  8 ++++
 .../juneau/http/exception/PayloadTooLarge.java     |  8 ++++
 .../juneau/http/exception/PreconditionFailed.java  |  8 ++++
 .../http/exception/PreconditionRequired.java       |  8 ++++
 .../juneau/http/exception/RangeNotSatisfiable.java |  8 ++++
 .../exception/RequestHeaderFieldsTooLarge.java     |  8 ++++
 .../juneau/http/exception/ServiceUnavailable.java  |  8 ++++
 .../juneau/http/exception/TooManyRequests.java     |  8 ++++
 .../apache/juneau/http/exception/Unauthorized.java |  8 ++++
 .../http/exception/UnavailableForLegalReasons.java |  8 ++++
 .../juneau/http/exception/UnprocessableEntity.java |  8 ++++
 .../http/exception/UnsupportedMediaType.java       |  8 ++++
 .../juneau/http/exception/UpgradeRequired.java     |  8 ++++
 .../apache/juneau/http/exception/UriTooLong.java   |  8 ++++
 .../http/exception/VariantAlsoNegotiates.java      |  8 ++++
 .../org/apache/juneau/http/response/Accepted.java  |  2 +
 .../juneau/http/response/AlreadyReported.java      |  2 +
 .../org/apache/juneau/http/response/Continue.java  |  2 +
 .../org/apache/juneau/http/response/Created.java   |  2 +
 .../apache/juneau/http/response/EarlyHints.java    |  2 +
 .../org/apache/juneau/http/response/Found.java     |  2 +
 .../apache/juneau/http/response/HttpResponse.java  |  1 +
 .../org/apache/juneau/http/response/IMUsed.java    |  2 +
 .../juneau/http/response/MovedPermanently.java     |  2 +
 .../apache/juneau/http/response/MultiStatus.java   |  2 +
 .../juneau/http/response/MultipleChoices.java      |  2 +
 .../org/apache/juneau/http/response/NoContent.java |  2 +
 .../http/response/NonAuthoritiveInformation.java   |  2 +
 .../apache/juneau/http/response/NotModified.java   |  2 +
 .../java/org/apache/juneau/http/response/Ok.java   |  2 +
 .../juneau/http/response/PartialContent.java       |  2 +
 .../juneau/http/response/PermanentRedirect.java    |  2 +
 .../apache/juneau/http/response/Processing.java    |  2 +
 .../apache/juneau/http/response/ResetContent.java  |  2 +
 .../org/apache/juneau/http/response/SeeOther.java  |  2 +
 .../juneau/http/response/SwitchingProtocols.java   |  2 +
 .../juneau/http/response/TemporaryRedirect.java    |  2 +
 .../org/apache/juneau/http/response/UseProxy.java  |  2 +
 .../org/apache/juneau/jso/JsoParserBuilder.java    |  2 +
 .../apache/juneau/jso/JsoSerializerBuilder.java    |  2 +
 .../org/apache/juneau/json/JsonParserBuilder.java  |  1 +
 .../juneau/json/JsonSchemaSerializerBuilder.java   |  1 +
 .../apache/juneau/json/JsonSerializerBuilder.java  |  1 +
 .../juneau/json/SimpleJsonParserBuilder.java       |  2 +
 .../juneau/json/SimpleJsonSerializerBuilder.java   |  2 +
 .../jsonschema/JsonSchemaGeneratorBuilder.java     |  1 +
 .../juneau/msgpack/MsgPackParserBuilder.java       |  2 +
 .../juneau/msgpack/MsgPackSerializerBuilder.java   |  2 +
 .../juneau/mstat/MethodExecStatsBuilder.java       |  5 +++
 .../juneau/mstat/MethodExecStoreBuilder.java       |  2 +
 .../apache/juneau/mstat/ThrownStatsBuilder.java    |  5 +++
 .../apache/juneau/mstat/ThrownStoreBuilder.java    |  2 +
 .../apache/juneau/oapi/OpenApiParserBuilder.java   |  1 +
 .../juneau/oapi/OpenApiSerializerBuilder.java      |  1 +
 .../juneau/parser/InputStreamParserBuilder.java    |  1 +
 .../org/apache/juneau/parser/ParserBuilder.java    |  1 +
 .../apache/juneau/parser/ParserGroupBuilder.java   |  1 +
 .../apache/juneau/parser/ParserSessionArgs.java    |  1 +
 .../apache/juneau/parser/ReaderParserBuilder.java  |  1 +
 .../juneau/plaintext/PlainTextParserBuilder.java   |  2 +
 .../plaintext/PlainTextSerializerBuilder.java      |  2 +
 .../org/apache/juneau/reflect/ConstructorInfo.java |  2 +
 .../org/apache/juneau/reflect/ExecutableInfo.java  |  1 +
 .../java/org/apache/juneau/reflect/MethodInfo.java |  1 +
 .../serializer/OutputStreamSerializerBuilder.java  |  1 +
 .../juneau/serializer/SerializerBuilder.java       |  1 +
 .../juneau/serializer/SerializerGroupBuilder.java  |  1 +
 .../juneau/serializer/SerializerSessionArgs.java   |  1 +
 .../juneau/serializer/WriterSerializerBuilder.java |  1 +
 .../juneau/soap/SoapXmlSerializerBuilder.java      |  1 +
 .../org/apache/juneau/uon/UonParserBuilder.java    |  1 +
 .../apache/juneau/uon/UonSerializerBuilder.java    |  1 +
 .../urlencoding/UrlEncodingParserBuilder.java      |  1 +
 .../urlencoding/UrlEncodingSerializerBuilder.java  |  1 +
 .../org/apache/juneau/xml/XmlParserBuilder.java    |  1 +
 .../apache/juneau/xml/XmlSerializerBuilder.java    |  1 +
 .../assertion/FluentResponseBodyAssertion.java     |  5 +++
 .../assertion/FluentResponseHeaderAssertion.java   |  6 +++
 .../org/apache/juneau/rest/RequestHttpPart.java    |  5 +++
 .../juneau/rest/RestOperationContextBuilder.java   |  1 +
 .../org/apache/juneau/rest/StaticFilesBuilder.java | 49 +++++++++++-----------
 .../assertions/FluentProtocolVersionAssertion.java |  6 +++
 .../assertions/FluentRequestBodyAssertion.java     |  5 +++
 .../FluentRequestFormParamAssertion.java           |  6 +++
 .../assertions/FluentRequestHeaderAssertion.java   |  6 +++
 .../assertions/FluentRequestLineAssertion.java     |  5 +++
 .../FluentRequestQueryParamAssertion.java          |  6 +++
 .../juneau/http/exception/HttpException_Test.java  |  4 +-
 150 files changed, 566 insertions(+), 32 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 54136aa..1f4543a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -13,3 +13,12 @@ Thrown NotFound causes - javax.servlet.ServletException: Invalid method response
 
 Instead of PropertyStores, builders should produce settings which are passed to contexts.
 
+Replace @Bean(findFluentSetters) with @FluentSetters.
+Remove @BeanIgnore annotations from classes.
+HttpResponse should use list of Headers and have a headers(Header...) method.
+HttpResponse should allow you to set code.
+Assertion.assertNotNull methods should be generic?
+HttpException subclasses can set status, but does it use code?
+HttpException should use list of Headers and have a headers(Header...) method.
+Add Named bean support by looking for @Named annotations.
+Rename BeanFactory to BeanStore.
\ No newline at end of file
diff --git a/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java b/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
index fcb993f..35dd419 100644
--- a/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
+++ b/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
@@ -23,6 +23,7 @@ import org.apache.juneau.assertions.*;
 import org.apache.juneau.collections.*;
 import org.apache.juneau.config.*;
 import org.apache.juneau.config.store.*;
+import org.apache.juneau.cp.*;
 import org.apache.juneau.csv.*;
 import org.apache.juneau.html.*;
 import org.apache.juneau.http.*;
@@ -34,12 +35,15 @@ import org.apache.juneau.jso.*;
 import org.apache.juneau.json.*;
 import org.apache.juneau.jsonschema.*;
 import org.apache.juneau.msgpack.*;
+import org.apache.juneau.mstat.*;
 import org.apache.juneau.oapi.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.plaintext.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.rest.*;
+import org.apache.juneau.rest.assertions.*;
 import org.apache.juneau.rest.client.*;
+import org.apache.juneau.rest.client.assertion.*;
 import org.apache.juneau.rest.mock.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.soap.*;
@@ -63,6 +67,7 @@ public class ConfigurablePropertyCodeGenerator {
 		BasicRuntimeException.class,
 		BeanAssertion.class,
 		BeanContextBuilder.class,
+		BeanFactoryBuilder.class,
 		BeanSessionArgs.class,
 		BeanTraverseBuilder.class,
 		BooleanAssertion.class,
@@ -86,6 +91,7 @@ public class ConfigurablePropertyCodeGenerator {
 		ExecutableInfo.class,
 		ExpectationFailed.class,
 		FailedDependency.class,
+		FileFinderBuilder.class,
 		FluentArrayAssertion.class,
 		FluentAssertion.class,
 		FluentBaseAssertion.class,
@@ -100,6 +106,14 @@ public class ConfigurablePropertyCodeGenerator {
 		FluentLongAssertion.class,
 		FluentMapAssertion.class,
 		FluentObjectAssertion.class,
+		FluentProtocolVersionAssertion.class,
+		FluentRequestBodyAssertion.class,
+		FluentRequestFormParamAssertion.class,
+		FluentRequestHeaderAssertion.class,
+		FluentRequestLineAssertion.class,
+		FluentRequestQueryParamAssertion.class,
+		FluentResponseBodyAssertion.class,
+		FluentResponseHeaderAssertion.class,
 		FluentStringAssertion.class,
 		FluentThrowableAssertion.class,
 		FluentZonedDateTimeAssertion.class,
@@ -131,11 +145,12 @@ public class ConfigurablePropertyCodeGenerator {
 		LongAssertion.class,
 		LoopDetected.class,
 		MapAssertion.class,
+		MethodExecStatsBuilder.class,
+		MethodExecStoreBuilder.class,
 		MethodInfo.class,
 		MethodNotAllowed.class,
 		MisdirectedRequest.class,
 		MockRestClientBuilder.class,
-		MockRestClientBuilder.class,
 		MovedPermanently.class,
 		MsgPackParserBuilder.class,
 		MsgPackSerializerBuilder.class,
@@ -170,6 +185,7 @@ public class ConfigurablePropertyCodeGenerator {
 		RdfSerializerBuilder.class,
 		ReaderParserBuilder.class,
 		RequestHeaderFieldsTooLarge.class,
+		RequestHttpPart.class,
 		ResetContent.class,
 		RestClientBuilder.class,
 		RestContextBuilder.class,
@@ -186,18 +202,22 @@ public class ConfigurablePropertyCodeGenerator {
 		SimpleJsonParserBuilder.class,
 		SimpleJsonSerializerBuilder.class,
 		SoapXmlSerializerBuilder.class,
+		StaticFilesBuilder.class,
 		StringAssertion.class,
 		SwitchingProtocols.class,
 		TargetedAnnotationBuilder.class,
 		TargetedAnnotationCBuilder.class,
 		TargetedAnnotationMBuilder.class,
 		TargetedAnnotationMFBuilder.class,
+		TargetedAnnotationMFCBuilder.class,
 		TargetedAnnotationTBuilder.class,
 		TargetedAnnotationTMBuilder.class,
 		TargetedAnnotationTMFBuilder.class,
 		TargetedAnnotationTMFCBuilder.class,
 		TemporaryRedirect.class,
 		ThrowableAssertion.class,
+		ThrownStatsBuilder.class,
+		ThrownStoreBuilder.class,
 		TooManyRequests.class,
 		Unauthorized.class,
 		UnavailableForLegalReasons.class,
@@ -236,10 +256,12 @@ public class ConfigurablePropertyCodeGenerator {
 		Map<Class<?>, Set<Method>> configMethods = new HashMap<>();
 
 		for (Class<?> c : classes) {
+			System.out.println("Seaching " + c.getName());
 			Set<Method> s = new TreeSet<>(new MethodComparator());
 			for (Method m : c.getDeclaredMethods()) {
 				if (m.getAnnotation(FluentSetter.class) != null) {
 					s.add(m);
+					System.out.println("\tFound: " + m.getName());
 				}
 			}
 			configMethods.put(c, s);
@@ -247,8 +269,13 @@ public class ConfigurablePropertyCodeGenerator {
 
 		for (Class<?> c : classes) {
 			File f = findClassFile(c);
+
 			if (f == null)
-				throw new RuntimeException("Couldn't find class " + c.getName());
+				System.err.println("Couldn't find class " + c.getName());
+
+			if (! c.isAnnotationPresent(FluentSetters.class))
+				System.err.println("@FluentSetters not present on class " + c.getName());
+
 			System.out.println("Processing " + f.getName());
 			String s = IOUtils.read(f);
 
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
index 66c4b01..bd9fa9e 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.*;
 import org.apache.juneau.config.encode.*;
 import org.apache.juneau.config.store.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.json.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.reflect.*;
@@ -40,6 +41,7 @@ import org.apache.juneau.svl.*;
  * 	<li class='link'>{@doc juneau-config}
  * </ul>
  */
+@FluentSetters
 public class ConfigBuilder extends ContextBuilder {
 
 	/**
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigClasspathStoreBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigClasspathStoreBuilder.java
index 761f0c7..374f086 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigClasspathStoreBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigClasspathStoreBuilder.java
@@ -17,12 +17,14 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 
 /**
  * Builder for {@link ConfigClasspathStore} objects.
  */
+@FluentSetters
 public class ConfigClasspathStoreBuilder extends ConfigStoreBuilder {
 
 	/**
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
index f84925b..a53a0fc 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
@@ -21,12 +21,14 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 
 /**
  * Builder for {@link ConfigFileStore} objects.
  */
+@FluentSetters
 public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
 
 	/**
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
index 1a13ccb..4f7f11d 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
@@ -17,12 +17,14 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 
 /**
  * Builder for {@link ConfigMemoryStore} objects.
  */
+@FluentSetters
 public class ConfigMemoryStoreBuilder extends ConfigStoreBuilder {
 
 	/**
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
index fcfd6ae..1abbcf9 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
@@ -17,12 +17,14 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 
 /**
  * Base builder class for {@link ConfigStore} objects.
  */
+@FluentSetters
 public abstract class ConfigStoreBuilder extends ContextBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index 8463077..1132619 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -31,6 +31,7 @@ import org.apache.juneau.xml.*;
 /**
  * Builder class for building instances of RDF parsers.
  */
+@FluentSetters
 public class RdfParserBuilder extends ReaderParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index bbe0631..135eb1d 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -33,6 +33,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Builder class for building instances of RDF serializers.
  */
+@FluentSetters
 public class RdfSerializerBuilder extends WriterSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BasicRuntimeException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BasicRuntimeException.java
index ad71fe5..6e070b0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BasicRuntimeException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BasicRuntimeException.java
@@ -21,6 +21,7 @@ import org.apache.juneau.internal.*;
 /**
  * Subclass of runtime exceptions that take in a message and zero or more arguments.
  */
+@FluentSetters
 public class BasicRuntimeException extends RuntimeException {
 
 	private static final long serialVersionUID = 1L;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
index 3698f18..2c930db 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
@@ -63,6 +63,7 @@ import org.apache.juneau.transform.*;
  * 	<li class='link'>{@doc GlossaryConfigurableProperties}
  * </ul>
  */
+@FluentSetters
 public class BeanContextBuilder extends ContextBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSessionArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSessionArgs.java
index 7fded29..72b9861 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSessionArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSessionArgs.java
@@ -22,6 +22,7 @@ import org.apache.juneau.internal.*;
 /**
  * Runtime arguments common to all bean, serializer, and parser sessions.
  */
+@FluentSetters
 public class BeanSessionArgs extends SessionArgs {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
index eea9bcc..4b81b6f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
@@ -26,6 +26,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of bean traversals.
  */
+@FluentSetters
 public class BeanTraverseBuilder extends BeanContextBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
index 4969b42..6b266a4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
@@ -43,6 +43,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Base builder class for building instances of any context objects configured through property stores.
  */
+@FluentSetters
 public abstract class ContextBuilder {
 
 	/** Contains all the modifiable settings for the implementation class. */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/SessionArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/SessionArgs.java
index 20e88a0..51558af 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/SessionArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/SessionArgs.java
@@ -24,6 +24,7 @@ import org.apache.juneau.json.*;
 /**
  * Runtime arguments common to all bean, serializer, and parser sessions.
  */
+@FluentSetters
 public class SessionArgs {
 
 	SessionProperties properties = SessionProperties.create();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/AnnotationBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/AnnotationBuilder.java
index 2165fce..8bcd424 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/AnnotationBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/AnnotationBuilder.java
@@ -14,9 +14,12 @@ package org.apache.juneau.annotation;
 
 import java.lang.annotation.*;
 
+import org.apache.juneau.internal.*;
+
 /**
  * Builder for {@link AnnotationImpl} objects.
  */
+@FluentSetters
 public class AnnotationBuilder {
 
 	Class<? extends Annotation> annotationType;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
index 55334bc..86eed0e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
@@ -19,6 +19,7 @@ import org.apache.juneau.internal.*;
 /**
  * Builder for {@link TargetedAnnotationImpl} objects.
  */
+@FluentSetters
 public class TargetedAnnotationBuilder extends AnnotationBuilder {
 
 	String[] on = {};
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationCBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationCBuilder.java
index 3d68db8..1fa49e3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationCBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationCBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.reflect.*;
 /**
  * An implementation of an annotation that has an <code>on</code> value targeting classes/methods/fields/constructors.
  */
+@FluentSetters
 public class TargetedAnnotationCBuilder extends TargetedAnnotationBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMBuilder.java
index 7d8285c..84add33 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.reflect.*;
 /**
  * An implementation of an annotation that has an <code>on</code> value targeting classes/methods/fields/constructors.
  */
+@FluentSetters
 public class TargetedAnnotationMBuilder extends TargetedAnnotationBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFBuilder.java
index 73291f1..6153315 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.reflect.*;
 /**
  * An implementation of an annotation that has an <code>on</code> value targeting classes/methods/fields/constructors.
  */
+@FluentSetters
 public class TargetedAnnotationMFBuilder extends TargetedAnnotationBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFCBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFCBuilder.java
index f181191..d1930eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFCBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationMFCBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.reflect.*;
 /**
  * An implementation of an annotation that has an <code>on</code> value targeting classes/methods/fields/constructors.
  */
+@FluentSetters
 public class TargetedAnnotationMFCBuilder extends TargetedAnnotationMFBuilder {
 
 	/**
@@ -46,5 +47,24 @@ public class TargetedAnnotationMFCBuilder extends TargetedAnnotationMFBuilder {
 	}
 
 	// <FluentSetters>
+
+	@Override /* GENERATED - TargetedAnnotationBuilder */
+	public TargetedAnnotationMFCBuilder on(String...values) {
+		super.on(values);
+		return this;
+	}
+
+	@Override /* GENERATED - TargetedAnnotationMFBuilder */
+	public TargetedAnnotationMFCBuilder on(Field...value) {
+		super.on(value);
+		return this;
+	}
+
+	@Override /* GENERATED - TargetedAnnotationMFBuilder */
+	public TargetedAnnotationMFCBuilder on(Method...value) {
+		super.on(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
index 5acc9d4..3088051 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
@@ -19,6 +19,7 @@ import org.apache.juneau.internal.*;
 /**
  * An implementation of an annotation that has an <code>on</code> value targeting classes/methods/fields/constructors.
  */
+@FluentSetters
 public class TargetedAnnotationTBuilder extends TargetedAnnotationBuilder {
 
 	Class<?>[] onClass = {};
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMBuilder.java
index 41aca87..a99ff42 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.reflect.*;
 /**
  * An implementation of an annotation that has an <code>on</code> value targeting classes/methods/fields/constructors.
  */
+@FluentSetters
 public class TargetedAnnotationTMBuilder extends TargetedAnnotationTBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFBuilder.java
index f3c5bd2..4c63b13 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.reflect.*;
 /**
  * An implementation of an annotation that has an <code>on</code> value targeting classes/methods/fields/constructors.
  */
+@FluentSetters
 public class TargetedAnnotationTMFBuilder extends TargetedAnnotationTBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFCBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFCBuilder.java
index 9a88102..aed53c1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFCBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTMFCBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.reflect.*;
 /**
  * An implementation of an annotation that has an <code>on</code> value targeting classes/methods/fields/constructors.
  */
+@FluentSetters
 public class TargetedAnnotationTMFCBuilder extends TargetedAnnotationTMFBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
index 4488a18..b93bd7e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -21,6 +21,7 @@ import org.apache.juneau.internal.*;
 /**
  * Base class for all assertion objects.
  */
+@FluentSetters
 public class Assertion {
 
 	String msg;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanFactory.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanFactory.java
index 68e18a9..54b5da1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanFactory.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanFactory.java
@@ -262,7 +262,7 @@ public class BeanFactory {
 
 	/**
 	 * Same as {@link #createBean(Class)} but returns the bean creation wrapped in a supplier.
-	 * 
+	 *
 	 * @param c The bean type to create.
 	 * @return A supplier for the newly-created bean.
 	 */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanFactoryBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanFactoryBuilder.java
index e5525a6..77da6ae 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanFactoryBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanFactoryBuilder.java
@@ -20,6 +20,7 @@ import org.apache.juneau.internal.*;
 /**
  * Builder for {@link BeanFactory} objects.
  */
+@FluentSetters
 public class BeanFactoryBuilder {
 
 	private Class<? extends BeanFactory> implClass;
@@ -92,4 +93,8 @@ public class BeanFactoryBuilder {
 		this.outer = value;
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinderBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinderBuilder.java
index b95c290..91ee1eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinderBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinderBuilder.java
@@ -27,6 +27,7 @@ import org.apache.juneau.internal.*;
 /**
  * Builder for {@link FileFinder} objects.
  */
+@FluentSetters
 public class FileFinderBuilder {
 
 	final Set<LocalDir> roots = new LinkedHashSet<>();
@@ -168,5 +169,6 @@ public class FileFinderBuilder {
 	}
 
 	// <FluentSetters>
+
 	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
index a81d9ba..66c0692 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
@@ -19,6 +19,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
@@ -26,6 +27,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of CSV parsers.
  */
+@FluentSetters
 public class CsvParserBuilder extends ReaderParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
index 064bf33..0a9764e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
@@ -19,6 +19,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.svl.*;
@@ -26,6 +27,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of CSV serializers.
  */
+@FluentSetters
 public class CsvSerializerBuilder extends WriterSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
index 8916a6d..117c201 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.xml.*;
 /**
  * Builder class for building instances of HTML Doc serializers.
  */
+@FluentSetters
 public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
index df6a8d9..24b6b32 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
@@ -22,6 +22,7 @@ import javax.xml.stream.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 import org.apache.juneau.xml.*;
@@ -29,6 +30,7 @@ import org.apache.juneau.xml.*;
 /**
  * Builder class for building instances of HTML parsers.
  */
+@FluentSetters
 public class HtmlParserBuilder extends XmlParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
index bba8a0b..4f67ff8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
@@ -33,6 +33,7 @@ import org.apache.juneau.xml.*;
 /**
  * Builder class for building instances of HTML Schema serializers.
  */
+@FluentSetters
 public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
index fcf691a..4fe8c8c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.xml.*;
 /**
  * Builder class for building instances of HTML serializers.
  */
+@FluentSetters
 public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
index b62f186..8b14304 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
@@ -19,6 +19,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 import org.apache.juneau.xml.*;
@@ -26,6 +27,7 @@ import org.apache.juneau.xml.*;
 /**
  * Builder class for building instances of HTML Doc serializers.
  */
+@FluentSetters
 public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
index 1e159cd..7439489 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
@@ -45,6 +45,7 @@ import org.apache.juneau.reflect.*;
  * </ul>
  */
 @BeanIgnore
+@FluentSetters
 public class BasicHeader implements Header, Cloneable, Serializable {
 	private static final long serialVersionUID = 1L;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
index 42291d9..6ab4c98 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
@@ -37,6 +37,7 @@ import org.apache.juneau.internal.*;
  * 		Fluent assertions.
  * </ul>
  */
+@FluentSetters
 public class BasicHttpEntity extends org.apache.http.entity.BasicHttpEntity {
 	private Object content;
 	private boolean cache;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
index a574404..4312ad4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
@@ -40,6 +40,7 @@ import org.apache.juneau.http.header.ContentType;
  * 		Fluent assertions.
  * </ul>
  */
+@FluentSetters
 public class BasicHttpResource extends BasicHttpEntity implements HttpResource {
 
 	private final List<Header> headers = AList.create();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
index 6f96ffd..4c7db15 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
@@ -21,6 +21,7 @@ import org.apache.http.*;
 import org.apache.juneau.*;
 import org.apache.juneau.annotation.*;
 import org.apache.juneau.assertions.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 
 /**
@@ -39,6 +40,7 @@ import org.apache.juneau.reflect.*;
  * </ul>
  */
 @BeanIgnore
+@FluentSetters
 public class BasicNameValuePair implements NameValuePair, Headerable {
 	private final String name;
 	private final Object value;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
index 3d451c5..d4d1690 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
@@ -19,6 +19,7 @@ import java.util.function.*;
 import org.apache.http.*;
 import org.apache.juneau.*;
 import org.apache.juneau.httppart.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.oapi.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.urlencoding.*;
@@ -35,6 +36,7 @@ import org.apache.juneau.urlencoding.*;
  * 	request.setEntity(<jk>new</jk> UrlEncodedFormEntity(params));
  * </p>
  */
+@FluentSetters
 public class SerializedHeader extends BasicHeader {
 	private static final long serialVersionUID = 1L;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
index 6f5cd1d..ba296ea 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
@@ -27,6 +27,7 @@ import org.apache.juneau.serializer.*;
 /**
  * HttpEntity for serializing POJOs as the body of HTTP requests.
  */
+@FluentSetters
 public class SerializedHttpEntity extends BasicHttpEntity {
 	private final Serializer serializer;
 	private HttpPartSchema schema;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
index ccfc489..8a8492b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
@@ -19,6 +19,7 @@ import java.util.function.*;
 import org.apache.http.*;
 import org.apache.juneau.*;
 import org.apache.juneau.httppart.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.oapi.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.urlencoding.*;
@@ -35,6 +36,7 @@ import org.apache.juneau.urlencoding.*;
  * 	request.setEntity(<jk>new</jk> UrlEncodedFormEntity(params));
  * </p>
  */
+@FluentSetters
 public class SerializedNameValuePair extends BasicNameValuePair implements Headerable {
 	private final Object value;
 	private HttpPartType type;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/BadRequest.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/BadRequest.java
index 9a7bace..40aa166 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/BadRequest.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/BadRequest.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.BadRequest.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 400 (Bad Request).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The server cannot or will not process the request due to an apparent client error (e.g., malformed request syntax, size too large, invalid request message framing, or deceptive request routing).
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class BadRequest extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class BadRequest extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public BadRequest status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Conflict.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Conflict.java
index f18c0b5..06cd291 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Conflict.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Conflict.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.Conflict.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 409 (Conflict).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * Indicates that the request could not be processed because of conflict in the request, such as an edit conflict between multiple simultaneous updates.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Conflict extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class Conflict extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public Conflict status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/ExpectationFailed.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/ExpectationFailed.java
index 555bded..c334085 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/ExpectationFailed.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/ExpectationFailed.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.ExpectationFailed.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 417 (Expectation Failed).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The server cannot meet the requirements of the Expect request-header field.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class ExpectationFailed extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class ExpectationFailed extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public ExpectationFailed status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/FailedDependency.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/FailedDependency.java
index cf62a03..9d8d8a8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/FailedDependency.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/FailedDependency.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.FailedDependency.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 424 (Failed Dependency).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The request failed because it depended on another request and that request failed (e.g., a PROPPATCH).
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class FailedDependency extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class FailedDependency extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public FailedDependency status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Forbidden.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Forbidden.java
index fcdb46b..539fdfb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Forbidden.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Forbidden.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.Forbidden.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 403 (Forbidden).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>The user might not have the necessary permissions for a resource, or may need an account of some sort.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Forbidden extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class Forbidden extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public Forbidden status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Gone.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Gone.java
index 6a3422b..4881174 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Gone.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Gone.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.Gone.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 410 ().
@@ -29,6 +30,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Most use cases do not require clients and search engines to purge the resource, and a <js>"404 Not Found"</js> may be used instead.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Gone extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -96,5 +98,11 @@ public class Gone extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public Gone status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpException.java
index c4f0762..3aac9b0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpException.java
@@ -32,6 +32,7 @@ import org.apache.juneau.internal.*;
  * automatically-generated <c>404</c>, <c>405</c>, and <c>500</c> statuses.
  */
 @Response
+@FluentSetters
 public class HttpException extends BasicRuntimeException {
 
 	private static final long serialVersionUID = 1L;
@@ -152,11 +153,12 @@ public class HttpException extends BasicRuntimeException {
 	/**
 	 * Set the status code on this exception.
 	 *
-	 * @param status The status code.
+	 * @param value The status code.
 	 * @return This object (for method chaining).
 	 */
-	public HttpException setStatus(int status) {
-		this.status = status;
+	@FluentSetter
+	public HttpException status(int value) {
+		status = value;
 		return this;
 	}
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpVersionNotSupported.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpVersionNotSupported.java
index 1fd16b8..f96b4eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpVersionNotSupported.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/HttpVersionNotSupported.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.HttpVersionNotSupported.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 505 ().
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The server does not support the HTTP protocol version used in the request.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class HttpVersionNotSupported extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class HttpVersionNotSupported extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public HttpVersionNotSupported status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/InsufficientStorage.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/InsufficientStorage.java
index a8f4490..07eb19c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/InsufficientStorage.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/InsufficientStorage.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.InsufficientStorage.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 507 ().
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The server is unable to store the representation needed to complete the request.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class InsufficientStorage extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class InsufficientStorage extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public InsufficientStorage status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/InternalServerError.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/InternalServerError.java
index 689600f..5722c86 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/InternalServerError.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/InternalServerError.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.InternalServerError.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 500 (Internal Server Error).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * A generic error message, given when an unexpected condition was encountered and no more specific message is suitable.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class InternalServerError extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class InternalServerError extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public InternalServerError status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/LengthRequired.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/LengthRequired.java
index 8174db2..e716441 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/LengthRequired.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/LengthRequired.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.LengthRequired.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 411 ().
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The request did not specify the length of its content, which is required by the requested resource.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class LengthRequired extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class LengthRequired extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public LengthRequired status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Locked.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Locked.java
index a3a1df2..1883d67 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Locked.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Locked.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.Locked.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 423 (Locked).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The resource that is being accessed is locked.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Locked extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class Locked extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public Locked status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/LoopDetected.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/LoopDetected.java
index 2cb3263..46853ed 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/LoopDetected.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/LoopDetected.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.LoopDetected.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 508 (Loop Detected).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The server detected an infinite loop while processing the request (sent in lieu of 208 Already Reported).
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class LoopDetected extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class LoopDetected extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public LoopDetected status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/MethodNotAllowed.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/MethodNotAllowed.java
index e628484..3128528 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/MethodNotAllowed.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/MethodNotAllowed.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.MethodNotAllowed.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 405 (Method Not Allowed).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * A request method is not supported for the requested resource; for example, a GET request on a form that requires data to be presented via POST, or a PUT request on a read-only resource.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class MethodNotAllowed extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class MethodNotAllowed extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public MethodNotAllowed status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/MisdirectedRequest.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/MisdirectedRequest.java
index f1b2077..619be1b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/MisdirectedRequest.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/MisdirectedRequest.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.MisdirectedRequest.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 421 (Misdirected Request).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The request was directed at a server that is not able to produce a response (for example because of connection reuse).
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class MisdirectedRequest extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class MisdirectedRequest extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public MisdirectedRequest status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NetworkAuthenticationRequired.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NetworkAuthenticationRequired.java
index 4656cb1..4f2d3a5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NetworkAuthenticationRequired.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NetworkAuthenticationRequired.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.NetworkAuthenticationRequired.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 511 (Network Authentication Required).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Intended for use by intercepting proxies used to control access to the network (e.g., "captive portals" used to require agreement to Terms of Service before granting full Internet access via a Wi-Fi hotspot).
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class NetworkAuthenticationRequired extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class NetworkAuthenticationRequired extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public NetworkAuthenticationRequired status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotAcceptable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotAcceptable.java
index 8873f2f..984c6a7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotAcceptable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotAcceptable.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.NotAcceptable.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 406 (Not Acceptable).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The requested resource is capable of generating only content not acceptable according to the Accept headers sent in the request.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class NotAcceptable extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class NotAcceptable extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public NotAcceptable status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotExtended.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotExtended.java
index 70eaba0..7630323 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotExtended.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotExtended.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.NotExtended.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 510 (Not Extended).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * Further extensions to the request are required for the server to fulfill it.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class NotExtended extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class NotExtended extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public NotExtended status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotFound.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotFound.java
index f8b223c..c02480b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotFound.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotFound.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.NotFound.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 404 (Not Found).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Subsequent requests by the client are permissible.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class NotFound extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class NotFound extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public NotFound status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotImplemented.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotImplemented.java
index 707adda..fce8d4a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotImplemented.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/NotImplemented.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.NotImplemented.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 501 (Not Implemented).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Usually this implies future availability (e.g., a new feature of a web-service API).
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class NotImplemented extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class NotImplemented extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public NotImplemented status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PayloadTooLarge.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PayloadTooLarge.java
index 4d182ce..33e313c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PayloadTooLarge.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PayloadTooLarge.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.PayloadTooLarge.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 413 (Payload Too Large).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The request is larger than the server is willing or able to process.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class PayloadTooLarge extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class PayloadTooLarge extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public PayloadTooLarge status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PreconditionFailed.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PreconditionFailed.java
index d9a4b81..8a8cfbd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PreconditionFailed.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PreconditionFailed.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.PreconditionFailed.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 412 (Precondition Failed).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The server does not meet one of the preconditions that the requester put on the request.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class PreconditionFailed extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class PreconditionFailed extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public PreconditionFailed status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PreconditionRequired.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PreconditionRequired.java
index ce99f67..8e81b6f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PreconditionRequired.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/PreconditionRequired.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.PreconditionRequired.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 428 (Precondition Required).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Intended to prevent the 'lost update' problem, where a client GETs a resource's state, modifies it, and PUTs it back to the server, when meanwhile a third party has modified the state on the server, leading to a conflict.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class PreconditionRequired extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class PreconditionRequired extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public PreconditionRequired status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/RangeNotSatisfiable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/RangeNotSatisfiable.java
index df13331..c23b849 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/RangeNotSatisfiable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/RangeNotSatisfiable.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.RangeNotSatisfiable.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 416 (Range Not Satisfiable).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>For example, if the client asked for a part of the file that lies beyond the end of the file.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class RangeNotSatisfiable extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class RangeNotSatisfiable extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public RangeNotSatisfiable status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/RequestHeaderFieldsTooLarge.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/RequestHeaderFieldsTooLarge.java
index 0d35d60..2b13bee 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/RequestHeaderFieldsTooLarge.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/RequestHeaderFieldsTooLarge.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.RequestHeaderFieldsTooLarge.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 431 (Request Header Fields Too Large).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The server is unwilling to process the request because either an individual header field, or all the header fields collectively, are too large.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class RequestHeaderFieldsTooLarge extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class RequestHeaderFieldsTooLarge extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public RequestHeaderFieldsTooLarge status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/ServiceUnavailable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/ServiceUnavailable.java
index e267776..10ca1a0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/ServiceUnavailable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/ServiceUnavailable.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.ServiceUnavailable.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 503 (Service Unavailable).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Generally, this is a temporary state.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class ServiceUnavailable extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class ServiceUnavailable extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public ServiceUnavailable status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/TooManyRequests.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/TooManyRequests.java
index b57bfe8..7eeea88 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/TooManyRequests.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/TooManyRequests.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.TooManyRequests.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 429 (Too Many Requests).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Intended for use with rate-limiting schemes.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class TooManyRequests extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class TooManyRequests extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public TooManyRequests status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Unauthorized.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Unauthorized.java
index effbd0e..6b3252a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Unauthorized.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/Unauthorized.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.Unauthorized.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 401 (Unauthorized).
@@ -28,6 +29,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Note: Some sites issue HTTP 401 when an IP address is banned from the website (usually the website domain) and that specific address is refused permission to access a website.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Unauthorized extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -95,5 +97,11 @@ public class Unauthorized extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public Unauthorized status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnavailableForLegalReasons.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnavailableForLegalReasons.java
index a745633..84b4fed 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnavailableForLegalReasons.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnavailableForLegalReasons.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.UnavailableForLegalReasons.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 451 (Unavailable For Legal Reasons).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * A server operator has received a legal demand to deny access to a resource or to a set of resources that includes the requested resource.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class UnavailableForLegalReasons extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class UnavailableForLegalReasons extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public UnavailableForLegalReasons status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnprocessableEntity.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnprocessableEntity.java
index f109dc8..27d99d6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnprocessableEntity.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnprocessableEntity.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.UnprocessableEntity.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 422 (Unprocessable Entity).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The request was well-formed but was unable to be followed due to semantic errors.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class UnprocessableEntity extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class UnprocessableEntity extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public UnprocessableEntity status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnsupportedMediaType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnsupportedMediaType.java
index d653eae..839528e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnsupportedMediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UnsupportedMediaType.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.UnsupportedMediaType.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 415 (Unsupported Media Type).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>For example, the client uploads an image as image/svg+xml, but the server requires that images use a different format.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class UnsupportedMediaType extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class UnsupportedMediaType extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public UnsupportedMediaType status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UpgradeRequired.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UpgradeRequired.java
index 51c1cdc..550adb1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UpgradeRequired.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UpgradeRequired.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.UpgradeRequired.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 426 (Upgrade Required).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * The client should switch to a different protocol such as TLS/1.0, given in the Upgrade header field.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class UpgradeRequired extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class UpgradeRequired extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public UpgradeRequired status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UriTooLong.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UriTooLong.java
index 0e1838c..573a7ac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UriTooLong.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/UriTooLong.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.UriTooLong.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 414 (URI Too Long).
@@ -26,6 +27,7 @@ import org.apache.juneau.http.annotation.*;
  * <br>Often the result of too much data being encoded as a query-string of a GET request, in which case it should be converted to a POST request.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class UriTooLong extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -93,5 +95,11 @@ public class UriTooLong extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public UriTooLong status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/VariantAlsoNegotiates.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/VariantAlsoNegotiates.java
index 76a2b24..4012d97 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/VariantAlsoNegotiates.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/exception/VariantAlsoNegotiates.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.http.exception.VariantAlsoNegotiates.*;
 import java.text.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Exception representing an HTTP 506 (Variant Also Negotiate).
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * Transparent content negotiation for the request results in a circular reference.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class VariantAlsoNegotiates extends HttpException {
 	private static final long serialVersionUID = 1L;
 
@@ -92,5 +94,11 @@ public class VariantAlsoNegotiates extends HttpException {
 		return this;
 	}
 
+	@Override /* GENERATED - HttpException */
+	public VariantAlsoNegotiates status(int value) {
+		super.status(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Accepted.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Accepted.java
index 24f6c09..ec868cd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Accepted.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Accepted.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.Accepted.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 202 Accepted</c> response.
@@ -24,6 +25,7 @@ import org.apache.juneau.http.annotation.*;
  * The request might or might not be eventually acted upon, and may be disallowed when processing occurs.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Accepted extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/AlreadyReported.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/AlreadyReported.java
index 02ce35a..1c8c208 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/AlreadyReported.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/AlreadyReported.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.AlreadyReported.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 208 Already Reported</c> response.
@@ -23,6 +24,7 @@ import org.apache.juneau.http.annotation.*;
  * The members of a DAV binding have already been enumerated in a preceding part of the (multistatus) response, and are not being included again.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class AlreadyReported extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Continue.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Continue.java
index b78fec8..53ee30e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Continue.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Continue.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.Continue.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 100 Continue</c> response.
@@ -27,6 +28,7 @@ import org.apache.juneau.http.annotation.*;
  * The response 417 Expectation Failed indicates that the request should be repeated without the Expect header as it indicates that the server doesn't support expectations (this is the case, for example, of HTTP/1.0 servers).
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Continue extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Created.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Created.java
index d588667..219066c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Created.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Created.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.Created.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 201 Created</c> response.
@@ -23,6 +24,7 @@ import org.apache.juneau.http.annotation.*;
  * The request has been fulfilled, resulting in the creation of a new resource.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Created extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/EarlyHints.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/EarlyHints.java
index 909b3c9..b32cebb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/EarlyHints.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/EarlyHints.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.EarlyHints.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 103 Early Hints</c> response.
@@ -23,6 +24,7 @@ import org.apache.juneau.http.annotation.*;
  * Used to return some response headers before final HTTP message.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class EarlyHints extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
index 36b50ba..9d6f31b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Found.java
@@ -18,6 +18,7 @@ import static org.apache.juneau.http.response.Found.*;
 
 import org.apache.juneau.annotation.BeanIgnore;
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 302 Found</c> response.
@@ -31,6 +32,7 @@ import org.apache.juneau.http.annotation.*;
  */
 @Response(code=CODE, description=MESSAGE)
 @BeanIgnore
+@FluentSetters
 public class Found extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponse.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponse.java
index 40883d1..4c0ac41 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponse.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/HttpResponse.java
@@ -26,6 +26,7 @@ import org.apache.juneau.internal.*;
  * Consists simply of a simple string message.
  */
 @Response
+@FluentSetters
 public abstract class HttpResponse {
 
 	private final String message;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/IMUsed.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/IMUsed.java
index ae7804a..eb40e20 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/IMUsed.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/IMUsed.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.IMUsed.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 226 IM Used</c> response.
@@ -23,6 +24,7 @@ import org.apache.juneau.http.annotation.*;
  * The server has fulfilled a request for the resource, and the response is a representation of the result of one or more instance-manipulations applied to the current instance.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class IMUsed extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
index 9ffc875..607d658 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MovedPermanently.java
@@ -18,6 +18,7 @@ import java.net.*;
 
 import org.apache.juneau.annotation.BeanIgnore;
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 301 Moved Permanently</c> response.
@@ -27,6 +28,7 @@ import org.apache.juneau.http.annotation.*;
  */
 @Response(code=CODE, description=MESSAGE)
 @BeanIgnore
+@FluentSetters
 public class MovedPermanently extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultiStatus.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultiStatus.java
index 976c05e..d420ee4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultiStatus.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultiStatus.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.MultiStatus.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 207 Multi-Status</c> response.
@@ -23,6 +24,7 @@ import org.apache.juneau.http.annotation.*;
  * The message body that follows is by default an XML message and can contain a number of separate response codes, depending on how many sub-requests were made.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class MultiStatus extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultipleChoices.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultipleChoices.java
index b65dfe5..302f6ec 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultipleChoices.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/MultipleChoices.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.MultipleChoices.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 300 Multiple Choices</c> response.
@@ -24,6 +25,7 @@ import org.apache.juneau.http.annotation.*;
  * For example, this code could be used to present multiple video format options, to list files with different filename extensions, or to suggest word-sense disambiguation.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class MultipleChoices extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NoContent.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NoContent.java
index d987117..fec84cc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NoContent.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NoContent.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.NoContent.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 204 No Content</c> response.
@@ -23,6 +24,7 @@ import org.apache.juneau.http.annotation.*;
  * The server successfully processed the request and is not returning any content.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class NoContent extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NonAuthoritiveInformation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NonAuthoritiveInformation.java
index 02d665a..7abd62a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NonAuthoritiveInformation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NonAuthoritiveInformation.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.NonAuthoritiveInformation.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 203 Non-Authoritative Information</c> response.
@@ -23,6 +24,7 @@ import org.apache.juneau.http.annotation.*;
  * The server is a transforming proxy (e.g. a Web accelerator) that received a 200 OK from its origin, but is returning a modified version of the origin's response.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class NonAuthoritiveInformation extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotModified.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotModified.java
index 8bd9e12..56d167c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotModified.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/NotModified.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.NotModified.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 304 Not Modified</c> response.
@@ -24,6 +25,7 @@ import org.apache.juneau.http.annotation.*;
  * In such case, there is no need to retransmit the resource since the client still has a previously-downloaded copy.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class NotModified extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Ok.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Ok.java
index 1809b2f..da57ff6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Ok.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Ok.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.Ok.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 200 OK</c> response.
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * In a POST request, the response will contain an entity describing or containing the result of the action.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Ok extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PartialContent.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PartialContent.java
index 2731c21..f919a48 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PartialContent.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PartialContent.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.PartialContent.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 206 Partial Content</c> response.
@@ -24,6 +25,7 @@ import org.apache.juneau.http.annotation.*;
  * The range header is used by HTTP clients to enable resuming of interrupted downloads, or split a download into multiple simultaneous streams.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class PartialContent extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
index fe0b782..b2af709 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/PermanentRedirect.java
@@ -18,6 +18,7 @@ import java.net.*;
 
 import org.apache.juneau.annotation.BeanIgnore;
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 308 Permanent Redirect</c> response.
@@ -28,6 +29,7 @@ import org.apache.juneau.http.annotation.*;
  */
 @Response(code=CODE, description=MESSAGE)
 @BeanIgnore
+@FluentSetters
 public class PermanentRedirect extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Processing.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Processing.java
index 84908ca..25a3d43 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Processing.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/Processing.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.Processing.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 102 Processing</c> response.
@@ -25,6 +26,7 @@ import org.apache.juneau.http.annotation.*;
  * This prevents the client from timing out and assuming the request was lost.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class Processing extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ResetContent.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ResetContent.java
index 7d6d580..98670d5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ResetContent.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/ResetContent.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.ResetContent.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 205 Reset Content</c> response.
@@ -24,6 +25,7 @@ import org.apache.juneau.http.annotation.*;
  * Unlike a 204 response, this response requires that the requester reset the document view.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class ResetContent extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
index 252aea4..b0fc5b9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SeeOther.java
@@ -18,6 +18,7 @@ import java.net.*;
 
 import org.apache.juneau.annotation.BeanIgnore;
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 303 See Other</c> response.
@@ -28,6 +29,7 @@ import org.apache.juneau.http.annotation.*;
  */
 @Response(code=CODE, description=MESSAGE)
 @BeanIgnore
+@FluentSetters
 public class SeeOther extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SwitchingProtocols.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SwitchingProtocols.java
index 9d4f93c..3041314 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SwitchingProtocols.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/SwitchingProtocols.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.SwitchingProtocols.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 101 Switching Protocols</c> response.
@@ -23,6 +24,7 @@ import org.apache.juneau.http.annotation.*;
  * The requester has asked the server to switch protocols and the server has agreed to do so.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class SwitchingProtocols extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
index 6d8a033..4722935 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/TemporaryRedirect.java
@@ -18,6 +18,7 @@ import java.net.*;
 
 import org.apache.juneau.annotation.BeanIgnore;
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 307 Temporary Redirect</c> response.
@@ -29,6 +30,7 @@ import org.apache.juneau.http.annotation.*;
  */
 @Response(code=CODE, description=MESSAGE)
 @BeanIgnore
+@FluentSetters
 public class TemporaryRedirect extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UseProxy.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UseProxy.java
index 8f26a8d..8fb53b1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UseProxy.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/response/UseProxy.java
@@ -15,6 +15,7 @@ package org.apache.juneau.http.response;
 import static org.apache.juneau.http.response.UseProxy.*;
 
 import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Represents an <c>HTTP 305 Use Proxy</c> response.
@@ -24,6 +25,7 @@ import org.apache.juneau.http.annotation.*;
  * Many HTTP clients (such as Mozilla and Internet Explorer) do not correctly handle responses with this status code, primarily for security reasons.
  */
 @Response(code=CODE, description=MESSAGE)
+@FluentSetters
 public class UseProxy extends HttpResponse {
 
 	/** HTTP status code */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
index bd6ac9b..8ff5363 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
@@ -18,6 +18,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
@@ -25,6 +26,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of Java Serialized Object parsers.
  */
+@FluentSetters
 public class JsoParserBuilder extends InputStreamParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
index 3ad66c3..3cc2f47 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
@@ -18,6 +18,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.svl.*;
@@ -25,6 +26,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of Java Serialized Object serializers.
  */
+@FluentSetters
 public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
index ffdbd21..4c36e71 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of JSON parsers.
  */
+@FluentSetters
 public class JsonParserBuilder extends ReaderParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
index 707c0e3..e25ec65 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
@@ -32,6 +32,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of JSON Schema serializers.
  */
+@FluentSetters
 public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
index 1811d63..98230bc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of JSON serializers.
  */
+@FluentSetters
 public class JsonSerializerBuilder extends WriterSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonParserBuilder.java
index c36ce6e..3fdf87a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonParserBuilder.java
@@ -19,12 +19,14 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 
 /**
  * Builder class for building instances of Simplified-JSON parsers.
  */
+@FluentSetters
 public class SimpleJsonParserBuilder extends JsonParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializerBuilder.java
index 235c67c..4216a6e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializerBuilder.java
@@ -19,12 +19,14 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
 
 /**
  * Builder class for building instances of Simplified-JSON serializers.
  */
+@FluentSetters
 public class SimpleJsonSerializerBuilder extends JsonSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
index cf04993..5d23961 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
@@ -30,6 +30,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of JSON Schema generators.
  */
+@FluentSetters
 public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
index 9d6a334..5a583a8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
@@ -18,6 +18,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
@@ -25,6 +26,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of MessagePack parsers.
  */
+@FluentSetters
 public class MsgPackParserBuilder extends InputStreamParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
index f0dae28..8624b16 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
@@ -18,6 +18,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.svl.*;
@@ -25,6 +26,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of MessagePack serializers.
  */
+@FluentSetters
 public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/MethodExecStatsBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/MethodExecStatsBuilder.java
index 4f39713..ec4ddeb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/MethodExecStatsBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/MethodExecStatsBuilder.java
@@ -23,6 +23,7 @@ import org.apache.juneau.internal.*;
 /**
  * Builder for {@link MethodExecStats} objects.
  */
+@FluentSetters
 public class MethodExecStatsBuilder {
 
 	Method method;
@@ -104,4 +105,8 @@ public class MethodExecStatsBuilder {
 		this.thrownStore = value;
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/MethodExecStoreBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/MethodExecStoreBuilder.java
index 19e524f..b6081c1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/MethodExecStoreBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/MethodExecStoreBuilder.java
@@ -21,6 +21,7 @@ import org.apache.juneau.internal.*;
 /**
  * Builder for {@link MethodExecStore} objects.
  */
+@FluentSetters
 public class MethodExecStoreBuilder {
 
 	ThrownStore thrownStore;
@@ -108,5 +109,6 @@ public class MethodExecStoreBuilder {
 	}
 
 	// <FluentSetters>
+
 	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ThrownStatsBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ThrownStatsBuilder.java
index 9999429..a423aaa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ThrownStatsBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ThrownStatsBuilder.java
@@ -23,6 +23,7 @@ import org.apache.juneau.internal.*;
 /**
  * Builder for {@link ThrownStats} objects.
  */
+@FluentSetters
 public class ThrownStatsBuilder {
 
 	Throwable throwable;
@@ -130,4 +131,8 @@ public class ThrownStatsBuilder {
 		this.causedBy = value;
 		return this;
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ThrownStoreBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ThrownStoreBuilder.java
index b051cd8..d2d1c32 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ThrownStoreBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/mstat/ThrownStoreBuilder.java
@@ -24,6 +24,7 @@ import org.apache.juneau.internal.*;
 /**
  * Builder for {@link ThrownStore} objects.
  */
+@FluentSetters
 public class ThrownStoreBuilder {
 
 	ThrownStore parent;
@@ -124,5 +125,6 @@ public class ThrownStoreBuilder {
 	}
 
 	// <FluentSetters>
+
 	// </FluentSetters>
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
index 4705093..30cc25e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
@@ -30,6 +30,7 @@ import org.apache.juneau.uon.*;
 /**
  * Builder class for building instances of {@link OpenApiParser}.
  */
+@FluentSetters
 public class OpenApiParserBuilder extends UonParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
index eba0f0c..8458062 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
@@ -30,6 +30,7 @@ import org.apache.juneau.uon.*;
 /**
  * Builder class for building instances of {@link OpenApiSerializer}.
  */
+@FluentSetters
 public class OpenApiSerializerBuilder extends UonSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
index c9c3bb9..67158c9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
@@ -27,6 +27,7 @@ import org.apache.juneau.svl.*;
 /**
  * Base builder class for building instances of stream-based parsers.
  */
+@FluentSetters
 public class InputStreamParserBuilder extends ParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
index f887740..5ecb0ee 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
@@ -32,6 +32,7 @@ import org.apache.juneau.xml.*;
 /**
  * Builder class for building instances of parsers.
  */
+@FluentSetters
 public class ParserBuilder extends BeanContextBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
index 86fd212..3961ae9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
@@ -30,6 +30,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for creating instances of {@link ParserGroup}.
  */
+@FluentSetters
 public class ParserGroupBuilder extends BeanContextBuilder {
 
 	private final AList<Object> parsers;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSessionArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSessionArgs.java
index b0741a1..0c047d6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSessionArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSessionArgs.java
@@ -25,6 +25,7 @@ import org.apache.juneau.internal.*;
 /**
  * Runtime arguments common to all parser sessions.
  */
+@FluentSetters
 public final class ParserSessionArgs extends BeanSessionArgs {
 
 	Method javaMethod;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
index 1b63ba4..126d989 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
@@ -28,6 +28,7 @@ import org.apache.juneau.svl.*;
 /**
  * Base builder class for building instances of reader-based parsers.
  */
+@FluentSetters
 public abstract class ReaderParserBuilder extends ParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
index 18b8a6e..6745d81 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
@@ -19,6 +19,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.svl.*;
@@ -26,6 +27,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of plain-text parsers.
  */
+@FluentSetters
 public class PlainTextParserBuilder extends ReaderParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
index c0d03ec..b7f738d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
@@ -19,6 +19,7 @@ import java.util.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.http.*;
+import org.apache.juneau.internal.*;
 import org.apache.juneau.reflect.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.svl.*;
@@ -26,6 +27,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of plain-text serializers.
  */
+@FluentSetters
 public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
 
 	/**
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 935fc2c..1373d5b 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
@@ -19,11 +19,13 @@ import java.lang.reflect.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.annotation.*;
+import org.apache.juneau.internal.*;
 
 /**
  * Lightweight utility class for introspecting information about a constructor.
  */
 @BeanIgnore
+@FluentSetters
 public final class ConstructorInfo extends ExecutableInfo implements Comparable<ConstructorInfo> {
 
 	private final Constructor<?> c;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
index 3d18321..34d0287 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
@@ -24,6 +24,7 @@ import org.apache.juneau.internal.*;
 /**
  * Contains common methods between {@link ConstructorInfo} and {@link MethodInfo}.
  */
+@FluentSetters
 public abstract class ExecutableInfo {
 
 	final ClassInfo declaringClass;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index ccb3c77..49484da 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -28,6 +28,7 @@ import org.apache.juneau.internal.*;
  * Lightweight utility class for introspecting information about a method.
  */
 @BeanIgnore
+@FluentSetters
 public final class MethodInfo extends ExecutableInfo implements Comparable<MethodInfo> {
 
 	private ClassInfo returnType;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
index bc4e7f4..752c317 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
@@ -27,6 +27,7 @@ import org.apache.juneau.svl.*;
 /**
  * Base class for all stream-based serializer builders.
  */
+@FluentSetters
 public class OutputStreamSerializerBuilder extends SerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
index 9c56008..b8a25a4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
@@ -28,6 +28,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of serializers.
  */
+@FluentSetters
 public class SerializerBuilder extends BeanTraverseBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
index 9f9ec00..a5cf758 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
@@ -30,6 +30,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for creating instances of {@link SerializerGroup}.
  */
+@FluentSetters
 public class SerializerGroupBuilder extends BeanTraverseBuilder {
 
 	private final AList<Object> serializers;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSessionArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSessionArgs.java
index 324dd33..78397b5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSessionArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSessionArgs.java
@@ -31,6 +31,7 @@ import org.apache.juneau.svl.*;
  * <p>
  * This object specifies information such as session locale or URI context.
  */
+@FluentSetters
 public final class SerializerSessionArgs extends BeanSessionArgs {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
index 00075fe..004b391 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
@@ -28,6 +28,7 @@ import org.apache.juneau.svl.*;
 /**
  * Base class for all writer-based serializer builders.
  */
+@FluentSetters
 public class WriterSerializerBuilder extends SerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
index 6ca15ea..1bc1c3d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.xml.*;
 /**
  * Builder class for building instances of soap/xml serializers.
  */
+@FluentSetters
 public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
index f6fee85..320b16b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
@@ -30,6 +30,7 @@ import org.apache.juneau.urlencoding.*;
 /**
  * Builder class for building instances of UON parsers.
  */
+@FluentSetters
 public class UonParserBuilder extends ReaderParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
index 395314d..968d697 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of UON serializers.
  */
+@FluentSetters
 public class UonSerializerBuilder extends WriterSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
index 3748c10..c53679d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.uon.*;
 /**
  * Builder class for building instances of URL-Encoding parsers.
  */
+@FluentSetters
 public class UrlEncodingParserBuilder extends UonParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
index 4616f3f..dbf7374 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.uon.*;
 /**
  * Builder class for building instances of URL-Encoding serializers.
  */
+@FluentSetters
 public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
index 9e87309..98ea1b4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
@@ -32,6 +32,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building XML parsers.
  */
+@FluentSetters
 public class XmlParserBuilder extends ReaderParserBuilder {
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
index ef6d5fa..f5f1c11 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
@@ -29,6 +29,7 @@ import org.apache.juneau.svl.*;
 /**
  * Builder class for building instances of XML serializers.
  */
+@FluentSetters
 public class XmlSerializerBuilder extends WriterSerializerBuilder {
 
 	/**
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
index a5554ff..c6138d4 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
@@ -292,6 +292,11 @@ public class FluentResponseBodyAssertion<R> extends FluentAssertion<R> {
 		return this;
 	}
 
+	@Override /* GENERATED - Assertion */
+	public FluentResponseBodyAssertion<R> throwable(Class<? extends java.lang.RuntimeException> value) {
+		super.throwable(value);
+		return this;
+	}
 
 	// </FluentSetters>
 }
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
index 5963f41..22108ec 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseHeaderAssertion.java
@@ -141,5 +141,11 @@ public class FluentResponseHeaderAssertion<R> extends FluentBaseAssertion<String
 		return this;
 	}
 
+	@Override /* GENERATED - Assertion */
+	public FluentResponseHeaderAssertion<R> throwable(Class<? extends java.lang.RuntimeException> value) {
+		super.throwable(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHttpPart.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHttpPart.java
index d2c152d..566d509 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHttpPart.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHttpPart.java
@@ -28,6 +28,7 @@ import org.apache.juneau.parser.ParseException;
 /**
  * Represents a single HTTP part on an HTTP request.
  */
+@FluentSetters
 public abstract class RequestHttpPart {
 
 	private final HttpPartType partType;
@@ -265,4 +266,8 @@ public abstract class RequestHttpPart {
 	public String toString() {
 		return getName() + ": " + getValue();
 	}
+
+	// <FluentSetters>
+
+	// </FluentSetters>
 }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
index bcdeb38..ea86f74 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
@@ -33,6 +33,7 @@ import java.lang.reflect.Method;
 /**
  * Builder class for {@link RestOperationContext} objects.
  */
+@FluentSetters
 public class RestOperationContextBuilder extends BeanContextBuilder {
 
 	RestContext restContext;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFilesBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFilesBuilder.java
index a8e73cb..88dcf31 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFilesBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFilesBuilder.java
@@ -26,6 +26,7 @@ import org.apache.juneau.utils.*;
 /**
  * Builder class for {@link BasicStaticFiles} objects.
  */
+@FluentSetters
 public class StaticFilesBuilder extends FileFinderBuilder {
 
 	List<Header> headers = AList.create();
@@ -77,51 +78,51 @@ public class StaticFilesBuilder extends FileFinderBuilder {
 
 	// <FluentSetters>
 
-	@Override
-	public StaticFilesBuilder cp(Class<?> c, String path, boolean recursive) {
-		super.cp(c, path, recursive);
-		return this;
-	}
-
-	@Override
-	public StaticFilesBuilder dir(String path) {
-		super.dir(path);
+	@Override /* GENERATED - FileFinderBuilder */
+	public StaticFilesBuilder beanFactory(BeanFactory value) {
+		super.beanFactory(value);
 		return this;
 	}
 
-	@Override
-	public StaticFilesBuilder path(Path path) {
-		super.path(path);
+	@Override /* GENERATED - FileFinderBuilder */
+	public StaticFilesBuilder caching(long cachingLimit) {
+		super.caching(cachingLimit);
 		return this;
 	}
 
-	@Override
-	public StaticFilesBuilder caching(long cachingLimit) {
-		super.caching(cachingLimit);
+	@Override /* GENERATED - FileFinderBuilder */
+	public StaticFilesBuilder cp(Class<?> c, String path, boolean recursive) {
+		super.cp(c, path, recursive);
 		return this;
 	}
 
-	@Override
-	public StaticFilesBuilder include(String...patterns) {
-		super.include(patterns);
+	@Override /* GENERATED - FileFinderBuilder */
+	public StaticFilesBuilder dir(String path) {
+		super.dir(path);
 		return this;
 	}
 
-	@Override
+	@Override /* GENERATED - FileFinderBuilder */
 	public StaticFilesBuilder exclude(String...patterns) {
 		super.exclude(patterns);
 		return this;
 	}
 
-	@Override
-	public StaticFilesBuilder implClass(Class<? extends FileFinder> value) {
+	@Override /* GENERATED - FileFinderBuilder */
+	public StaticFilesBuilder implClass(Class<? extends org.apache.juneau.cp.FileFinder> value) {
 		super.implClass(value);
 		return this;
 	}
 
-	@Override
-	public StaticFilesBuilder beanFactory(BeanFactory value) {
-		super.beanFactory(value);
+	@Override /* GENERATED - FileFinderBuilder */
+	public StaticFilesBuilder include(String...patterns) {
+		super.include(patterns);
+		return this;
+	}
+
+	@Override /* GENERATED - FileFinderBuilder */
+	public StaticFilesBuilder path(Path path) {
+		super.path(path);
 		return this;
 	}
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentProtocolVersionAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentProtocolVersionAssertion.java
index 1a8aaad..8686b1e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentProtocolVersionAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentProtocolVersionAssertion.java
@@ -86,5 +86,11 @@ public class FluentProtocolVersionAssertion<R> extends FluentAssertion<R> {
 		return this;
 	}
 
+	@Override /* GENERATED - Assertion */
+	public FluentProtocolVersionAssertion<R> throwable(Class<? extends java.lang.RuntimeException> value) {
+		super.throwable(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestBodyAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestBodyAssertion.java
index 29d6a0a..642b31f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestBodyAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestBodyAssertion.java
@@ -252,6 +252,11 @@ public class FluentRequestBodyAssertion<R> extends FluentAssertion<R> {
 		return this;
 	}
 
+	@Override /* GENERATED - Assertion */
+	public FluentRequestBodyAssertion<R> throwable(Class<? extends java.lang.RuntimeException> value) {
+		super.throwable(value);
+		return this;
+	}
 
 	// </FluentSetters>
 }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestFormParamAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestFormParamAssertion.java
index 54d75c3..0b96bd7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestFormParamAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestFormParamAssertion.java
@@ -120,5 +120,11 @@ public class FluentRequestFormParamAssertion<R> extends FluentBaseAssertion<Stri
 		return this;
 	}
 
+	@Override /* GENERATED - Assertion */
+	public FluentRequestFormParamAssertion<R> throwable(Class<? extends java.lang.RuntimeException> value) {
+		super.throwable(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestHeaderAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestHeaderAssertion.java
index f993e56..2fc14e4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestHeaderAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestHeaderAssertion.java
@@ -120,5 +120,11 @@ public class FluentRequestHeaderAssertion<R> extends FluentBaseAssertion<String,
 		return this;
 	}
 
+	@Override /* GENERATED - Assertion */
+	public FluentRequestHeaderAssertion<R> throwable(Class<? extends java.lang.RuntimeException> value) {
+		super.throwable(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestLineAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestLineAssertion.java
index cc73691..7e7a987 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestLineAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestLineAssertion.java
@@ -86,6 +86,11 @@ public class FluentRequestLineAssertion<R> extends FluentAssertion<R> {
 		return this;
 	}
 
+	@Override /* GENERATED - Assertion */
+	public FluentRequestLineAssertion<R> throwable(Class<? extends java.lang.RuntimeException> value) {
+		super.throwable(value);
+		return this;
+	}
 
 	// </FluentSetters>
 }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestQueryParamAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestQueryParamAssertion.java
index 57c1c17..2b680bc 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestQueryParamAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/assertions/FluentRequestQueryParamAssertion.java
@@ -120,5 +120,11 @@ public class FluentRequestQueryParamAssertion<R> extends FluentBaseAssertion<Str
 		return this;
 	}
 
+	@Override /* GENERATED - Assertion */
+	public FluentRequestQueryParamAssertion<R> throwable(Class<? extends java.lang.RuntimeException> value) {
+		super.throwable(value);
+		return this;
+	}
+
 	// </FluentSetters>
 }
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/exception/HttpException_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/exception/HttpException_Test.java
index 198fe64..9771f25 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/exception/HttpException_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/exception/HttpException_Test.java
@@ -33,7 +33,7 @@ public class HttpException_Test {
 		}
 		@RestGet
 		public void f2() throws HttpException {
-			throw new HttpException("foo").setStatus(225);
+			throw new HttpException("foo").status(225);
 		}
 		@RestGet
 		public void f3() throws HttpException {
@@ -45,7 +45,7 @@ public class HttpException_Test {
 		}
 		@RestGet
 		public void f5() throws HttpException {
-			throw new HttpException(null).setStatus(225).header("Foo", "bar");
+			throw new HttpException(null).status(225).header("Foo", "bar");
 		}
 	}