You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/01/11 01:13:11 UTC
[3/7] juneau git commit: Javadoc updates
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 83562a1..3a96302 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,14 +131,20 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
//--------------------------------------------------------------------------------
/**
- * Sets the {@link Serializer#SERIALIZER_abridged} property on all serializers in this group.
+ * Configuration property: Abridged output.
+ *
+ * <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.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_abridged}
* </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 SerializerGroupBuilder abridged(boolean value) {
@@ -146,14 +152,37 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.
+ * Configuration property: Abridged output.
+ *
+ * <p>
+ * Shortcut for calling <code>abridged(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_abridged}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder abridged() {
+ return set(SERIALIZER_abridged, true);
+ }
+
+ /**
+ * Configuration property: Add <js>"_type"</js> properties when needed.
+ *
+ * <p>
+ * If <jk>true</jk>, then <js>"_type"</js> properties will be added to beans if their type cannot be inferred
+ * through reflection.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypeProperties}
* </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 SerializerGroupBuilder addBeanTypeProperties(boolean value) {
@@ -161,14 +190,24 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_detectRecursions} property on all serializers in this group.
+ * Configuration property: Automatically detect POJO recursions.
+ *
+ * <p>
+ * Specifies that recursions should be checked for during serialization.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>Checking for recursion can cause a small performance penalty.
+ * </ul>
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_detectRecursions}
* </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 SerializerGroupBuilder detectRecursions(boolean value) {
@@ -176,14 +215,42 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_ignoreRecursions} property on all serializers in this group.
+ * Configuration property: Automatically detect POJO recursions.
+ *
+ * <p>
+ * Shortcut for calling <code>detectRecursions(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_detectRecursions}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder detectRecursions() {
+ return set(SERIALIZER_detectRecursions, true);
+ }
+
+ /**
+ * Configuration property: Ignore recursion errors.
+ *
+ * <p>
+ * If <jk>true</jk>, when we encounter the same object when serializing a tree, we set the value to <jk>null</jk>.
+ * Otherwise, an exception is thrown.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>Checking for recursion can cause a small performance penalty.
+ * </ul>
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_ignoreRecursions}
* </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 SerializerGroupBuilder ignoreRecursions(boolean value) {
@@ -191,14 +258,36 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_initialDepth} property on all serializers in this group.
+ * Configuration property: Ignore recursion errors.
+ *
+ * <p>
+ * Shortcut for calling <code>ignoreRecursions(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_ignoreRecursions}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder ignoreRecursions() {
+ return set(SERIALIZER_ignoreRecursions, true);
+ }
+
+ /**
+ * Configuration property: Initial depth.
+ *
+ * <p>
+ * The initial indentation level at the root.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_initialDepth}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default is <code>0</code>.
* @return This object (for method chaining).
*/
public SerializerGroupBuilder initialDepth(int value) {
@@ -206,14 +295,18 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_listener} property on all serializers in this group.
+ * Configuration property: Serializer listener.
+ *
+ * <p>
+ * Class used to listen for errors and warnings that occur during serialization.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_listener}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
* @return This object (for method chaining).
*/
public SerializerGroupBuilder listener(Class<? extends SerializerListener> value) {
@@ -221,14 +314,21 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_maxDepth} property on all serializers in this group.
+ * Configuration property: Max serialization depth.
+ *
+ * <p>
+ * Abort serialization if specified depth is reached in the POJO tree.
+ * <br>If this depth is exceeded, an exception is thrown.
+ * <br>This prevents stack overflows from occurring when trying to serialize models with recursive references.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_maxDepth}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default is <code>100</code>.
* @return This object (for method chaining).
*/
public SerializerGroupBuilder maxDepth(int value) {
@@ -236,29 +336,39 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_maxIndent} property on all serializers in this group.
+ * Configuration property: Maximum indentation.
+ *
+ * <p>
+ * Specifies the maximum indentation level in the serialized document.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_maxIndent}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default is <code>100</code>.
* @return This object (for method chaining).
*/
- public SerializerGroupBuilder maxIndent(boolean value) {
+ public SerializerGroupBuilder maxIndent(int value) {
return set(SERIALIZER_maxIndent, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_quoteChar} property on all serializers in this group.
+ * Configuration property: Quote character.
+ *
+ * <p>
+ * This is the character used for quoting attributes and values.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_quoteChar}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default is <js>'"'</js>.
* @return This object (for method chaining).
*/
public SerializerGroupBuilder quoteChar(char value) {
@@ -266,14 +376,16 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_sortCollections} property on all serializers in this group.
+ * Configuration property: Sort arrays and collections alphabetically.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_sortCollections}
* </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 SerializerGroupBuilder sortCollections(boolean value) {
@@ -281,14 +393,33 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_sortMaps} property on all serializers in this group.
+ * Configuration property: Sort arrays and collections alphabetically.
+ *
+ * <p>
+ * Shortcut for calling <code>sortCollections(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_sortCollections}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder sortCollections() {
+ return set(SERIALIZER_sortCollections, true);
+ }
+
+ /**
+ * Configuration property: Sort maps alphabetically.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_sortMaps}
* </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 SerializerGroupBuilder sortMaps(boolean value) {
@@ -296,6 +427,26 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
+ * Configuration property: Sort maps alphabetically.
+ *
+ * <p>
+ * Shortcut for calling <code>sortMaps(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_sortMaps}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder sortMaps() {
+ return set(SERIALIZER_sortMaps, true);
+ }
+
+ /**
+ * Configuration property: Sort maps alphabetically.
+ *
+ * <p>
* Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
*
* <h5 class='section'>See Also:</h5>
@@ -310,14 +461,19 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimEmptyCollections} property on all serializers in this group.
+ * Configuration property: Trim empty lists and arrays.
+ *
+ * <p>
+ * If <jk>true</jk>, empty list values will not be serialized to the output.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_trimEmptyCollections}
* </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 SerializerGroupBuilder trimEmptyCollections(boolean value) {
@@ -325,14 +481,36 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimEmptyMaps} property on all serializers in this group.
+ * Configuration property: Trim empty lists and arrays.
+ *
+ * <p>
+ * Shortcut for calling <code>trimEmptyCollections(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_trimEmptyCollections}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder trimEmptyCollections() {
+ return set(SERIALIZER_trimEmptyCollections, true);
+ }
+
+ /**
+ * Configuration property: Trim empty maps.
+ *
+ * <p>
+ * If <jk>true</jk>, empty map values will not be serialized to the output.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_trimEmptyMaps}
* </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 SerializerGroupBuilder trimEmptyMaps(boolean value) {
@@ -340,14 +518,36 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimNullProperties} property on all serializers in this group.
+ * Configuration property: Trim empty maps.
+ *
+ * <p>
+ * Shortcut for calling <code>trimEmptyMaps(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_trimEmptyMaps}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder trimEmptyMaps() {
+ return set(SERIALIZER_trimEmptyMaps, true);
+ }
+
+ /**
+ * 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'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_trimNullProperties}
* </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 SerializerGroupBuilder trimNullProperties(boolean value) {
@@ -355,14 +555,19 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimStrings} property on all serializers in this group.
+ * Configuration property: Trim strings.
+ *
+ * <p>
+ * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being serialized.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_trimStrings}
* </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 SerializerGroupBuilder trimStrings(boolean value) {
@@ -370,7 +575,27 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_uriContext} property on all serializers in this group.
+ * Configuration property: Trim strings.
+ *
+ * <p>
+ * Shortcut for calling <code>trimStrings(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_trimStrings}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder trimStrings() {
+ return set(SERIALIZER_trimStrings, true);
+ }
+
+ /**
+ * Configuration property: URI context bean.
+ *
+ * <p>
+ * Bean used for resolution of URIs to absolute or root-relative form.
*
* <h5 class='section'>See Also:</h5>
* <ul>
@@ -385,14 +610,19 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_uriRelativity} property on all serializers in this group.
+ * Configuration property: URI relativity.
+ *
+ * <p>
+ * Defines what relative URIs are relative to when serializing URI/URL objects.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_uriRelativity}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default is {@link UriRelativity#RESOURCE}
* @return This object (for method chaining).
*/
public SerializerGroupBuilder uriRelativity(UriRelativity value) {
@@ -400,14 +630,19 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_uriResolution} property on all serializers in this group.
+ * Configuration property: URI resolution.
+ *
+ * <p>
+ * Defines the resolution level for URIs when serializing URI/URL objects.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_uriResolution}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default is {@link UriResolution#NONE}
* @return This object (for method chaining).
*/
public SerializerGroupBuilder uriResolution(UriResolution value) {
@@ -415,14 +650,19 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_useWhitespace} property on all serializers in this group.
+ * Configuration property: Use whitespace.
+ *
+ * <p>
+ * If <jk>true</jk>, newlines and indentation and spaces are added to the output to improve readability.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link Serializer#SERIALIZER_useWhitespace}
* </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 SerializerGroupBuilder useWhitespace(boolean value) {
@@ -430,6 +670,25 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
+ * Configuration property: Use whitespace.
+ *
+ * <p>
+ * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_useWhitespace}
+ * </ul>
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder useWhitespace() {
+ return set(SERIALIZER_useWhitespace, true);
+ }
+
+ /**
+ * Configuration property: Use whitespace.
+ *
+ * <p>
* Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
*
* <h5 class='section'>See Also:</h5>
@@ -440,9 +699,10 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
* @return This object (for method chaining).
*/
public SerializerGroupBuilder ws() {
- return useWhitespace(true);
+ return useWhitespace();
}
+
@Override /* BeanContextBuilder */
public SerializerGroupBuilder beansRequireDefaultConstructor(boolean value) {
super.beansRequireDefaultConstructor(value);
@@ -450,18 +710,36 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
@@ -474,6 +752,12 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder beanMapPutReturnsOldValue() {
+ super.beanMapPutReturnsOldValue();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
@@ -504,6 +788,12 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder useJavaBeanIntrospector() {
+ super.useJavaBeanIntrospector();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
@@ -516,6 +806,12 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder ignoreUnknownBeanProperties() {
+ super.ignoreUnknownBeanProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
@@ -534,18 +830,36 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder ignoreInvocationExceptionsOnGetters() {
+ super.ignoreInvocationExceptionsOnGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder ignoreInvocationExceptionsOnSetters() {
+ super.ignoreInvocationExceptionsOnSetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder sortProperties() {
+ super.sortProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SerializerGroupBuilder 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/soap/SoapXmlSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index 7ccc4a9..3ba6ce8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -46,6 +46,10 @@ public final class SoapXmlSerializer extends XmlSerializer {
* <li><b>Name:</b> <js>"SoapXmlSerializer.SOAPAction.s"</js>
* <li><b>Data type:</b> <code>String</code>
* <li><b>Default:</b> <js>"http://www.w3.org/2003/05/soap-envelope"</js>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link SoapXmlSerializerBuilder#soapAction(String)}
+ * </ul>
* </ul>
*/
public static final String SOAPXML_SOAPAction = PREFIX + "SOAPAction.s";
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 69f32bf..bb27c48 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
@@ -55,62 +55,29 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
/**
* Configuration property: The <code>SOAPAction</code> HTTP header value to set on responses.
*
- * <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 SoapXmlSerializer#SOAPXML_SOAPAction}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default is <js>"http://www.w3.org/2003/05/soap-envelope"</js>.
* @return This object (for method chaining).
*/
public SoapXmlSerializerBuilder soapAction(String value) {
return set(SOAPXML_SOAPAction, value);
}
- @Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
- super.addNamespaceUrisToRoot(value);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder autoDetectNamespaces(boolean value) {
- super.autoDetectNamespaces(value);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder defaultNamespace(String value) {
- super.defaultNamespace(value);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder enableNamespaces(boolean value) {
- super.enableNamespaces(value);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder namespaces(Namespace...values) {
- super.namespaces(values);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder xsNamespace(Namespace value) {
- super.xsNamespace(value);
+ @Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public SoapXmlSerializerBuilder abridged() {
+ super.abridged();
return this;
}
@@ -127,12 +94,23 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder detectRecursions() {
+ super.detectRecursions();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public SoapXmlSerializerBuilder ignoreRecursions(boolean value) {
super.ignoreRecursions(value);
return this;
}
@Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder ignoreRecursions() {
+ super.ignoreRecursions();
+ return this;
+ }
+ @Override /* SerializerBuilder */
public SoapXmlSerializerBuilder initialDepth(int value) {
super.initialDepth(value);
return this;
@@ -169,12 +147,24 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder sortCollections() {
+ super.sortCollections();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public SoapXmlSerializerBuilder sortMaps(boolean value) {
super.sortMaps(value);
return this;
}
@Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder sortMaps() {
+ super.sortMaps();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public SoapXmlSerializerBuilder sq() {
super.sq();
return this;
@@ -187,12 +177,24 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder trimEmptyCollections() {
+ super.trimEmptyCollections();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public SoapXmlSerializerBuilder trimEmptyMaps(boolean value) {
super.trimEmptyMaps(value);
return this;
}
@Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder trimEmptyMaps() {
+ super.trimEmptyMaps();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public SoapXmlSerializerBuilder trimNullProperties(boolean value) {
super.trimNullProperties(value);
return this;
@@ -205,6 +207,12 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder trimStrings() {
+ super.trimStrings();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public SoapXmlSerializerBuilder uriContext(UriContext value) {
super.uriContext(value);
return this;
@@ -229,6 +237,12 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder useWhitespace() {
+ super.useWhitespace();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public SoapXmlSerializerBuilder ws() {
super.ws();
return this;
@@ -241,18 +255,36 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
@@ -265,6 +297,12 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder beanMapPutReturnsOldValue() {
+ super.beanMapPutReturnsOldValue();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
@@ -295,6 +333,12 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder useJavaBeanIntrospector() {
+ super.useJavaBeanIntrospector();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
@@ -307,6 +351,12 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder ignoreUnknownBeanProperties() {
+ super.ignoreUnknownBeanProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
@@ -325,18 +375,36 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder ignoreInvocationExceptionsOnGetters() {
+ super.ignoreInvocationExceptionsOnGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder ignoreInvocationExceptionsOnSetters() {
+ super.ignoreInvocationExceptionsOnSetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder sortProperties() {
+ super.sortProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder 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/transform/AnnotationBeanFilterBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/AnnotationBeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/AnnotationBeanFilterBuilder.java
index b583756..7e56858 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/AnnotationBeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/AnnotationBeanFilterBuilder.java
@@ -45,7 +45,7 @@ public final class AnnotationBeanFilterBuilder<T> extends BeanFilterBuilder<T> {
Bean b = li.previous();
if (! b.properties().isEmpty())
- properties(split(b.properties()));
+ includeProperties(split(b.properties()));
if (! b.typeName().isEmpty())
typeName(b.typeName());
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java
index 6a2a9b3..f20e0ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilter.java
@@ -51,7 +51,7 @@ public final class BeanFilter {
BeanFilter(BeanFilterBuilder<?> builder) {
this.beanClass = builder.beanClass;
this.typeName = builder.typeName;
- this.properties = split(builder.properties, ',');
+ this.properties = split(builder.includeProperties, ',');
this.excludeProperties = split(builder.excludeProperties, ',');
this.interfaceClass = builder.interfaceClass;
this.stopClass = builder.stopClass;
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
index 3f290c5..7268aa5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
@@ -37,7 +37,7 @@ public class BeanFilterBuilder<T> {
Class<?> beanClass;
String typeName;
- String[] properties, excludeProperties;
+ String[] includeProperties, excludeProperties;
Class<?> interfaceClass, stopClass;
boolean sortProperties;
Object propertyNamer;
@@ -75,25 +75,40 @@ public class BeanFilterBuilder<T> {
}
/**
- * Specifies the set and order of names of properties associated with the bean class.
- *
+ * Configuration property: Bean property includes.
+ *
* <p>
- * The order specified is the same order that the entries will be returned by the {@link BeanMap#entrySet()} and
- * related methods.
- * Entries in the list can also contain comma-delimited lists that will be split.
- *
- * @param value The new value for this setting.
+ * Specifies the set and order of names of properties associated with the bean class.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link BeanContext#BEAN_includeProperties}
+ * </ul>
+ *
+ * @param value
+ * The new value for this setting.
+ * <br>Values can contain comma-delimited list of property names.
* @return This object (for method chaining).
*/
- public BeanFilterBuilder<T> properties(String...value) {
- this.properties = value;
+ public BeanFilterBuilder<T> includeProperties(String...value) {
+ this.includeProperties = value;
return this;
}
/**
- * Specifies the list of properties to ignore on a bean.
+ * Configuration property: Bean property excludes.
*
- * @param value The new value for this setting.
+ * <p>
+ * Specifies to exclude the specified list of properties for the specified bean class.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link BeanContext#BEAN_excludeProperties}
+ * </ul>
+ *
+ * @param value
+ * The new value for this setting.
+ * <br>Values can contain comma-delimited list of property names.
* @return This object (for method chaining).
*/
public BeanFilterBuilder<T> excludeProperties(String...value) {
@@ -179,9 +194,20 @@ public class BeanFilterBuilder<T> {
}
/**
- * Sort properties in alphabetical order.
+ * Configuration property: Sort bean properties.
*
- * @param value The new value for this setting.
+ * <p>
+ * When <jk>true</jk>, all bean properties will be serialized and access in alphabetical order.
+ * Otherwise, the natural order of the bean properties is used which is dependent on the JVM vendor.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link BeanContext#BEAN_sortProperties}
+ * </ul>
+ *
+ * @param value
+ * The new value for this property.
+ * <br>The default is <jk>false</jk>.
* @return This object (for method chaining).
*/
public BeanFilterBuilder<T> sortProperties(boolean value) {
@@ -190,37 +216,57 @@ public class BeanFilterBuilder<T> {
}
/**
- * The property namer to use to name bean properties.
+ * Configuration property: Sort bean properties.
*
- * @param value The new value for this setting.
+ * <p>
+ * Shortcut for calling <code>sortProperties(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link BeanContext#BEAN_sortProperties}
+ * </ul>
+ *
* @return This object (for method chaining).
*/
- public BeanFilterBuilder<T> propertyNamer(PropertyNamer value) {
- this.propertyNamer = value;
+ public BeanFilterBuilder<T> sortProperties() {
+ this.sortProperties = true;
return this;
}
/**
- * The property namer to use to name bean properties.
+ * Configuration property: Bean property namer
+ *
+ * <p>
+ * The class to use for calculating bean property names.
*
- * @param value The new value for this setting.
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link BeanContext#BEAN_propertyNamer}
+ * </ul>
+ *
+ * @param value
+ * The new value for this setting.
+ * <br>The default is {@link PropertyNamerDefault}.
* @return This object (for method chaining).
- * @throws Exception Thrown from constructor method.
*/
- public BeanFilterBuilder<T> propertyNamer(Class<? extends PropertyNamer> value) throws Exception {
+ public BeanFilterBuilder<T> propertyNamer(Class<? extends PropertyNamer> value) {
this.propertyNamer = value;
return this;
}
/**
- * Adds classes to this bean's bean dictionary.
+ * Configuration property: Bean dictionary.
*
+ * <p>
+ * Adds to the list of classes that make up the bean dictionary in this bean context.
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
* </ul>
*
- * @param values The values to add to this setting.
+ * @param values
+ * The values to add to this property.
* @return This object (for method chaining).
*/
public BeanFilterBuilder<T> beanDictionary(Class<?>...values) {
@@ -232,8 +278,11 @@ public class BeanFilterBuilder<T> {
}
/**
- * Sets the contents of this bean's bean dictionary.
+ * Configuration property: Bean dictionary.
*
+ * <p>
+ * Adds to the list of classes that make up the bean dictionary in this bean context.
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
@@ -255,7 +304,9 @@ public class BeanFilterBuilder<T> {
/**
* The property filter to use for intercepting and altering getter and setter calls.
*
- * @param value The new value for this setting.
+ * @param value
+ * The new value for this setting.
+ * <br>The default value is {@link PropertyFilter}.
* @return This object (for method chaining).
*/
public BeanFilterBuilder<T> propertyFilter(Class<? extends PropertyFilter> value) {
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
index 0b90a73..daa32a2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
@@ -61,7 +61,7 @@ public class InterfaceBeanFilterBuilder<T> extends BeanFilterBuilder<T> {
Bean b = li.previous();
if (! b.properties().isEmpty())
- properties(split(b.properties()));
+ includeProperties(split(b.properties()));
if (! b.typeName().isEmpty())
typeName(b.typeName());
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 2f4b026..73983f8 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
@@ -103,14 +103,14 @@ public class UonParserBuilder extends ParserBuilder {
}
@Override /* ParserBuilder */
- public UonParserBuilder strict() {
- super.strict();
+ public UonParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public UonParserBuilder strict(boolean value) {
- super.strict(value);
+ public UonParserBuilder strict() {
+ super.strict();
return this;
}
@@ -120,6 +120,12 @@ public class UonParserBuilder extends ParserBuilder {
return this;
}
+ @Override /* ParserBuilder */
+ public UonParserBuilder trimStrings() {
+ super.trimStrings();
+ return this;
+ }
+
@Override /* BeanContextBuilder */
public UonParserBuilder beansRequireDefaultConstructor(boolean value) {
super.beansRequireDefaultConstructor(value);
@@ -127,18 +133,36 @@ public class UonParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
@@ -151,6 +175,12 @@ public class UonParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder beanMapPutReturnsOldValue() {
+ super.beanMapPutReturnsOldValue();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
@@ -181,6 +211,12 @@ public class UonParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder useJavaBeanIntrospector() {
+ super.useJavaBeanIntrospector();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
@@ -193,6 +229,12 @@ public class UonParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder ignoreUnknownBeanProperties() {
+ super.ignoreUnknownBeanProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
@@ -211,18 +253,36 @@ public class UonParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder ignoreInvocationExceptionsOnGetters() {
+ super.ignoreInvocationExceptionsOnGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder ignoreInvocationExceptionsOnSetters() {
+ super.ignoreInvocationExceptionsOnSetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder sortProperties() {
+ super.sortProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonParserBuilder 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/uon/UonSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index 737e9b3..0f0ad07 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -129,7 +129,7 @@ public class UonSerializer extends WriterSerializer {
* <ul>
* <li><b>Name:</b> <js>"UonSerializer.addBeanTypeProperties.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
- * <li><b>Default:</b> <jk>false</jk>
+ * <li><b>Default:</b> <jk>true</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
@@ -163,6 +163,7 @@ public class UonSerializer extends WriterSerializer {
* <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link UonSerializerBuilder#encoding(boolean)}
+ * <li class='jm'>{@link UonSerializerBuilder#encoding()}
* </ul>
* </ul>
*
@@ -189,6 +190,7 @@ public class UonSerializer extends WriterSerializer {
* <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link UonSerializerBuilder#paramFormat(ParamFormat)}
+ * <li class='jm'>{@link UonSerializerBuilder#paramFormatPlain()}
* </ul>
* </ul>
*
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 b1d824b..ff4b0d8 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
@@ -57,23 +57,14 @@ public class UonSerializerBuilder extends SerializerBuilder {
* <p>
* Encode non-valid URI characters with <js>"%xx"</js> constructs.
*
- * <p>
- * If <jk>true</jk>, non-valid URI characters will be converted to <js>"%xx"</js> sequences.
- * Set to <jk>false</jk> if parameter value is being passed to some other code that will already perform
- * URL-encoding of non-valid URI characters.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>UON_encoding</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
- *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link UonSerializer#UON_encoding}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default value is <jk>false</jk>.
* @return This object (for method chaining).
*/
public UonSerializerBuilder encoding(boolean value) {
@@ -81,12 +72,20 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
/**
- * Shortcut for calling <code>setEncodeChars(true)</code>.
+ * Configuration property: Encode non-valid URI characters.
+ *
+ * <p>
+ * Shortcut for calling <code>encoding(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link UonSerializer#UON_encoding}
+ * </ul>
*
* @return This object (for method chaining).
*/
public UonSerializerBuilder encoding() {
- return encoding(true);
+ return set(UON_encoding, true);
}
/**
@@ -100,7 +99,9 @@ public class UonSerializerBuilder extends SerializerBuilder {
* <li class='jf'>{@link UonSerializer#UON_paramFormat}
* </ul>
*
- * @param value The new value for this property.
+ * @param value
+ * The new value for this property.
+ * <br>The default value is {@link ParamFormat#UON}.
* @return This object (for method chaining).
*/
public UonSerializerBuilder paramFormat(ParamFormat value) {
@@ -111,7 +112,7 @@ public class UonSerializerBuilder extends SerializerBuilder {
* Configuration property: Format to use for query/form-data/header values.
*
* <p>
- * Specifies the format to use for URL GET parameter keys and values.
+ * Shortcut for calling <code>paramFormat(<jsf>PLAINTEXT</jsf>)</code>.
*
* <h5 class='section'>See Also:</h5>
* <ul>
@@ -131,6 +132,12 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder abridged() {
+ super.abridged();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UonSerializerBuilder addBeanTypeProperties(boolean value) {
super.addBeanTypeProperties(value);
return this;
@@ -143,12 +150,23 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder detectRecursions() {
+ super.detectRecursions();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UonSerializerBuilder ignoreRecursions(boolean value) {
super.ignoreRecursions(value);
return this;
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder ignoreRecursions() {
+ super.ignoreRecursions();
+ return this;
+ }
+ @Override /* SerializerBuilder */
public UonSerializerBuilder initialDepth(int value) {
super.initialDepth(value);
return this;
@@ -185,12 +203,24 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder sortCollections() {
+ super.sortCollections();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UonSerializerBuilder sortMaps(boolean value) {
super.sortMaps(value);
return this;
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder sortMaps() {
+ super.sortMaps();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UonSerializerBuilder sq() {
super.sq();
return this;
@@ -203,12 +233,24 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder trimEmptyCollections() {
+ super.trimEmptyCollections();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UonSerializerBuilder trimEmptyMaps(boolean value) {
super.trimEmptyMaps(value);
return this;
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder trimEmptyMaps() {
+ super.trimEmptyMaps();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UonSerializerBuilder trimNullProperties(boolean value) {
super.trimNullProperties(value);
return this;
@@ -221,6 +263,12 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder trimStrings() {
+ super.trimStrings();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UonSerializerBuilder uriContext(UriContext value) {
super.uriContext(value);
return this;
@@ -245,6 +293,12 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UonSerializerBuilder useWhitespace() {
+ super.useWhitespace();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UonSerializerBuilder ws() {
super.ws();
return this;
@@ -257,18 +311,36 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
@@ -281,6 +353,12 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder beanMapPutReturnsOldValue() {
+ super.beanMapPutReturnsOldValue();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
@@ -311,6 +389,12 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder useJavaBeanIntrospector() {
+ super.useJavaBeanIntrospector();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
@@ -323,6 +407,12 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder ignoreUnknownBeanProperties() {
+ super.ignoreUnknownBeanProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
@@ -341,18 +431,36 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder ignoreInvocationExceptionsOnGetters() {
+ super.ignoreInvocationExceptionsOnGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder ignoreInvocationExceptionsOnSetters() {
+ super.ignoreInvocationExceptionsOnSetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder sortProperties() {
+ super.sortProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UonSerializerBuilder 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/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 c1d1025..d89c2d8 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
@@ -126,14 +126,14 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* ParserBuilder */
- public UrlEncodingParserBuilder strict() {
- super.strict();
+ public UrlEncodingParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public UrlEncodingParserBuilder strict(boolean value) {
- super.strict(value);
+ public UrlEncodingParserBuilder strict() {
+ super.strict();
return this;
}
@@ -143,6 +143,12 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
return this;
}
+ @Override /* ParserBuilder */
+ public UrlEncodingParserBuilder trimStrings() {
+ super.trimStrings();
+ return this;
+ }
+
@Override /* BeanContextBuilder */
public UrlEncodingParserBuilder beansRequireDefaultConstructor(boolean value) {
super.beansRequireDefaultConstructor(value);
@@ -150,18 +156,36 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
@@ -174,6 +198,12 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder beanMapPutReturnsOldValue() {
+ super.beanMapPutReturnsOldValue();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
@@ -204,6 +234,12 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder useJavaBeanIntrospector() {
+ super.useJavaBeanIntrospector();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
@@ -216,6 +252,12 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder ignoreUnknownBeanProperties() {
+ super.ignoreUnknownBeanProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
@@ -234,18 +276,36 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder ignoreInvocationExceptionsOnGetters() {
+ super.ignoreInvocationExceptionsOnGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder ignoreInvocationExceptionsOnSetters() {
+ super.ignoreInvocationExceptionsOnSetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder sortProperties() {
+ super.sortProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder 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/urlencoding/UrlEncodingSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index e606c9a..cabb5b6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -129,6 +129,7 @@ public class UrlEncodingSerializer extends UonSerializer {
* <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link UrlEncodingSerializerBuilder#expandedParams(boolean)}
+ * <li class='jm'>{@link UrlEncodingSerializerBuilder#expandedParams()}
* </ul>
* </ul>
*
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 6bcb712..0501ed3 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
@@ -59,46 +59,35 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
* If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
* If <jk>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>.
*
- * <h5 class='section'>Example:</h5>
- * <p class='bcode'>
- * <jk>public class</jk> A {
- * <jk>public</jk> String[] f1 = {<js>"a"</js>,<js>"b"</js>};
- * <jk>public</jk> List<String> f2 = <jk>new</jk> LinkedList<String>(Arrays.<jsm>asList</jsm>(<jk>new</jk> String[]{<js>"c"</js>,<js>"d"</js>}));
- * }
- *
- * UrlEncodingSerializer s1 = UrlEncodingSerializer.<jsf>DEFAULT</jsf>;
- * UrlEncodingSerializer s2 = <jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();
- *
- * String ss1 = s1.serialize(<jk>new</jk> A()); <jc>// Produces "f1=(a,b)&f2=(c,d)"</jc>
- * String ss2 = s2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc>
- * </p>
- *
- * <p>
- * This option only applies to beans.
- *
- * <h5 class='section'>Notes:</h5>
+ * <h5 class='section'>See Also:</h5>
* <ul>
- * <li>If parsing multi-part parameters, it's highly recommended to use Collections or Lists
- * as bean property types instead of arrays since arrays have to be recreated from scratch every time a value
- * is added to it.
+ * <li class='jf'>{@link UrlEncodingSerializer#URLENC_expandedParams}
* </ul>
+ *
+ * @param value
+ * The new value for this property.
+ * <br>The default value is <jk>false</jk>.
+ * @return This object (for method chaining).
+ */
+ public UrlEncodingSerializerBuilder expandedParams(boolean value) {
+ return set(URLENC_expandedParams, value);
+ }
+
+ /**
+ * Configuration property: Serialize bean property collections/arrays as separate key/value pairs.
*
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>URLENC_expandedParams</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
+ * <p>
+ * Shortcut for calling <code>expandedParams(<jk>true</jk>)</code>.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link UrlEncodingSerializer#URLENC_expandedParams}
* </ul>
*
- * @param value The new value for this property.
* @return This object (for method chaining).
*/
- public UrlEncodingSerializerBuilder expandedParams(boolean value) {
- return set(URLENC_expandedParams, value);
+ public UrlEncodingSerializerBuilder expandedParams() {
+ return set(URLENC_expandedParams, true);
}
@Override /* UonSerializerBuilder */
@@ -132,6 +121,12 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder abridged() {
+ super.abridged();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder addBeanTypeProperties(boolean value) {
super.addBeanTypeProperties(value);
return this;
@@ -144,12 +139,23 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder detectRecursions() {
+ super.detectRecursions();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder ignoreRecursions(boolean value) {
super.ignoreRecursions(value);
return this;
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder ignoreRecursions() {
+ super.ignoreRecursions();
+ return this;
+ }
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder initialDepth(int value) {
super.initialDepth(value);
return this;
@@ -186,12 +192,24 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder sortCollections() {
+ super.sortCollections();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder sortMaps(boolean value) {
super.sortMaps(value);
return this;
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder sortMaps() {
+ super.sortMaps();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder sq() {
super.sq();
return this;
@@ -204,12 +222,24 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder trimEmptyCollections() {
+ super.trimEmptyCollections();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder trimEmptyMaps(boolean value) {
super.trimEmptyMaps(value);
return this;
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder trimEmptyMaps() {
+ super.trimEmptyMaps();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder trimNullProperties(boolean value) {
super.trimNullProperties(value);
return this;
@@ -222,6 +252,12 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder trimStrings() {
+ super.trimStrings();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder uriContext(UriContext value) {
super.uriContext(value);
return this;
@@ -246,6 +282,12 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder useWhitespace() {
+ super.useWhitespace();
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
public UrlEncodingSerializerBuilder ws() {
super.ws();
return this;
@@ -258,18 +300,36 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
@@ -282,6 +342,12 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder beanMapPutReturnsOldValue() {
+ super.beanMapPutReturnsOldValue();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
@@ -312,6 +378,12 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder useJavaBeanIntrospector() {
+ super.useJavaBeanIntrospector();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
@@ -324,6 +396,12 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder ignoreUnknownBeanProperties() {
+ super.ignoreUnknownBeanProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
@@ -342,18 +420,36 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder ignoreInvocationExceptionsOnGetters() {
+ super.ignoreInvocationExceptionsOnGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder ignoreInvocationExceptionsOnSetters() {
+ super.ignoreInvocationExceptionsOnSetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder sortProperties() {
+ super.sortProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder notBeanPackages(Object...values) {
super.notBeanPackages(values);
return this;
@@ -547,6 +643,7 @@ 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/c162400e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index 703b1d2..96a3f8b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -70,6 +70,7 @@ public class XmlParser extends ReaderParser {
* <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link XmlParserBuilder#preserveRootElement(boolean)}
+ * <li class='jm'>{@link XmlParserBuilder#preserveRootElement()}
* </ul>
* </ul>
*
@@ -153,12 +154,15 @@ public class XmlParser extends ReaderParser {
* <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link XmlParserBuilder#validating(boolean)}
+ * <li class='jm'>{@link XmlParserBuilder#validating()}
* </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
* <p>
* If <jk>true</jk>, XML document will be validated.
+ *
+ * <p>
* See {@link XMLInputFactory#IS_VALIDATING} for more info.
*/
public static final String XML_validating = PREFIX + "validating.b";
http://git-wip-us.apache.org/repos/asf/juneau/blob/c162400e/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 00f8ee4..1858b88 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
@@ -60,10 +60,6 @@ public class XmlParserBuilder extends ParserBuilder {
* <p>
* 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
- * the POJO.
- *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link XmlParser#XML_eventAllocator}
@@ -83,26 +79,14 @@ public class XmlParserBuilder extends ParserBuilder {
* 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><root><a></xt>foobar<xt></a></root></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'>See Also:</h5>
* <ul>
* <li class='jf'>{@link XmlParser#XML_preserveRootElement}
* </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 XmlParserBuilder preserveRootElement(boolean value) {
@@ -110,19 +94,27 @@ public class XmlParserBuilder extends ParserBuilder {
}
/**
- * Configuration property: XML reporter.
+ * Configuration property: Preserve root element during generalized parsing.
*
* <p>
- * Associates an {@link XMLReporter} with this parser.
+ * Shortcut for calling <code>preserveRootElement(<jk>true</jk>)</code>.
*
- * <h5 class='section'>Notes:</h5>
+ * <h5 class='section'>See Also:</h5>
* <ul>
- * <li>Reporters are not copied to new parsers during a clone.
+ * <li class='jf'>{@link XmlParser#XML_preserveRootElement}
* </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public XmlParserBuilder preserveRootElement() {
+ return set(XML_preserveRootElement, true);
+ }
+
+ /**
+ * Configuration property: XML reporter.
*
* <p>
- * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
- * the POJO.
+ * Associates an {@link XMLReporter} with this parser.
*
* <h5 class='section'>See Also:</h5>
* <ul>
@@ -142,10 +134,6 @@ public class XmlParserBuilder extends ParserBuilder {
* <p>
* Associates an {@link XMLResolver} with this parser.
*
- * <p>
- * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
- * the POJO.
- *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link XmlParser#XML_resolver}
@@ -163,24 +151,38 @@ public class XmlParserBuilder extends ParserBuilder {
*
* <p>
* 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
- * the POJO.
*
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link XmlParser#XML_validating}
* </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 XmlParserBuilder validating(boolean value) {
return set(XML_validating, value);
}
+ /**
+ * Configuration property: Enable validation.
+ *
+ * <p>
+ * Shortcut for calling <code>validating(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link XmlParser#XML_validating}
+ * </ul>
+ *
+ * @return This object (for method chaining).
+ */
+ public XmlParserBuilder validating() {
+ return set(XML_validating, true);
+ }
+
@Override /* ParserBuilder */
public XmlParserBuilder fileCharset(String value) {
super.fileCharset(value);
@@ -200,14 +202,14 @@ public class XmlParserBuilder extends ParserBuilder {
}
@Override /* ParserBuilder */
- public XmlParserBuilder strict() {
- super.strict();
+ public XmlParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public XmlParserBuilder strict(boolean value) {
- super.strict(value);
+ public XmlParserBuilder strict() {
+ super.strict();
return this;
}
@@ -217,6 +219,12 @@ public class XmlParserBuilder extends ParserBuilder {
return this;
}
+ @Override /* ParserBuilder */
+ public XmlParserBuilder trimStrings() {
+ super.trimStrings();
+ return this;
+ }
+
@Override /* BeanContextBuilder */
public XmlParserBuilder beansRequireDefaultConstructor(boolean value) {
super.beansRequireDefaultConstructor(value);
@@ -224,18 +232,36 @@ public class XmlParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder beansRequireDefaultConstructor() {
+ super.beansRequireDefaultConstructor();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder beansRequireSerializable(boolean value) {
super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder beansRequireSerializable() {
+ super.beansRequireSerializable();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder beansRequireSettersForGetters(boolean value) {
super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder beansRequireSettersForGetters() {
+ super.beansRequireSettersForGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder beansRequireSomeProperties(boolean value) {
super.beansRequireSomeProperties(value);
return this;
@@ -248,6 +274,12 @@ public class XmlParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder beanMapPutReturnsOldValue() {
+ super.beanMapPutReturnsOldValue();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder beanConstructorVisibility(Visibility value) {
super.beanConstructorVisibility(value);
return this;
@@ -278,6 +310,12 @@ public class XmlParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder useJavaBeanIntrospector() {
+ super.useJavaBeanIntrospector();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder useInterfaceProxies(boolean value) {
super.useInterfaceProxies(value);
return this;
@@ -290,6 +328,12 @@ public class XmlParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder ignoreUnknownBeanProperties() {
+ super.ignoreUnknownBeanProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
super.ignoreUnknownNullBeanProperties(value);
return this;
@@ -308,18 +352,36 @@ public class XmlParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder ignoreInvocationExceptionsOnGetters() {
+ super.ignoreInvocationExceptionsOnGetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder ignoreInvocationExceptionsOnSetters() {
+ super.ignoreInvocationExceptionsOnSetters();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder sortProperties(boolean value) {
super.sortProperties(value);
return this;
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder sortProperties() {
+ super.sortProperties();
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public XmlParserBuilder notBeanPackages(Object...values) {
super.notBeanPackages(values);
return this;