juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [2/7] juneau git commit: Javadoc updates
Date Thu, 11 Jan 2018 01:13:10 GMT
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 a225d2a..147e8aa 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
@@ -56,6 +56,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* XmlSerializerBuilder */
+	public XmlSchemaSerializerBuilder addNamespaceUrisToRoot() {
+		super.addNamespaceUrisToRoot();
+		return this;
+	}
+
+	@Override /* XmlSerializerBuilder */
 	public XmlSchemaSerializerBuilder autoDetectNamespaces(boolean value) {
 		super.autoDetectNamespaces(value);
 		return this;
@@ -92,6 +98,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder abridged() {
+		super.abridged();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
 		super.addBeanTypeProperties(value);
 		return this;
@@ -104,12 +116,23 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder detectRecursions() {
+		super.detectRecursions();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder ignoreRecursions(boolean value) {
 		super.ignoreRecursions(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder ignoreRecursions() {
+		super.ignoreRecursions();
+		return this;
+	}
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder initialDepth(int value) {
 		super.initialDepth(value);
 		return this;
@@ -146,12 +169,24 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder sortCollections() {
+		super.sortCollections();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder sortMaps(boolean value) {
 		super.sortMaps(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder sortMaps() {
+		super.sortMaps();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder sq() {
 		super.sq();
 		return this;
@@ -164,12 +199,24 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder trimEmptyCollections() {
+		super.trimEmptyCollections();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder trimEmptyMaps(boolean value) {
 		super.trimEmptyMaps(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder trimEmptyMaps() {
+		super.trimEmptyMaps();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder trimNullProperties(boolean value) {
 		super.trimNullProperties(value);
 		return this;
@@ -182,6 +229,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder trimStrings() {
+		super.trimStrings();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder uriContext(UriContext value) {
 		super.uriContext(value);
 		return this;
@@ -206,6 +259,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSchemaSerializerBuilder useWhitespace() {
+		super.useWhitespace();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSchemaSerializerBuilder ws() {
 		super.ws();
 		return this;
@@ -218,18 +277,36 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder beansRequireDefaultConstructor() {
+		super.beansRequireDefaultConstructor();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder beansRequireSerializable(boolean value) {
 		super.beansRequireSerializable(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder beansRequireSerializable() {
+		super.beansRequireSerializable();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder beansRequireSettersForGetters(boolean value) {
 		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder beansRequireSettersForGetters() {
+		super.beansRequireSettersForGetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder beansRequireSomeProperties(boolean value) {
 		super.beansRequireSomeProperties(value);
 		return this;
@@ -242,6 +319,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder beanMapPutReturnsOldValue() {
+		super.beanMapPutReturnsOldValue();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder beanConstructorVisibility(Visibility value) {
 		super.beanConstructorVisibility(value);
 		return this;
@@ -272,6 +355,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder useJavaBeanIntrospector() {
+		super.useJavaBeanIntrospector();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder useInterfaceProxies(boolean value) {
 		super.useInterfaceProxies(value);
 		return this;
@@ -284,6 +373,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder ignoreUnknownBeanProperties() {
+		super.ignoreUnknownBeanProperties();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
 		super.ignoreUnknownNullBeanProperties(value);
 		return this;
@@ -302,18 +397,36 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder ignoreInvocationExceptionsOnGetters() {
+		super.ignoreInvocationExceptionsOnGetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
 		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder ignoreInvocationExceptionsOnSetters() {
+		super.ignoreInvocationExceptionsOnSetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder sortProperties(boolean value) {
 		super.sortProperties(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSchemaSerializerBuilder sortProperties() {
+		super.sortProperties();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSchemaSerializerBuilder notBeanPackages(Object...values) {
 		super.notBeanPackages(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 3619ad0..ea9a891 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -158,6 +158,7 @@ public class XmlSerializer extends WriterSerializer {
 	 * 	<li><b>Methods:</b> 
 	 * 		<ul>
 	 * 			<li class='jm'>{@link XmlSerializerBuilder#addNamespaceUrisToRoot(boolean)}
+	 * 			<li class='jm'>{@link XmlSerializerBuilder#addNamespaceUrisToRoot()}
 	 * 		</ul>
 	 * </ul>
 	 *

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 5397ae7..a026209 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
@@ -57,20 +57,14 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	 * <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 introduces a slight performance penalty.
-	 * </ul>
-	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link XmlSerializer#XML_addNamespaceUrisToRoot}
 	 * </ul>
 	 * 
-	 * @param value The new value for this property.
+	 * @param value 
+	 * 	The new value for this property.
+	 * 	<br>The default is <jk>false</jk>.
 	 * @return This object (for method chaining).
 	 */
 	public XmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
@@ -78,40 +72,36 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	/**
-	 * Configuration property:  Auto-detect namespace usage.
-	 *
-	 * <p>
-	 * Detect namespace usage before serialization.
-	 *
-	 * <p>
-	 * Used in conjunction with {@link XmlSerializer#XML_addNamespaceUrisToRoot} to reduce the list of namespace
-	 * URLs appended to the root element to only those that will be used in the resulting document.
-	 *
-	 * <p>
-	 * If enabled, then the data structure will first be crawled looking for namespaces that will be encountered before
-	 * the root element is serialized.
+	 * Configuration property:  Add namespace URLs to the root element.
 	 *
 	 * <p>
-	 * This setting is ignored if {@link XmlSerializer#XML_enableNamespaces} is not enabled.
+	 * Shortcut for calling <code>addNamespaceUrisToRoot(<jk>true</jk>)</code>.
 	 *
-	 * <h5 class='section'>Notes:</h5>
+	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
-	 * 	<li>Auto-detection of namespaces can be costly performance-wise.
-	 * 		In high-performance environments, it's recommended that namespace detection be disabled, and that
-	 * 		namespaces be manually defined through the {@link XmlSerializer#XML_namespaces} property.
+	 * 	<li class='jf'>{@link XmlSerializer#XML_addNamespaceUrisToRoot}
 	 * </ul>
+	 * 
+	 * @return This object (for method chaining).
+	 */
+	public XmlSerializerBuilder addNamespaceUrisToRoot() {
+		return set(XML_addNamespaceUrisToRoot, true);
+	}
+
+	/**
+	 * Configuration property:  Auto-detect namespace usage.
 	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This introduces a slight performance penalty.
-	 * </ul>
+	 * <p>
+	 * Detect namespace usage before serialization.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link XmlSerializer#XML_autoDetectNamespaces}
 	 * </ul>
 	 * 
-	 * @param value The new value for this property.
+	 * @param value 
+	 * 	The new value for this property.
+	 * 	<br>The default is <jk>true</jk>.
 	 * @return This object (for method chaining).
 	 */
 	public XmlSerializerBuilder autoDetectNamespaces(boolean value) {
@@ -124,17 +114,14 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	 * <p>
 	 * Specifies the default namespace URI for this document.
 	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This introduces a slight performance penalty.
-	 * </ul>
-	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link XmlSerializer#XML_defaultNamespace}
 	 * </ul>
 	 * 
-	 * @param value The new value for this property.
+	 * @param value 
+	 * 	The new value for this property.
+	 * 	<br>The default is <js>"juneau: http://www.apache.org/2013/Juneau"</js>.
 	 * @return This object (for method chaining).
 	 */
 	public XmlSerializerBuilder defaultNamespace(String value) {
@@ -147,17 +134,14 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	 * <p>
 	 * If not enabled, XML output will not contain any namespaces regardless of any other settings.
 	 *
-	 * <h5 class='section'>Notes:</h5>
-	 * <ul>
-	 * 	<li>This introduces a slight performance penalty.
-	 * </ul>
-	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link XmlSerializer#XML_enableNamespaces}
 	 * </ul>
 	 * 
-	 * @param value The new value for this property.
+	 * @param value 
+	 * 	The new value for this property.
+	 * 	<br>The default is <jk>false</jk>.
 	 * @return This object (for method chaining).
 	 */
 	public XmlSerializerBuilder enableNamespaces(boolean value) {
@@ -165,40 +149,55 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	/**
-	 * Configuration property:  Default namespaces.
+	 * Configuration property:  Enable support for XML namespaces.
 	 *
 	 * <p>
-	 * The default list of namespaces associated with this serializer.
+	 * Shortcut for calling <code>enableNamespaces(<jk>true</jk>)</code>.
 	 *
-	 * <h5 class='section'>Notes:</h5>
+	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
-	 * 	<li>This introduces a slight performance penalty.
+	 * 	<li class='jf'>{@link XmlSerializer#XML_enableNamespaces}
 	 * </ul>
+	 * 
+	 * @return This object (for method chaining).
+	 */
+	public XmlSerializerBuilder enableNamespaces() {
+		return set(XML_enableNamespaces, true);
+	}
+
+	/**
+	 * Configuration property:  Enable support for XML namespaces.
+	 *
+	 * <p>
+	 * Shortcut for calling <code>enableNamespaces(<jk>true</jk>)</code>.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
-	 * 	<li class='jf'>{@link XmlSerializer#XML_namespaces}
+	 * 	<li class='jf'>{@link XmlSerializer#XML_enableNamespaces}
 	 * </ul>
 	 * 
-	 * @param values The new value for this property.
 	 * @return This object (for method chaining).
 	 */
-	public XmlSerializerBuilder namespaces(Namespace...values) {
-		return set(XML_namespaces, values);
+	public XmlSerializerBuilder ns() {
+		return set(XML_enableNamespaces, true);
 	}
 
 	/**
-	 * Shortcut for calling <code>setEnableNamespaces(<jk>true</jk>)</code>.
+	 * Configuration property:  Default namespaces.
+	 *
+	 * <p>
+	 * The default list of namespaces associated with this serializer.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
-	 * 	<li class='jf'>{@link XmlSerializer#XML_enableNamespaces}
+	 * 	<li class='jf'>{@link XmlSerializer#XML_namespaces}
 	 * </ul>
 	 * 
+	 * @param values The new value for this property.
 	 * @return This object (for method chaining).
 	 */
-	public XmlSerializerBuilder ns() {
-		return enableNamespaces(true);
+	public XmlSerializerBuilder namespaces(Namespace...values) {
+		return set(XML_namespaces, values);
 	}
 
 	/**
@@ -208,17 +207,14 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	 * 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 introduces a slight performance penalty.
-	 * </ul>
-	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link XmlSerializer#XML_xsNamespace}
 	 * </ul>
 	 * 
-	 * @param value The new value for this property.
+	 * @param value 
+	 * 	The new value for this property.
+	 * 	<br>The default is <js>"xs: http://www.w3.org/2001/XMLSchema"</js>.
 	 * @return This object (for method chaining).
 	 */
 	public XmlSerializerBuilder xsNamespace(Namespace value) {
@@ -232,6 +228,12 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder abridged() {
+		super.abridged();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder addBeanTypeProperties(boolean value) {
 		super.addBeanTypeProperties(value);
 		return this;
@@ -244,12 +246,23 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder detectRecursions() {
+		super.detectRecursions();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder ignoreRecursions(boolean value) {
 		super.ignoreRecursions(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder ignoreRecursions() {
+		super.ignoreRecursions();
+		return this;
+	}
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder initialDepth(int value) {
 		super.initialDepth(value);
 		return this;
@@ -286,12 +299,24 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder sortCollections() {
+		super.sortCollections();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder sortMaps(boolean value) {
 		super.sortMaps(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder sortMaps() {
+		super.sortMaps();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder sq() {
 		super.sq();
 		return this;
@@ -304,12 +329,24 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder trimEmptyCollections() {
+		super.trimEmptyCollections();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder trimEmptyMaps(boolean value) {
 		super.trimEmptyMaps(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder trimEmptyMaps() {
+		super.trimEmptyMaps();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder trimNullProperties(boolean value) {
 		super.trimNullProperties(value);
 		return this;
@@ -322,6 +359,12 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder trimStrings() {
+		super.trimStrings();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder uriContext(UriContext value) {
 		super.uriContext(value);
 		return this;
@@ -346,6 +389,12 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public XmlSerializerBuilder useWhitespace() {
+		super.useWhitespace();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public XmlSerializerBuilder ws() {
 		super.ws();
 		return this;
@@ -358,18 +407,36 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder beansRequireDefaultConstructor() {
+		super.beansRequireDefaultConstructor();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder beansRequireSerializable(boolean value) {
 		super.beansRequireSerializable(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder beansRequireSerializable() {
+		super.beansRequireSerializable();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder beansRequireSettersForGetters(boolean value) {
 		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder beansRequireSettersForGetters() {
+		super.beansRequireSettersForGetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder beansRequireSomeProperties(boolean value) {
 		super.beansRequireSomeProperties(value);
 		return this;
@@ -382,6 +449,12 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder beanMapPutReturnsOldValue() {
+		super.beanMapPutReturnsOldValue();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder beanConstructorVisibility(Visibility value) {
 		super.beanConstructorVisibility(value);
 		return this;
@@ -412,6 +485,12 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder useJavaBeanIntrospector() {
+		super.useJavaBeanIntrospector();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder useInterfaceProxies(boolean value) {
 		super.useInterfaceProxies(value);
 		return this;
@@ -424,6 +503,12 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder ignoreUnknownBeanProperties() {
+		super.ignoreUnknownBeanProperties();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
 		super.ignoreUnknownNullBeanProperties(value);
 		return this;
@@ -442,18 +527,36 @@ public class XmlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder ignoreInvocationExceptionsOnGetters() {
+		super.ignoreInvocationExceptionsOnGetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
 		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder ignoreInvocationExceptionsOnSetters() {
+		super.ignoreInvocationExceptionsOnSetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder sortProperties(boolean value) {
 		super.sortProperties(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public XmlSerializerBuilder sortProperties() {
+		super.sortProperties();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public XmlSerializerBuilder notBeanPackages(Object...values) {
 		super.notBeanPackages(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 e83f2e2..dcf12a0 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
@@ -68,14 +68,14 @@ public class YamlParserBuilder extends ParserBuilder {
 	}
 
 	@Override /* ParserBuilder */
-	public YamlParserBuilder strict() {
-		super.strict();
+	public YamlParserBuilder strict(boolean value) {
+		super.strict(value);
 		return this;
 	}
 
 	@Override /* ParserBuilder */
-	public YamlParserBuilder strict(boolean value) {
-		super.strict(value);
+	public YamlParserBuilder strict() {
+		super.strict();
 		return this;
 	}
 
@@ -85,6 +85,12 @@ public class YamlParserBuilder extends ParserBuilder {
 		return this;
 	}
 
+	@Override /* ParserBuilder */
+	public YamlParserBuilder trimStrings() {
+		super.trimStrings();
+		return this;
+	}
+
 	@Override /* BeanContextBuilder */
 	public YamlParserBuilder beansRequireDefaultConstructor(boolean value) {
 		super.beansRequireDefaultConstructor(value);
@@ -92,18 +98,36 @@ public class YamlParserBuilder extends ParserBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder beansRequireDefaultConstructor() {
+		super.beansRequireDefaultConstructor();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder beansRequireSerializable(boolean value) {
 		super.beansRequireSerializable(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder beansRequireSerializable() {
+		super.beansRequireSerializable();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder beansRequireSettersForGetters(boolean value) {
 		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder beansRequireSettersForGetters() {
+		super.beansRequireSettersForGetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder beansRequireSomeProperties(boolean value) {
 		super.beansRequireSomeProperties(value);
 		return this;
@@ -116,6 +140,12 @@ public class YamlParserBuilder extends ParserBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder beanMapPutReturnsOldValue() {
+		super.beanMapPutReturnsOldValue();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder beanConstructorVisibility(Visibility value) {
 		super.beanConstructorVisibility(value);
 		return this;
@@ -146,6 +176,12 @@ public class YamlParserBuilder extends ParserBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder useJavaBeanIntrospector() {
+		super.useJavaBeanIntrospector();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder useInterfaceProxies(boolean value) {
 		super.useInterfaceProxies(value);
 		return this;
@@ -158,6 +194,12 @@ public class YamlParserBuilder extends ParserBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder ignoreUnknownBeanProperties() {
+		super.ignoreUnknownBeanProperties();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
 		super.ignoreUnknownNullBeanProperties(value);
 		return this;
@@ -176,18 +218,36 @@ public class YamlParserBuilder extends ParserBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder ignoreInvocationExceptionsOnGetters() {
+		super.ignoreInvocationExceptionsOnGetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
 		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder ignoreInvocationExceptionsOnSetters() {
+		super.ignoreInvocationExceptionsOnSetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder sortProperties(boolean value) {
 		super.sortProperties(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlParserBuilder sortProperties() {
+		super.sortProperties();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlParserBuilder notBeanPackages(Object...values) {
 		super.notBeanPackages(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
index ae9c45f..7f27569 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
@@ -73,36 +73,36 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	/**
-	 * Shortcut for calling <code>setSimpleMode(<jk>true</jk>).sq()</code>.
+	 * Configuration property:  Simple JSON mode.
+	 *
+	 * <p>
+	 * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
+	 * Otherwise, they are always quoted.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link YamlSerializer#YAML_simpleMode}
 	 * </ul>
 	 * 
+	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
 	 */
-	public YamlSerializerBuilder simple() {
-		return simple(true).sq();
+	public YamlSerializerBuilder simple(boolean value) {
+		return set(YAML_simpleMode, value);
 	}
 
 	/**
-	 * Configuration property:  Simple JSON mode.
-	 *
-	 * <p>
-	 * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
-	 * Otherwise, they are always quoted.
+	 * Shortcut for calling <code>setSimpleMode(<jk>true</jk>).sq()</code>.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link YamlSerializer#YAML_simpleMode}
 	 * </ul>
 	 * 
-	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
 	 */
-	public YamlSerializerBuilder simple(boolean value) {
-		return set(YAML_simpleMode, value);
+	public YamlSerializerBuilder simple() {
+		return simple(true).sq();
 	}
 
 	@Override /* SerializerBuilder */
@@ -112,6 +112,12 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder abridged() {
+		super.abridged();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder addBeanTypeProperties(boolean value) {
 		super.addBeanTypeProperties(value);
 		return this;
@@ -124,12 +130,23 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder detectRecursions() {
+		super.detectRecursions();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder ignoreRecursions(boolean value) {
 		super.ignoreRecursions(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder ignoreRecursions() {
+		super.ignoreRecursions();
+		return this;
+	}
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder initialDepth(int value) {
 		super.initialDepth(value);
 		return this;
@@ -166,12 +183,24 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder sortCollections() {
+		super.sortCollections();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder sortMaps(boolean value) {
 		super.sortMaps(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder sortMaps() {
+		super.sortMaps();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder sq() {
 		super.sq();
 		return this;
@@ -184,12 +213,24 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder trimEmptyCollections() {
+		super.trimEmptyCollections();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder trimEmptyMaps(boolean value) {
 		super.trimEmptyMaps(value);
 		return this;
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder trimEmptyMaps() {
+		super.trimEmptyMaps();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder trimNullProperties(boolean value) {
 		super.trimNullProperties(value);
 		return this;
@@ -202,6 +243,12 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder trimStrings() {
+		super.trimStrings();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder uriContext(UriContext value) {
 		super.uriContext(value);
 		return this;
@@ -226,6 +273,12 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* SerializerBuilder */
+	public YamlSerializerBuilder useWhitespace() {
+		super.useWhitespace();
+		return this;
+	}
+
+	@Override /* SerializerBuilder */
 	public YamlSerializerBuilder ws() {
 		super.ws();
 		return this;
@@ -238,18 +291,36 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder beansRequireDefaultConstructor() {
+		super.beansRequireDefaultConstructor();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder beansRequireSerializable(boolean value) {
 		super.beansRequireSerializable(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder beansRequireSerializable() {
+		super.beansRequireSerializable();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder beansRequireSettersForGetters(boolean value) {
 		super.beansRequireSettersForGetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder beansRequireSettersForGetters() {
+		super.beansRequireSettersForGetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder beansRequireSomeProperties(boolean value) {
 		super.beansRequireSomeProperties(value);
 		return this;
@@ -262,6 +333,12 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder beanMapPutReturnsOldValue() {
+		super.beanMapPutReturnsOldValue();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder beanConstructorVisibility(Visibility value) {
 		super.beanConstructorVisibility(value);
 		return this;
@@ -292,6 +369,12 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder useJavaBeanIntrospector() {
+		super.useJavaBeanIntrospector();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder useInterfaceProxies(boolean value) {
 		super.useInterfaceProxies(value);
 		return this;
@@ -304,6 +387,12 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder ignoreUnknownBeanProperties() {
+		super.ignoreUnknownBeanProperties();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
 		super.ignoreUnknownNullBeanProperties(value);
 		return this;
@@ -322,18 +411,36 @@ public class YamlSerializerBuilder extends SerializerBuilder {
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder ignoreInvocationExceptionsOnGetters() {
+		super.ignoreInvocationExceptionsOnGetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
 		super.ignoreInvocationExceptionsOnSetters(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder ignoreInvocationExceptionsOnSetters() {
+		super.ignoreInvocationExceptionsOnSetters();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder sortProperties(boolean value) {
 		super.sortProperties(value);
 		return this;
 	}
 
 	@Override /* BeanContextBuilder */
+	public YamlSerializerBuilder sortProperties() {
+		super.sortProperties();
+		return this;
+	}
+
+	@Override /* BeanContextBuilder */
 	public YamlSerializerBuilder notBeanPackages(Object...values) {
 		super.notBeanPackages(values);
 		return this;

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-doc/src/main/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 0524a9d..0c9d628 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -2567,9 +2567,9 @@
 			<p>
 				While parsing into beans, Juneau attempts to determine the class types of bean properties through 
 				reflection on the bean property getter or setter.
-				Often this is insufficient if the property type is an interface or abstract class that cannot be 
+				<br>Often this is insufficient if the property type is an interface or abstract class that cannot be 
 				instantiated.
-				This is where bean names and dictionaries come into play.
+				<br>This is where bean names and dictionaries come into play.
 			</p>
 			<p>
 				Bean names and dictionaries are used for identifying class types when they cannot be inferred through 
@@ -2578,7 +2578,7 @@
 			<p>
 				Bean classes are given names through the {@link org.apache.juneau.annotation.Bean#typeName() @Bean.typeName()} 
 				annotation.
-				These names are then added to the serialized output as virtual <js>"_type"</js> properties (or element 
+				<br>These names are then added to the serialized output as virtual <js>"_type"</js> properties (or element 
 				names in XML).
 			</p>
 			<p>
@@ -2594,7 +2594,7 @@
  		<jc>// A bean property where the object types cannot be inferred since it's an Object[].</jc>
  		<ja>@BeanProperty</ja>(beanDictionary={Bar.<jk>class</jk>,Baz.<jk>class</jk>})
  		<jk>public</jk> Object[] x = <jk>new</jk> Object[]{<jk>new</jk> Bar(), <jk>new</jk> Baz()};
- 		}
+ 	}
  		
  	<ja>@Bean</ja>(typeName=<js>"bar"</js>)
  	<jk>public class</jk> Bar {}
@@ -2602,6 +2602,15 @@
  	<ja>@Bean</ja>(typeName=<js>"baz"</js>)
  	<jk>public class</jk> Baz {}
 	 		</p>
+	 		
+	 		<p class='bcode'>
+	 WriterSerializer s = JsonSerializer
+	 	.create()
+	 	.addBeanTypeProperties()
+	 			
+	 		
+	 		
+	 		</p>
 	 		<p>
 	 			When serialized as JSON, <js>"_type"</js> attributes would be added when needed to infer the type during 
 	 			parsing:
@@ -2616,8 +2625,8 @@
 	 		</p>
 	 		<p>
 	 			Type names can be represented slightly differently in different languages.
-	 			For example, the dictionary name is used as element names when serialized to XML.
-	 			This allows the <code>typeName</code> annotation to be used as a shortcut for defining element names for 
+	 			<br>For example, the dictionary name is used as element names when serialized to XML.
+	 			<br>This allows the <code>typeName</code> annotation to be used as a shortcut for defining element names for 
 	 			beans.
 	 		</p>
 			<p>
@@ -2632,15 +2641,77 @@
 	<xt>&lt;/foo&gt;</xt>
 			</p>
 			<p>
-				Bean dictionaries are defined at two levels:
+				Bean dictionaries are registered through the following:
 			</p>
 			<ul>
-				<li>On individual bean properties through the 
-					{@link org.apache.juneau.annotation.BeanProperty#beanDictionary() @BeanProperty.beanDictionary()} 
-					annotation.
-				<li>Globally for a parser using the {@link org.apache.juneau.parser.ParserBuilder#beanDictionary(Object...)} 
-					method.
+				<li class='ja'>{@link org.apache.juneau.annotation.BeanProperty#beanDictionary() @BeanProperty.beanDictionary()} 
+					- On individual bean properties through the annotation.
+				<li class='ja'>{@link org.apache.juneau.annotation.Bean#beanDictionary() @Bean.beanDictionary()} 
+					- On all properties on a bean and all subclasses.
+				<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanDictionary} 
+					- Configuration property on serializers and parsers.
+				<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanDictionary(Object...)}
+					- Builder method on serializers and parsers.
+			</ul>
+			<p>
+				The bean dictionary setting can consist of any of the following types:
+			</p>
+			<ul>
+				<li>Any bean class that specifies a value for {@link org.apache.juneau.annotation.Bean#typeName() @Bean.typeName()}.
+				<li>Any subclass of {@link org.apache.juneau.BeanDictionaryList} containing a collection of bean classes with type name annotations.
+				<li>Any subclass of {@link org.apache.juneau.BeanDictionaryMap} containing a mapping of type names to classes without type name annotations.
+				<li>Any array or collection of the objects above.
 			</ul>
+			<p class='bcode'>
+	<jc>// Create a parser and tell it which classes to try to resolve.</jc>
+	ReaderParser p = JsonParser
+		.<jsm>create</jsm>()
+		.beanDictionary(Foo.<jk>class</jk>, Bar.<jk>class</jk>)
+		.build();
+	
+	<jc>// Same, but use property.</jc>
+	ReaderParser p = JsonParser
+		.<jsm>create</jsm>()
+		.addTo(<jsf>BEAN_beanDictionary</jsf>, Foo.<jk>class</jk>)
+		.addTo(<jsf>BEAN_beanDictionary</jsf>, Bar.<jk>class</jk>)
+		.build();
+
+	<jc>// Use the predefined HTML5 bean dictionary which is a BeanDictionaryList.</jc>
+	ReaderParser p = HtmlParser
+		.<jsm>create</jsm>()
+		.beanDictionary(HtmlBeanDictionary.<jk>class</jk>)
+		.build();
+			</p>
+			<p>
+				The <js>"_type"</js> property name can be overridden through the following:
+			</p>
+			<ul>
+				<li class='ja'>{@link org.apache.juneau.annotation.Bean#typePropertyName() @Bean.typePropertyName()} 
+					- On individual beans through the annotation.
+				<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanTypePropertyName} 
+					- Configuration property on serializers and parsers.
+				<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanTypePropertyName(String)} 
+					- Builder method on serializers and parsers.
+			</ul>
+			<p>
+				When using the annotation, you'll typically want to define it on an interface class so that it can
+				be inherited by all subclasses.
+			</p>
+			<p class='bcode'>
+	<ja>@Bean</ja>(typePropertyName=<js>"mytype"</js>, beanDictionary={MyClass1.<jk>class</jk>,MyClass2.<jk>class</jk>})
+	<jk>public interface</jk> MyInterface {...}
+
+	<ja>@Bean</ja>(typeName=<js>"C1"</js>)
+	<jk>public class</jk> MyClass1 <jk>implements</jk> MyInterface {...}
+
+	<ja>@Bean</ja>(typeName=<js>"C2"</js>)
+	<jk>public class</jk> MyClass2 <jk>implements</jk> MyInterface {...}
+
+	MyInterface[] x = <jk>new</jk> MyInterface[]{ <jk>new</jk> MyClass1(), <jk>new</jk> MyClass2() };
+
+	<jc>// Produces "[{mytype:'C1',...},{mytype:'C2',...}]"</jc>
+	String json = JsonSerializer.<jsf>DEFAULT_LAX</jsf>.serialize(x);
+			</p>
 			<ul class='doctree'>
 				<li class='info'>
 					Type names do not need to be universally unique.  
@@ -2653,9 +2724,6 @@
 					They must be enabled on the serializer using the 
 					{@link org.apache.juneau.serializer.Serializer#SERIALIZER_addBeanTypeProperties} 
 					configuration property.
-				<li class='info'>
-					The <js>"_type"</js> property name can be overridden using the 
-					{@link org.apache.juneau.BeanContext#BEAN_beanTypePropertyName} configuration property.
 			</ul>
 		
 			<!-- =================================================================================================== -->

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java
----------------------------------------------------------------------
diff --git a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java
index 708bf6d..dd53f7d 100644
--- a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java
+++ b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java
@@ -40,7 +40,7 @@ public class JsonConfigurationExample {
 		// the output will be padded with spaces after format characters
 		System.out.println(withWhitespace);
 
-		String escaped = JsonSerializer.create().escapeSolidus(true).build().serialize(aPojo);
+		String escaped = JsonSerializer.create().escapeSolidus().build().serialize(aPojo);
 		// the output will have escaped /
 		System.out.println(escaped);
 	}

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
----------------------------------------------------------------------
diff --git a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
index e11667c..8720521 100644
--- a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
+++ b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
@@ -47,8 +47,8 @@ public class TestUtils {
 
 	private static JsonSerializer jsSorted = JsonSerializer.create()
 		.simple()
-		.sortCollections(true)
-		.sortMaps(true)
+		.sortCollections()
+		.sortMaps()
 		.trimNullProperties(false)
 		.build();
 
@@ -61,7 +61,7 @@ public class TestUtils {
 	private static JsonSerializer js3 = JsonSerializer.create()
 		.simple()
 		.pojoSwaps(IteratorSwap.class, EnumerationSwap.class)
-		.sortProperties(true)
+		.sortProperties()
 		.build();
 
 	/**
@@ -230,7 +230,7 @@ public class TestUtils {
 	 * Test whitespace and generated schema.
 	 */
 	public static void validateXml(Object o, XmlSerializer s) throws Exception {
-		s = s.builder().ws().ns().addNamespaceUrisToRoot(true).build();
+		s = s.builder().ws().ns().addNamespaceUrisToRoot().build();
 		String xml = s.serialize(o);
 
 		String xmlSchema = null;

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/FormDataTest.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/FormDataTest.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/FormDataTest.java
index 95aabdf..de670a9 100644
--- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/FormDataTest.java
+++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/FormDataTest.java
@@ -68,7 +68,7 @@ public class FormDataTest extends RestTestcase {
 	//====================================================================================================
 	@Test
 	public void testPlainTextParams() throws Exception {
-		RestClient c = TestMicroservice.client(UrlEncodingSerializer.class, UrlEncodingParser.class).plainTextParts().build();
+		RestClient c = TestMicroservice.client(UrlEncodingSerializer.class, UrlEncodingParser.class).paramFormatPlain().build();
 		try {
 			String r;
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java
index 5e19738..33c2ede 100644
--- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java
+++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/UrlPathPatternTest.java
@@ -35,6 +35,6 @@ public class UrlPathPatternTest {
 		l.add(new UrlPathPattern("/foo/{id}/bar/*"));
 
 		Collections.sort(l);
-		assertEquals("[{patternString:'/foo/bar',vars:[]},{patternString:'/foo/bar/*',vars:[]},{patternString:'/foo/{id}/bar',vars:['id']},{patternString:'/foo/{id}/bar/*',vars:['id']},{patternString:'/foo/{id}',vars:['id']},{patternString:'/foo/{id}/*',vars:['id']},{patternString:'/foo',vars:[]},{patternString:'/foo/*',vars:[]}]", JsonSerializer.DEFAULT_LAX.builder().sortProperties(true).build().serialize(l));
+		assertEquals("[{patternString:'/foo/bar',vars:[]},{patternString:'/foo/bar/*',vars:[]},{patternString:'/foo/{id}/bar',vars:['id']},{patternString:'/foo/{id}/bar/*',vars:['id']},{patternString:'/foo/{id}',vars:['id']},{patternString:'/foo/{id}/*',vars:['id']},{patternString:'/foo',vars:[]},{patternString:'/foo/*',vars:[]}]", JsonSerializer.DEFAULT_LAX.builder().sortProperties().build().serialize(l));
 	}
 }

http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index b89a87f..2d62063 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -174,7 +174,7 @@ public class RestClient extends BeanContext {
 	 * 	<li><b>Default:</b>  empty list.
 	 * 	<li><b>Methods:</b> 
 	 * 		<ul>
-	 * 			<li class='jm'>{@link RestClientBuilder#interceptor(RestCallInterceptor)}
+	 * 			<li class='jm'>{@link RestClientBuilder#interceptors(RestCallInterceptor...)}
 	 * 		</ul>
 	 * </ul>
 	 * 
@@ -350,8 +350,8 @@ public class RestClient extends BeanContext {
 	 * <p>
 	 * When set, relative URL strings passed in through the various rest call methods (e.g. {@link RestClient#doGet(Object)}
 	 * will be prefixed with the specified root.
-	 * This root URL is ignored on those methods if you pass in a {@link URL}, {@link URI}, or an absolute URL string.
-	 * Trailing slashes are trimmed.
+	 * <br>This root URL is ignored on those methods if you pass in a {@link URL}, {@link URI}, or an absolute URL string.
+	 * <br>Trailing slashes are trimmed.
 	 */
 	public static final String RESTCLIENT_rootUri = PREFIX + "rootUri.s";
 	


Mime
View raw message