juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [3/5] juneau git commit: Sort methods in builder classes.
Date Sun, 07 Jan 2018 21:28:35 GMT
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
----------------------------------------------------------------------
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 584a02f..b823a86 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
@@ -53,26 +53,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	//--------------------------------------------------------------------------------
 
 	/**
-	 * Configuration property:  Anchor text source.
-	 *
-	 * <p>
-	 * When creating anchor tags (e.g. <code><xt>&lt;a</xt> <xa>href</xa>=<xs>'...'</xs><xt>&gt;</xt>text<xt>&lt;/a&gt;</xt></code>)
-	 * in HTML, this setting defines what to set the inner text to.
-	 *
-	 * <p>
-	 * See the {@link AnchorText} enum for possible values.
+	 * Configuration property:  Add key/value headers on bean/map tables.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>HTML_uriAnchorText</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>HTML_addKeyValueTableHeaders</jsf>, value)</code>.
+	 * 	<li>This introduces a slight performance penalty.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see HtmlSerializer#HTML_uriAnchorText
+	 * @see HtmlSerializer#HTML_addKeyValueTableHeaders
 	 */
-	public HtmlSerializerBuilder uriAnchorText(AnchorText value) {
-		return set(HTML_uriAnchorText, value);
+	public HtmlSerializerBuilder addKeyValueTableHeaders(boolean value) {
+		return set(HTML_addKeyValueTableHeaders, value);
 	}
 
 	/**
@@ -97,6 +91,23 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	/**
+	 * Configuration property:  The parameter name to use when using {@link HtmlSerializer#HTML_lookForLabelParameters}.
+	 *
+	 * <h5 class='section'>Notes:</h5>
+	 * <ul>
+	 * 	<li>This is equivalent to calling <code>property(<jsf>HTML_labelParameter</jsf>, value)</code>.
+	 * 	<li>This introduces a slight performance penalty.
+	 * </ul>
+	 *
+	 * @param value The new value for this property.
+	 * @return This object (for method chaining).
+	 * @see HtmlSerializer#HTML_labelParameter
+	 */
+	public HtmlSerializerBuilder labelParameter(String value) {
+		return set(HTML_labelParameter, value);
+	}
+
+	/**
 	 * Configuration property:  Look for link labels in the <js>"label"</js> parameter of the URL.
 	 *
 	 * <p>
@@ -120,42 +131,31 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	/**
-	 * Configuration property:  The parameter name to use when using {@link HtmlSerializer#HTML_lookForLabelParameters}.
+	 * Configuration property:  Anchor text source.
 	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>HTML_labelParameter</jsf>, value)</code>.
-	 * 	<li>This introduces a slight performance penalty.
-	 * </ul>
+	 * <p>
+	 * When creating anchor tags (e.g. <code><xt>&lt;a</xt> <xa>href</xa>=<xs>'...'</xs><xt>&gt;</xt>text<xt>&lt;/a&gt;</xt></code>)
+	 * in HTML, this setting defines what to set the inner text to.
 	 *
-	 * @param value The new value for this property.
-	 * @return This object (for method chaining).
-	 * @see HtmlSerializer#HTML_labelParameter
-	 */
-	public HtmlSerializerBuilder labelParameter(String value) {
-		return set(HTML_labelParameter, value);
-	}
-
-	/**
-	 * Configuration property:  Add key/value headers on bean/map tables.
+	 * <p>
+	 * See the {@link AnchorText} enum for possible values.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>HTML_addKeyValueTableHeaders</jsf>, value)</code>.
-	 * 	<li>This introduces a slight performance penalty.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>HTML_uriAnchorText</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see HtmlSerializer#HTML_addKeyValueTableHeaders
+	 * @see HtmlSerializer#HTML_uriAnchorText
 	 */
-	public HtmlSerializerBuilder addKeyValueTableHeaders(boolean value) {
-		return set(HTML_addKeyValueTableHeaders, value);
+	public HtmlSerializerBuilder uriAnchorText(AnchorText value) {
+		return set(HTML_uriAnchorText, value);
 	}
 
 	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder enableNamespaces(boolean value) {
-		super.enableNamespaces(value);
+	public HtmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
+		super.addNamespaceUrisToRoot(value);
 		return this;
 	}
 
@@ -166,20 +166,14 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
-		super.addNamespaceUrisToRoot(value);
-		return this;
-	}
-
-	@Override /* XmlSerializerBuilder */
 	public HtmlSerializerBuilder defaultNamespace(String value) {
 		super.defaultNamespace(value);
 		return this;
 	}
 
 	@Override /* XmlSerializerBuilder */
-	public HtmlSerializerBuilder xsNamespace(Namespace value) {
-		super.xsNamespace(value);
+	public HtmlSerializerBuilder enableNamespaces(boolean value) {
+		super.enableNamespaces(value);
 		return this;
 	}
 
@@ -189,15 +183,21 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 		return this;
 	}
 
+	@Override /* XmlSerializerBuilder */
+	public HtmlSerializerBuilder xsNamespace(Namespace value) {
+		super.xsNamespace(value);
+		return this;
+	}
+
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public HtmlSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public HtmlSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -214,20 +214,26 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public HtmlSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder ws() {
-		super.ws();
+	public HtmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public HtmlSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public HtmlSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -238,14 +244,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder sq() {
-		super.sq();
+	public HtmlSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public HtmlSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public HtmlSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -262,20 +274,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public HtmlSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public HtmlSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public HtmlSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -286,26 +298,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public HtmlSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public HtmlSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public HtmlSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public HtmlSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -520,42 +526,6 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public HtmlSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public HtmlSerializerBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
index 0e1666e..9454356 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
@@ -74,14 +74,14 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public SimpleUonPartSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public SimpleUonPartSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -98,20 +98,26 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public SimpleUonPartSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder ws() {
-		super.ws();
+	public SimpleUonPartSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public SimpleUonPartSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public SimpleUonPartSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -122,14 +128,20 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder sq() {
-		super.sq();
+	public SimpleUonPartSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public SimpleUonPartSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public SimpleUonPartSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -146,20 +158,20 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public SimpleUonPartSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public SimpleUonPartSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public SimpleUonPartSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -170,26 +182,20 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public SimpleUonPartSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public SimpleUonPartSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SimpleUonPartSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public SimpleUonPartSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -404,42 +410,6 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public SimpleUonPartSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SimpleUonPartSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SimpleUonPartSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SimpleUonPartSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SimpleUonPartSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SimpleUonPartSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public SimpleUonPartSerializerBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
index 3fd38f9..8d13857 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
@@ -52,44 +52,44 @@ public class UonPartParserBuilder extends UonParserBuilder {
 	// Properties
 	//--------------------------------------------------------------------------------
 
-	@Override /* UonParser */
+	@Override /* UonParserBuilder */
 	public UonPartParserBuilder decodeChars(boolean value) {
 		return set(UON_decodeChars, value);
 	}
 
 	@Override /* ParserBuilder */
-	public UonPartParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public UonPartParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonPartParserBuilder strict(boolean value) {
-		super.strict(value);
+	public UonPartParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonPartParserBuilder strict() {
-		super.strict();
+	public UonPartParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonPartParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	public UonPartParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonPartParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	public UonPartParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonPartParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public UonPartParserBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
index c65eeda..cb50074 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
@@ -104,14 +104,14 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public UonPartSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public UonPartSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -128,20 +128,26 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public UonPartSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder ws() {
-		super.ws();
+	public UonPartSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public UonPartSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public UonPartSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -152,14 +158,20 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder sq() {
-		super.sq();
+	public UonPartSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public UonPartSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public UonPartSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -176,20 +188,20 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public UonPartSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public UonPartSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public UonPartSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -200,26 +212,20 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public UonPartSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public UonPartSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonPartSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public UonPartSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -434,42 +440,6 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public UonPartSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonPartSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonPartSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonPartSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonPartSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonPartSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public UonPartSerializerBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
----------------------------------------------------------------------
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 3d53cb5..868fe57 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
@@ -49,39 +49,39 @@ public class JsoParserBuilder extends ParserBuilder {
 	// Properties
 	//--------------------------------------------------------------------------------
 
-	@Override /* Parser */
-	public JsoParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	@Override /* ParserBuilder */
+	public JsoParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
-	@Override /* Parser */
-	public JsoParserBuilder strict(boolean value) {
-		super.strict(value);
+	@Override /* ParserBuilder */
+	public JsoParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public JsoParserBuilder strict() {
-		super.strict();
+	public JsoParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
-	@Override /* Parser */
-	public JsoParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	@Override /* ParserBuilder */
+	public JsoParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
-	@Override /* Parser */
-	public JsoParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	@Override /* ParserBuilder */
+	public JsoParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public JsoParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public JsoParserBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
----------------------------------------------------------------------
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 70ef906..e26519e 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
@@ -50,14 +50,14 @@ public class JsoSerializerBuilder extends SerializerBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public JsoSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public JsoSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -74,26 +74,26 @@ public class JsoSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public JsoSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder ws() {
-		super.ws();
+	public JsoSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	public JsoSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public JsoSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -104,14 +104,20 @@ public class JsoSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder sq() {
-		super.sq();
+	public JsoSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public JsoSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public JsoSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -128,20 +134,20 @@ public class JsoSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public JsoSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public JsoSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public JsoSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -152,26 +158,20 @@ public class JsoSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public JsoSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public JsoSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsoSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public JsoSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -386,42 +386,6 @@ public class JsoSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsoSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public JsoSerializerBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
----------------------------------------------------------------------
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 84110e1..458efa7 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
@@ -50,38 +50,38 @@ public class JsonParserBuilder extends ParserBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* ParserBuilder */
-	public JsonParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public JsonParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public JsonParserBuilder strict(boolean value) {
-		super.strict(value);
+	public JsonParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public JsonParserBuilder strict() {
-		super.strict();
+	public JsonParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public JsonParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	public JsonParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public JsonParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	public JsonParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public JsonParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public JsonParserBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
@@ -313,7 +313,6 @@ public class JsonParserBuilder extends ParserBuilder {
 		return this;
 	}
 
-
 	@Override /* BeanContextBuilder */
 	public JsonParserBuilder beanDictionaryRemove(Object...values) {
 		super.beanDictionaryRemove(values);

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
----------------------------------------------------------------------
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 de6278c..6c9aa78 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
@@ -50,8 +50,8 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* JsonSerializerBuilder */
-	public JsonSchemaSerializerBuilder simple(boolean value) {
-		super.simple(value);
+	public JsonSchemaSerializerBuilder escapeSolidus(boolean value) {
+		super.escapeSolidus(value);
 		return this;
 	}
 
@@ -62,20 +62,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
 	}
 
 	@Override /* JsonSerializerBuilder */
-	public JsonSchemaSerializerBuilder escapeSolidus(boolean value) {
-		super.escapeSolidus(value);
+	public JsonSchemaSerializerBuilder simple(boolean value) {
+		super.simple(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public JsonSchemaSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public JsonSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -92,20 +92,26 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public JsonSchemaSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder ws() {
-		super.ws();
+	public JsonSchemaSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public JsonSchemaSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public JsonSchemaSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -116,14 +122,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder sq() {
-		super.sq();
+	public JsonSchemaSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public JsonSchemaSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public JsonSchemaSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -140,20 +152,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public JsonSchemaSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public JsonSchemaSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public JsonSchemaSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -164,26 +176,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public JsonSchemaSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public JsonSchemaSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSchemaSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public JsonSchemaSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -398,42 +404,6 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public JsonSchemaSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSchemaSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSchemaSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSchemaSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSchemaSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSchemaSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public JsonSchemaSerializerBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
----------------------------------------------------------------------
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 4b9bd09..2101fd4 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
@@ -52,23 +52,25 @@ public class JsonSerializerBuilder extends SerializerBuilder {
 	//--------------------------------------------------------------------------------
 
 	/**
-	 * Configuration property:  Simple JSON mode.
+	 * Configuration property:  Prefix solidus <js>'/'</js> characters with escapes.
 	 *
 	 * <p>
-	 * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
-	 * Otherwise, they are always quoted.
+	 * If <jk>true</jk>, solidus (e.g. slash) characters should be escaped.
+	 * The JSON specification allows for either format.
+	 * However, if you're embedding JSON in an HTML script tag, this setting prevents confusion when trying to
+	 * serialize <xt>&lt;\/script&gt;</xt>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>JSON_simpleMode</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>JSON_escapeSolidus</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see JsonSerializer#JSON_simpleMode
+	 * @see JsonSerializer#JSON_escapeSolidus
 	 */
-	public JsonSerializerBuilder simple(boolean value) {
-		return set(JSON_simpleMode, value);
+	public JsonSerializerBuilder escapeSolidus(boolean value) {
+		return set(JSON_escapeSolidus, value);
 	}
 
 	/**
@@ -81,36 +83,34 @@ public class JsonSerializerBuilder extends SerializerBuilder {
 	}
 
 	/**
-	 * Configuration property:  Prefix solidus <js>'/'</js> characters with escapes.
+	 * Configuration property:  Simple JSON mode.
 	 *
 	 * <p>
-	 * If <jk>true</jk>, solidus (e.g. slash) characters should be escaped.
-	 * The JSON specification allows for either format.
-	 * However, if you're embedding JSON in an HTML script tag, this setting prevents confusion when trying to
-	 * serialize <xt>&lt;\/script&gt;</xt>.
+	 * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
+	 * Otherwise, they are always quoted.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>JSON_escapeSolidus</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>JSON_simpleMode</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see JsonSerializer#JSON_escapeSolidus
+	 * @see JsonSerializer#JSON_simpleMode
 	 */
-	public JsonSerializerBuilder escapeSolidus(boolean value) {
-		return set(JSON_escapeSolidus, value);
+	public JsonSerializerBuilder simple(boolean value) {
+		return set(JSON_simpleMode, value);
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public JsonSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public JsonSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -127,26 +127,26 @@ public class JsonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public JsonSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder ws() {
-		super.ws();
+	public JsonSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	public JsonSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public JsonSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -157,14 +157,20 @@ public class JsonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder sq() {
-		super.sq();
+	public JsonSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public JsonSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public JsonSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -181,20 +187,20 @@ public class JsonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public JsonSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public JsonSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public JsonSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -205,26 +211,20 @@ public class JsonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public JsonSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public JsonSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public JsonSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public JsonSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -439,42 +439,6 @@ public class JsonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public JsonSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public JsonSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public JsonSerializerBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
----------------------------------------------------------------------
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 773edae..4034362 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
@@ -50,38 +50,38 @@ public class MsgPackParserBuilder extends ParserBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* ParserBuilder */
-	public MsgPackParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public MsgPackParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public MsgPackParserBuilder strict(boolean value) {
-		super.strict(value);
+	public MsgPackParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public MsgPackParserBuilder strict() {
-		super.strict();
+	public MsgPackParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public MsgPackParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	public MsgPackParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public MsgPackParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	public MsgPackParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public MsgPackParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public MsgPackParserBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
----------------------------------------------------------------------
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 c5188bf..cc10a8c 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
@@ -50,14 +50,14 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public MsgPackSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public MsgPackSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -74,26 +74,26 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public MsgPackSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder ws() {
-		super.ws();
+	public MsgPackSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	public MsgPackSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public MsgPackSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -104,14 +104,20 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder sq() {
-		super.sq();
+	public MsgPackSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public MsgPackSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public MsgPackSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -128,20 +134,20 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public MsgPackSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public MsgPackSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public MsgPackSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -152,26 +158,20 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public MsgPackSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public MsgPackSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public MsgPackSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public MsgPackSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -386,42 +386,6 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public MsgPackSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public MsgPackSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public MsgPackSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public MsgPackSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public MsgPackSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public MsgPackSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public MsgPackSerializerBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
----------------------------------------------------------------------
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 14ea714..411239a 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
@@ -46,23 +46,73 @@ public class ParserBuilder extends BeanContextBuilder {
 	//--------------------------------------------------------------------------------
 
 	/**
-	 * Configuration property:  Trim parsed strings.
+	 * Configuration property:  File charset.
 	 *
 	 * <p>
-	 * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
-	 * the POJO.
+	 * The character set to use for reading <code>Files</code> from the file system.
+	 *
+	 * <p>
+	 * Used when passing in files to {@link Parser#parse(Object, Class)}.
+	 *
+	 * <p>
+	 * <js>"default"</js> can be used to indicate the JVM default file system charset.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>PARSER_trimStrings</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>PARSER_fileCharset</jsf>,value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_trimStrings
+	 * @see Parser#PARSER_fileCharset
 	 */
-	public ParserBuilder trimStrings(boolean value) {
-		return set(PARSER_trimStrings, value);
+	public ParserBuilder fileCharset(String value) {
+		return set(PARSER_fileCharset, value);
+	}
+
+	/**
+	 * Configuration property:  Input stream charset.
+	 *
+	 * <p>
+	 * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.
+	 *
+	 * <p>
+	 * Used when passing in input streams and byte arrays to {@link Parser#parse(Object, Class)}.
+	 *
+	 * <h5 class='section'>Notes:</h5>
+	 * <ul>
+	 * 	<li>This is equivalent to calling <code>property(<jsf>PARSER_inputStreamCharset</jsf>, value)</code>.
+	 * </ul>
+	 *
+	 * @param value The new value for this property.
+	 * @return This object (for method chaining).
+	 * @see Parser#PARSER_inputStreamCharset
+	 */
+	public ParserBuilder inputStreamCharset(String value) {
+		return set(PARSER_inputStreamCharset, value);
+	}
+
+	/**
+	 * Configuration property:  Parser listener.
+	 *
+	 * <p>
+	 * Class used to listen for errors and warnings that occur during parsing.
+	 *
+	 * @param value The new value for this property.
+	 * @return This object (for method chaining).
+	 * @see Parser#PARSER_listener
+	 */
+	public ParserBuilder listener(Class<? extends ParserListener> value) {
+		return set(PARSER_listener, value);
+	}
+
+	/**
+	 * Shortcut for calling <code>strict(<jk>true</jk>)</code>.
+	 *
+	 * @return This object (for method chaining).
+	 */
+	public ParserBuilder strict() {
+		return strict(true);
 	}
 
 	/**
@@ -113,318 +163,268 @@ public class ParserBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Shortcut for calling <code>strict(<jk>true</jk>)</code>.
-	 *
-	 * @return This object (for method chaining).
-	 */
-	public ParserBuilder strict() {
-		return strict(true);
-	}
-
-	/**
-	 * Configuration property:  Input stream charset.
-	 *
-	 * <p>
-	 * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.
-	 *
-	 * <p>
-	 * Used when passing in input streams and byte arrays to {@link Parser#parse(Object, Class)}.
-	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>PARSER_inputStreamCharset</jsf>, value)</code>.
-	 * </ul>
-	 *
-	 * @param value The new value for this property.
-	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_inputStreamCharset
-	 */
-	public ParserBuilder inputStreamCharset(String value) {
-		return set(PARSER_inputStreamCharset, value);
-	}
-
-	/**
-	 * Configuration property:  File charset.
-	 *
-	 * <p>
-	 * The character set to use for reading <code>Files</code> from the file system.
-	 *
-	 * <p>
-	 * Used when passing in files to {@link Parser#parse(Object, Class)}.
+	 * Configuration property:  Trim parsed strings.
 	 *
 	 * <p>
-	 * <js>"default"</js> can be used to indicate the JVM default file system charset.
+	 * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
+	 * the POJO.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>PARSER_fileCharset</jsf>,value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>PARSER_trimStrings</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_fileCharset
-	 */
-	public ParserBuilder fileCharset(String value) {
-		return set(PARSER_fileCharset, value);
-	}
-
-	/**
-	 * Configuration property:  Parser listener.
-	 *
-	 * <p>
-	 * Class used to listen for errors and warnings that occur during parsing.
-	 *
-	 * @param value The new value for this property.
-	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_listener
+	 * @see Parser#PARSER_trimStrings
 	 */
-	public ParserBuilder listener(Class<? extends ParserListener> value) {
-		return set(PARSER_listener, value);
+	public ParserBuilder trimStrings(boolean value) {
+		return set(PARSER_trimStrings, value);
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beansRequireDefaultConstructor(boolean value) {
-		super.beansRequireDefaultConstructor(value);
+	public ParserBuilder beanClassVisibility(Visibility value) {
+		super.beanClassVisibility(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beansRequireSerializable(boolean value) {
-		super.beansRequireSerializable(value);
+	public ParserBuilder beanConstructorVisibility(Visibility value) {
+		super.beanConstructorVisibility(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beansRequireSettersForGetters(boolean value) {
-		super.beansRequireSettersForGetters(value);
+	public ParserBuilder beanDictionary(boolean append, Object...values) {
+		super.beanDictionary(append, values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beansRequireSomeProperties(boolean value) {
-		super.beansRequireSomeProperties(value);
+	public ParserBuilder beanDictionary(Class<?>...values) {
+		super.beanDictionary(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanMapPutReturnsOldValue(boolean value) {
-		super.beanMapPutReturnsOldValue(value);
+	public ParserBuilder beanDictionary(Object...values) {
+		super.beanDictionary(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanConstructorVisibility(Visibility value) {
-		super.beanConstructorVisibility(value);
+	public ParserBuilder beanDictionaryRemove(Object...values) {
+		super.beanDictionaryRemove(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanClassVisibility(Visibility value) {
-		super.beanClassVisibility(value);
+	public ParserBuilder beanFieldVisibility(Visibility value) {
+		super.beanFieldVisibility(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanFieldVisibility(Visibility value) {
-		super.beanFieldVisibility(value);
+	public ParserBuilder beanFilters(boolean append, Object...values) {
+		super.beanFilters(append, values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder methodVisibility(Visibility value) {
-		super.methodVisibility(value);
+	public ParserBuilder beanFilters(Class<?>...values) {
+		super.beanFilters(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder useJavaBeanIntrospector(boolean value) {
-		super.useJavaBeanIntrospector(value);
+	public ParserBuilder beanFilters(Object...values) {
+		super.beanFilters(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder useInterfaceProxies(boolean value) {
-		super.useInterfaceProxies(value);
+	public ParserBuilder beanFiltersRemove(Object...values) {
+		super.beanFiltersRemove(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder ignoreUnknownBeanProperties(boolean value) {
-		super.ignoreUnknownBeanProperties(value);
+	public ParserBuilder beanMapPutReturnsOldValue(boolean value) {
+		super.beanMapPutReturnsOldValue(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
-		super.ignoreUnknownNullBeanProperties(value);
+	public ParserBuilder beansRequireDefaultConstructor(boolean value) {
+		super.beansRequireDefaultConstructor(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder ignorePropertiesWithoutSetters(boolean value) {
-		super.ignorePropertiesWithoutSetters(value);
+	public ParserBuilder beansRequireSerializable(boolean value) {
+		super.beansRequireSerializable(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
-		super.ignoreInvocationExceptionsOnGetters(value);
+	public ParserBuilder beansRequireSettersForGetters(boolean value) {
+		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
-		super.ignoreInvocationExceptionsOnSetters(value);
+	public ParserBuilder beansRequireSomeProperties(boolean value) {
+		super.beansRequireSomeProperties(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder sortProperties(boolean value) {
-		super.sortProperties(value);
+	public ParserBuilder beanTypePropertyName(String value) {
+		super.beanTypePropertyName(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder notBeanPackages(Object...values) {
-		super.notBeanPackages(values);
+	public ParserBuilder debug() {
+		super.debug();
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder notBeanPackages(String...values) {
-		super.notBeanPackages(values);
+	public ParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
+		super.ignoreInvocationExceptionsOnGetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder notBeanPackages(boolean append, Object...values) {
-		super.notBeanPackages(append, values);
+	public ParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
+		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder notBeanPackagesRemove(Object...values) {
-		super.notBeanPackagesRemove(values);
+	public ParserBuilder ignorePropertiesWithoutSetters(boolean value) {
+		super.ignorePropertiesWithoutSetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder notBeanClasses(Object...values) {
-		super.notBeanClasses(values);
+	public ParserBuilder ignoreUnknownBeanProperties(boolean value) {
+		super.ignoreUnknownBeanProperties(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder notBeanClasses(Class<?>...values) {
-		super.notBeanClasses(values);
+	public ParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
+		super.ignoreUnknownNullBeanProperties(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder notBeanClasses(boolean append, Object...values) {
-		super.notBeanClasses(append, values);
+	public <T> ParserBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
+		super.implClass(interfaceClass, implClass);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder notBeanClassesRemove(Object...values) {
-		super.notBeanClassesRemove(values);
+	public ParserBuilder implClasses(Map<String,Class<?>> values) {
+		super.implClasses(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanFilters(Object...values) {
-		super.beanFilters(values);
+	public ParserBuilder locale(Locale value) {
+		super.locale(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanFilters(Class<?>...values) {
-		super.beanFilters(values);
+	public ParserBuilder mediaType(MediaType value) {
+		super.mediaType(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanFilters(boolean append, Object...values) {
-		super.beanFilters(append, values);
+	public ParserBuilder methodVisibility(Visibility value) {
+		super.methodVisibility(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanFiltersRemove(Object...values) {
-		super.beanFiltersRemove(values);
+	public ParserBuilder notBeanClasses(boolean append, Object...values) {
+		super.notBeanClasses(append, values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder pojoSwaps(Object...values) {
-		super.pojoSwaps(values);
+	public ParserBuilder notBeanClasses(Class<?>...values) {
+		super.notBeanClasses(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder pojoSwaps(Class<?>...values) {
-		super.pojoSwaps(values);
+	public ParserBuilder notBeanClasses(Object...values) {
+		super.notBeanClasses(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder pojoSwaps(boolean append, Object...values) {
-		super.pojoSwaps(append, values);
+	public ParserBuilder notBeanClassesRemove(Object...values) {
+		super.notBeanClassesRemove(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder pojoSwapsRemove(Object...values) {
-		super.pojoSwapsRemove(values);
+	public ParserBuilder notBeanPackages(boolean append, Object...values) {
+		super.notBeanPackages(append, values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder implClasses(Map<String,Class<?>> values) {
-		super.implClasses(values);
+	public ParserBuilder notBeanPackages(Object...values) {
+		super.notBeanPackages(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public <T> ParserBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
-		super.implClass(interfaceClass, implClass);
+	public ParserBuilder notBeanPackages(String...values) {
+		super.notBeanPackages(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanDictionary(Object...values) {
-		super.beanDictionary(values);
+	public ParserBuilder notBeanPackagesRemove(Object...values) {
+		super.notBeanPackagesRemove(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanDictionary(Class<?>...values) {
-		super.beanDictionary(values);
+	public ParserBuilder pojoSwaps(boolean append, Object...values) {
+		super.pojoSwaps(append, values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanDictionary(boolean append, Object...values) {
-		super.beanDictionary(append, values);
+	public ParserBuilder pojoSwaps(Class<?>...values) {
+		super.pojoSwaps(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanDictionaryRemove(Object...values) {
-		super.beanDictionaryRemove(values);
+	public ParserBuilder pojoSwaps(Object...values) {
+		super.pojoSwaps(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder beanTypePropertyName(String value) {
-		super.beanTypePropertyName(value);
+	public ParserBuilder pojoSwapsRemove(Object...values) {
+		super.pojoSwapsRemove(values);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder locale(Locale value) {
-		super.locale(value);
+	public ParserBuilder sortProperties(boolean value) {
+		super.sortProperties(value);
 		return this;
 	}
 
@@ -435,14 +435,14 @@ public class ParserBuilder extends BeanContextBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder mediaType(MediaType value) {
-		super.mediaType(value);
+	public ParserBuilder useInterfaceProxies(boolean value) {
+		super.useInterfaceProxies(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserBuilder debug() {
-		super.debug();
+	public ParserBuilder useJavaBeanIntrospector(boolean value) {
+		super.useJavaBeanIntrospector(value);
 		return this;
 	}
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
----------------------------------------------------------------------
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 f1a0a43..a7cc59f 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
@@ -131,58 +131,58 @@ public class ParserGroupBuilder extends BeanContextBuilder {
 	//--------------------------------------------------------------------------------
 
 	/**
-	 * Sets the {@link Parser#PARSER_trimStrings} property on all parsers in this group.
+	 * Sets the {@link Parser#PARSER_fileCharset} property on all parsers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_trimStrings
+	 * @see Parser#PARSER_fileCharset
 	 */
-	public ParserGroupBuilder trimStrings(boolean value) {
-		return set(PARSER_trimStrings, value);
+	public ParserGroupBuilder fileCharset(String value) {
+		return set(PARSER_fileCharset, value);
 	}
 
 	/**
-	 * Sets the {@link Parser#PARSER_strict} property on all parsers in this group.
+	 * Sets the {@link Parser#PARSER_inputStreamCharset} property on all parsers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_strict
+	 * @see Parser#PARSER_inputStreamCharset
 	 */
-	public ParserGroupBuilder strict(boolean value) {
-		return set(PARSER_strict, value);
+	public ParserGroupBuilder inputStreamCharset(String value) {
+		return set(PARSER_inputStreamCharset, value);
 	}
 
 	/**
-	 * Sets the {@link Parser#PARSER_inputStreamCharset} property on all parsers in this group.
+	 * Sets the {@link Parser#PARSER_listener} property on all parsers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_inputStreamCharset
+	 * @see Parser#PARSER_listener
 	 */
-	public ParserGroupBuilder inputStreamCharset(String value) {
-		return set(PARSER_inputStreamCharset, value);
+	public ParserGroupBuilder listener(Class<? extends ParserListener> value) {
+		return set(PARSER_listener, value);
 	}
 
 	/**
-	 * Sets the {@link Parser#PARSER_fileCharset} property on all parsers in this group.
+	 * Sets the {@link Parser#PARSER_strict} property on all parsers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_fileCharset
+	 * @see Parser#PARSER_strict
 	 */
-	public ParserGroupBuilder fileCharset(String value) {
-		return set(PARSER_fileCharset, value);
+	public ParserGroupBuilder strict(boolean value) {
+		return set(PARSER_strict, value);
 	}
 
 	/**
-	 * Sets the {@link Parser#PARSER_listener} property on all parsers in this group.
+	 * Sets the {@link Parser#PARSER_trimStrings} property on all parsers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Parser#PARSER_listener
+	 * @see Parser#PARSER_trimStrings
 	 */
-	public ParserGroupBuilder listener(Class<? extends ParserListener> value) {
-		return set(PARSER_listener, value);
+	public ParserGroupBuilder trimStrings(boolean value) {
+		return set(PARSER_trimStrings, value);
 	}
 
 	@Override /* BeanContextBuilder */
@@ -396,42 +396,6 @@ public class ParserGroupBuilder extends BeanContextBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public ParserGroupBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public ParserGroupBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public ParserGroupBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public ParserGroupBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public ParserGroupBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public ParserGroupBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public ParserGroupBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;
@@ -531,5 +495,5 @@ public class ParserGroupBuilder extends BeanContextBuilder {
 	public ParserGroupBuilder apply(PropertyStore copyFrom) {
 		super.apply(copyFrom);
 		return this;
-	}	
+	}
 }

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
----------------------------------------------------------------------
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 10f4f62..cad2088 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
@@ -50,38 +50,38 @@ public class PlainTextParserBuilder extends ParserBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* ParserBuilder */
-	public PlainTextParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public PlainTextParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public PlainTextParserBuilder strict(boolean value) {
-		super.strict(value);
+	public PlainTextParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public PlainTextParserBuilder strict() {
-		super.strict();
+	public PlainTextParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public PlainTextParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	public PlainTextParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public PlainTextParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	public PlainTextParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public PlainTextParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public PlainTextParserBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 


Mime
View raw message