juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [2/5] juneau git commit: Sort methods in builder classes.
Date Sun, 07 Jan 2018 21:28:34 GMT
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
----------------------------------------------------------------------
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 bfe0fae..09ed68f 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
@@ -50,14 +50,14 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public PlainTextSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public PlainTextSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -74,26 +74,26 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public PlainTextSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder ws() {
-		super.ws();
+	public PlainTextSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	public PlainTextSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public PlainTextSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -104,14 +104,20 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder sq() {
-		super.sq();
+	public PlainTextSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public PlainTextSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public PlainTextSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -128,20 +134,20 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public PlainTextSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public PlainTextSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public PlainTextSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -152,26 +158,20 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public PlainTextSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public PlainTextSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public PlainTextSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public PlainTextSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -386,42 +386,6 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public PlainTextSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public PlainTextSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public PlainTextSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public PlainTextSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public PlainTextSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public PlainTextSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public PlainTextSerializerBuilder 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/serializer/SerializerBuilder.java
----------------------------------------------------------------------
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 4cb4471..e0af5e4 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
@@ -47,44 +47,46 @@ public class SerializerBuilder extends BeanContextBuilder {
 	//--------------------------------------------------------------------------------
 
 	/**
-	 * Configuration property:  Max serialization depth.
+	 * Configuration property:  Abridged output.
 	 *
 	 * <p>
-	 * Abort serialization if specified depth is reached in the POJO tree.
-	 * If this depth is exceeded, an exception is thrown.
-	 * This prevents stack overflows from occurring when trying to serialize models with recursive references.
+	 * When enabled, it is assumed that the parser knows the exact Java POJO type being parsed, and therefore top-level
+	 * type information that might normally be included to determine the data type will not be serialized.
 	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_maxDepth</jsf>, value)</code>.
-	 * </ul>
+	 * <p>
+	 * For example, when serializing a POJO with a {@link Bean#typeName()} value, a <js>"_type"</js> will be added when
+	 * this setting is disabled, but not added when it is enabled.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_maxDepth
+	 * @see Serializer#SERIALIZER_sortMaps
 	 */
-	public SerializerBuilder maxDepth(int value) {
-		return set(SERIALIZER_maxDepth, value);
+	public SerializerBuilder abridged(boolean value) {
+		return set(SERIALIZER_abridged, value);
 	}
 
 	/**
-	 * Configuration property:  Initial depth.
+	 * Configuration property:  Add <js>"_type"</js> properties when needed.
 	 *
 	 * <p>
-	 * The initial indentation level at the root.
-	 * Useful when constructing document fragments that need to be indented at a certain level.
+	 * If <jk>true</jk>, then <js>"_type"</js> properties will be added to beans if their type cannot be inferred
+	 * through reflection.
+	 * This is used to recreate the correct objects during parsing if the object types cannot be inferred.
+	 * For example, when serializing a {@code Map<String,Object>} field, where the bean class cannot be determined from
+	 * the value type.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_initialDepth</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_addBeanTypeProperties</jsf>, value)</code>.
+	 * 	<li>Checking for recursion can cause a small performance penalty.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_initialDepth
+	 * @see Serializer#SERIALIZER_addBeanTypeProperties
 	 */
-	public SerializerBuilder initialDepth(int value) {
-		return set(SERIALIZER_initialDepth, value);
+	public SerializerBuilder addBeanTypeProperties(boolean value) {
+		return set(SERIALIZER_addBeanTypeProperties, value);
 	}
 
 	/**
@@ -145,74 +147,76 @@ public class SerializerBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Configuration property:  Use whitespace.
+	 * Configuration property:  Initial depth.
 	 *
 	 * <p>
-	 * If <jk>true</jk>, newlines and indentation and spaces are added to the output to improve readability.
+	 * The initial indentation level at the root.
+	 * Useful when constructing document fragments that need to be indented at a certain level.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_useWhitespace</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_initialDepth</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_useWhitespace
+	 * @see Serializer#SERIALIZER_initialDepth
 	 */
-	public SerializerBuilder useWhitespace(boolean value) {
-		return set(SERIALIZER_useWhitespace, value);
+	public SerializerBuilder initialDepth(int value) {
+		return set(SERIALIZER_initialDepth, value);
 	}
 
 	/**
-	 * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
+	 * Configuration property:  Serializer listener.
 	 *
+	 * <p>
+	 * Class used to listen for errors and warnings that occur during serialization.
+	 *
+	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
 	 */
-	public SerializerBuilder ws() {
-		return useWhitespace(true);
+	public SerializerBuilder listener(Class<? extends SerializerListener> value) {
+		return set(SERIALIZER_listener, value);
 	}
 
 	/**
-	 * Configuration property:  Maximum indentation.
+	 * Configuration property:  Max serialization depth.
 	 *
 	 * <p>
-	 * Specifies the maximum indentation level in the serialized document.
+	 * Abort serialization if specified depth is reached in the POJO tree.
+	 * If this depth is exceeded, an exception is thrown.
+	 * This prevents stack overflows from occurring when trying to serialize models with recursive references.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_maxIndent</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_maxDepth</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_maxIndent
+	 * @see Serializer#SERIALIZER_maxDepth
 	 */
-	public SerializerBuilder maxIndent(int value) {
-		return set(SERIALIZER_maxIndent, value);
+	public SerializerBuilder maxDepth(int value) {
+		return set(SERIALIZER_maxDepth, value);
 	}
 
 	/**
-	 * Configuration property:  Add <js>"_type"</js> properties when needed.
+	 * Configuration property:  Maximum indentation.
 	 *
 	 * <p>
-	 * If <jk>true</jk>, then <js>"_type"</js> properties will be added to beans if their type cannot be inferred
-	 * through reflection.
-	 * This is used to recreate the correct objects during parsing if the object types cannot be inferred.
-	 * For example, when serializing a {@code Map<String,Object>} field, where the bean class cannot be determined from
-	 * the value type.
+	 * Specifies the maximum indentation level in the serialized document.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_addBeanTypeProperties</jsf>, value)</code>.
-	 * 	<li>Checking for recursion can cause a small performance penalty.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_maxIndent</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_addBeanTypeProperties
+	 * @see Serializer#SERIALIZER_maxIndent
 	 */
-	public SerializerBuilder addBeanTypeProperties(boolean value) {
-		return set(SERIALIZER_addBeanTypeProperties, value);
+	public SerializerBuilder maxIndent(int value) {
+		return set(SERIALIZER_maxIndent, value);
 	}
 
 	/**
@@ -235,35 +239,46 @@ public class SerializerBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
+	 * Configuration property:  Sort arrays and collections alphabetically.
 	 *
+	 * <h5 class='section'>Notes:</h5>
+	 * <ul>
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_sortCollections</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 Serializer#SERIALIZER_sortCollections
 	 */
-	public SerializerBuilder sq() {
-		return quoteChar('\'');
+	public SerializerBuilder sortCollections(boolean value) {
+		return set(SERIALIZER_sortCollections, value);
 	}
 
 	/**
-	 * Configuration property:  Trim null bean property values.
-	 *
-	 * <p>
-	 * If <jk>true</jk>, null bean values will not be serialized to the output.
+	 * Configuration property:  Sort maps alphabetically.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_trimNullProperties</jsf>, value)</code>.
-	 * 	<li>Enabling this setting has the following effects on parsing:
-	 * 	<ul>
-	 * 		<li>Map entries with <jk>null</jk> values will be lost.
-	 * 	</ul>
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_sortMaps</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 Serializer#SERIALIZER_trimNullProperties
+	 * @see Serializer#SERIALIZER_sortMaps
 	 */
-	public SerializerBuilder trimNullProperties(boolean value) {
-		return set(SERIALIZER_trimNullProperties, value);
+	public SerializerBuilder sortMaps(boolean value) {
+		return set(SERIALIZER_sortMaps, value);
+	}
+
+	/**
+	 * Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
+	 *
+	 * @return This object (for method chaining).
+	 */
+	public SerializerBuilder sq() {
+		return quoteChar('\'');
 	}
 
 	/**
@@ -314,6 +329,29 @@ public class SerializerBuilder extends BeanContextBuilder {
 	}
 
 	/**
+	 * Configuration property:  Trim null bean property values.
+	 *
+	 * <p>
+	 * If <jk>true</jk>, null bean values will not be serialized to the output.
+	 *
+	 * <h5 class='section'>Notes:</h5>
+	 * <ul>
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_trimNullProperties</jsf>, value)</code>.
+	 * 	<li>Enabling this setting has the following effects on parsing:
+	 * 	<ul>
+	 * 		<li>Map entries with <jk>null</jk> values will be lost.
+	 * 	</ul>
+	 * </ul>
+	 *
+	 * @param value The new value for this property.
+	 * @return This object (for method chaining).
+	 * @see Serializer#SERIALIZER_trimNullProperties
+	 */
+	public SerializerBuilder trimNullProperties(boolean value) {
+		return set(SERIALIZER_trimNullProperties, value);
+	}
+
+	/**
 	 * Configuration property:  Trim strings.
 	 *
 	 * <p>
@@ -357,41 +395,6 @@ public class SerializerBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Configuration property:  URI resolution.
-	 *
-	 * <p>
-	 * Defines the resolution level for URIs when serializing any of the following:
-	 * <ul>
-	 * 	<li>{@link java.net.URI}
-	 * 	<li>{@link java.net.URL}
-	 * 	<li>Properties annotated with {@link org.apache.juneau.annotation.URI @URI}
-	 * </ul>
-	 *
-	 * <p>
-	 * Possible values are:
-	 * <ul>
-	 * 	<li>{@link UriResolution#ABSOLUTE}
-	 * 		- Resolve to an absolute URL (e.g. <js>"http://host:port/context-root/servlet-path/path-info"</js>).
-	 * 	<li>{@link UriResolution#ROOT_RELATIVE}
-	 * 		- Resolve to a root-relative URL (e.g. <js>"/context-root/servlet-path/path-info"</js>).
-	 * 	<li>{@link UriResolution#NONE}
-	 * 		- Don't do any URL resolution.
-	 * </ul>
-	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_uriResolution</jsf>, value)</code>.
-	 * </ul>
-	 *
-	 * @param value The new value for this property.
-	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_uriResolution
-	 */
-	public SerializerBuilder uriResolution(UriResolution value) {
-		return set(SERIALIZER_uriResolution, value);
-	}
-
-	/**
 	 * Configuration property:  URI relativity.
 	 *
 	 * <p>
@@ -425,69 +428,66 @@ public class SerializerBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Configuration property:  Sort arrays and collections alphabetically.
+	 * Configuration property:  URI resolution.
 	 *
-	 * <h5 class='section'>Notes:</h5>
+	 * <p>
+	 * Defines the resolution level for URIs when serializing any of the following:
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_sortCollections</jsf>, value)</code>.
-	 * 	<li>This introduces a slight performance penalty.
+	 * 	<li>{@link java.net.URI}
+	 * 	<li>{@link java.net.URL}
+	 * 	<li>Properties annotated with {@link org.apache.juneau.annotation.URI @URI}
 	 * </ul>
 	 *
-	 * @param value The new value for this property.
-	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_sortCollections
-	 */
-	public SerializerBuilder sortCollections(boolean value) {
-		return set(SERIALIZER_sortCollections, value);
-	}
-
-	/**
-	 * Configuration property:  Sort maps alphabetically.
+	 * <p>
+	 * Possible values are:
+	 * <ul>
+	 * 	<li>{@link UriResolution#ABSOLUTE}
+	 * 		- Resolve to an absolute URL (e.g. <js>"http://host:port/context-root/servlet-path/path-info"</js>).
+	 * 	<li>{@link UriResolution#ROOT_RELATIVE}
+	 * 		- Resolve to a root-relative URL (e.g. <js>"/context-root/servlet-path/path-info"</js>).
+	 * 	<li>{@link UriResolution#NONE}
+	 * 		- Don't do any URL resolution.
+	 * </ul>
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_sortMaps</jsf>, value)</code>.
-	 * 	<li>This introduces a slight performance penalty.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_uriResolution</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_sortMaps
+	 * @see Serializer#SERIALIZER_uriResolution
 	 */
-	public SerializerBuilder sortMaps(boolean value) {
-		return set(SERIALIZER_sortMaps, value);
+	public SerializerBuilder uriResolution(UriResolution value) {
+		return set(SERIALIZER_uriResolution, value);
 	}
 
 	/**
-	 * Configuration property:  Abridged output.
+	 * Configuration property:  Use whitespace.
 	 *
 	 * <p>
-	 * When enabled, it is assumed that the parser knows the exact Java POJO type being parsed, and therefore top-level
-	 * type information that might normally be included to determine the data type will not be serialized.
+	 * If <jk>true</jk>, newlines and indentation and spaces are added to the output to improve readability.
 	 *
-	 * <p>
-	 * For example, when serializing a POJO with a {@link Bean#typeName()} value, a <js>"_type"</js> will be added when
-	 * this setting is disabled, but not added when it is enabled.
+	 * <h5 class='section'>Notes:</h5>
+	 * <ul>
+	 * 	<li>This is equivalent to calling <code>property(<jsf>SERIALIZER_useWhitespace</jsf>, value)</code>.
+	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_sortMaps
+	 * @see Serializer#SERIALIZER_useWhitespace
 	 */
-	public SerializerBuilder abridged(boolean value) {
-		return set(SERIALIZER_abridged, value);
+	public SerializerBuilder useWhitespace(boolean value) {
+		return set(SERIALIZER_useWhitespace, value);
 	}
 
 	/**
-	 * Configuration property:  Serializer listener.
-	 *
-	 * <p>
-	 * Class used to listen for errors and warnings that occur during serialization.
+	 * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
 	 *
-	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
 	 */
-	public SerializerBuilder listener(Class<? extends SerializerListener> value) {
-		return set(SERIALIZER_listener, value);
+	public SerializerBuilder ws() {
+		return useWhitespace(true);
 	}
 
 	@Override /* BeanContextBuilder */
@@ -701,42 +701,6 @@ public class SerializerBuilder extends BeanContextBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public SerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public SerializerBuilder 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/serializer/SerializerGroupBuilder.java
----------------------------------------------------------------------
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 aeed1c4..a8ab6e7 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
@@ -131,25 +131,25 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
 	//--------------------------------------------------------------------------------
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_maxDepth} property on all serializers in this group.
+	 * Sets the {@link Serializer#SERIALIZER_abridged} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_maxDepth
+	 * @see Serializer#SERIALIZER_abridged
 	 */
-	public SerializerGroupBuilder maxDepth(int value) {
-		return set(SERIALIZER_maxDepth, value);
+	public SerializerGroupBuilder abridged(boolean value) {
+		return set(SERIALIZER_abridged, value);
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_initialDepth} property on all serializers in this group.
+	 * Sets the {@link Serializer#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_initialDepth
+	 * @see Serializer#SERIALIZER_addBeanTypeProperties
 	 */
-	public SerializerGroupBuilder initialDepth(int value) {
-		return set(SERIALIZER_initialDepth, value);
+	public SerializerGroupBuilder addBeanTypeProperties(boolean value) {
+		return set(SERIALIZER_addBeanTypeProperties, value);
 	}
 
 	/**
@@ -175,45 +175,47 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_useWhitespace} property on all serializers in this group.
+	 * Sets the {@link Serializer#SERIALIZER_initialDepth} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_useWhitespace
+	 * @see Serializer#SERIALIZER_initialDepth
 	 */
-	public SerializerGroupBuilder useWhitespace(boolean value) {
-		return set(SERIALIZER_useWhitespace, value);
+	public SerializerGroupBuilder initialDepth(int value) {
+		return set(SERIALIZER_initialDepth, value);
 	}
 
 	/**
-	 * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
+	 * Sets the {@link Serializer#SERIALIZER_listener} property on all serializers in this group.
 	 *
+	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
+	 * @see Serializer#SERIALIZER_listener
 	 */
-	public SerializerGroupBuilder ws() {
-		return useWhitespace(true);
+	public SerializerGroupBuilder listener(Class<? extends SerializerListener> value) {
+		return set(SERIALIZER_listener, value);
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_maxIndent} property on all serializers in this group.
+	 * Sets the {@link Serializer#SERIALIZER_maxDepth} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_maxIndent
+	 * @see Serializer#SERIALIZER_maxDepth
 	 */
-	public SerializerGroupBuilder maxIndent(boolean value) {
-		return set(SERIALIZER_maxIndent, value);
+	public SerializerGroupBuilder maxDepth(int value) {
+		return set(SERIALIZER_maxDepth, value);
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.
+	 * Sets the {@link Serializer#SERIALIZER_maxIndent} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_addBeanTypeProperties
+	 * @see Serializer#SERIALIZER_maxIndent
 	 */
-	public SerializerGroupBuilder addBeanTypeProperties(boolean value) {
-		return set(SERIALIZER_addBeanTypeProperties, value);
+	public SerializerGroupBuilder maxIndent(boolean value) {
+		return set(SERIALIZER_maxIndent, value);
 	}
 
 	/**
@@ -228,23 +230,34 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
+	 * Sets the {@link Serializer#SERIALIZER_sortCollections} property on all serializers in this group.
 	 *
+	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
+	 * @see Serializer#SERIALIZER_sortCollections
 	 */
-	public SerializerGroupBuilder sq() {
-		return quoteChar('\'');
+	public SerializerGroupBuilder sortCollections(boolean value) {
+		return set(SERIALIZER_sortCollections, value);
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_trimNullProperties} property on all serializers in this group.
+	 * Sets the {@link Serializer#SERIALIZER_sortMaps} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_trimNullProperties
+	 * @see Serializer#SERIALIZER_sortMaps
 	 */
-	public SerializerGroupBuilder trimNullProperties(boolean value) {
-		return set(SERIALIZER_trimNullProperties, value);
+	public SerializerGroupBuilder sortMaps(boolean value) {
+		return set(SERIALIZER_sortMaps, value);
+	}
+
+	/**
+	 * Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
+	 *
+	 * @return This object (for method chaining).
+	 */
+	public SerializerGroupBuilder sq() {
+		return quoteChar('\'');
 	}
 
 	/**
@@ -270,6 +283,17 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
 	}
 
 	/**
+	 * Sets the {@link Serializer#SERIALIZER_trimNullProperties} property on all serializers in this group.
+	 *
+	 * @param value The new value for this property.
+	 * @return This object (for method chaining).
+	 * @see Serializer#SERIALIZER_trimNullProperties
+	 */
+	public SerializerGroupBuilder trimNullProperties(boolean value) {
+		return set(SERIALIZER_trimNullProperties, value);
+	}
+
+	/**
 	 * Sets the {@link Serializer#SERIALIZER_trimStrings} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
@@ -292,17 +316,6 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_uriResolution} property on all serializers in this group.
-	 *
-	 * @param value The new value for this property.
-	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_uriResolution
-	 */
-	public SerializerGroupBuilder uriResolution(UriResolution value) {
-		return set(SERIALIZER_uriResolution, value);
-	}
-
-	/**
 	 * Sets the {@link Serializer#SERIALIZER_uriRelativity} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
@@ -314,47 +327,34 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_sortCollections} property on all serializers in this group.
-	 *
-	 * @param value The new value for this property.
-	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_sortCollections
-	 */
-	public SerializerGroupBuilder sortCollections(boolean value) {
-		return set(SERIALIZER_sortCollections, value);
-	}
-
-	/**
-	 * Sets the {@link Serializer#SERIALIZER_sortMaps} property on all serializers in this group.
+	 * Sets the {@link Serializer#SERIALIZER_uriResolution} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_sortMaps
+	 * @see Serializer#SERIALIZER_uriResolution
 	 */
-	public SerializerGroupBuilder sortMaps(boolean value) {
-		return set(SERIALIZER_sortMaps, value);
+	public SerializerGroupBuilder uriResolution(UriResolution value) {
+		return set(SERIALIZER_uriResolution, value);
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_abridged} property on all serializers in this group.
+	 * Sets the {@link Serializer#SERIALIZER_useWhitespace} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_abridged
+	 * @see Serializer#SERIALIZER_useWhitespace
 	 */
-	public SerializerGroupBuilder abridged(boolean value) {
-		return set(SERIALIZER_abridged, value);
+	public SerializerGroupBuilder useWhitespace(boolean value) {
+		return set(SERIALIZER_useWhitespace, value);
 	}
 
 	/**
-	 * Sets the {@link Serializer#SERIALIZER_listener} property on all serializers in this group.
+	 * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
 	 *
-	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see Serializer#SERIALIZER_listener
 	 */
-	public SerializerGroupBuilder listener(Class<? extends SerializerListener> value) {
-		return set(SERIALIZER_listener, value);
+	public SerializerGroupBuilder ws() {
+		return useWhitespace(true);
 	}
 
 	@Override /* BeanContextBuilder */
@@ -568,42 +568,6 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public SerializerGroupBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerGroupBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerGroupBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerGroupBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerGroupBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SerializerGroupBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public SerializerGroupBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;
@@ -703,5 +667,5 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
 	public SerializerGroupBuilder 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/soap/SoapXmlSerializerBuilder.java
----------------------------------------------------------------------
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 beb20ba..8b4829b 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
@@ -70,8 +70,8 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* XmlSerializerBuilder */
-	public SoapXmlSerializerBuilder enableNamespaces(boolean value) {
-		super.enableNamespaces(value);
+	public SoapXmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
+		super.addNamespaceUrisToRoot(value);
 		return this;
 	}
 
@@ -82,20 +82,14 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* XmlSerializerBuilder */
-	public SoapXmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
-		super.addNamespaceUrisToRoot(value);
-		return this;
-	}
-
-	@Override /* XmlSerializerBuilder */
 	public SoapXmlSerializerBuilder defaultNamespace(String value) {
 		super.defaultNamespace(value);
 		return this;
 	}
 
 	@Override /* XmlSerializerBuilder */
-	public SoapXmlSerializerBuilder xsNamespace(Namespace value) {
-		super.xsNamespace(value);
+	public SoapXmlSerializerBuilder enableNamespaces(boolean value) {
+		super.enableNamespaces(value);
 		return this;
 	}
 
@@ -105,15 +99,21 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 		return this;
 	}
 
+	@Override /* XmlSerializerBuilder */
+	public SoapXmlSerializerBuilder xsNamespace(Namespace value) {
+		super.xsNamespace(value);
+		return this;
+	}
+
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public SoapXmlSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public SoapXmlSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -130,20 +130,26 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public SoapXmlSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder ws() {
-		super.ws();
+	public SoapXmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public SoapXmlSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public SoapXmlSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -154,14 +160,20 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder sq() {
-		super.sq();
+	public SoapXmlSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public SoapXmlSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public SoapXmlSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -178,20 +190,20 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public SoapXmlSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public SoapXmlSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public SoapXmlSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -202,26 +214,20 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public SoapXmlSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public SoapXmlSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public SoapXmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public SoapXmlSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -436,42 +442,6 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public SoapXmlSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SoapXmlSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SoapXmlSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SoapXmlSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SoapXmlSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public SoapXmlSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public SoapXmlSerializerBuilder 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/uon/UonParserBuilder.java
----------------------------------------------------------------------
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 f37d6ec..4fbe581 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
@@ -81,38 +81,38 @@ public class UonParserBuilder extends ParserBuilder {
 	}
 
 	@Override /* ParserBuilder */
-	public UonParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public UonParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonParserBuilder strict(boolean value) {
-		super.strict(value);
+	public UonParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonParserBuilder strict() {
-		super.strict();
+	public UonParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	public UonParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	public UonParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UonParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public UonParserBuilder 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/uon/UonSerializerBuilder.java
----------------------------------------------------------------------
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 4641185..6bf6d5c 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
@@ -105,14 +105,14 @@ public class UonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public UonSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public UonSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -129,26 +129,26 @@ public class UonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public UonSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder ws() {
-		super.ws();
+	public UonSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	public UonSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public UonSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -159,14 +159,20 @@ public class UonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder sq() {
-		super.sq();
+	public UonSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public UonSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public UonSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -183,20 +189,20 @@ public class UonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public UonSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public UonSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public UonSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -207,26 +213,20 @@ public class UonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public UonSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public UonSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public UonSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UonSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public UonSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -441,42 +441,6 @@ public class UonSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public UonSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UonSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public UonSerializerBuilder 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/urlencoding/UrlEncodingParserBuilder.java
----------------------------------------------------------------------
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 7b7b3e0..41b4e4c 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
@@ -97,44 +97,44 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
 		return set(URLENC_expandedParams, value);
 	}
 
-	@Override /* UonParser */
+	@Override /* UonParserBuilder */
 	public UrlEncodingParserBuilder decodeChars(boolean value) {
 		return set(UON_decodeChars, value);
 	}
 
 	@Override /* ParserBuilder */
-	public UrlEncodingParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public UrlEncodingParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UrlEncodingParserBuilder strict(boolean value) {
-		super.strict(value);
+	public UrlEncodingParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UrlEncodingParserBuilder strict() {
-		super.strict();
+	public UrlEncodingParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UrlEncodingParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	public UrlEncodingParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UrlEncodingParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	public UrlEncodingParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public UrlEncodingParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public UrlEncodingParserBuilder 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/urlencoding/UrlEncodingSerializerBuilder.java
----------------------------------------------------------------------
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 aec1631..6c55907 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
@@ -150,14 +150,14 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public UrlEncodingSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public UrlEncodingSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -174,20 +174,26 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public UrlEncodingSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder ws() {
-		super.ws();
+	public UrlEncodingSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public UrlEncodingSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public UrlEncodingSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -198,14 +204,20 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder sq() {
-		super.sq();
+	public UrlEncodingSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public UrlEncodingSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public UrlEncodingSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -222,20 +234,20 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public UrlEncodingSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public UrlEncodingSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public UrlEncodingSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -246,26 +258,20 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public UrlEncodingSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public UrlEncodingSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public UrlEncodingSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public UrlEncodingSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -480,42 +486,6 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public UrlEncodingSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UrlEncodingSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UrlEncodingSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UrlEncodingSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UrlEncodingSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public UrlEncodingSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public UrlEncodingSerializerBuilder beanDictionary(Object...values) {
 		super.beanDictionary(values);
 		return this;
@@ -601,7 +571,6 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
 
 	@Override /* ContextBuilder */
 	public UrlEncodingSerializerBuilder addTo(String name, String key, Object value) {
-		super.addTo(name, key, value);
 		return this;
 	}
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
----------------------------------------------------------------------
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 5157b81..6e1a43a 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
@@ -55,11 +55,10 @@ public class XmlParserBuilder extends ParserBuilder {
 	//--------------------------------------------------------------------------------
 
 	/**
-	 * Configuration property:  Enable validation.
+	 * Configuration property:  XML event allocator.
 	 *
 	 * <p>
-	 * If <jk>true</jk>, XML document will be validated.
-	 * See {@link XMLInputFactory#IS_VALIDATING} for more info.
+	 * Associates an {@link XMLEventAllocator} with this parser.
 	 *
 	 * <p>
 	 * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
@@ -67,15 +66,49 @@ public class XmlParserBuilder extends ParserBuilder {
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_validating</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_eventAllocator</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see XmlParser#XML_validating
+	 * @see XmlParser#XML_eventAllocator
 	 */
-	public XmlParserBuilder validating(boolean value) {
-		return set(XML_validating, value);
+	public XmlParserBuilder eventAllocator(XMLEventAllocator value) {
+		return set(XML_eventAllocator, value);
+	}
+
+	/**
+	 * Configuration property:  Preserve root element during generalized parsing.
+	 *
+	 * <p>
+	 * If <jk>true</jk>, when parsing into a generic {@link ObjectMap}, the map will contain a single entry whose key is
+	 * the root element name.
+	 *
+	 * Example:
+	 * <table class='styled'>
+	 * 	<tr>
+	 * 		<td>XML</td>
+	 * 		<td>ObjectMap.toString(), preserveRootElement==false</td>
+	 * 		<td>ObjectMap.toString(), preserveRootElement==true</td>
+	 * 	</tr>
+	 * 	<tr>
+	 * 		<td><code><xt>&lt;root&gt;&lt;a&gt;</xt>foobar<xt>&lt;/a&gt;&lt;/root&gt;</xt></code></td>
+	 * 		<td><code>{ a:<js>'foobar'</js> }</code></td>
+	 * 		<td><code>{ root: { a:<js>'foobar'</js> }}</code></td>
+	 * 	</tr>
+	 * </table>
+	 *
+	 * <h5 class='section'>Notes:</h5>
+	 * <ul>
+	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_preserveRootElement</jsf>, value)</code>.
+	 * </ul>
+	 *
+	 * @param value The new value for this property.
+	 * @return This object (for method chaining).
+	 * @see XmlParser#XML_preserveRootElement
+	 */
+	public XmlParserBuilder preserveRootElement(boolean value) {
+		return set(XML_preserveRootElement, value);
 	}
 
 	/**
@@ -130,10 +163,11 @@ public class XmlParserBuilder extends ParserBuilder {
 	}
 
 	/**
-	 * Configuration property:  XML event allocator.
+	 * Configuration property:  Enable validation.
 	 *
 	 * <p>
-	 * Associates an {@link XMLEventAllocator} with this parser.
+	 * If <jk>true</jk>, XML document will be validated.
+	 * See {@link XMLInputFactory#IS_VALIDATING} for more info.
 	 *
 	 * <p>
 	 * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
@@ -141,84 +175,50 @@ public class XmlParserBuilder extends ParserBuilder {
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_eventAllocator</jsf>, value)</code>.
-	 * </ul>
-	 *
-	 * @param value The new value for this property.
-	 * @return This object (for method chaining).
-	 * @see XmlParser#XML_eventAllocator
-	 */
-	public XmlParserBuilder eventAllocator(XMLEventAllocator value) {
-		return set(XML_eventAllocator, value);
-	}
-
-	/**
-	 * Configuration property:  Preserve root element during generalized parsing.
-	 *
-	 * <p>
-	 * If <jk>true</jk>, when parsing into a generic {@link ObjectMap}, the map will contain a single entry whose key is
-	 * the root element name.
-	 *
-	 * Example:
-	 * <table class='styled'>
-	 * 	<tr>
-	 * 		<td>XML</td>
-	 * 		<td>ObjectMap.toString(), preserveRootElement==false</td>
-	 * 		<td>ObjectMap.toString(), preserveRootElement==true</td>
-	 * 	</tr>
-	 * 	<tr>
-	 * 		<td><code><xt>&lt;root&gt;&lt;a&gt;</xt>foobar<xt>&lt;/a&gt;&lt;/root&gt;</xt></code></td>
-	 * 		<td><code>{ a:<js>'foobar'</js> }</code></td>
-	 * 		<td><code>{ root: { a:<js>'foobar'</js> }}</code></td>
-	 * 	</tr>
-	 * </table>
-	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_preserveRootElement</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_validating</jsf>, value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see XmlParser#XML_preserveRootElement
+	 * @see XmlParser#XML_validating
 	 */
-	public XmlParserBuilder preserveRootElement(boolean value) {
-		return set(XML_preserveRootElement, value);
+	public XmlParserBuilder validating(boolean value) {
+		return set(XML_validating, value);
 	}
 
 	@Override /* ParserBuilder */
-	public XmlParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public XmlParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public XmlParserBuilder strict(boolean value) {
-		super.strict(value);
+	public XmlParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public XmlParserBuilder strict() {
-		super.strict();
+	public XmlParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public XmlParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	public XmlParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public XmlParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	public XmlParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public XmlParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public XmlParserBuilder 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/xml/XmlSchemaSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
index 985993a..9451ce5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
@@ -50,14 +50,8 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* XmlSerializerBuilder */
-	public XmlSchemaSerializerBuilder enableNamespaces(boolean value) {
-		super.enableNamespaces(value);
-		return this;
-	}
-
-	@Override /* XmlSerializerBuilder */
-	public XmlSchemaSerializerBuilder ns() {
-		super.ns();
+	public XmlSchemaSerializerBuilder addNamespaceUrisToRoot(boolean value) {
+		super.addNamespaceUrisToRoot(value);
 		return this;
 	}
 
@@ -68,20 +62,14 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* XmlSerializerBuilder */
-	public XmlSchemaSerializerBuilder addNamespaceUrisToRoot(boolean value) {
-		super.addNamespaceUrisToRoot(value);
-		return this;
-	}
-
-	@Override /* XmlSerializerBuilder */
 	public XmlSchemaSerializerBuilder defaultNamespace(String value) {
 		super.defaultNamespace(value);
 		return this;
 	}
 
 	@Override /* XmlSerializerBuilder */
-	public XmlSchemaSerializerBuilder xsNamespace(Namespace value) {
-		super.xsNamespace(value);
+	public XmlSchemaSerializerBuilder enableNamespaces(boolean value) {
+		super.enableNamespaces(value);
 		return this;
 	}
 
@@ -91,15 +79,21 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 		return this;
 	}
 
+	@Override /* XmlSerializerBuilder */
+	public XmlSchemaSerializerBuilder xsNamespace(Namespace value) {
+		super.xsNamespace(value);
+		return this;
+	}
+
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public XmlSchemaSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public XmlSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -116,20 +110,26 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public XmlSchemaSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder ws() {
-		super.ws();
+	public XmlSchemaSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public XmlSchemaSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -140,14 +140,20 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder sq() {
-		super.sq();
+	public XmlSchemaSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public XmlSchemaSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -164,20 +170,20 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public XmlSchemaSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public XmlSchemaSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public XmlSchemaSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -188,26 +194,20 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public XmlSchemaSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public XmlSchemaSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSchemaSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public XmlSchemaSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -422,42 +422,6 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public XmlSchemaSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSchemaSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSchemaSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSchemaSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSchemaSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSchemaSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder 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/xml/XmlSerializerBuilder.java
----------------------------------------------------------------------
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 a057f7e..6d82365 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
@@ -52,32 +52,26 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	//--------------------------------------------------------------------------------
 
 	/**
-	 * Configuration property:  Enable support for XML namespaces.
+	 * Configuration property:  Add namespace URLs to the root element.
 	 *
 	 * <p>
-	 * If not enabled, XML output will not contain any namespaces regardless of any other settings.
+	 * Use this setting to add {@code xmlns:x} attributes to the root element for the default and all mapped namespaces.
+	 *
+	 * <p>
+	 * This setting is ignored if {@link XmlSerializer#XML_enableNamespaces} is not enabled.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_enableNamespaces</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_addNamespaceUrisToRoot</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 XmlSerializer#XML_enableNamespaces
-	 */
-	public XmlSerializerBuilder enableNamespaces(boolean value) {
-		return set(XML_enableNamespaces, value);
-	}
-
-	/**
-	 * Shortcut for calling <code>setEnableNamespaces(<jk>true</jk>)</code>.
-	 *
-	 * @return This object (for method chaining).
+	 * @see XmlSerializer#XML_addNamespaceUrisToRoot
 	 */
-	public XmlSerializerBuilder ns() {
-		return enableNamespaces(true);
+	public XmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
+		return set(XML_addNamespaceUrisToRoot, value);
 	}
 
 	/**
@@ -119,29 +113,6 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	/**
-	 * Configuration property:  Add namespace URLs to the root element.
-	 *
-	 * <p>
-	 * Use this setting to add {@code xmlns:x} attributes to the root element for the default and all mapped namespaces.
-	 *
-	 * <p>
-	 * This setting is ignored if {@link XmlSerializer#XML_enableNamespaces} is not enabled.
-	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_addNamespaceUrisToRoot</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 XmlSerializer#XML_addNamespaceUrisToRoot
-	 */
-	public XmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
-		return set(XML_addNamespaceUrisToRoot, value);
-	}
-
-	/**
 	 * Configuration property:  Default namespace.
 	 *
 	 * <p>
@@ -162,24 +133,23 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	/**
-	 * Configuration property:  XMLSchema namespace.
+	 * Configuration property:  Enable support for XML namespaces.
 	 *
 	 * <p>
-	 * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the
-	 * {@link XmlSchemaSerializer} class.
+	 * If not enabled, XML output will not contain any namespaces regardless of any other settings.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_xsNamespace</jsf>, value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_enableNamespaces</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 XmlSerializer#XML_xsNamespace
+	 * @see XmlSerializer#XML_enableNamespaces
 	 */
-	public XmlSerializerBuilder xsNamespace(Namespace value) {
-		return set(XML_xsNamespace, value);
+	public XmlSerializerBuilder enableNamespaces(boolean value) {
+		return set(XML_enableNamespaces, value);
 	}
 
 	/**
@@ -202,15 +172,45 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 		return set(XML_namespaces, values);
 	}
 
+	/**
+	 * Shortcut for calling <code>setEnableNamespaces(<jk>true</jk>)</code>.
+	 *
+	 * @return This object (for method chaining).
+	 */
+	public XmlSerializerBuilder ns() {
+		return enableNamespaces(true);
+	}
+
+	/**
+	 * Configuration property:  XMLSchema namespace.
+	 *
+	 * <p>
+	 * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the
+	 * {@link XmlSchemaSerializer} class.
+	 *
+	 * <h5 class='section'>Notes:</h5>
+	 * <ul>
+	 * 	<li>This is equivalent to calling <code>property(<jsf>XML_xsNamespace</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 XmlSerializer#XML_xsNamespace
+	 */
+	public XmlSerializerBuilder xsNamespace(Namespace value) {
+		return set(XML_xsNamespace, value);
+	}
+
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder maxDepth(int value) {
-		super.maxDepth(value);
+	public XmlSerializerBuilder abridged(boolean value) {
+		super.abridged(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder initialDepth(int value) {
-		super.initialDepth(value);
+	public XmlSerializerBuilder addBeanTypeProperties(boolean value) {
+		super.addBeanTypeProperties(value);
 		return this;
 	}
 
@@ -227,26 +227,26 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder useWhitespace(boolean value) {
-		super.useWhitespace(value);
+	public XmlSerializerBuilder initialDepth(int value) {
+		super.initialDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder ws() {
-		super.ws();
+	public XmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder maxIndent(int value) {
-		super.maxIndent(value);
+	public XmlSerializerBuilder maxDepth(int value) {
+		super.maxDepth(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder addBeanTypeProperties(boolean value) {
-		super.addBeanTypeProperties(value);
+	public XmlSerializerBuilder maxIndent(int value) {
+		super.maxIndent(value);
 		return this;
 	}
 
@@ -257,14 +257,20 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder sq() {
-		super.sq();
+	public XmlSerializerBuilder sortCollections(boolean value) {
+		super.sortCollections(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder trimNullProperties(boolean value) {
-		super.trimNullProperties(value);
+	public XmlSerializerBuilder sortMaps(boolean value) {
+		super.sortMaps(value);
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder sq() {
+		super.sq();
 		return this;
 	}
 
@@ -281,20 +287,20 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public XmlSerializerBuilder trimNullProperties(boolean value) {
+		super.trimNullProperties(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder uriContext(UriContext value) {
-		super.uriContext(value);
+	public XmlSerializerBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder uriResolution(UriResolution value) {
-		super.uriResolution(value);
+	public XmlSerializerBuilder uriContext(UriContext value) {
+		super.uriContext(value);
 		return this;
 	}
 
@@ -305,26 +311,20 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder sortCollections(boolean value) {
-		super.sortCollections(value);
-		return this;
-	}
-
-	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder sortMaps(boolean value) {
-		super.sortMaps(value);
+	public XmlSerializerBuilder uriResolution(UriResolution value) {
+		super.uriResolution(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder abridged(boolean value) {
-		super.abridged(value);
+	public XmlSerializerBuilder useWhitespace(boolean value) {
+		super.useWhitespace(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
-	public XmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
-		super.listener(value);
+	public XmlSerializerBuilder ws() {
+		super.ws();
 		return this;
 	}
 
@@ -539,42 +539,6 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
-	public XmlSerializerBuilder includeProperties(Map<String,String> values) {
-		super.includeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSerializerBuilder includeProperties(String beanClassName, String properties) {
-		super.includeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
-		super.includeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSerializerBuilder excludeProperties(Map<String,String> values) {
-		super.excludeProperties(values);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSerializerBuilder excludeProperties(String beanClassName, String properties) {
-		super.excludeProperties(beanClassName, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
-	public XmlSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
-		super.excludeProperties(beanClass, properties);
-		return this;
-	}
-
-	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder 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/yaml/proto/YamlParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java
index 69df83d..3be1b6b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java
@@ -50,38 +50,38 @@ public class YamlParserBuilder extends ParserBuilder {
 	//--------------------------------------------------------------------------------
 
 	@Override /* ParserBuilder */
-	public YamlParserBuilder trimStrings(boolean value) {
-		super.trimStrings(value);
+	public YamlParserBuilder fileCharset(String value) {
+		super.fileCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public YamlParserBuilder strict(boolean value) {
-		super.strict(value);
+	public YamlParserBuilder inputStreamCharset(String value) {
+		super.inputStreamCharset(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public YamlParserBuilder strict() {
-		super.strict();
+	public YamlParserBuilder listener(Class<? extends ParserListener> value) {
+		super.listener(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public YamlParserBuilder inputStreamCharset(String value) {
-		super.inputStreamCharset(value);
+	public YamlParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public YamlParserBuilder fileCharset(String value) {
-		super.fileCharset(value);
+	public YamlParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public YamlParserBuilder listener(Class<? extends ParserListener> value) {
-		super.listener(value);
+	public YamlParserBuilder trimStrings(boolean value) {
+		super.trimStrings(value);
 		return this;
 	}
 


Mime
View raw message