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/07 21:28:33 UTC
[1/5] juneau git commit: Sort methods in builder classes.
Repository: juneau
Updated Branches:
refs/heads/master 13af2b9d2 -> 45640a1a2
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/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 29a14bb..3cc18f7 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
@@ -52,23 +52,25 @@ public class YamlSerializerBuilder extends SerializerBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Simple JSON mode.
+ * Configuration property: Prefix solidus <js>'/'</js> characters with escapes.
*
* <p>
- * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
- * Otherwise, they are always quoted.
+ * If <jk>true</jk>, solidus (e.g. slash) characters should be escaped.
+ * The JSON specification allows for either format.
+ * However, if you're embedding JSON in an HTML script tag, this setting prevents confusion when trying to
+ * serialize <xt><\/script></xt>.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>JSON_simpleMode</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>JSON_escapeSolidus</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see #YAML_simpleMode
+ * @see #YAML_escapeSolidus
*/
- public YamlSerializerBuilder simple(boolean value) {
- return set(YAML_simpleMode, value);
+ public YamlSerializerBuilder escapeSolidus(boolean value) {
+ return set(YAML_escapeSolidus, value);
}
/**
@@ -81,36 +83,34 @@ public class YamlSerializerBuilder extends SerializerBuilder {
}
/**
- * Configuration property: Prefix solidus <js>'/'</js> characters with escapes.
+ * Configuration property: Simple JSON mode.
*
* <p>
- * If <jk>true</jk>, solidus (e.g. slash) characters should be escaped.
- * The JSON specification allows for either format.
- * However, if you're embedding JSON in an HTML script tag, this setting prevents confusion when trying to
- * serialize <xt><\/script></xt>.
+ * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
+ * Otherwise, they are always quoted.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>JSON_escapeSolidus</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>JSON_simpleMode</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see #YAML_escapeSolidus
+ * @see #YAML_simpleMode
*/
- public YamlSerializerBuilder escapeSolidus(boolean value) {
- return set(YAML_escapeSolidus, value);
+ public YamlSerializerBuilder simple(boolean value) {
+ return set(YAML_simpleMode, value);
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public YamlSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public YamlSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -127,26 +127,26 @@ public class YamlSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public YamlSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder ws() {
- super.ws();
+ public YamlSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder maxIndent(int value) {
- super.maxIndent(value);
+ public YamlSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public YamlSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -157,14 +157,20 @@ public class YamlSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder sq() {
- super.sq();
+ public YamlSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public YamlSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public YamlSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -181,20 +187,20 @@ public class YamlSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public YamlSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public YamlSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public YamlSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -205,26 +211,20 @@ public class YamlSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public YamlSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public YamlSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public YamlSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public YamlSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -439,42 +439,6 @@ public class YamlSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public YamlSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public YamlSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public YamlSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public YamlSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public YamlSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public YamlSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public YamlSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index 01779bf..4803ade 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -817,79 +817,59 @@ public class RestClientBuilder extends BeanContextBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Keep HttpClient open.
- *
- * <p>
- * Don't close this client when the {@link RestClient#close()} method is called.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>set(<jsf>RESTCLIENT_keepHttpClientOpen</jsf>, value)</code>.
- * </ul>
+ * Sets the {@link Serializer#SERIALIZER_abridged} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see RestClient#RESTCLIENT_keepHttpClientOpen
- */
- public RestClientBuilder keepHttpClientOpen(boolean value) {
- return set(RESTCLIENT_keepHttpClientOpen, value);
- }
-
- /**
- * Configuration property: Request headers.
- *
- * @param key The header name.
- * @param value The header value.
- * @return This object (for method chaining).
- * @see RestClient#RESTCLIENT_headers
+ * @see Serializer#SERIALIZER_abridged
*/
- public RestClientBuilder header(String key, Object value) {
- return addTo(RESTCLIENT_headers, key, value);
+ public RestClientBuilder abridged(boolean value) {
+ return set(SERIALIZER_abridged, value);
}
/**
- * Configuration property: Request query parameters.
+ * Sets the {@link Serializer#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.
*
- * @param key The query parameter name.
- * @param value The query parameter value value.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see RestClient#RESTCLIENT_query
+ * @see Serializer#SERIALIZER_addBeanTypeProperties
*/
- public RestClientBuilder query(String key, Object value) {
- return addTo(RESTCLIENT_query, key, value);
+ public RestClientBuilder addBeanTypeProperties(boolean value) {
+ return set(SERIALIZER_addBeanTypeProperties, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_maxDepth} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_detectRecursions} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_maxDepth
+ * @see Serializer#SERIALIZER_detectRecursions
*/
- public RestClientBuilder maxDepth(int value) {
- return set(SERIALIZER_maxDepth, value);
+ public RestClientBuilder detectRecursions(boolean value) {
+ return set(SERIALIZER_detectRecursions, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_initialDepth} property on all serializers in this group.
+ * Sets the {@link Parser#PARSER_fileCharset} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_initialDepth
+ * @see Parser#PARSER_fileCharset
*/
- public RestClientBuilder initialDepth(int value) {
- return set(SERIALIZER_initialDepth, value);
+ public RestClientBuilder fileCharset(String value) {
+ return set(PARSER_fileCharset, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_detectRecursions} property on all serializers in this group.
+ * Configuration property: Request headers.
*
- * @param value The new value for this property.
+ * @param key The header name.
+ * @param value The header value.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_detectRecursions
+ * @see RestClient#RESTCLIENT_headers
*/
- public RestClientBuilder detectRecursions(boolean value) {
- return set(SERIALIZER_detectRecursions, value);
+ public RestClientBuilder header(String key, Object value) {
+ return addTo(RESTCLIENT_headers, key, value);
}
/**
@@ -904,124 +884,161 @@ public class RestClientBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_useWhitespace} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_initialDepth} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_useWhitespace
+ * @see Serializer#SERIALIZER_initialDepth
*/
- public RestClientBuilder useWhitespace(boolean value) {
- return set(SERIALIZER_useWhitespace, value);
+ public RestClientBuilder initialDepth(int value) {
+ return set(SERIALIZER_initialDepth, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_maxIndent} property on all serializers in this group.
+ * Sets the {@link Parser#PARSER_inputStreamCharset} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_maxIndent
+ * @see Parser#PARSER_inputStreamCharset
*/
- public RestClientBuilder maxIndent(boolean value) {
- return set(SERIALIZER_maxIndent, value);
+ public RestClientBuilder inputStreamCharset(String value) {
+ return set(PARSER_inputStreamCharset, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.
+ * Configuration property: Keep HttpClient open.
+ *
+ * <p>
+ * Don't close this client when the {@link RestClient#close()} method is called.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>set(<jsf>RESTCLIENT_keepHttpClientOpen</jsf>, value)</code>.
+ * </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_addBeanTypeProperties
+ * @see RestClient#RESTCLIENT_keepHttpClientOpen
*/
- public RestClientBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public RestClientBuilder keepHttpClientOpen(boolean value) {
+ return set(RESTCLIENT_keepHttpClientOpen, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_quoteChar} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_listener} and {@link Parser#PARSER_listener} property on all
+ * serializers and parsers in this group.
*
- * @param value The new value for this property.
+ * @param sl The new serializer listener.
+ * @param pl The new parser listener.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_quoteChar
+ * @see Serializer#SERIALIZER_abridged
*/
- public RestClientBuilder quoteChar(char value) {
- return set(SERIALIZER_quoteChar, value);
+ public RestClientBuilder listeners(Class<? extends SerializerListener> sl, Class<? extends ParserListener> pl) {
+ set(SERIALIZER_listener, sl);
+ set(PARSER_listener, pl);
+ return this;
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimNullProperties} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_maxDepth} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_trimNullProperties
+ * @see Serializer#SERIALIZER_maxDepth
*/
- public RestClientBuilder trimNullProperties(boolean value) {
- return set(SERIALIZER_trimNullProperties, value);
+ public RestClientBuilder maxDepth(int value) {
+ return set(SERIALIZER_maxDepth, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimEmptyCollections} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_maxIndent} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_trimEmptyCollections
+ * @see Serializer#SERIALIZER_maxIndent
*/
- public RestClientBuilder trimEmptyCollections(boolean value) {
- return set(SERIALIZER_trimEmptyCollections, value);
+ public RestClientBuilder maxIndent(boolean value) {
+ return set(SERIALIZER_maxIndent, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimEmptyMaps} property on all serializers in this group.
+ * When called, <code>No-Trace: true</code> is added to requests.
+ *
+ * <p>
+ * This gives the opportunity for the servlet to not log errors on invalid requests.
+ * This is useful for testing purposes when you don't want your log file to show lots of errors that are simply the
+ * results of testing.
*
- * @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_trimEmptyMaps
*/
- public RestClientBuilder trimEmptyMaps(boolean value) {
- return set(SERIALIZER_trimEmptyMaps, value);
+ public RestClientBuilder noTrace() {
+ return header("No-Trace", true);
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimStrings} property on all serializers in this group.
+ * Sets the {@link UonSerializer#UON_paramFormat} property on the URL-encoding serializers in this group.
+ *
+ * <p>
+ * This overrides the behavior of the URL-encoding serializer to quote and escape characters in query names and
+ * values that may be confused for UON notation (e.g. <js>"'(foo=123)'"</js>, <js>"'@(1,2,3)'"</js>).
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_trimStrings
+ * @see UonSerializer#UON_paramFormat
*/
- public RestClientBuilder trimStrings(boolean value) {
- return set(SERIALIZER_trimStrings, value);
+ public RestClientBuilder paramFormat(String value) {
+ super.set(UON_paramFormat, value);
+ return this;
}
/**
- * Sets the {@link Serializer#SERIALIZER_uriContext} property on all serializers in this group.
+ * Shortcut for calling <code>paramFormat(<js>"PLAINTEXT"</js>)</code>.
+ *
+ * <p>
+ * The default behavior is to serialize part values (query parameters, form data, headers, path variables) in UON
+ * notation.
+ * Calling this method forces plain-text to be used instead.
+ *
+ * <p>
+ * Specifically, UON notation has the following effects:
+ * <ul>
+ * <li>Boolean strings (<js>"true"</js>/<js>"false"</js>) and numeric values (<js>"123"</js>) will be
+ * quoted (<js>"'true'"</js>, <js>"'false'"</js>, <js>"'123'"</js>.
+ * <br>This allows them to be differentiated from actual boolean and numeric values.
+ * <li>String such as <js>"(foo='bar')"</js> that mimic UON structures will be quoted and escaped to
+ * <js>"'(foo=bar~'baz~')'"</js>.
+ * </ul>
+ * <p>
+ * The down-side to using plain text part serialization is that you cannot serialize arbitrary POJOs.
*
- * @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_uriContext
*/
- public RestClientBuilder uriContext(UriContext value) {
- return set(SERIALIZER_uriContext, value);
+ public RestClientBuilder plainTextParts() {
+ super.set(UON_paramFormat, "PLAINTEXT");
+ return this;
}
/**
- * Sets the {@link Serializer#SERIALIZER_uriResolution} property on all serializers in this group.
+ * Configuration property: Request query parameters.
*
- * @param value The new value for this property.
+ * @param key The query parameter name.
+ * @param value The query parameter value value.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_uriResolution
+ * @see RestClient#RESTCLIENT_query
*/
- public RestClientBuilder uriResolution(UriResolution value) {
- return set(SERIALIZER_uriResolution, value);
+ public RestClientBuilder query(String key, Object value) {
+ return addTo(RESTCLIENT_query, key, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_uriRelativity} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_quoteChar} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_uriRelativity
+ * @see Serializer#SERIALIZER_quoteChar
*/
- public RestClientBuilder uriRelativity(UriRelativity value) {
- return set(SERIALIZER_uriRelativity, value);
+ public RestClientBuilder quoteChar(char value) {
+ return set(SERIALIZER_quoteChar, value);
}
/**
@@ -1047,405 +1064,390 @@ public class RestClientBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_abridged} property on all serializers in this group.
+ * Sets the {@link Parser#PARSER_strict} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_abridged
+ * @see Parser#PARSER_strict
*/
- public RestClientBuilder abridged(boolean value) {
- return set(SERIALIZER_abridged, value);
+ public RestClientBuilder strict(boolean value) {
+ return set(PARSER_strict, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_listener} and {@link Parser#PARSER_listener} property on all
- * serializers and parsers in this group.
+ * Sets the {@link Serializer#SERIALIZER_trimEmptyCollections} property on all serializers in this group.
*
- * @param sl The new serializer listener.
- * @param pl The new parser listener.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_abridged
+ * @see Serializer#SERIALIZER_trimEmptyCollections
*/
- public RestClientBuilder listeners(Class<? extends SerializerListener> sl, Class<? extends ParserListener> pl) {
- set(SERIALIZER_listener, sl);
- set(PARSER_listener, pl);
- return this;
+ public RestClientBuilder trimEmptyCollections(boolean value) {
+ return set(SERIALIZER_trimEmptyCollections, value);
}
/**
- * Sets the {@link Parser#PARSER_trimStrings} property on all parsers in this group.
+ * Sets the {@link Serializer#SERIALIZER_trimEmptyMaps} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_trimStrings
+ * @see Serializer#SERIALIZER_trimEmptyMaps
*/
- public RestClientBuilder trimStringsP(boolean value) {
- return set(PARSER_trimStrings, value);
+ public RestClientBuilder trimEmptyMaps(boolean value) {
+ return set(SERIALIZER_trimEmptyMaps, value);
}
/**
- * Sets the {@link Parser#PARSER_strict} property on all parsers in this group.
+ * Sets the {@link Serializer#SERIALIZER_trimNullProperties} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_strict
+ * @see Serializer#SERIALIZER_trimNullProperties
*/
- public RestClientBuilder strict(boolean value) {
- return set(PARSER_strict, value);
+ public RestClientBuilder trimNullProperties(boolean value) {
+ return set(SERIALIZER_trimNullProperties, value);
}
/**
- * Sets the {@link Parser#PARSER_inputStreamCharset} property on all parsers in this group.
+ * Sets the {@link Serializer#SERIALIZER_trimStrings} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_inputStreamCharset
+ * @see Serializer#SERIALIZER_trimStrings
*/
- public RestClientBuilder inputStreamCharset(String value) {
- return set(PARSER_inputStreamCharset, value);
+ public RestClientBuilder trimStrings(boolean value) {
+ return set(SERIALIZER_trimStrings, value);
}
/**
- * Sets the {@link Parser#PARSER_fileCharset} property on all parsers in this group.
+ * Sets the {@link Parser#PARSER_trimStrings} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_fileCharset
+ * @see Parser#PARSER_trimStrings
*/
- public RestClientBuilder fileCharset(String value) {
- return set(PARSER_fileCharset, value);
+ public RestClientBuilder trimStringsP(boolean value) {
+ return set(PARSER_trimStrings, value);
}
/**
- * When called, <code>No-Trace: true</code> is added to requests.
- *
- * <p>
- * This gives the opportunity for the servlet to not log errors on invalid requests.
- * This is useful for testing purposes when you don't want your log file to show lots of errors that are simply the
- * results of testing.
+ * Sets the {@link Serializer#SERIALIZER_uriContext} property on all serializers in this group.
*
+ * @param value The new value for this property.
* @return This object (for method chaining).
+ * @see Serializer#SERIALIZER_uriContext
*/
- public RestClientBuilder noTrace() {
- return header("No-Trace", true);
+ public RestClientBuilder uriContext(UriContext value) {
+ return set(SERIALIZER_uriContext, value);
}
/**
- * Sets the {@link UonSerializer#UON_paramFormat} property on the URL-encoding serializers in this group.
- *
- * <p>
- * This overrides the behavior of the URL-encoding serializer to quote and escape characters in query names and
- * values that may be confused for UON notation (e.g. <js>"'(foo=123)'"</js>, <js>"'@(1,2,3)'"</js>).
+ * Sets the {@link Serializer#SERIALIZER_uriRelativity} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see UonSerializer#UON_paramFormat
+ * @see Serializer#SERIALIZER_uriRelativity
*/
- public RestClientBuilder paramFormat(String value) {
- super.set(UON_paramFormat, value);
- return this;
+ public RestClientBuilder uriRelativity(UriRelativity value) {
+ return set(SERIALIZER_uriRelativity, value);
}
/**
- * Shortcut for calling <code>paramFormat(<js>"PLAINTEXT"</js>)</code>.
- *
- * <p>
- * The default behavior is to serialize part values (query parameters, form data, headers, path variables) in UON
- * notation.
- * Calling this method forces plain-text to be used instead.
+ * Sets the {@link Serializer#SERIALIZER_uriResolution} property on all serializers in this group.
*
- * <p>
- * Specifically, UON notation has the following effects:
- * <ul>
- * <li>Boolean strings (<js>"true"</js>/<js>"false"</js>) and numeric values (<js>"123"</js>) will be
- * quoted (<js>"'true'"</js>, <js>"'false'"</js>, <js>"'123'"</js>.
- * <br>This allows them to be differentiated from actual boolean and numeric values.
- * <li>String such as <js>"(foo='bar')"</js> that mimic UON structures will be quoted and escaped to
- * <js>"'(foo=bar~'baz~')'"</js>.
- * </ul>
- * <p>
- * The down-side to using plain text part serialization is that you cannot serialize arbitrary POJOs.
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see Serializer#SERIALIZER_uriResolution
+ */
+ public RestClientBuilder uriResolution(UriResolution value) {
+ return set(SERIALIZER_uriResolution, value);
+ }
+
+ /**
+ * Sets the {@link Serializer#SERIALIZER_useWhitespace} property on all serializers in this group.
*
+ * @param value The new value for this property.
* @return This object (for method chaining).
+ * @see Serializer#SERIALIZER_useWhitespace
*/
- public RestClientBuilder plainTextParts() {
- super.set(UON_paramFormat, "PLAINTEXT");
- return this;
+ public RestClientBuilder useWhitespace(boolean value) {
+ return set(SERIALIZER_useWhitespace, value);
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beansRequireDefaultConstructor(boolean value) {
- super.beansRequireDefaultConstructor(value);
+ public RestClientBuilder beanClassVisibility(Visibility value) {
+ super.beanClassVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beansRequireSerializable(boolean value) {
- super.beansRequireSerializable(value);
+ public RestClientBuilder beanConstructorVisibility(Visibility value) {
+ super.beanConstructorVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beansRequireSettersForGetters(boolean value) {
- super.beansRequireSettersForGetters(value);
+ public RestClientBuilder beanDictionary(boolean append, Object...values) {
+ super.beanDictionary(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beansRequireSomeProperties(boolean value) {
- super.beansRequireSomeProperties(value);
+ public RestClientBuilder beanDictionary(Class<?>...values) {
+ super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanMapPutReturnsOldValue(boolean value) {
- super.beanMapPutReturnsOldValue(value);
+ public RestClientBuilder beanDictionary(Object...values) {
+ super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
+ public RestClientBuilder beanDictionaryRemove(Object...values) {
+ super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
+ public RestClientBuilder beanFieldVisibility(Visibility value) {
+ super.beanFieldVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
+ public RestClientBuilder beanFilters(boolean append, Object...values) {
+ super.beanFilters(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder methodVisibility(Visibility value) {
- super.methodVisibility(value);
+ public RestClientBuilder beanFilters(Object...values) {
+ super.beanFilters(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder useJavaBeanIntrospector(boolean value) {
- super.useJavaBeanIntrospector(value);
+ public RestClientBuilder beanFiltersRemove(Object...values) {
+ super.beanFiltersRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder useInterfaceProxies(boolean value) {
- super.useInterfaceProxies(value);
+ public RestClientBuilder beanMapPutReturnsOldValue(boolean value) {
+ super.beanMapPutReturnsOldValue(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder ignoreUnknownBeanProperties(boolean value) {
- super.ignoreUnknownBeanProperties(value);
+ public RestClientBuilder beansRequireDefaultConstructor(boolean value) {
+ super.beansRequireDefaultConstructor(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder ignoreUnknownNullBeanProperties(boolean value) {
- super.ignoreUnknownNullBeanProperties(value);
+ public RestClientBuilder beansRequireSerializable(boolean value) {
+ super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder ignorePropertiesWithoutSetters(boolean value) {
- super.ignorePropertiesWithoutSetters(value);
+ public RestClientBuilder beansRequireSettersForGetters(boolean value) {
+ super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
- super.ignoreInvocationExceptionsOnGetters(value);
+ public RestClientBuilder beansRequireSomeProperties(boolean value) {
+ super.beansRequireSomeProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
- super.ignoreInvocationExceptionsOnSetters(value);
+ public RestClientBuilder beanTypePropertyName(String value) {
+ super.beanTypePropertyName(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder sortProperties(boolean value) {
- super.sortProperties(value);
+ public RestClientBuilder debug() {
+ super.debug();
+ set(RESTCLIENT_debug, true);
+ header("Debug", true);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder notBeanPackages(Object...values) {
- super.notBeanPackages(values);
+ public RestClientBuilder excludeProperties(Class<?> beanClass, String properties) {
+ super.excludeProperties(beanClass, properties);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder notBeanPackages(String...values) {
- super.notBeanPackages(values);
+ public RestClientBuilder excludeProperties(Map<String,String> values) {
+ super.excludeProperties(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder notBeanPackages(boolean append, Object...values) {
- super.notBeanPackages(append, values);
+ public RestClientBuilder excludeProperties(String beanClassName, String properties) {
+ super.excludeProperties(beanClassName, properties);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder notBeanPackagesRemove(Object...values) {
- super.notBeanPackagesRemove(values);
+ public RestClientBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
+ super.ignoreInvocationExceptionsOnGetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder notBeanClasses(Object...values) {
- super.notBeanClasses(values);
+ public RestClientBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
+ super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder notBeanClasses(Class<?>...values) {
- super.notBeanClasses(values);
+ public RestClientBuilder ignorePropertiesWithoutSetters(boolean value) {
+ super.ignorePropertiesWithoutSetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder notBeanClasses(boolean append, Object...values) {
- super.notBeanClasses(append, values);
+ public RestClientBuilder ignoreUnknownBeanProperties(boolean value) {
+ super.ignoreUnknownBeanProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder notBeanClassesRemove(Object...values) {
- super.notBeanClassesRemove(values);
+ public RestClientBuilder ignoreUnknownNullBeanProperties(boolean value) {
+ super.ignoreUnknownNullBeanProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanFilters(Object...values) {
- super.beanFilters(values);
+ public <T> RestClientBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
+ super.implClass(interfaceClass, implClass);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanFilters(boolean append, Object...values) {
- super.beanFilters(append, values);
+ public RestClientBuilder implClasses(Map<String,Class<?>> values) {
+ super.implClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanFiltersRemove(Object...values) {
- super.beanFiltersRemove(values);
+ public RestClientBuilder includeProperties(Class<?> beanClass, String properties) {
+ super.includeProperties(beanClass, properties);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder pojoSwaps(Object...values) {
- super.pojoSwaps(values);
+ public RestClientBuilder includeProperties(Map<String,String> values) {
+ super.includeProperties(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder pojoSwaps(Class<?>...values) {
- super.pojoSwaps(values);
+ public RestClientBuilder includeProperties(String beanClassName, String properties) {
+ super.includeProperties(beanClassName, properties);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder pojoSwaps(boolean append, Object...values) {
- super.pojoSwaps(append, values);
+ public RestClientBuilder locale(Locale value) {
+ super.locale(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder pojoSwapsRemove(Object...values) {
- super.pojoSwapsRemove(values);
+ public RestClientBuilder mediaType(MediaType value) {
+ super.mediaType(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder implClasses(Map<String,Class<?>> values) {
- super.implClasses(values);
+ public RestClientBuilder methodVisibility(Visibility value) {
+ super.methodVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public <T> RestClientBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
- super.implClass(interfaceClass, implClass);
+ public RestClientBuilder notBeanClasses(boolean append, Object...values) {
+ super.notBeanClasses(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
+ public RestClientBuilder notBeanClasses(Class<?>...values) {
+ super.notBeanClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
+ public RestClientBuilder notBeanClasses(Object...values) {
+ super.notBeanClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
+ public RestClientBuilder notBeanClassesRemove(Object...values) {
+ super.notBeanClassesRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
+ public RestClientBuilder notBeanPackages(boolean append, Object...values) {
+ super.notBeanPackages(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
+ public RestClientBuilder notBeanPackages(Object...values) {
+ super.notBeanPackages(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
+ public RestClientBuilder notBeanPackages(String...values) {
+ super.notBeanPackages(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanDictionary(Object...values) {
- super.beanDictionary(values);
+ public RestClientBuilder notBeanPackagesRemove(Object...values) {
+ super.notBeanPackagesRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanDictionary(Class<?>...values) {
- super.beanDictionary(values);
+ public RestClientBuilder pojoSwaps(boolean append, Object...values) {
+ super.pojoSwaps(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanDictionary(boolean append, Object...values) {
- super.beanDictionary(append, values);
+ public RestClientBuilder pojoSwaps(Class<?>...values) {
+ super.pojoSwaps(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanDictionaryRemove(Object...values) {
- super.beanDictionaryRemove(values);
+ public RestClientBuilder pojoSwaps(Object...values) {
+ super.pojoSwaps(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder beanTypePropertyName(String value) {
- super.beanTypePropertyName(value);
+ public RestClientBuilder pojoSwapsRemove(Object...values) {
+ super.pojoSwapsRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder locale(Locale value) {
- super.locale(value);
+ public RestClientBuilder sortProperties(boolean value) {
+ super.sortProperties(value);
return this;
}
@@ -1456,16 +1458,14 @@ public class RestClientBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public RestClientBuilder mediaType(MediaType value) {
- super.mediaType(value);
+ public RestClientBuilder useInterfaceProxies(boolean value) {
+ super.useInterfaceProxies(value);
return this;
}
@Override /* BeanContextBuilder */
- public RestClientBuilder debug() {
- super.debug();
- set(RESTCLIENT_debug, true);
- header("Debug", true);
+ public RestClientBuilder useJavaBeanIntrospector(boolean value) {
+ super.useJavaBeanIntrospector(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index c52c1c5..3c07472 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -15,9 +15,9 @@ package org.apache.juneau.rest;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.internal.ReflectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.parser.Parser.*;
import static org.apache.juneau.rest.RestContext.*;
import static org.apache.juneau.serializer.Serializer.*;
-import static org.apache.juneau.parser.Parser.*;
import java.lang.reflect.Method;
import java.util.*;
@@ -1861,42 +1861,6 @@ public class RestContextBuilder extends BeanContextBuilder implements ServletCon
}
@Override /* BeanContextBuilder */
- public RestContextBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RestContextBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RestContextBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RestContextBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RestContextBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RestContextBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public RestContextBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
index 55af351..660f770 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
@@ -13,11 +13,11 @@
package org.apache.juneau.rest;
import static javax.servlet.http.HttpServletResponse.*;
+import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.dto.swagger.SwaggerBuilder.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.Utils.*;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.rest.RestContext.*;
import java.lang.annotation.*;
@@ -31,7 +31,6 @@ import org.apache.juneau.dto.swagger.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.httppart.HttpPartParser;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index d8f5ad3..6b105a8 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -32,18 +32,13 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.dto.swagger.*;
-import org.apache.juneau.encoders.*;
-import org.apache.juneau.html.*;
import org.apache.juneau.http.*;
-import org.apache.juneau.httppart.*;
import org.apache.juneau.ini.*;
-import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.widget.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
import org.apache.juneau.uon.*;
-import org.apache.juneau.urlencoding.*;
import org.apache.juneau.utils.*;
/**
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
index 21d9a72..be4773a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
@@ -19,7 +19,7 @@ import java.util.*;
import java.util.concurrent.*;
import org.apache.juneau.*;
-import org.apache.juneau.dto.LinkString;
+import org.apache.juneau.dto.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
[2/5] juneau git commit: Sort methods in builder classes.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
index bfe0fae..09ed68f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
@@ -50,14 +50,14 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
//--------------------------------------------------------------------------------
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public PlainTextSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public PlainTextSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -74,26 +74,26 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public PlainTextSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder ws() {
- super.ws();
+ public PlainTextSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder maxIndent(int value) {
- super.maxIndent(value);
+ public PlainTextSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public PlainTextSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -104,14 +104,20 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder sq() {
- super.sq();
+ public PlainTextSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public PlainTextSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public PlainTextSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -128,20 +134,20 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public PlainTextSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public PlainTextSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public PlainTextSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -152,26 +158,20 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public PlainTextSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public PlainTextSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public PlainTextSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public PlainTextSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -386,42 +386,6 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public PlainTextSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public PlainTextSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public PlainTextSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public PlainTextSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public PlainTextSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public PlainTextSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public PlainTextSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
index 4cb4471..e0af5e4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
@@ -47,44 +47,46 @@ public class SerializerBuilder extends BeanContextBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Max serialization depth.
+ * Configuration property: Abridged output.
*
* <p>
- * Abort serialization if specified depth is reached in the POJO tree.
- * If this depth is exceeded, an exception is thrown.
- * This prevents stack overflows from occurring when trying to serialize models with recursive references.
+ * When enabled, it is assumed that the parser knows the exact Java POJO type being parsed, and therefore top-level
+ * type information that might normally be included to determine the data type will not be serialized.
*
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_maxDepth</jsf>, value)</code>.
- * </ul>
+ * <p>
+ * For example, when serializing a POJO with a {@link Bean#typeName()} value, a <js>"_type"</js> will be added when
+ * this setting is disabled, but not added when it is enabled.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_maxDepth
+ * @see Serializer#SERIALIZER_sortMaps
*/
- public SerializerBuilder maxDepth(int value) {
- return set(SERIALIZER_maxDepth, value);
+ public SerializerBuilder abridged(boolean value) {
+ return set(SERIALIZER_abridged, value);
}
/**
- * Configuration property: Initial depth.
+ * Configuration property: Add <js>"_type"</js> properties when needed.
*
* <p>
- * The initial indentation level at the root.
- * Useful when constructing document fragments that need to be indented at a certain level.
+ * If <jk>true</jk>, then <js>"_type"</js> properties will be added to beans if their type cannot be inferred
+ * through reflection.
+ * This is used to recreate the correct objects during parsing if the object types cannot be inferred.
+ * For example, when serializing a {@code Map<String,Object>} field, where the bean class cannot be determined from
+ * the value type.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_initialDepth</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_addBeanTypeProperties</jsf>, value)</code>.
+ * <li>Checking for recursion can cause a small performance penalty.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_initialDepth
+ * @see Serializer#SERIALIZER_addBeanTypeProperties
*/
- public SerializerBuilder initialDepth(int value) {
- return set(SERIALIZER_initialDepth, value);
+ public SerializerBuilder addBeanTypeProperties(boolean value) {
+ return set(SERIALIZER_addBeanTypeProperties, value);
}
/**
@@ -145,74 +147,76 @@ public class SerializerBuilder extends BeanContextBuilder {
}
/**
- * Configuration property: Use whitespace.
+ * Configuration property: Initial depth.
*
* <p>
- * If <jk>true</jk>, newlines and indentation and spaces are added to the output to improve readability.
+ * The initial indentation level at the root.
+ * Useful when constructing document fragments that need to be indented at a certain level.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_useWhitespace</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_initialDepth</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_useWhitespace
+ * @see Serializer#SERIALIZER_initialDepth
*/
- public SerializerBuilder useWhitespace(boolean value) {
- return set(SERIALIZER_useWhitespace, value);
+ public SerializerBuilder initialDepth(int value) {
+ return set(SERIALIZER_initialDepth, value);
}
/**
- * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
+ * Configuration property: Serializer listener.
*
+ * <p>
+ * Class used to listen for errors and warnings that occur during serialization.
+ *
+ * @param value The new value for this property.
* @return This object (for method chaining).
*/
- public SerializerBuilder ws() {
- return useWhitespace(true);
+ public SerializerBuilder listener(Class<? extends SerializerListener> value) {
+ return set(SERIALIZER_listener, value);
}
/**
- * Configuration property: Maximum indentation.
+ * Configuration property: Max serialization depth.
*
* <p>
- * Specifies the maximum indentation level in the serialized document.
+ * Abort serialization if specified depth is reached in the POJO tree.
+ * If this depth is exceeded, an exception is thrown.
+ * This prevents stack overflows from occurring when trying to serialize models with recursive references.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_maxIndent</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_maxDepth</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_maxIndent
+ * @see Serializer#SERIALIZER_maxDepth
*/
- public SerializerBuilder maxIndent(int value) {
- return set(SERIALIZER_maxIndent, value);
+ public SerializerBuilder maxDepth(int value) {
+ return set(SERIALIZER_maxDepth, value);
}
/**
- * Configuration property: Add <js>"_type"</js> properties when needed.
+ * Configuration property: Maximum indentation.
*
* <p>
- * If <jk>true</jk>, then <js>"_type"</js> properties will be added to beans if their type cannot be inferred
- * through reflection.
- * This is used to recreate the correct objects during parsing if the object types cannot be inferred.
- * For example, when serializing a {@code Map<String,Object>} field, where the bean class cannot be determined from
- * the value type.
+ * Specifies the maximum indentation level in the serialized document.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_addBeanTypeProperties</jsf>, value)</code>.
- * <li>Checking for recursion can cause a small performance penalty.
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_maxIndent</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_addBeanTypeProperties
+ * @see Serializer#SERIALIZER_maxIndent
*/
- public SerializerBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public SerializerBuilder maxIndent(int value) {
+ return set(SERIALIZER_maxIndent, value);
}
/**
@@ -235,35 +239,46 @@ public class SerializerBuilder extends BeanContextBuilder {
}
/**
- * Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
+ * Configuration property: Sort arrays and collections alphabetically.
*
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_sortCollections</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
+ * </ul>
+ *
+ * @param value The new value for this property.
* @return This object (for method chaining).
+ * @see Serializer#SERIALIZER_sortCollections
*/
- public SerializerBuilder sq() {
- return quoteChar('\'');
+ public SerializerBuilder sortCollections(boolean value) {
+ return set(SERIALIZER_sortCollections, value);
}
/**
- * Configuration property: Trim null bean property values.
- *
- * <p>
- * If <jk>true</jk>, null bean values will not be serialized to the output.
+ * Configuration property: Sort maps alphabetically.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_trimNullProperties</jsf>, value)</code>.
- * <li>Enabling this setting has the following effects on parsing:
- * <ul>
- * <li>Map entries with <jk>null</jk> values will be lost.
- * </ul>
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_sortMaps</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_trimNullProperties
+ * @see Serializer#SERIALIZER_sortMaps
*/
- public SerializerBuilder trimNullProperties(boolean value) {
- return set(SERIALIZER_trimNullProperties, value);
+ public SerializerBuilder sortMaps(boolean value) {
+ return set(SERIALIZER_sortMaps, value);
+ }
+
+ /**
+ * Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerBuilder sq() {
+ return quoteChar('\'');
}
/**
@@ -314,6 +329,29 @@ public class SerializerBuilder extends BeanContextBuilder {
}
/**
+ * Configuration property: Trim null bean property values.
+ *
+ * <p>
+ * If <jk>true</jk>, null bean values will not be serialized to the output.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_trimNullProperties</jsf>, value)</code>.
+ * <li>Enabling this setting has the following effects on parsing:
+ * <ul>
+ * <li>Map entries with <jk>null</jk> values will be lost.
+ * </ul>
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see Serializer#SERIALIZER_trimNullProperties
+ */
+ public SerializerBuilder trimNullProperties(boolean value) {
+ return set(SERIALIZER_trimNullProperties, value);
+ }
+
+ /**
* Configuration property: Trim strings.
*
* <p>
@@ -357,41 +395,6 @@ public class SerializerBuilder extends BeanContextBuilder {
}
/**
- * Configuration property: URI resolution.
- *
- * <p>
- * Defines the resolution level for URIs when serializing any of the following:
- * <ul>
- * <li>{@link java.net.URI}
- * <li>{@link java.net.URL}
- * <li>Properties annotated with {@link org.apache.juneau.annotation.URI @URI}
- * </ul>
- *
- * <p>
- * Possible values are:
- * <ul>
- * <li>{@link UriResolution#ABSOLUTE}
- * - Resolve to an absolute URL (e.g. <js>"http://host:port/context-root/servlet-path/path-info"</js>).
- * <li>{@link UriResolution#ROOT_RELATIVE}
- * - Resolve to a root-relative URL (e.g. <js>"/context-root/servlet-path/path-info"</js>).
- * <li>{@link UriResolution#NONE}
- * - Don't do any URL resolution.
- * </ul>
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_uriResolution</jsf>, value)</code>.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see Serializer#SERIALIZER_uriResolution
- */
- public SerializerBuilder uriResolution(UriResolution value) {
- return set(SERIALIZER_uriResolution, value);
- }
-
- /**
* Configuration property: URI relativity.
*
* <p>
@@ -425,69 +428,66 @@ public class SerializerBuilder extends BeanContextBuilder {
}
/**
- * Configuration property: Sort arrays and collections alphabetically.
+ * Configuration property: URI resolution.
*
- * <h5 class='section'>Notes:</h5>
+ * <p>
+ * Defines the resolution level for URIs when serializing any of the following:
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_sortCollections</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
+ * <li>{@link java.net.URI}
+ * <li>{@link java.net.URL}
+ * <li>Properties annotated with {@link org.apache.juneau.annotation.URI @URI}
* </ul>
*
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see Serializer#SERIALIZER_sortCollections
- */
- public SerializerBuilder sortCollections(boolean value) {
- return set(SERIALIZER_sortCollections, value);
- }
-
- /**
- * Configuration property: Sort maps alphabetically.
+ * <p>
+ * Possible values are:
+ * <ul>
+ * <li>{@link UriResolution#ABSOLUTE}
+ * - Resolve to an absolute URL (e.g. <js>"http://host:port/context-root/servlet-path/path-info"</js>).
+ * <li>{@link UriResolution#ROOT_RELATIVE}
+ * - Resolve to a root-relative URL (e.g. <js>"/context-root/servlet-path/path-info"</js>).
+ * <li>{@link UriResolution#NONE}
+ * - Don't do any URL resolution.
+ * </ul>
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_sortMaps</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_uriResolution</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_sortMaps
+ * @see Serializer#SERIALIZER_uriResolution
*/
- public SerializerBuilder sortMaps(boolean value) {
- return set(SERIALIZER_sortMaps, value);
+ public SerializerBuilder uriResolution(UriResolution value) {
+ return set(SERIALIZER_uriResolution, value);
}
/**
- * Configuration property: Abridged output.
+ * Configuration property: Use whitespace.
*
* <p>
- * When enabled, it is assumed that the parser knows the exact Java POJO type being parsed, and therefore top-level
- * type information that might normally be included to determine the data type will not be serialized.
+ * If <jk>true</jk>, newlines and indentation and spaces are added to the output to improve readability.
*
- * <p>
- * For example, when serializing a POJO with a {@link Bean#typeName()} value, a <js>"_type"</js> will be added when
- * this setting is disabled, but not added when it is enabled.
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>SERIALIZER_useWhitespace</jsf>, value)</code>.
+ * </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_sortMaps
+ * @see Serializer#SERIALIZER_useWhitespace
*/
- public SerializerBuilder abridged(boolean value) {
- return set(SERIALIZER_abridged, value);
+ public SerializerBuilder useWhitespace(boolean value) {
+ return set(SERIALIZER_useWhitespace, value);
}
/**
- * Configuration property: Serializer listener.
- *
- * <p>
- * Class used to listen for errors and warnings that occur during serialization.
+ * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
*
- * @param value The new value for this property.
* @return This object (for method chaining).
*/
- public SerializerBuilder listener(Class<? extends SerializerListener> value) {
- return set(SERIALIZER_listener, value);
+ public SerializerBuilder ws() {
+ return useWhitespace(true);
}
@Override /* BeanContextBuilder */
@@ -701,42 +701,6 @@ public class SerializerBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public SerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public SerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
index aeed1c4..a8ab6e7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
@@ -131,25 +131,25 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
//--------------------------------------------------------------------------------
/**
- * Sets the {@link Serializer#SERIALIZER_maxDepth} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_abridged} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_maxDepth
+ * @see Serializer#SERIALIZER_abridged
*/
- public SerializerGroupBuilder maxDepth(int value) {
- return set(SERIALIZER_maxDepth, value);
+ public SerializerGroupBuilder abridged(boolean value) {
+ return set(SERIALIZER_abridged, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_initialDepth} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_initialDepth
+ * @see Serializer#SERIALIZER_addBeanTypeProperties
*/
- public SerializerGroupBuilder initialDepth(int value) {
- return set(SERIALIZER_initialDepth, value);
+ public SerializerGroupBuilder addBeanTypeProperties(boolean value) {
+ return set(SERIALIZER_addBeanTypeProperties, value);
}
/**
@@ -175,45 +175,47 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_useWhitespace} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_initialDepth} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_useWhitespace
+ * @see Serializer#SERIALIZER_initialDepth
*/
- public SerializerGroupBuilder useWhitespace(boolean value) {
- return set(SERIALIZER_useWhitespace, value);
+ public SerializerGroupBuilder initialDepth(int value) {
+ return set(SERIALIZER_initialDepth, value);
}
/**
- * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
+ * Sets the {@link Serializer#SERIALIZER_listener} property on all serializers in this group.
*
+ * @param value The new value for this property.
* @return This object (for method chaining).
+ * @see Serializer#SERIALIZER_listener
*/
- public SerializerGroupBuilder ws() {
- return useWhitespace(true);
+ public SerializerGroupBuilder listener(Class<? extends SerializerListener> value) {
+ return set(SERIALIZER_listener, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_maxIndent} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_maxDepth} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_maxIndent
+ * @see Serializer#SERIALIZER_maxDepth
*/
- public SerializerGroupBuilder maxIndent(boolean value) {
- return set(SERIALIZER_maxIndent, value);
+ public SerializerGroupBuilder maxDepth(int value) {
+ return set(SERIALIZER_maxDepth, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_addBeanTypeProperties} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_maxIndent} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_addBeanTypeProperties
+ * @see Serializer#SERIALIZER_maxIndent
*/
- public SerializerGroupBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public SerializerGroupBuilder maxIndent(boolean value) {
+ return set(SERIALIZER_maxIndent, value);
}
/**
@@ -228,23 +230,34 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
+ * Sets the {@link Serializer#SERIALIZER_sortCollections} property on all serializers in this group.
*
+ * @param value The new value for this property.
* @return This object (for method chaining).
+ * @see Serializer#SERIALIZER_sortCollections
*/
- public SerializerGroupBuilder sq() {
- return quoteChar('\'');
+ public SerializerGroupBuilder sortCollections(boolean value) {
+ return set(SERIALIZER_sortCollections, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_trimNullProperties} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_sortMaps} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_trimNullProperties
+ * @see Serializer#SERIALIZER_sortMaps
*/
- public SerializerGroupBuilder trimNullProperties(boolean value) {
- return set(SERIALIZER_trimNullProperties, value);
+ public SerializerGroupBuilder sortMaps(boolean value) {
+ return set(SERIALIZER_sortMaps, value);
+ }
+
+ /**
+ * Shortcut for calling <code>quoteChar(<js>'\''</js>)</code>.
+ *
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder sq() {
+ return quoteChar('\'');
}
/**
@@ -270,6 +283,17 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
+ * Sets the {@link Serializer#SERIALIZER_trimNullProperties} property on all serializers in this group.
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see Serializer#SERIALIZER_trimNullProperties
+ */
+ public SerializerGroupBuilder trimNullProperties(boolean value) {
+ return set(SERIALIZER_trimNullProperties, value);
+ }
+
+ /**
* Sets the {@link Serializer#SERIALIZER_trimStrings} property on all serializers in this group.
*
* @param value The new value for this property.
@@ -292,17 +316,6 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_uriResolution} property on all serializers in this group.
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see Serializer#SERIALIZER_uriResolution
- */
- public SerializerGroupBuilder uriResolution(UriResolution value) {
- return set(SERIALIZER_uriResolution, value);
- }
-
- /**
* Sets the {@link Serializer#SERIALIZER_uriRelativity} property on all serializers in this group.
*
* @param value The new value for this property.
@@ -314,47 +327,34 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
/**
- * Sets the {@link Serializer#SERIALIZER_sortCollections} property on all serializers in this group.
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see Serializer#SERIALIZER_sortCollections
- */
- public SerializerGroupBuilder sortCollections(boolean value) {
- return set(SERIALIZER_sortCollections, value);
- }
-
- /**
- * Sets the {@link Serializer#SERIALIZER_sortMaps} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_uriResolution} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_sortMaps
+ * @see Serializer#SERIALIZER_uriResolution
*/
- public SerializerGroupBuilder sortMaps(boolean value) {
- return set(SERIALIZER_sortMaps, value);
+ public SerializerGroupBuilder uriResolution(UriResolution value) {
+ return set(SERIALIZER_uriResolution, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_abridged} property on all serializers in this group.
+ * Sets the {@link Serializer#SERIALIZER_useWhitespace} property on all serializers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_abridged
+ * @see Serializer#SERIALIZER_useWhitespace
*/
- public SerializerGroupBuilder abridged(boolean value) {
- return set(SERIALIZER_abridged, value);
+ public SerializerGroupBuilder useWhitespace(boolean value) {
+ return set(SERIALIZER_useWhitespace, value);
}
/**
- * Sets the {@link Serializer#SERIALIZER_listener} property on all serializers in this group.
+ * Shortcut for calling <code>useWhitespace(<jk>true</jk>)</code>.
*
- * @param value The new value for this property.
* @return This object (for method chaining).
- * @see Serializer#SERIALIZER_listener
*/
- public SerializerGroupBuilder listener(Class<? extends SerializerListener> value) {
- return set(SERIALIZER_listener, value);
+ public SerializerGroupBuilder ws() {
+ return useWhitespace(true);
}
@Override /* BeanContextBuilder */
@@ -568,42 +568,6 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public SerializerGroupBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerGroupBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerGroupBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerGroupBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerGroupBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SerializerGroupBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public SerializerGroupBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
@@ -703,5 +667,5 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
public SerializerGroupBuilder apply(PropertyStore copyFrom) {
super.apply(copyFrom);
return this;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
index beb20ba..8b4829b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
@@ -70,8 +70,8 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder enableNamespaces(boolean value) {
- super.enableNamespaces(value);
+ public SoapXmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
+ super.addNamespaceUrisToRoot(value);
return this;
}
@@ -82,20 +82,14 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
- super.addNamespaceUrisToRoot(value);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
public SoapXmlSerializerBuilder defaultNamespace(String value) {
super.defaultNamespace(value);
return this;
}
@Override /* XmlSerializerBuilder */
- public SoapXmlSerializerBuilder xsNamespace(Namespace value) {
- super.xsNamespace(value);
+ public SoapXmlSerializerBuilder enableNamespaces(boolean value) {
+ super.enableNamespaces(value);
return this;
}
@@ -105,15 +99,21 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
return this;
}
+ @Override /* XmlSerializerBuilder */
+ public SoapXmlSerializerBuilder xsNamespace(Namespace value) {
+ super.xsNamespace(value);
+ return this;
+ }
+
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public SoapXmlSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public SoapXmlSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -130,20 +130,26 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public SoapXmlSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder ws() {
- super.ws();
+ public SoapXmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public SoapXmlSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -154,14 +160,20 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder sq() {
- super.sq();
+ public SoapXmlSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public SoapXmlSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -178,20 +190,20 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public SoapXmlSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public SoapXmlSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public SoapXmlSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -202,26 +214,20 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public SoapXmlSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public SoapXmlSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public SoapXmlSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -436,42 +442,6 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public SoapXmlSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SoapXmlSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SoapXmlSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SoapXmlSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SoapXmlSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SoapXmlSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
index f37d6ec..4fbe581 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
@@ -81,38 +81,38 @@ public class UonParserBuilder extends ParserBuilder {
}
@Override /* ParserBuilder */
- public UonParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public UonParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public UonParserBuilder strict(boolean value) {
- super.strict(value);
+ public UonParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public UonParserBuilder strict() {
- super.strict();
+ public UonParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public UonParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public UonParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public UonParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public UonParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public UonParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public UonParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
index 4641185..6bf6d5c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
@@ -105,14 +105,14 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public UonSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public UonSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -129,26 +129,26 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public UonSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder ws() {
- super.ws();
+ public UonSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder maxIndent(int value) {
- super.maxIndent(value);
+ public UonSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public UonSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -159,14 +159,20 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder sq() {
- super.sq();
+ public UonSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public UonSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public UonSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -183,20 +189,20 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public UonSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public UonSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public UonSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -207,26 +213,20 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public UonSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public UonSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public UonSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public UonSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -441,42 +441,6 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public UonSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UonSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
index 7b7b3e0..41b4e4c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
@@ -97,44 +97,44 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
return set(URLENC_expandedParams, value);
}
- @Override /* UonParser */
+ @Override /* UonParserBuilder */
public UrlEncodingParserBuilder decodeChars(boolean value) {
return set(UON_decodeChars, value);
}
@Override /* ParserBuilder */
- public UrlEncodingParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public UrlEncodingParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public UrlEncodingParserBuilder strict(boolean value) {
- super.strict(value);
+ public UrlEncodingParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public UrlEncodingParserBuilder strict() {
- super.strict();
+ public UrlEncodingParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public UrlEncodingParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public UrlEncodingParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public UrlEncodingParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public UrlEncodingParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public UrlEncodingParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public UrlEncodingParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
index aec1631..6c55907 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
@@ -150,14 +150,14 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public UrlEncodingSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public UrlEncodingSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -174,20 +174,26 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public UrlEncodingSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder ws() {
- super.ws();
+ public UrlEncodingSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public UrlEncodingSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -198,14 +204,20 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder sq() {
- super.sq();
+ public UrlEncodingSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public UrlEncodingSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -222,20 +234,20 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public UrlEncodingSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public UrlEncodingSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public UrlEncodingSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -246,26 +258,20 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public UrlEncodingSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public UrlEncodingSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public UrlEncodingSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -480,42 +486,6 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public UrlEncodingSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UrlEncodingSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UrlEncodingSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UrlEncodingSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UrlEncodingSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UrlEncodingSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
@@ -601,7 +571,6 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
@Override /* ContextBuilder */
public UrlEncodingSerializerBuilder addTo(String name, String key, Object value) {
- super.addTo(name, key, value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
index 5157b81..6e1a43a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
@@ -55,11 +55,10 @@ public class XmlParserBuilder extends ParserBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Enable validation.
+ * Configuration property: XML event allocator.
*
* <p>
- * If <jk>true</jk>, XML document will be validated.
- * See {@link XMLInputFactory#IS_VALIDATING} for more info.
+ * Associates an {@link XMLEventAllocator} with this parser.
*
* <p>
* If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
@@ -67,15 +66,49 @@ public class XmlParserBuilder extends ParserBuilder {
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>XML_validating</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>XML_eventAllocator</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see XmlParser#XML_validating
+ * @see XmlParser#XML_eventAllocator
*/
- public XmlParserBuilder validating(boolean value) {
- return set(XML_validating, value);
+ public XmlParserBuilder eventAllocator(XMLEventAllocator value) {
+ return set(XML_eventAllocator, value);
+ }
+
+ /**
+ * Configuration property: Preserve root element during generalized parsing.
+ *
+ * <p>
+ * If <jk>true</jk>, when parsing into a generic {@link ObjectMap}, the map will contain a single entry whose key is
+ * the root element name.
+ *
+ * Example:
+ * <table class='styled'>
+ * <tr>
+ * <td>XML</td>
+ * <td>ObjectMap.toString(), preserveRootElement==false</td>
+ * <td>ObjectMap.toString(), preserveRootElement==true</td>
+ * </tr>
+ * <tr>
+ * <td><code><xt><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'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>XML_preserveRootElement</jsf>, value)</code>.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see XmlParser#XML_preserveRootElement
+ */
+ public XmlParserBuilder preserveRootElement(boolean value) {
+ return set(XML_preserveRootElement, value);
}
/**
@@ -130,10 +163,11 @@ public class XmlParserBuilder extends ParserBuilder {
}
/**
- * Configuration property: XML event allocator.
+ * Configuration property: Enable validation.
*
* <p>
- * Associates an {@link XMLEventAllocator} with this parser.
+ * If <jk>true</jk>, XML document will be validated.
+ * See {@link XMLInputFactory#IS_VALIDATING} for more info.
*
* <p>
* If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
@@ -141,84 +175,50 @@ public class XmlParserBuilder extends ParserBuilder {
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>XML_eventAllocator</jsf>, value)</code>.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see XmlParser#XML_eventAllocator
- */
- public XmlParserBuilder eventAllocator(XMLEventAllocator value) {
- return set(XML_eventAllocator, value);
- }
-
- /**
- * Configuration property: Preserve root element during generalized parsing.
- *
- * <p>
- * If <jk>true</jk>, when parsing into a generic {@link ObjectMap}, the map will contain a single entry whose key is
- * the root element name.
- *
- * Example:
- * <table class='styled'>
- * <tr>
- * <td>XML</td>
- * <td>ObjectMap.toString(), preserveRootElement==false</td>
- * <td>ObjectMap.toString(), preserveRootElement==true</td>
- * </tr>
- * <tr>
- * <td><code><xt><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'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>XML_preserveRootElement</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>XML_validating</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see XmlParser#XML_preserveRootElement
+ * @see XmlParser#XML_validating
*/
- public XmlParserBuilder preserveRootElement(boolean value) {
- return set(XML_preserveRootElement, value);
+ public XmlParserBuilder validating(boolean value) {
+ return set(XML_validating, value);
}
@Override /* ParserBuilder */
- public XmlParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public XmlParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public XmlParserBuilder strict(boolean value) {
- super.strict(value);
+ public XmlParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public XmlParserBuilder strict() {
- super.strict();
+ public XmlParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public XmlParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public XmlParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public XmlParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public XmlParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public XmlParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public XmlParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
index 985993a..9451ce5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
@@ -50,14 +50,8 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
//--------------------------------------------------------------------------------
@Override /* XmlSerializerBuilder */
- public XmlSchemaSerializerBuilder enableNamespaces(boolean value) {
- super.enableNamespaces(value);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
- public XmlSchemaSerializerBuilder ns() {
- super.ns();
+ public XmlSchemaSerializerBuilder addNamespaceUrisToRoot(boolean value) {
+ super.addNamespaceUrisToRoot(value);
return this;
}
@@ -68,20 +62,14 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* XmlSerializerBuilder */
- public XmlSchemaSerializerBuilder addNamespaceUrisToRoot(boolean value) {
- super.addNamespaceUrisToRoot(value);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
public XmlSchemaSerializerBuilder defaultNamespace(String value) {
super.defaultNamespace(value);
return this;
}
@Override /* XmlSerializerBuilder */
- public XmlSchemaSerializerBuilder xsNamespace(Namespace value) {
- super.xsNamespace(value);
+ public XmlSchemaSerializerBuilder enableNamespaces(boolean value) {
+ super.enableNamespaces(value);
return this;
}
@@ -91,15 +79,21 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
return this;
}
+ @Override /* XmlSerializerBuilder */
+ public XmlSchemaSerializerBuilder xsNamespace(Namespace value) {
+ super.xsNamespace(value);
+ return this;
+ }
+
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public XmlSchemaSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public XmlSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -116,20 +110,26 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public XmlSchemaSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder ws() {
- super.ws();
+ public XmlSchemaSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public XmlSchemaSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public XmlSchemaSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -140,14 +140,20 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder sq() {
- super.sq();
+ public XmlSchemaSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public XmlSchemaSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public XmlSchemaSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -164,20 +170,20 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public XmlSchemaSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public XmlSchemaSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public XmlSchemaSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -188,26 +194,20 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public XmlSchemaSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public XmlSchemaSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public XmlSchemaSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -422,42 +422,6 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public XmlSchemaSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSchemaSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSchemaSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSchemaSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSchemaSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSchemaSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public XmlSchemaSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
index a057f7e..6d82365 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
@@ -52,32 +52,26 @@ public class XmlSerializerBuilder extends SerializerBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Enable support for XML namespaces.
+ * Configuration property: Add namespace URLs to the root element.
*
* <p>
- * If not enabled, XML output will not contain any namespaces regardless of any other settings.
+ * Use this setting to add {@code xmlns:x} attributes to the root element for the default and all mapped namespaces.
+ *
+ * <p>
+ * This setting is ignored if {@link XmlSerializer#XML_enableNamespaces} is not enabled.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>XML_enableNamespaces</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>XML_addNamespaceUrisToRoot</jsf>, value)</code>.
* <li>This introduces a slight performance penalty.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see XmlSerializer#XML_enableNamespaces
- */
- public XmlSerializerBuilder enableNamespaces(boolean value) {
- return set(XML_enableNamespaces, value);
- }
-
- /**
- * Shortcut for calling <code>setEnableNamespaces(<jk>true</jk>)</code>.
- *
- * @return This object (for method chaining).
+ * @see XmlSerializer#XML_addNamespaceUrisToRoot
*/
- public XmlSerializerBuilder ns() {
- return enableNamespaces(true);
+ public XmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
+ return set(XML_addNamespaceUrisToRoot, value);
}
/**
@@ -119,29 +113,6 @@ public class XmlSerializerBuilder extends SerializerBuilder {
}
/**
- * Configuration property: Add namespace URLs to the root element.
- *
- * <p>
- * Use this setting to add {@code xmlns:x} attributes to the root element for the default and all mapped namespaces.
- *
- * <p>
- * This setting is ignored if {@link XmlSerializer#XML_enableNamespaces} is not enabled.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>XML_addNamespaceUrisToRoot</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see XmlSerializer#XML_addNamespaceUrisToRoot
- */
- public XmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
- return set(XML_addNamespaceUrisToRoot, value);
- }
-
- /**
* Configuration property: Default namespace.
*
* <p>
@@ -162,24 +133,23 @@ public class XmlSerializerBuilder extends SerializerBuilder {
}
/**
- * Configuration property: XMLSchema namespace.
+ * Configuration property: Enable support for XML namespaces.
*
* <p>
- * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the
- * {@link XmlSchemaSerializer} class.
+ * If not enabled, XML output will not contain any namespaces regardless of any other settings.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>XML_xsNamespace</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>XML_enableNamespaces</jsf>, value)</code>.
* <li>This introduces a slight performance penalty.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see XmlSerializer#XML_xsNamespace
+ * @see XmlSerializer#XML_enableNamespaces
*/
- public XmlSerializerBuilder xsNamespace(Namespace value) {
- return set(XML_xsNamespace, value);
+ public XmlSerializerBuilder enableNamespaces(boolean value) {
+ return set(XML_enableNamespaces, value);
}
/**
@@ -202,15 +172,45 @@ public class XmlSerializerBuilder extends SerializerBuilder {
return set(XML_namespaces, values);
}
+ /**
+ * Shortcut for calling <code>setEnableNamespaces(<jk>true</jk>)</code>.
+ *
+ * @return This object (for method chaining).
+ */
+ public XmlSerializerBuilder ns() {
+ return enableNamespaces(true);
+ }
+
+ /**
+ * Configuration property: XMLSchema namespace.
+ *
+ * <p>
+ * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the
+ * {@link XmlSchemaSerializer} class.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>XML_xsNamespace</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see XmlSerializer#XML_xsNamespace
+ */
+ public XmlSerializerBuilder xsNamespace(Namespace value) {
+ return set(XML_xsNamespace, value);
+ }
+
@Override /* SerializerBuilder */
- public XmlSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public XmlSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public XmlSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -227,26 +227,26 @@ public class XmlSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public XmlSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder ws() {
- super.ws();
+ public XmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder maxIndent(int value) {
- super.maxIndent(value);
+ public XmlSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public XmlSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -257,14 +257,20 @@ public class XmlSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder sq() {
- super.sq();
+ public XmlSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public XmlSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public XmlSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -281,20 +287,20 @@ public class XmlSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public XmlSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public XmlSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public XmlSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -305,26 +311,20 @@ public class XmlSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public XmlSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public XmlSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public XmlSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public XmlSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -539,42 +539,6 @@ public class XmlSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public XmlSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public XmlSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public XmlSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java
index 69df83d..3be1b6b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserBuilder.java
@@ -50,38 +50,38 @@ public class YamlParserBuilder extends ParserBuilder {
//--------------------------------------------------------------------------------
@Override /* ParserBuilder */
- public YamlParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public YamlParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public YamlParserBuilder strict(boolean value) {
- super.strict(value);
+ public YamlParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public YamlParserBuilder strict() {
- super.strict();
+ public YamlParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public YamlParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public YamlParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public YamlParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public YamlParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public YamlParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public YamlParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
[5/5] juneau git commit: Sort methods in builder classes.
Posted by ja...@apache.org.
Sort methods in builder classes.
Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/45640a1a
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/45640a1a
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/45640a1a
Branch: refs/heads/master
Commit: 45640a1a26e952b434afb4be6e1a08141d4090ad
Parents: 13af2b9
Author: JamesBognar <ja...@apache.org>
Authored: Sun Jan 7 16:28:28 2018 -0500
Committer: JamesBognar <ja...@apache.org>
Committed: Sun Jan 7 16:28:28 2018 -0500
----------------------------------------------------------------------
.../apache/juneau/jena/RdfParserBuilder.java | 264 ++--
.../juneau/jena/RdfSerializerBuilder.java | 442 +++----
.../org/apache/juneau/BeanContextBuilder.java | 1212 +++++++++---------
.../org/apache/juneau/csv/CsvParserBuilder.java | 24 +-
.../apache/juneau/csv/CsvSerializerBuilder.java | 104 +-
.../apache/juneau/html/HtmlParserBuilder.java | 24 +-
.../juneau/html/HtmlSerializerBuilder.java | 192 ++-
.../SimpleUonPartSerializerBuilder.java | 106 +-
.../juneau/httppart/UonPartParserBuilder.java | 26 +-
.../httppart/UonPartSerializerBuilder.java | 106 +-
.../org/apache/juneau/jso/JsoParserBuilder.java | 32 +-
.../apache/juneau/jso/JsoSerializerBuilder.java | 104 +-
.../apache/juneau/json/JsonParserBuilder.java | 25 +-
.../json/JsonSchemaSerializerBuilder.java | 114 +-
.../juneau/json/JsonSerializerBuilder.java | 136 +-
.../juneau/msgpack/MsgPackParserBuilder.java | 24 +-
.../msgpack/MsgPackSerializerBuilder.java | 104 +-
.../org/apache/juneau/parser/ParserBuilder.java | 300 ++---
.../juneau/parser/ParserGroupBuilder.java | 78 +-
.../plaintext/PlainTextParserBuilder.java | 24 +-
.../plaintext/PlainTextSerializerBuilder.java | 104 +-
.../juneau/serializer/SerializerBuilder.java | 294 ++---
.../serializer/SerializerGroupBuilder.java | 168 +--
.../juneau/soap/SoapXmlSerializerBuilder.java | 126 +-
.../org/apache/juneau/uon/UonParserBuilder.java | 24 +-
.../apache/juneau/uon/UonSerializerBuilder.java | 104 +-
.../urlencoding/UrlEncodingParserBuilder.java | 26 +-
.../UrlEncodingSerializerBuilder.java | 107 +-
.../org/apache/juneau/xml/XmlParserBuilder.java | 118 +-
.../juneau/xml/XmlSchemaSerializerBuilder.java | 132 +-
.../apache/juneau/xml/XmlSerializerBuilder.java | 194 ++-
.../juneau/yaml/proto/YamlParserBuilder.java | 24 +-
.../yaml/proto/YamlSerializerBuilder.java | 136 +-
.../juneau/rest/client/RestClientBuilder.java | 510 ++++----
.../apache/juneau/rest/RestContextBuilder.java | 38 +-
.../org/apache/juneau/rest/RestJavaMethod.java | 3 +-
.../org/apache/juneau/rest/RestRequest.java | 5 -
.../rest/remoteable/RemoteableServlet.java | 2 +-
38 files changed, 2435 insertions(+), 3121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index 8ad124f..d1bdf65 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -56,22 +56,73 @@ public class RdfParserBuilder extends ParserBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Trim whitespace from text elements.
+ * Configuration property: RDF format for representing collections and arrays.
*
* <p>
- * If <jk>true</jk>, whitespace in text elements will be automatically trimmed.
+ * Possible values:
+ * <ul class='spaced-list'>
+ * <li>
+ * <js>"DEFAULT"</js> - Default format. The default is an RDF Sequence container.
+ * <li>
+ * <js>"SEQ"</js> - RDF Sequence container.
+ * <li>
+ * <js>"BAG"</js> - RDF Bag container.
+ * <li>
+ * <js>"LIST"</js> - RDF List container.
+ * <li>
+ * <js>"MULTI_VALUED"</js> - Multi-valued properties.
+ * </ul>
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_trimWhitespace</jsf>, value)</code>.
+ * <li>If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>, the order of the elements in the collection will get
+ * lost.
+ * </ul>
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_collectionFormat</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see RdfParser#RDF_trimWhitespace
+ * @see RdfCommon#RDF_collectionFormat
*/
- public RdfParserBuilder trimWhitespace(boolean value) {
- return set(RDF_trimWhitespace, value);
+ public RdfParserBuilder collectionFormat(RdfCollectionFormat value) {
+ return set(RDF_collectionFormat, value);
+ }
+
+ /**
+ * Configuration property: Default XML namespace for bean properties.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauBpNs</jsf>, value)</code>.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see RdfCommon#RDF_juneauBpNs
+ */
+ public RdfParserBuilder juneauBpNs(Namespace value) {
+ return set(RDF_juneauBpNs, value);
+ }
+
+ /**
+ * Configuration property: XML namespace for Juneau properties.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauNs</jsf>, value)</code>.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see RdfCommon#RDF_juneauNs
+ */
+ public RdfParserBuilder juneauNs(Namespace value) {
+ return set(RDF_juneauNs, value);
}
/**
@@ -121,30 +172,54 @@ public class RdfParserBuilder extends ParserBuilder {
}
/**
- * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>
+ * Configuration property: Collections should be serialized and parsed as loose collections.
*
- * @return This object (for method chaining).
- */
- public RdfParserBuilder xml() {
- return language(Constants.LANG_RDF_XML);
- }
-
- /**
- * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code>
+ * <p>
+ * When specified, collections of resources are handled as loose collections of resources in RDF instead of
+ * resources that are children of an RDF collection (e.g. Sequence, Bag).
*
- * @return This object (for method chaining).
- */
- public RdfParserBuilder xmlabbrev() {
- return language(Constants.LANG_RDF_XML_ABBREV);
- }
-
- /**
- * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code>
+ * <p>
+ * Note that this setting is specialized for RDF syntax, and is incompatible with the concept of
+ * losslessly representing POJO models, since the tree structure of these POJO models are lost
+ * when serialized as loose collections.
+ *
+ * <p>
+ * This setting is typically only useful if the beans being parsed into do not have a bean property
+ * annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode'>
+ * WriterSerializer s = <jk>new</jk> RdfSerializerBuilder().xmlabbrev().looseCollections(<jk>true</jk>).build();
+ * ReaderParser p = <jk>new</jk> RdfParserBuilder().xml().looseCollections(<jk>true</jk>).build();
+ *
+ * List<MyBean> l = createListOfMyBeans();
+ *
+ * <jc>// Serialize to RDF/XML as loose resources</jc>
+ * String rdfXml = s.serialize(l);
*
+ * <jc>// Parse back into a Java collection</jc>
+ * l = p.parse(rdfXml, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ *
+ * MyBean[] b = createArrayOfMyBeans();
+ *
+ * <jc>// Serialize to RDF/XML as loose resources</jc>
+ * String rdfXml = s.serialize(b);
+ *
+ * <jc>// Parse back into a bean array</jc>
+ * b = p.parse(rdfXml, MyBean[].<jk>class</jk>);
+ * </p>
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_looseCollections</jsf>, value)</code>.
+ * </ul>
+ *
+ * @param value The new value for this property.
* @return This object (for method chaining).
+ * @see RdfCommon#RDF_looseCollections
*/
- public RdfParserBuilder ntriple() {
- return language(Constants.LANG_NTRIPLE);
+ public RdfParserBuilder looseCollections(boolean value) {
+ return set(RDF_looseCollections, value);
}
/**
@@ -157,44 +232,40 @@ public class RdfParserBuilder extends ParserBuilder {
}
/**
- * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code>
+ * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code>
*
* @return This object (for method chaining).
*/
- public RdfParserBuilder turtle() {
- return language(Constants.LANG_TURTLE);
+ public RdfParserBuilder ntriple() {
+ return language(Constants.LANG_NTRIPLE);
}
/**
- * Configuration property: XML namespace for Juneau properties.
+ * Configuration property: Trim whitespace from text elements.
+ *
+ * <p>
+ * If <jk>true</jk>, whitespace in text elements will be automatically trimmed.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauNs</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_trimWhitespace</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see RdfCommon#RDF_juneauNs
+ * @see RdfParser#RDF_trimWhitespace
*/
- public RdfParserBuilder juneauNs(Namespace value) {
- return set(RDF_juneauNs, value);
+ public RdfParserBuilder trimWhitespace(boolean value) {
+ return set(RDF_trimWhitespace, value);
}
/**
- * Configuration property: Default XML namespace for bean properties.
+ * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code>
*
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauBpNs</jsf>, value)</code>.
- * </ul>
- *
- * @param value The new value for this property.
* @return This object (for method chaining).
- * @see RdfCommon#RDF_juneauBpNs
*/
- public RdfParserBuilder juneauBpNs(Namespace value) {
- return set(RDF_juneauBpNs, value);
+ public RdfParserBuilder turtle() {
+ return language(Constants.LANG_TURTLE);
}
/**
@@ -219,127 +290,56 @@ public class RdfParserBuilder extends ParserBuilder {
}
/**
- * Configuration property: RDF format for representing collections and arrays.
- *
- * <p>
- * Possible values:
- * <ul class='spaced-list'>
- * <li>
- * <js>"DEFAULT"</js> - Default format. The default is an RDF Sequence container.
- * <li>
- * <js>"SEQ"</js> - RDF Sequence container.
- * <li>
- * <js>"BAG"</js> - RDF Bag container.
- * <li>
- * <js>"LIST"</js> - RDF List container.
- * <li>
- * <js>"MULTI_VALUED"</js> - Multi-valued properties.
- * </ul>
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>, the order of the elements in the collection will get
- * lost.
- * </ul>
+ * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>
*
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_collectionFormat</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
- *
- * @param value The new value for this property.
* @return This object (for method chaining).
- * @see RdfCommon#RDF_collectionFormat
*/
- public RdfParserBuilder collectionFormat(RdfCollectionFormat value) {
- return set(RDF_collectionFormat, value);
+ public RdfParserBuilder xml() {
+ return language(Constants.LANG_RDF_XML);
}
/**
- * Configuration property: Collections should be serialized and parsed as loose collections.
- *
- * <p>
- * When specified, collections of resources are handled as loose collections of resources in RDF instead of
- * resources that are children of an RDF collection (e.g. Sequence, Bag).
- *
- * <p>
- * Note that this setting is specialized for RDF syntax, and is incompatible with the concept of
- * losslessly representing POJO models, since the tree structure of these POJO models are lost
- * when serialized as loose collections.
- *
- * <p>
- * This setting is typically only useful if the beans being parsed into do not have a bean property
- * annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode'>
- * WriterSerializer s = <jk>new</jk> RdfSerializerBuilder().xmlabbrev().looseCollections(<jk>true</jk>).build();
- * ReaderParser p = <jk>new</jk> RdfParserBuilder().xml().looseCollections(<jk>true</jk>).build();
- *
- * List<MyBean> l = createListOfMyBeans();
- *
- * <jc>// Serialize to RDF/XML as loose resources</jc>
- * String rdfXml = s.serialize(l);
- *
- * <jc>// Parse back into a Java collection</jc>
- * l = p.parse(rdfXml, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
- *
- * MyBean[] b = createArrayOfMyBeans();
- *
- * <jc>// Serialize to RDF/XML as loose resources</jc>
- * String rdfXml = s.serialize(b);
- *
- * <jc>// Parse back into a bean array</jc>
- * b = p.parse(rdfXml, MyBean[].<jk>class</jk>);
- * </p>
+ * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code>
*
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_looseCollections</jsf>, value)</code>.
- * </ul>
- *
- * @param value The new value for this property.
* @return This object (for method chaining).
- * @see RdfCommon#RDF_looseCollections
*/
- public RdfParserBuilder looseCollections(boolean value) {
- return set(RDF_looseCollections, value);
+ public RdfParserBuilder xmlabbrev() {
+ return language(Constants.LANG_RDF_XML_ABBREV);
}
@Override /* ParserBuilder */
- public RdfParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public RdfParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public RdfParserBuilder strict(boolean value) {
- super.strict(value);
+ public RdfParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public RdfParserBuilder strict() {
- super.strict();
+ public RdfParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public RdfParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public RdfParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public RdfParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public RdfParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public RdfParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public RdfParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index c0968ca..af33ee5 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -56,154 +56,6 @@ public class RdfSerializerBuilder extends SerializerBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: RDF language.
- *
- * <p>
- * Can be any of the following:
- * <ul class='spaced-list'>
- * <li>
- * <js>"RDF/XML"</js>
- * <li>
- * <js>"RDF/XML-ABBREV"</js>
- * <li>
- * <js>"N-TRIPLE"</js>
- * <li>
- * <js>"N3"</js> - General name for the N3 writer.
- * Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
- * created.
- * Default is the pretty writer but can be overridden with system property
- * <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.
- * <li>
- * <js>"N3-PP"</js> - Name of the N3 pretty writer.
- * The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
- * one-referenced bNodes.
- * <li>
- * <js>"N3-PLAIN"</js> - Name of the N3 plain writer.
- * The plain writer writes records by subject.
- * <li>
- * <js>"N3-TRIPLES"</js> - Name of the N3 triples writer.
- * This writer writes one line per statement, like N-Triples, but does N3-style prefixing.
- * <li>
- * <js>"TURTLE"</js> - Turtle writer.
- * http://www.dajobe.org/2004/01/turtle/
- * </ul>
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_language</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see RdfCommon#RDF_language
- */
- public RdfSerializerBuilder language(String value) {
- return set(RDF_language, value);
- }
-
- /**
- * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>
- *
- * @return This object (for method chaining).
- */
- public RdfSerializerBuilder xml() {
- return language(Constants.LANG_RDF_XML);
- }
-
- /**
- * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code>
- *
- * @return This object (for method chaining).
- */
- public RdfSerializerBuilder xmlabbrev() {
- return language(Constants.LANG_RDF_XML_ABBREV);
- }
-
- /**
- * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code>
- *
- * @return This object (for method chaining).
- */
- public RdfSerializerBuilder ntriple() {
- return language(Constants.LANG_NTRIPLE);
- }
-
- /**
- * Shortcut for calling <code>language(<jsf>LANG_N3</jsf>)</code>
- *
- * @return This object (for method chaining).
- */
- public RdfSerializerBuilder n3() {
- return language(Constants.LANG_N3);
- }
-
- /**
- * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code>
- *
- * @return This object (for method chaining).
- */
- public RdfSerializerBuilder turtle() {
- return language(Constants.LANG_TURTLE);
- }
-
- /**
- * Configuration property: XML namespace for Juneau properties.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauNs</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see RdfCommon#RDF_juneauNs
- */
- public RdfSerializerBuilder juneauNs(Namespace value) {
- return set(RDF_juneauNs, value);
- }
-
- /**
- * Configuration property: Default XML namespace for bean properties.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauBpNs</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see RdfCommon#RDF_juneauBpNs
- */
- public RdfSerializerBuilder juneauBpNs(Namespace value) {
- return set(RDF_juneauBpNs, value);
- }
-
- /**
- * Configuration property: Reuse XML namespaces when RDF namespaces not specified.
- *
- * <p>
- * When specified, namespaces defined using {@link XmlNs} and {@link org.apache.juneau.xml.annotation.Xml} will be
- * inherited by the RDF serializers.
- * Otherwise, namespaces will be defined using {@link RdfNs} and {@link Rdf}.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_useXmlNamespaces</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see RdfCommon#RDF_useXmlNamespaces
- */
- public RdfSerializerBuilder useXmlNamespaces(boolean value) {
- return set(RDF_useXmlNamespaces, value);
- }
-
- /**
* Configuration property: Add XSI data types to non-<code>String</code> literals.
*
* <h5 class='section'>Notes:</h5>
@@ -271,26 +123,6 @@ public class RdfSerializerBuilder extends SerializerBuilder {
}
/**
- * Configuration property: Default namespaces.
- *
- * <p>
- * The default list of namespaces associated with this serializer.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>RDF_namespaces</jsf>, values)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
- *
- * @param values The new value for this property.
- * @return This object (for method chaining).
- * @see RdfSerializer#RDF_namespaces
- */
- public RdfSerializerBuilder namespaces(Namespace...values) {
- return set(RDF_namespaces, values);
- }
-
- /**
* Configuration property: RDF format for representing collections and arrays.
*
* <p>
@@ -329,6 +161,87 @@ public class RdfSerializerBuilder extends SerializerBuilder {
}
/**
+ * Configuration property: Default XML namespace for bean properties.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauBpNs</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see RdfCommon#RDF_juneauBpNs
+ */
+ public RdfSerializerBuilder juneauBpNs(Namespace value) {
+ return set(RDF_juneauBpNs, value);
+ }
+
+ /**
+ * Configuration property: XML namespace for Juneau properties.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauNs</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see RdfCommon#RDF_juneauNs
+ */
+ public RdfSerializerBuilder juneauNs(Namespace value) {
+ return set(RDF_juneauNs, value);
+ }
+
+ /**
+ * Configuration property: RDF language.
+ *
+ * <p>
+ * Can be any of the following:
+ * <ul class='spaced-list'>
+ * <li>
+ * <js>"RDF/XML"</js>
+ * <li>
+ * <js>"RDF/XML-ABBREV"</js>
+ * <li>
+ * <js>"N-TRIPLE"</js>
+ * <li>
+ * <js>"N3"</js> - General name for the N3 writer.
+ * Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
+ * created.
+ * Default is the pretty writer but can be overridden with system property
+ * <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.
+ * <li>
+ * <js>"N3-PP"</js> - Name of the N3 pretty writer.
+ * The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
+ * one-referenced bNodes.
+ * <li>
+ * <js>"N3-PLAIN"</js> - Name of the N3 plain writer.
+ * The plain writer writes records by subject.
+ * <li>
+ * <js>"N3-TRIPLES"</js> - Name of the N3 triples writer.
+ * This writer writes one line per statement, like N-Triples, but does N3-style prefixing.
+ * <li>
+ * <js>"TURTLE"</js> - Turtle writer.
+ * http://www.dajobe.org/2004/01/turtle/
+ * </ul>
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_language</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see RdfCommon#RDF_language
+ */
+ public RdfSerializerBuilder language(String value) {
+ return set(RDF_language, value);
+ }
+
+ /**
* Configuration property: Collections should be serialized and parsed as loose collections.
*
* <p>
@@ -379,15 +292,102 @@ public class RdfSerializerBuilder extends SerializerBuilder {
return set(RDF_looseCollections, value);
}
+ /**
+ * Shortcut for calling <code>language(<jsf>LANG_N3</jsf>)</code>
+ *
+ * @return This object (for method chaining).
+ */
+ public RdfSerializerBuilder n3() {
+ return language(Constants.LANG_N3);
+ }
+
+ /**
+ * Configuration property: Default namespaces.
+ *
+ * <p>
+ * The default list of namespaces associated with this serializer.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_namespaces</jsf>, values)</code>.
+ * <li>This introduces a slight performance penalty.
+ * </ul>
+ *
+ * @param values The new value for this property.
+ * @return This object (for method chaining).
+ * @see RdfSerializer#RDF_namespaces
+ */
+ public RdfSerializerBuilder namespaces(Namespace...values) {
+ return set(RDF_namespaces, values);
+ }
+
+ /**
+ * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code>
+ *
+ * @return This object (for method chaining).
+ */
+ public RdfSerializerBuilder ntriple() {
+ return language(Constants.LANG_NTRIPLE);
+ }
+
+ /**
+ * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code>
+ *
+ * @return This object (for method chaining).
+ */
+ public RdfSerializerBuilder turtle() {
+ return language(Constants.LANG_TURTLE);
+ }
+
+ /**
+ * Configuration property: Reuse XML namespaces when RDF namespaces not specified.
+ *
+ * <p>
+ * When specified, namespaces defined using {@link XmlNs} and {@link org.apache.juneau.xml.annotation.Xml} will be
+ * inherited by the RDF serializers.
+ * Otherwise, namespaces will be defined using {@link RdfNs} and {@link Rdf}.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>RDF_useXmlNamespaces</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see RdfCommon#RDF_useXmlNamespaces
+ */
+ public RdfSerializerBuilder useXmlNamespaces(boolean value) {
+ return set(RDF_useXmlNamespaces, value);
+ }
+
+ /**
+ * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>
+ *
+ * @return This object (for method chaining).
+ */
+ public RdfSerializerBuilder xml() {
+ return language(Constants.LANG_RDF_XML);
+ }
+
+ /**
+ * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code>
+ *
+ * @return This object (for method chaining).
+ */
+ public RdfSerializerBuilder xmlabbrev() {
+ return language(Constants.LANG_RDF_XML_ABBREV);
+ }
+
@Override /* SerializerBuilder */
- public RdfSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public RdfSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public RdfSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -404,20 +404,26 @@ public class RdfSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public RdfSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder ws() {
- super.ws();
+ public RdfSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public RdfSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public RdfSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -428,14 +434,20 @@ public class RdfSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder sq() {
- super.sq();
+ public RdfSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public RdfSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public RdfSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -452,20 +464,20 @@ public class RdfSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public RdfSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public RdfSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public RdfSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -476,26 +488,20 @@ public class RdfSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public RdfSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public RdfSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public RdfSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public RdfSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -710,42 +716,6 @@ public class RdfSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public RdfSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RdfSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RdfSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RdfSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RdfSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public RdfSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public RdfSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
[3/5] juneau git commit: Sort methods in builder classes.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
index 584a02f..b823a86 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
@@ -53,26 +53,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Anchor text source.
- *
- * <p>
- * When creating anchor tags (e.g. <code><xt><a</xt> <xa>href</xa>=<xs>'...'</xs><xt>></xt>text<xt></a></xt></code>)
- * in HTML, this setting defines what to set the inner text to.
- *
- * <p>
- * See the {@link AnchorText} enum for possible values.
+ * Configuration property: Add key/value headers on bean/map tables.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>HTML_uriAnchorText</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>HTML_addKeyValueTableHeaders</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see HtmlSerializer#HTML_uriAnchorText
+ * @see HtmlSerializer#HTML_addKeyValueTableHeaders
*/
- public HtmlSerializerBuilder uriAnchorText(AnchorText value) {
- return set(HTML_uriAnchorText, value);
+ public HtmlSerializerBuilder addKeyValueTableHeaders(boolean value) {
+ return set(HTML_addKeyValueTableHeaders, value);
}
/**
@@ -97,6 +91,23 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
/**
+ * Configuration property: The parameter name to use when using {@link HtmlSerializer#HTML_lookForLabelParameters}.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>HTML_labelParameter</jsf>, value)</code>.
+ * <li>This introduces a slight performance penalty.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see HtmlSerializer#HTML_labelParameter
+ */
+ public HtmlSerializerBuilder labelParameter(String value) {
+ return set(HTML_labelParameter, value);
+ }
+
+ /**
* Configuration property: Look for link labels in the <js>"label"</js> parameter of the URL.
*
* <p>
@@ -120,42 +131,31 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
/**
- * Configuration property: The parameter name to use when using {@link HtmlSerializer#HTML_lookForLabelParameters}.
+ * Configuration property: Anchor text source.
*
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>HTML_labelParameter</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
- * </ul>
+ * <p>
+ * When creating anchor tags (e.g. <code><xt><a</xt> <xa>href</xa>=<xs>'...'</xs><xt>></xt>text<xt></a></xt></code>)
+ * in HTML, this setting defines what to set the inner text to.
*
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see HtmlSerializer#HTML_labelParameter
- */
- public HtmlSerializerBuilder labelParameter(String value) {
- return set(HTML_labelParameter, value);
- }
-
- /**
- * Configuration property: Add key/value headers on bean/map tables.
+ * <p>
+ * See the {@link AnchorText} enum for possible values.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>HTML_addKeyValueTableHeaders</jsf>, value)</code>.
- * <li>This introduces a slight performance penalty.
+ * <li>This is equivalent to calling <code>property(<jsf>HTML_uriAnchorText</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see HtmlSerializer#HTML_addKeyValueTableHeaders
+ * @see HtmlSerializer#HTML_uriAnchorText
*/
- public HtmlSerializerBuilder addKeyValueTableHeaders(boolean value) {
- return set(HTML_addKeyValueTableHeaders, value);
+ public HtmlSerializerBuilder uriAnchorText(AnchorText value) {
+ return set(HTML_uriAnchorText, value);
}
@Override /* XmlSerializerBuilder */
- public HtmlSerializerBuilder enableNamespaces(boolean value) {
- super.enableNamespaces(value);
+ public HtmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
+ super.addNamespaceUrisToRoot(value);
return this;
}
@@ -166,20 +166,14 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* XmlSerializerBuilder */
- public HtmlSerializerBuilder addNamespaceUrisToRoot(boolean value) {
- super.addNamespaceUrisToRoot(value);
- return this;
- }
-
- @Override /* XmlSerializerBuilder */
public HtmlSerializerBuilder defaultNamespace(String value) {
super.defaultNamespace(value);
return this;
}
@Override /* XmlSerializerBuilder */
- public HtmlSerializerBuilder xsNamespace(Namespace value) {
- super.xsNamespace(value);
+ public HtmlSerializerBuilder enableNamespaces(boolean value) {
+ super.enableNamespaces(value);
return this;
}
@@ -189,15 +183,21 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
return this;
}
+ @Override /* XmlSerializerBuilder */
+ public HtmlSerializerBuilder xsNamespace(Namespace value) {
+ super.xsNamespace(value);
+ return this;
+ }
+
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public HtmlSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public HtmlSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -214,20 +214,26 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public HtmlSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder ws() {
- super.ws();
+ public HtmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public HtmlSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public HtmlSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -238,14 +244,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder sq() {
- super.sq();
+ public HtmlSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public HtmlSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public HtmlSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -262,20 +274,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public HtmlSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public HtmlSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public HtmlSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -286,26 +298,20 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public HtmlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public HtmlSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public HtmlSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public HtmlSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -520,42 +526,6 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public HtmlSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public HtmlSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public HtmlSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public HtmlSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public HtmlSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public HtmlSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public HtmlSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
index 0e1666e..9454356 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
@@ -74,14 +74,14 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public SimpleUonPartSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public SimpleUonPartSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -98,20 +98,26 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public SimpleUonPartSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder ws() {
- super.ws();
+ public SimpleUonPartSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public SimpleUonPartSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public SimpleUonPartSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -122,14 +128,20 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder sq() {
- super.sq();
+ public SimpleUonPartSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public SimpleUonPartSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public SimpleUonPartSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -146,20 +158,20 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public SimpleUonPartSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public SimpleUonPartSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public SimpleUonPartSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -170,26 +182,20 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public SimpleUonPartSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public SimpleUonPartSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public SimpleUonPartSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -404,42 +410,6 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public SimpleUonPartSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SimpleUonPartSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SimpleUonPartSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SimpleUonPartSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SimpleUonPartSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public SimpleUonPartSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public SimpleUonPartSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
index 3fd38f9..8d13857 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartParserBuilder.java
@@ -52,44 +52,44 @@ public class UonPartParserBuilder extends UonParserBuilder {
// Properties
//--------------------------------------------------------------------------------
- @Override /* UonParser */
+ @Override /* UonParserBuilder */
public UonPartParserBuilder decodeChars(boolean value) {
return set(UON_decodeChars, value);
}
@Override /* ParserBuilder */
- public UonPartParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public UonPartParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public UonPartParserBuilder strict(boolean value) {
- super.strict(value);
+ public UonPartParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public UonPartParserBuilder strict() {
- super.strict();
+ public UonPartParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public UonPartParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public UonPartParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public UonPartParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public UonPartParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public UonPartParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public UonPartParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
index c65eeda..cb50074 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
@@ -104,14 +104,14 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public UonPartSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public UonPartSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -128,20 +128,26 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public UonPartSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder ws() {
- super.ws();
+ public UonPartSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public UonPartSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public UonPartSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -152,14 +158,20 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder sq() {
- super.sq();
+ public UonPartSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public UonPartSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public UonPartSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -176,20 +188,20 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public UonPartSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public UonPartSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public UonPartSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -200,26 +212,20 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public UonPartSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public UonPartSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public UonPartSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public UonPartSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -434,42 +440,6 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public UonPartSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonPartSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonPartSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonPartSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonPartSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public UonPartSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UonPartSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
index 3d53cb5..868fe57 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
@@ -49,39 +49,39 @@ public class JsoParserBuilder extends ParserBuilder {
// Properties
//--------------------------------------------------------------------------------
- @Override /* Parser */
- public JsoParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ @Override /* ParserBuilder */
+ public JsoParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
- @Override /* Parser */
- public JsoParserBuilder strict(boolean value) {
- super.strict(value);
+ @Override /* ParserBuilder */
+ public JsoParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public JsoParserBuilder strict() {
- super.strict();
+ public JsoParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
- @Override /* Parser */
- public JsoParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ @Override /* ParserBuilder */
+ public JsoParserBuilder strict() {
+ super.strict();
return this;
}
- @Override /* Parser */
- public JsoParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ @Override /* ParserBuilder */
+ public JsoParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public JsoParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public JsoParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
index 70ef906..e26519e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
@@ -50,14 +50,14 @@ public class JsoSerializerBuilder extends SerializerBuilder {
//--------------------------------------------------------------------------------
@Override /* SerializerBuilder */
- public JsoSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public JsoSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public JsoSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -74,26 +74,26 @@ public class JsoSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public JsoSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder ws() {
- super.ws();
+ public JsoSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder maxIndent(int value) {
- super.maxIndent(value);
+ public JsoSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public JsoSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -104,14 +104,20 @@ public class JsoSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder sq() {
- super.sq();
+ public JsoSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public JsoSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public JsoSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -128,20 +134,20 @@ public class JsoSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public JsoSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public JsoSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public JsoSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -152,26 +158,20 @@ public class JsoSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public JsoSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public JsoSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public JsoSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public JsoSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -386,42 +386,6 @@ public class JsoSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public JsoSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsoSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsoSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsoSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsoSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsoSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public JsoSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
index 84110e1..458efa7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
@@ -50,38 +50,38 @@ public class JsonParserBuilder extends ParserBuilder {
//--------------------------------------------------------------------------------
@Override /* ParserBuilder */
- public JsonParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public JsonParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public JsonParserBuilder strict(boolean value) {
- super.strict(value);
+ public JsonParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public JsonParserBuilder strict() {
- super.strict();
+ public JsonParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public JsonParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public JsonParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public JsonParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public JsonParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public JsonParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public JsonParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@@ -313,7 +313,6 @@ public class JsonParserBuilder extends ParserBuilder {
return this;
}
-
@Override /* BeanContextBuilder */
public JsonParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
index de6278c..6c9aa78 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
@@ -50,8 +50,8 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
//--------------------------------------------------------------------------------
@Override /* JsonSerializerBuilder */
- public JsonSchemaSerializerBuilder simple(boolean value) {
- super.simple(value);
+ public JsonSchemaSerializerBuilder escapeSolidus(boolean value) {
+ super.escapeSolidus(value);
return this;
}
@@ -62,20 +62,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* JsonSerializerBuilder */
- public JsonSchemaSerializerBuilder escapeSolidus(boolean value) {
- super.escapeSolidus(value);
+ public JsonSchemaSerializerBuilder simple(boolean value) {
+ super.simple(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public JsonSchemaSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public JsonSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -92,20 +92,26 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public JsonSchemaSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder ws() {
- super.ws();
+ public JsonSchemaSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public JsonSchemaSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public JsonSchemaSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -116,14 +122,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder sq() {
- super.sq();
+ public JsonSchemaSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public JsonSchemaSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public JsonSchemaSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -140,20 +152,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public JsonSchemaSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public JsonSchemaSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public JsonSchemaSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -164,26 +176,20 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public JsonSchemaSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public JsonSchemaSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public JsonSchemaSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -398,42 +404,6 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public JsonSchemaSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSchemaSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSchemaSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSchemaSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSchemaSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSchemaSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public JsonSchemaSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
index 4b9bd09..2101fd4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
@@ -52,23 +52,25 @@ public class JsonSerializerBuilder extends SerializerBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Simple JSON mode.
+ * Configuration property: Prefix solidus <js>'/'</js> characters with escapes.
*
* <p>
- * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
- * Otherwise, they are always quoted.
+ * If <jk>true</jk>, solidus (e.g. slash) characters should be escaped.
+ * The JSON specification allows for either format.
+ * However, if you're embedding JSON in an HTML script tag, this setting prevents confusion when trying to
+ * serialize <xt><\/script></xt>.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>JSON_simpleMode</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>JSON_escapeSolidus</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see JsonSerializer#JSON_simpleMode
+ * @see JsonSerializer#JSON_escapeSolidus
*/
- public JsonSerializerBuilder simple(boolean value) {
- return set(JSON_simpleMode, value);
+ public JsonSerializerBuilder escapeSolidus(boolean value) {
+ return set(JSON_escapeSolidus, value);
}
/**
@@ -81,36 +83,34 @@ public class JsonSerializerBuilder extends SerializerBuilder {
}
/**
- * Configuration property: Prefix solidus <js>'/'</js> characters with escapes.
+ * Configuration property: Simple JSON mode.
*
* <p>
- * If <jk>true</jk>, solidus (e.g. slash) characters should be escaped.
- * The JSON specification allows for either format.
- * However, if you're embedding JSON in an HTML script tag, this setting prevents confusion when trying to
- * serialize <xt><\/script></xt>.
+ * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
+ * Otherwise, they are always quoted.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>JSON_escapeSolidus</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>JSON_simpleMode</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see JsonSerializer#JSON_escapeSolidus
+ * @see JsonSerializer#JSON_simpleMode
*/
- public JsonSerializerBuilder escapeSolidus(boolean value) {
- return set(JSON_escapeSolidus, value);
+ public JsonSerializerBuilder simple(boolean value) {
+ return set(JSON_simpleMode, value);
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public JsonSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public JsonSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -127,26 +127,26 @@ public class JsonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public JsonSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder ws() {
- super.ws();
+ public JsonSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder maxIndent(int value) {
- super.maxIndent(value);
+ public JsonSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public JsonSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -157,14 +157,20 @@ public class JsonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder sq() {
- super.sq();
+ public JsonSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public JsonSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public JsonSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -181,20 +187,20 @@ public class JsonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public JsonSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public JsonSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public JsonSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -205,26 +211,20 @@ public class JsonSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public JsonSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public JsonSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public JsonSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public JsonSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -439,42 +439,6 @@ public class JsonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public JsonSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public JsonSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public JsonSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
index 773edae..4034362 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
@@ -50,38 +50,38 @@ public class MsgPackParserBuilder extends ParserBuilder {
//--------------------------------------------------------------------------------
@Override /* ParserBuilder */
- public MsgPackParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public MsgPackParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public MsgPackParserBuilder strict(boolean value) {
- super.strict(value);
+ public MsgPackParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public MsgPackParserBuilder strict() {
- super.strict();
+ public MsgPackParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public MsgPackParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public MsgPackParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public MsgPackParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public MsgPackParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public MsgPackParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public MsgPackParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
index c5188bf..cc10a8c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
@@ -50,14 +50,14 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
//--------------------------------------------------------------------------------
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public MsgPackSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public MsgPackSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -74,26 +74,26 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public MsgPackSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder ws() {
- super.ws();
+ public MsgPackSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder maxIndent(int value) {
- super.maxIndent(value);
+ public MsgPackSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public MsgPackSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -104,14 +104,20 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder sq() {
- super.sq();
+ public MsgPackSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public MsgPackSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public MsgPackSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -128,20 +134,20 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public MsgPackSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public MsgPackSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public MsgPackSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -152,26 +158,20 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public MsgPackSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public MsgPackSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public MsgPackSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public MsgPackSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -386,42 +386,6 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public MsgPackSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public MsgPackSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public MsgPackSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public MsgPackSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public MsgPackSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public MsgPackSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public MsgPackSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
index 14ea714..411239a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
@@ -46,23 +46,73 @@ public class ParserBuilder extends BeanContextBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Trim parsed strings.
+ * Configuration property: File charset.
*
* <p>
- * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
- * the POJO.
+ * The character set to use for reading <code>Files</code> from the file system.
+ *
+ * <p>
+ * Used when passing in files to {@link Parser#parse(Object, Class)}.
+ *
+ * <p>
+ * <js>"default"</js> can be used to indicate the JVM default file system charset.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>PARSER_trimStrings</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>PARSER_fileCharset</jsf>,value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_trimStrings
+ * @see Parser#PARSER_fileCharset
*/
- public ParserBuilder trimStrings(boolean value) {
- return set(PARSER_trimStrings, value);
+ public ParserBuilder fileCharset(String value) {
+ return set(PARSER_fileCharset, value);
+ }
+
+ /**
+ * Configuration property: Input stream charset.
+ *
+ * <p>
+ * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.
+ *
+ * <p>
+ * Used when passing in input streams and byte arrays to {@link Parser#parse(Object, Class)}.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>PARSER_inputStreamCharset</jsf>, value)</code>.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see Parser#PARSER_inputStreamCharset
+ */
+ public ParserBuilder inputStreamCharset(String value) {
+ return set(PARSER_inputStreamCharset, value);
+ }
+
+ /**
+ * Configuration property: Parser listener.
+ *
+ * <p>
+ * Class used to listen for errors and warnings that occur during parsing.
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see Parser#PARSER_listener
+ */
+ public ParserBuilder listener(Class<? extends ParserListener> value) {
+ return set(PARSER_listener, value);
+ }
+
+ /**
+ * Shortcut for calling <code>strict(<jk>true</jk>)</code>.
+ *
+ * @return This object (for method chaining).
+ */
+ public ParserBuilder strict() {
+ return strict(true);
}
/**
@@ -113,318 +163,268 @@ public class ParserBuilder extends BeanContextBuilder {
}
/**
- * Shortcut for calling <code>strict(<jk>true</jk>)</code>.
- *
- * @return This object (for method chaining).
- */
- public ParserBuilder strict() {
- return strict(true);
- }
-
- /**
- * Configuration property: Input stream charset.
- *
- * <p>
- * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.
- *
- * <p>
- * Used when passing in input streams and byte arrays to {@link Parser#parse(Object, Class)}.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>PARSER_inputStreamCharset</jsf>, value)</code>.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see Parser#PARSER_inputStreamCharset
- */
- public ParserBuilder inputStreamCharset(String value) {
- return set(PARSER_inputStreamCharset, value);
- }
-
- /**
- * Configuration property: File charset.
- *
- * <p>
- * The character set to use for reading <code>Files</code> from the file system.
- *
- * <p>
- * Used when passing in files to {@link Parser#parse(Object, Class)}.
+ * Configuration property: Trim parsed strings.
*
* <p>
- * <js>"default"</js> can be used to indicate the JVM default file system charset.
+ * If <jk>true</jk>, string values will be trimmed of whitespace using {@link String#trim()} before being added to
+ * the POJO.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>PARSER_fileCharset</jsf>,value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>PARSER_trimStrings</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_fileCharset
- */
- public ParserBuilder fileCharset(String value) {
- return set(PARSER_fileCharset, value);
- }
-
- /**
- * Configuration property: Parser listener.
- *
- * <p>
- * Class used to listen for errors and warnings that occur during parsing.
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see Parser#PARSER_listener
+ * @see Parser#PARSER_trimStrings
*/
- public ParserBuilder listener(Class<? extends ParserListener> value) {
- return set(PARSER_listener, value);
+ public ParserBuilder trimStrings(boolean value) {
+ return set(PARSER_trimStrings, value);
}
@Override /* BeanContextBuilder */
- public ParserBuilder beansRequireDefaultConstructor(boolean value) {
- super.beansRequireDefaultConstructor(value);
+ public ParserBuilder beanClassVisibility(Visibility value) {
+ super.beanClassVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beansRequireSerializable(boolean value) {
- super.beansRequireSerializable(value);
+ public ParserBuilder beanConstructorVisibility(Visibility value) {
+ super.beanConstructorVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beansRequireSettersForGetters(boolean value) {
- super.beansRequireSettersForGetters(value);
+ public ParserBuilder beanDictionary(boolean append, Object...values) {
+ super.beanDictionary(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beansRequireSomeProperties(boolean value) {
- super.beansRequireSomeProperties(value);
+ public ParserBuilder beanDictionary(Class<?>...values) {
+ super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanMapPutReturnsOldValue(boolean value) {
- super.beanMapPutReturnsOldValue(value);
+ public ParserBuilder beanDictionary(Object...values) {
+ super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanConstructorVisibility(Visibility value) {
- super.beanConstructorVisibility(value);
+ public ParserBuilder beanDictionaryRemove(Object...values) {
+ super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanClassVisibility(Visibility value) {
- super.beanClassVisibility(value);
+ public ParserBuilder beanFieldVisibility(Visibility value) {
+ super.beanFieldVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanFieldVisibility(Visibility value) {
- super.beanFieldVisibility(value);
+ public ParserBuilder beanFilters(boolean append, Object...values) {
+ super.beanFilters(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder methodVisibility(Visibility value) {
- super.methodVisibility(value);
+ public ParserBuilder beanFilters(Class<?>...values) {
+ super.beanFilters(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder useJavaBeanIntrospector(boolean value) {
- super.useJavaBeanIntrospector(value);
+ public ParserBuilder beanFilters(Object...values) {
+ super.beanFilters(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder useInterfaceProxies(boolean value) {
- super.useInterfaceProxies(value);
+ public ParserBuilder beanFiltersRemove(Object...values) {
+ super.beanFiltersRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder ignoreUnknownBeanProperties(boolean value) {
- super.ignoreUnknownBeanProperties(value);
+ public ParserBuilder beanMapPutReturnsOldValue(boolean value) {
+ super.beanMapPutReturnsOldValue(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
- super.ignoreUnknownNullBeanProperties(value);
+ public ParserBuilder beansRequireDefaultConstructor(boolean value) {
+ super.beansRequireDefaultConstructor(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder ignorePropertiesWithoutSetters(boolean value) {
- super.ignorePropertiesWithoutSetters(value);
+ public ParserBuilder beansRequireSerializable(boolean value) {
+ super.beansRequireSerializable(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
- super.ignoreInvocationExceptionsOnGetters(value);
+ public ParserBuilder beansRequireSettersForGetters(boolean value) {
+ super.beansRequireSettersForGetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
- super.ignoreInvocationExceptionsOnSetters(value);
+ public ParserBuilder beansRequireSomeProperties(boolean value) {
+ super.beansRequireSomeProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder sortProperties(boolean value) {
- super.sortProperties(value);
+ public ParserBuilder beanTypePropertyName(String value) {
+ super.beanTypePropertyName(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder notBeanPackages(Object...values) {
- super.notBeanPackages(values);
+ public ParserBuilder debug() {
+ super.debug();
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder notBeanPackages(String...values) {
- super.notBeanPackages(values);
+ public ParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
+ super.ignoreInvocationExceptionsOnGetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder notBeanPackages(boolean append, Object...values) {
- super.notBeanPackages(append, values);
+ public ParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
+ super.ignoreInvocationExceptionsOnSetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder notBeanPackagesRemove(Object...values) {
- super.notBeanPackagesRemove(values);
+ public ParserBuilder ignorePropertiesWithoutSetters(boolean value) {
+ super.ignorePropertiesWithoutSetters(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder notBeanClasses(Object...values) {
- super.notBeanClasses(values);
+ public ParserBuilder ignoreUnknownBeanProperties(boolean value) {
+ super.ignoreUnknownBeanProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder notBeanClasses(Class<?>...values) {
- super.notBeanClasses(values);
+ public ParserBuilder ignoreUnknownNullBeanProperties(boolean value) {
+ super.ignoreUnknownNullBeanProperties(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder notBeanClasses(boolean append, Object...values) {
- super.notBeanClasses(append, values);
+ public <T> ParserBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
+ super.implClass(interfaceClass, implClass);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder notBeanClassesRemove(Object...values) {
- super.notBeanClassesRemove(values);
+ public ParserBuilder implClasses(Map<String,Class<?>> values) {
+ super.implClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanFilters(Object...values) {
- super.beanFilters(values);
+ public ParserBuilder locale(Locale value) {
+ super.locale(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanFilters(Class<?>...values) {
- super.beanFilters(values);
+ public ParserBuilder mediaType(MediaType value) {
+ super.mediaType(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanFilters(boolean append, Object...values) {
- super.beanFilters(append, values);
+ public ParserBuilder methodVisibility(Visibility value) {
+ super.methodVisibility(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanFiltersRemove(Object...values) {
- super.beanFiltersRemove(values);
+ public ParserBuilder notBeanClasses(boolean append, Object...values) {
+ super.notBeanClasses(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder pojoSwaps(Object...values) {
- super.pojoSwaps(values);
+ public ParserBuilder notBeanClasses(Class<?>...values) {
+ super.notBeanClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder pojoSwaps(Class<?>...values) {
- super.pojoSwaps(values);
+ public ParserBuilder notBeanClasses(Object...values) {
+ super.notBeanClasses(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder pojoSwaps(boolean append, Object...values) {
- super.pojoSwaps(append, values);
+ public ParserBuilder notBeanClassesRemove(Object...values) {
+ super.notBeanClassesRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder pojoSwapsRemove(Object...values) {
- super.pojoSwapsRemove(values);
+ public ParserBuilder notBeanPackages(boolean append, Object...values) {
+ super.notBeanPackages(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder implClasses(Map<String,Class<?>> values) {
- super.implClasses(values);
+ public ParserBuilder notBeanPackages(Object...values) {
+ super.notBeanPackages(values);
return this;
}
@Override /* BeanContextBuilder */
- public <T> ParserBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) {
- super.implClass(interfaceClass, implClass);
+ public ParserBuilder notBeanPackages(String...values) {
+ super.notBeanPackages(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanDictionary(Object...values) {
- super.beanDictionary(values);
+ public ParserBuilder notBeanPackagesRemove(Object...values) {
+ super.notBeanPackagesRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanDictionary(Class<?>...values) {
- super.beanDictionary(values);
+ public ParserBuilder pojoSwaps(boolean append, Object...values) {
+ super.pojoSwaps(append, values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanDictionary(boolean append, Object...values) {
- super.beanDictionary(append, values);
+ public ParserBuilder pojoSwaps(Class<?>...values) {
+ super.pojoSwaps(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanDictionaryRemove(Object...values) {
- super.beanDictionaryRemove(values);
+ public ParserBuilder pojoSwaps(Object...values) {
+ super.pojoSwaps(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder beanTypePropertyName(String value) {
- super.beanTypePropertyName(value);
+ public ParserBuilder pojoSwapsRemove(Object...values) {
+ super.pojoSwapsRemove(values);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder locale(Locale value) {
- super.locale(value);
+ public ParserBuilder sortProperties(boolean value) {
+ super.sortProperties(value);
return this;
}
@@ -435,14 +435,14 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public ParserBuilder mediaType(MediaType value) {
- super.mediaType(value);
+ public ParserBuilder useInterfaceProxies(boolean value) {
+ super.useInterfaceProxies(value);
return this;
}
@Override /* BeanContextBuilder */
- public ParserBuilder debug() {
- super.debug();
+ public ParserBuilder useJavaBeanIntrospector(boolean value) {
+ super.useJavaBeanIntrospector(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
index f1a0a43..a7cc59f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
@@ -131,58 +131,58 @@ public class ParserGroupBuilder extends BeanContextBuilder {
//--------------------------------------------------------------------------------
/**
- * Sets the {@link Parser#PARSER_trimStrings} property on all parsers in this group.
+ * Sets the {@link Parser#PARSER_fileCharset} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_trimStrings
+ * @see Parser#PARSER_fileCharset
*/
- public ParserGroupBuilder trimStrings(boolean value) {
- return set(PARSER_trimStrings, value);
+ public ParserGroupBuilder fileCharset(String value) {
+ return set(PARSER_fileCharset, value);
}
/**
- * Sets the {@link Parser#PARSER_strict} property on all parsers in this group.
+ * Sets the {@link Parser#PARSER_inputStreamCharset} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_strict
+ * @see Parser#PARSER_inputStreamCharset
*/
- public ParserGroupBuilder strict(boolean value) {
- return set(PARSER_strict, value);
+ public ParserGroupBuilder inputStreamCharset(String value) {
+ return set(PARSER_inputStreamCharset, value);
}
/**
- * Sets the {@link Parser#PARSER_inputStreamCharset} property on all parsers in this group.
+ * Sets the {@link Parser#PARSER_listener} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_inputStreamCharset
+ * @see Parser#PARSER_listener
*/
- public ParserGroupBuilder inputStreamCharset(String value) {
- return set(PARSER_inputStreamCharset, value);
+ public ParserGroupBuilder listener(Class<? extends ParserListener> value) {
+ return set(PARSER_listener, value);
}
/**
- * Sets the {@link Parser#PARSER_fileCharset} property on all parsers in this group.
+ * Sets the {@link Parser#PARSER_strict} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_fileCharset
+ * @see Parser#PARSER_strict
*/
- public ParserGroupBuilder fileCharset(String value) {
- return set(PARSER_fileCharset, value);
+ public ParserGroupBuilder strict(boolean value) {
+ return set(PARSER_strict, value);
}
/**
- * Sets the {@link Parser#PARSER_listener} property on all parsers in this group.
+ * Sets the {@link Parser#PARSER_trimStrings} property on all parsers in this group.
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see Parser#PARSER_listener
+ * @see Parser#PARSER_trimStrings
*/
- public ParserGroupBuilder listener(Class<? extends ParserListener> value) {
- return set(PARSER_listener, value);
+ public ParserGroupBuilder trimStrings(boolean value) {
+ return set(PARSER_trimStrings, value);
}
@Override /* BeanContextBuilder */
@@ -396,42 +396,6 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public ParserGroupBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public ParserGroupBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public ParserGroupBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public ParserGroupBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public ParserGroupBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public ParserGroupBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public ParserGroupBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
@@ -531,5 +495,5 @@ public class ParserGroupBuilder extends BeanContextBuilder {
public ParserGroupBuilder apply(PropertyStore copyFrom) {
super.apply(copyFrom);
return this;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
index 10f4f62..cad2088 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
@@ -50,38 +50,38 @@ public class PlainTextParserBuilder extends ParserBuilder {
//--------------------------------------------------------------------------------
@Override /* ParserBuilder */
- public PlainTextParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public PlainTextParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public PlainTextParserBuilder strict(boolean value) {
- super.strict(value);
+ public PlainTextParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public PlainTextParserBuilder strict() {
- super.strict();
+ public PlainTextParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public PlainTextParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public PlainTextParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public PlainTextParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public PlainTextParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public PlainTextParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public PlainTextParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
[4/5] juneau git commit: Sort methods in builder classes.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
index 73784e3..a73b80b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
@@ -56,202 +56,162 @@ public class BeanContextBuilder extends ContextBuilder {
// Properties
//--------------------------------------------------------------------------------
- @Override /* ContextBuilder */
- public BeanContextBuilder set(String name, Object value) {
- super.set(name, value);
- return this;
- }
-
- @Override /* ContextBuilder */
- public BeanContextBuilder set(boolean append, String name, Object value) {
- super.set(append, name, value);
- return this;
- }
-
- @Override /* ContextBuilder */
- public BeanContextBuilder set(Map<String,Object> properties) {
- super.set(properties);
- return this;
- }
-
- @Override /* ContextBuilder */
- public BeanContextBuilder add(Map<String,Object> properties) {
- super.add(properties);
- return this;
- }
-
- @Override /* ContextBuilder */
- public BeanContextBuilder addTo(String name, Object value) {
- super.addTo(name, value);
- return this;
- }
-
- @Override /* ContextBuilder */
- public BeanContextBuilder addTo(String name, String key, Object value) {
- super.addTo(name, key, value);
- return this;
- }
-
- @Override /* ContextBuilder */
- public BeanContextBuilder removeFrom(String name, Object value) {
- super.removeFrom(name, value);
- return this;
- }
-
/**
- * Configuration property: Beans require no-arg constructors.
- *
- * <p>
- * If <jk>true</jk>, a Java class must implement a default no-arg constructor to be considered a bean.
- * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
+ * Configuration property: Look for bean classes with the specified minimum visibility.
*
* <p>
- * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>.
+ * Classes are not considered beans unless they meet the minimum visibility requirements.
+ * For example, if the visibility is <code>PUBLIC</code> and the bean class is <jk>protected</jk>, then the class
+ * will not be interpreted as a bean class.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireDefaultConstructor</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanClassVisibility</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beansRequireDefaultConstructor
+ * @see BeanContext#BEAN_beanClassVisibility
*/
- public BeanContextBuilder beansRequireDefaultConstructor(boolean value) {
- return set(BEAN_beansRequireDefaultConstructor, value);
+ public BeanContextBuilder beanClassVisibility(Visibility value) {
+ return set(BEAN_beanClassVisibility, value);
}
/**
- * Configuration property: Beans require {@link Serializable} interface.
- *
- * <p>
- * If <jk>true</jk>, a Java class must implement the {@link Serializable} interface to be considered a bean.
- * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
+ * Configuration property: Look for bean constructors with the specified minimum visibility.
*
* <p>
- * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>.
+ * Constructors not meeting this minimum visibility will be ignored.
+ * For example, if the visibility is <code>PUBLIC</code> and the constructor is <jk>protected</jk>, then the
+ * constructor will be ignored.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSerializable</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanConstructorVisibility</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beansRequireSerializable
+ * @see BeanContext#BEAN_beanConstructorVisibility
*/
- public BeanContextBuilder beansRequireSerializable(boolean value) {
- return set(BEAN_beansRequireSerializable, value);
+ public BeanContextBuilder beanConstructorVisibility(Visibility value) {
+ return set(BEAN_beanConstructorVisibility, value);
}
/**
- * Configuration property: Beans require setters for getters.
- *
- * <p>
- * If <jk>true</jk>, only getters that have equivalent setters will be considered as properties on a bean.
- * Otherwise, they will be ignored.
+ * Configuration property: Bean lookup dictionary.
+ *
+ * <h6 class='figure'>Example:</h6>
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSettersForGetters</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanDictionary</jsf>, values)</code>.
* </ul>
- *
- * @param value The new value for this property.
+ *
+ * @param append
+ * If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
+ * @param values
+ * The new value for this property.
+ * <br>Values can be any of the following types:
+ * <ul>
+ * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.typeName()}.
+ * <li>Any subclass of {@link BeanDictionaryList} containing a collection of bean classes with type name
+ * annotations.
+ * <li>Any subclass of {@link BeanDictionaryMap} containing a mapping of type names to classes without type name
+ * annotations.
+ * <li>Any array or collection of the types above:
+ * </ul>
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beansRequireSettersForGetters
+ * @see BeanContext#BEAN_beanDictionary
*/
- public BeanContextBuilder beansRequireSettersForGetters(boolean value) {
- return set(BEAN_beansRequireSettersForGetters, value);
+ public BeanContextBuilder beanDictionary(boolean append, Object...values) {
+ return set(append, BEAN_beanDictionary, values);
}
/**
- * Configuration property: Beans require at least one property.
- *
- * <p>
- * If <jk>true</jk>, then a Java class must contain at least 1 property to be considered a bean.
- * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
- *
+ * Configuration property: Bean lookup dictionary.
+ *
* <p>
- * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSomeProperties</jsf>, value)</code>.
- * </ul>
+ * Same as calling {@link #beanDictionary(Object...)} but with an array of classes.
*
- * @param value The new value for this property.
+ * @param values The values to add to this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beansRequireSomeProperties
*/
- public BeanContextBuilder beansRequireSomeProperties(boolean value) {
- return set(BEAN_beansRequireSomeProperties, value);
+ public BeanContextBuilder beanDictionary(Class<?>...values) {
+ return addTo(BEAN_beanDictionary, values);
}
/**
- * Configuration property: {@link BeanMap#put(String,Object) BeanMap.put()} method will return old property
- * value.
+ * Configuration property: Bean lookup dictionary.
*
* <p>
- * If <jk>true</jk>, then the {@link BeanMap#put(String,Object) BeanMap.put()} method will return old property
- * values.
- * Otherwise, it returns <jk>null</jk>.
- *
+ * The list of classes that make up the bean dictionary in this bean context.
+ *
* <p>
- * Disabled by default because it introduces a slight performance penalty.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanMapPutReturnsOldValue</jsf>, value)</code>.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see BeanContext#BEAN_beanMapPutReturnsOldValue
- */
- public BeanContextBuilder beanMapPutReturnsOldValue(boolean value) {
- return set(BEAN_beanMapPutReturnsOldValue, value);
- }
-
- /**
- * Configuration property: Look for bean constructors with the specified minimum visibility.
+ * A dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred
+ * through reflection.
+ * <br>The names are defined through the {@link Bean#typeName()} annotation defined on the bean class.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode'>
+ * BeanContext bc = BeanContext.<jsf>create</jsf>().beanDictionary(Bar.<jk>class</jk>, Baz.<jk>class</jk>).build();
+ * </p>
*
* <p>
- * Constructors not meeting this minimum visibility will be ignored.
- * For example, if the visibility is <code>PUBLIC</code> and the constructor is <jk>protected</jk>, then the
- * constructor will be ignored.
- *
* <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanConstructorVisibility</jsf>, value)</code>.
- * </ul>
+ * <ul class='spaced-list'>
+ * <li>Properties:
+ * <ul>
+ * <li>{@link BeanContext#BEAN_beanDictionary}
+ * <li>{@link BeanContext#BEAN_beanDictionary_add}
+ * <li>{@link BeanContext#BEAN_beanDictionary_remove}
+ * </ul>
+ * <li>Annotations:
+ * <ul>
+ * <li>{@link Bean#beanDictionary()}
+ * <li>{@link BeanProperty#beanDictionary()}
+ * </ul>
+ * <li>Methods:
+ * <ul>
+ * <li>{@link BeanContextBuilder#beanDictionary(Object...)}
+ * <li>{@link BeanContextBuilder#beanDictionary(boolean,Object...)}
+ * <li>{@link BeanContextBuilder#beanDictionaryRemove(Object...)}
+ * </ul>
+ * <li>Values can consist of any of the following types:
+ * <ul>
+ * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.typeName()}.
+ * <li>Any subclass of {@link BeanDictionaryList} containing a collection of bean classes with type name
+ * annotations.
+ * <li>Any subclass of {@link BeanDictionaryMap} containing a mapping of type names to classes without type name
+ * annotations.
+ * </ul>
+ * <li>See <a class='doclink' href='../../../overview-summary.html#juneau-marshall.BeanDictionaries'>Bean Names and Dictionaries</a>
+ * for more information.
+ * </ul>
*
- * @param value The new value for this property.
+ * @param values The values to add to this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beanConstructorVisibility
*/
- public BeanContextBuilder beanConstructorVisibility(Visibility value) {
- return set(BEAN_beanConstructorVisibility, value);
+ public BeanContextBuilder beanDictionary(Object...values) {
+ return addTo(BEAN_beanDictionary, values);
}
/**
- * Configuration property: Look for bean classes with the specified minimum visibility.
- *
- * <p>
- * Classes are not considered beans unless they meet the minimum visibility requirements.
- * For example, if the visibility is <code>PUBLIC</code> and the bean class is <jk>protected</jk>, then the class
- * will not be interpreted as a bean class.
+ * Configuration property: Remove from bean dictionary.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanClassVisibility</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_beanDictionary</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_beanDictionary_remove</jsf>, values)</code>.
* </ul>
*
- * @param value The new value for this property.
+ * @param values The values to remove from this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beanClassVisibility
+ * @see BeanContext#BEAN_beanDictionary
+ * @see BeanContext#BEAN_beanDictionary_remove
*/
- public BeanContextBuilder beanClassVisibility(Visibility value) {
- return set(BEAN_beanClassVisibility, value);
+ public BeanContextBuilder beanDictionaryRemove(Object...values) {
+ return removeFrom(BEAN_beanDictionary, values);
}
/**
@@ -277,524 +237,434 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
- * Configuration property: Look for bean methods with the specified minimum visibility.
+ * Configuration property: Bean filters to apply to beans.
*
* <p>
- * Methods are not considered bean getters/setters unless they meet the minimum visibility requirements.
- * For example, if the visibility is <code>PUBLIC</code> and the bean method is <jk>protected</jk>, then the method
- * will not be interpreted as a bean getter or setter.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_methodVisibility</jsf>, value)</code>.
- * <li>Use {@link Visibility#NONE} to prevent bean methods from being interpreted as bean properties altogether.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see BeanContext#BEAN_methodVisibility
- */
- public BeanContextBuilder methodVisibility(Visibility value) {
- return set(BEAN_methodVisibility, value);
- }
-
- /**
- * Configuration property: Use Java {@link Introspector} for determining bean properties.
+ * This is a programmatic equivalent to the {@link Bean @Bean} annotation.
+ * It's useful when you want to use the Bean annotation functionality, but you don't have the ability to alter the
+ * bean classes.
*
* <p>
- * Using the built-in Java bean introspector will not pick up fields or non-standard getters/setters.
- *
- * <h5 class 'section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_useJavaBeanIntrospector</jsf>, value)</code>.
- * <li>Most {@link Bean @Bean} annotations will be ignored if you enable this setting.
+ * There are two category of classes that can be passed in through this method:
+ * <ul class='spaced-list'>
+ * <li>
+ * Subclasses of {@link BeanFilterBuilder}.
+ * These must have a public no-arg constructor.
+ * <li>
+ * Bean interface classes.
+ * A shortcut for defining a {@link InterfaceBeanFilterBuilder}.
+ * Any subclasses of an interface class will only have properties defined on the interface.
+ * All other bean properties will be ignored.
* </ul>
*
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see BeanContext#BEAN_useJavaBeanIntrospector
- */
- public BeanContextBuilder useJavaBeanIntrospector(boolean value) {
- return set(BEAN_useJavaBeanIntrospector, value);
- }
-
- /**
- * Configuration property: Use interface proxies.
- *
- * <p>
- * If <jk>true</jk>, then interfaces will be instantiated as proxy classes through the use of an
- * {@link InvocationHandler} if there is no other way of instantiating them.
- *
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_useInterfaceProxies</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanFilters</jsf>, values)</code>.
* </ul>
- *
- * @param value The new value for this property.
+ *
+ * @param append
+ * If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
+ * @param values The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_useInterfaceProxies
+ * @see BeanContext#BEAN_beanFilters
*/
- public BeanContextBuilder useInterfaceProxies(boolean value) {
- return set(BEAN_useInterfaceProxies, value);
+ public BeanContextBuilder beanFilters(boolean append, Object...values) {
+ return set(append, BEAN_beanFilters, values);
}
/**
- * Configuration property: Ignore unknown properties.
- *
+ * Configuration property: Add to bean filters.
+ *
* <p>
- * If <jk>true</jk>, trying to set a value on a non-existent bean property will silently be ignored.
- * Otherwise, a {@code BeanRuntimeException} is thrown.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreUnknownBeanProperties</jsf>, value)</code>.
- * </ul>
+ * Same as {@link #beanFilters(Object...)} but takes in an array of classes.
*
- * @param value The new value for this property.
+ * @param values The values to add to this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_ignoreUnknownBeanProperties
*/
- public BeanContextBuilder ignoreUnknownBeanProperties(boolean value) {
- return set(BEAN_ignoreUnknownBeanProperties, value);
+ public BeanContextBuilder beanFilters(Class<?>...values) {
+ return addTo(BEAN_beanFilters, values);
}
/**
- * Configuration property: Ignore unknown properties with null values.
- *
- * <p>
- * If <jk>true</jk>, trying to set a <jk>null</jk> value on a non-existent bean property will silently be ignored.
- * Otherwise, a {@code BeanRuntimeException} is thrown.
+ * Configuration property: Add to bean filters.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreUnknownNullBeanProperties</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_beanFilters</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_beanFilters_add</jsf>, values)</code>.
* </ul>
*
- * @param value The new value for this property.
+ * @param values The values to add to this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_ignoreUnknownNullBeanProperties
+ * @see BeanContext#BEAN_beanFilters
+ * @see BeanContext#BEAN_beanFilters_add
*/
- public BeanContextBuilder ignoreUnknownNullBeanProperties(boolean value) {
- return set(BEAN_ignoreUnknownNullBeanProperties, value);
+ public BeanContextBuilder beanFilters(Object...values) {
+ return addTo(BEAN_beanFilters, values);
}
/**
- * Configuration property: Ignore properties without setters.
- *
- * <p>
- * If <jk>true</jk>, trying to set a value on a bean property without a setter will silently be ignored.
- * Otherwise, a {@code BeanRuntimeException} is thrown.
+ * Configuration property: Remove from bean filters.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignorePropertiesWithoutSetters</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_beanFilters</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_beanFilters_remove</jsf>, values)</code>.
* </ul>
*
- * @param value The new value for this property.
+ * @param values The values to remove from this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_ignorePropertiesWithoutSetters
+ * @see BeanContext#BEAN_beanFilters
+ * @see BeanContext#BEAN_beanFilters_remove
*/
- public BeanContextBuilder ignorePropertiesWithoutSetters(boolean value) {
- return set(BEAN_ignorePropertiesWithoutSetters, value);
+ public BeanContextBuilder beanFiltersRemove(Object...values) {
+ return removeFrom(BEAN_beanFilters, values);
}
/**
- * Configuration property: Ignore invocation errors on getters.
+ * Configuration property: {@link BeanMap#put(String,Object) BeanMap.put()} method will return old property
+ * value.
*
* <p>
- * If <jk>true</jk>, errors thrown when calling bean getter methods will silently be ignored.
- * Otherwise, a {@code BeanRuntimeException} is thrown.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreInvocationExceptionsOnGetters</jsf>, value)</code>.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see BeanContext#BEAN_ignoreInvocationExceptionsOnGetters
- */
- public BeanContextBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
- return set(BEAN_ignoreInvocationExceptionsOnGetters, value);
- }
-
- /**
- * Configuration property: Ignore invocation errors on setters.
+ * If <jk>true</jk>, then the {@link BeanMap#put(String,Object) BeanMap.put()} method will return old property
+ * values.
+ * Otherwise, it returns <jk>null</jk>.
*
* <p>
- * If <jk>true</jk>, errors thrown when calling bean setter methods will silently be ignored.
- * Otherwise, a {@code BeanRuntimeException} is thrown.
+ * Disabled by default because it introduces a slight performance penalty.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreInvocationExceptionsOnSetters</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanMapPutReturnsOldValue</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_ignoreInvocationExceptionsOnSetters
+ * @see BeanContext#BEAN_beanMapPutReturnsOldValue
*/
- public BeanContextBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
- return set(BEAN_ignoreInvocationExceptionsOnSetters, value);
+ public BeanContextBuilder beanMapPutReturnsOldValue(boolean value) {
+ return set(BEAN_beanMapPutReturnsOldValue, value);
}
/**
- * Configuration property: Sort bean properties in alphabetical order.
+ * Configuration property: Beans require no-arg constructors.
*
* <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.
- * On IBM JVMs, the bean properties are ordered based on their ordering in the Java file.
- * On Oracle JVMs, the bean properties are not ordered (which follows the official JVM specs).
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>
- * This is equivalent to calling <code>property(<jsf>BEAN_sortProperties</jsf>, value)</code>.
- * <li>
- * This property is disabled by default so that IBM JVM users don't have to use {@link Bean @Bean} annotations
- * to force bean properties to be in a particular order and can just alter the order of the fields/methods
- * in the Java file.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see BeanContext#BEAN_sortProperties
- */
- public BeanContextBuilder sortProperties(boolean value) {
- return set(BEAN_sortProperties, value);
- }
-
- /**
- * Configuration property: Add to packages whose classes should not be considered beans.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanPackages</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_notBeanPackages_add</jsf>, s)</code>.
- * </ul>
+ * If <jk>true</jk>, a Java class must implement a default no-arg constructor to be considered a bean.
+ * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
*
- * @param values The values to add to this property.
- * @return This object (for method chaining).
- * @see BeanContext#BEAN_notBeanPackages_add
- */
- public BeanContextBuilder notBeanPackages(Object...values) {
- return addTo(BEAN_notBeanPackages, values);
- }
-
- /**
- * Configuration property: Add to packages whose classes should not be considered beans.
+ * <p>
+ * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanPackages</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_notBeanPackages_add</jsf>, s)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireDefaultConstructor</jsf>, value)</code>.
* </ul>
*
- * @param values The values to add to this property.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_notBeanPackages_add
+ * @see BeanContext#BEAN_beansRequireDefaultConstructor
*/
- public BeanContextBuilder notBeanPackages(String...values) {
- return addTo(BEAN_notBeanPackages, values);
+ public BeanContextBuilder beansRequireDefaultConstructor(boolean value) {
+ return set(BEAN_beansRequireDefaultConstructor, value);
}
/**
- * Configuration property: Packages whose classes should not be considered beans.
- *
- * <p>
- * When specified, the current list of ignore packages are appended to.
+ * Configuration property: Beans require {@link Serializable} interface.
*
* <p>
- * Any classes within these packages will be serialized to strings using {@link Object#toString()}.
+ * If <jk>true</jk>, a Java class must implement the {@link Serializable} interface to be considered a bean.
+ * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
*
* <p>
- * Note that you can specify prefix patterns to include all subpackages.
+ * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_notBeanPackages</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSerializable</jsf>, value)</code>.
* </ul>
- *
- * @param append
- * If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
- * @param values The new value for this property.
+ *
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_notBeanPackages
+ * @see BeanContext#BEAN_beansRequireSerializable
*/
- public BeanContextBuilder notBeanPackages(boolean append, Object...values) {
- return set(append, BEAN_notBeanPackages, values);
+ public BeanContextBuilder beansRequireSerializable(boolean value) {
+ return set(BEAN_beansRequireSerializable, value);
}
/**
- * Configuration property: Remove from packages whose classes should not be considered beans.
+ * Configuration property: Beans require setters for getters.
+ *
+ * <p>
+ * If <jk>true</jk>, only getters that have equivalent setters will be considered as properties on a bean.
+ * Otherwise, they will be ignored.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_notBeanPackages</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_notBeanPackages_remove</jsf>, s)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSettersForGetters</jsf>, value)</code>.
* </ul>
*
- * @param values The values to remove from this property.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_notBeanPackages
- * @see BeanContext#BEAN_notBeanPackages_remove
+ * @see BeanContext#BEAN_beansRequireSettersForGetters
*/
- public BeanContextBuilder notBeanPackagesRemove(Object...values) {
- return removeFrom(BEAN_notBeanPackages, values);
+ public BeanContextBuilder beansRequireSettersForGetters(boolean value) {
+ return set(BEAN_beansRequireSettersForGetters, value);
}
/**
- * Configuration property: Add to classes that should not be considered beans.
+ * Configuration property: Beans require at least one property.
+ *
+ * <p>
+ * If <jk>true</jk>, then a Java class must contain at least 1 property to be considered a bean.
+ * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
+ *
+ * <p>
+ * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanClasses</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_notBeanClasses_add</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSomeProperties</jsf>, value)</code>.
* </ul>
*
- * @param values The values to add to this property.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_notBeanClasses
- * @see BeanContext#BEAN_notBeanClasses_add
+ * @see BeanContext#BEAN_beansRequireSomeProperties
*/
- public BeanContextBuilder notBeanClasses(Object...values) {
- return addTo(BEAN_notBeanClasses, values);
+ public BeanContextBuilder beansRequireSomeProperties(boolean value) {
+ return set(BEAN_beansRequireSomeProperties, value);
}
/**
- * Configuration property: Add to classes that should not be considered beans.
+ * Configuration property: Name to use for the bean type properties used to represent a bean type.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanClasses</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_notBeanClasses_add</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanTypePropertyName</jsf>, value)</code>.
* </ul>
*
- * @param values The values to add to this property.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_notBeanClasses
- * @see BeanContext#BEAN_notBeanClasses_add
+ * @see BeanContext#BEAN_beanTypePropertyName
*/
- public BeanContextBuilder notBeanClasses(Class<?>...values) {
- return addTo(BEAN_notBeanClasses, values);
+ public BeanContextBuilder beanTypePropertyName(String value) {
+ return set(BEAN_beanTypePropertyName, value);
}
/**
- * Configuration property: Classes to be excluded from consideration as being beans.
+ * Configuration property: Debug mode.
*
* <p>
- * Not-bean classes are typically converted to <code>Strings</code> during serialization even if they appear to be
- * bean-like.
+ * Enables the following additional information during serialization:
+ * <ul class='spaced-list'>
+ * <li>
+ * When bean getters throws exceptions, the exception includes the object stack information
+ * in order to determine how that method was invoked.
+ * <li>
+ * Enables {@link Serializer#SERIALIZER_detectRecursions}.
+ * </ul>
+ *
+ * <p>
+ * Enables the following additional information during parsing:
+ * <ul class='spaced-list'>
+ * <li>
+ * When bean setters throws exceptions, the exception includes the object stack information
+ * in order to determine how that method was invoked.
+ * </ul>
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_notBeanClasses</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_debug</jsf>, value)</code>.
* </ul>
- *
- * @param append
- * If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
- * @param values The new value for this property.
+ *
* @return This object (for method chaining).
- * @see BeanContext#BEAN_notBeanClasses
+ * @see BeanContext#BEAN_debug
*/
- public BeanContextBuilder notBeanClasses(boolean append, Object...values) {
- return set(append, BEAN_notBeanClasses, values);
+ public BeanContextBuilder debug() {
+ return set(BEAN_debug, true);
}
/**
- * Configuration property: Remove from classes that should not be considered beans.
+ * Configuration property: Exclude specified properties from beans.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_notBeanClasses</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_notBeanClasses_remove</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_excludeProperties</jsf>, beanClass.getName(), properties)</code>
+ * or <code>property(<jsf>BEAN_excludeProperties_put</jsf>, beanClass.getName(), properties)</code>.
* </ul>
*
- * @param values The values to remove from this property.
+ * @param beanClass The bean class.
+ * @param properties Comma-delimited list of property names.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_notBeanClasses
- * @see BeanContext#BEAN_notBeanClasses_remove
+ * @see BeanContext#BEAN_excludeProperties
*/
- public BeanContextBuilder notBeanClassesRemove(Object...values) {
- return removeFrom(BEAN_notBeanClasses, values);
+ public BeanContextBuilder excludeProperties(Class<?> beanClass, String properties) {
+ return addTo(BEAN_excludeProperties, beanClass.getName(), properties);
}
/**
- * Configuration property: Bean filters to apply to beans.
+ * Configuration property: Exclude specified properties from beans.
*
* <p>
- * This is a programmatic equivalent to the {@link Bean @Bean} annotation.
- * It's useful when you want to use the Bean annotation functionality, but you don't have the ability to alter the
- * bean classes.
+ * Specifies to exclude the specified list of properties for the specified bean classes.
*
* <p>
- * There are two category of classes that can be passed in through this method:
- * <ul class='spaced-list'>
- * <li>
- * Subclasses of {@link BeanFilterBuilder}.
- * These must have a public no-arg constructor.
- * <li>
- * Bean interface classes.
- * A shortcut for defining a {@link InterfaceBeanFilterBuilder}.
- * Any subclasses of an interface class will only have properties defined on the interface.
- * All other bean properties will be ignored.
- * </ul>
+ * The keys are either fully-qualified or simple class names, and the values are comma-delimited lists of property
+ * names.
+ * The key <js>"*"</js> means all bean classes.
+ *
+ * <p>
+ * For example, <code>{Bean1:<js>"foo,bar"</js>}</code> means don't serialize the <code>foo</code> and <code>bar</code>
+ * properties on the specified bean.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanFilters</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_excludeProperties</jsf>, values)</code>.
* </ul>
- *
- * @param append
- * If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
+ *
* @param values The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beanFilters
+ * @see BeanContext#BEAN_excludeProperties
*/
- public BeanContextBuilder beanFilters(boolean append, Object...values) {
- return set(append, BEAN_beanFilters, values);
+ public BeanContextBuilder excludeProperties(Map<String,String> values) {
+ return set(BEAN_excludeProperties, values);
}
/**
- * Configuration property: Add to bean filters.
+ * Configuration property: Exclude specified properties from beans.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_beanFilters</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_beanFilters_add</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_excludeProperties</jsf>, beanClassName, properties)</code>
+ * or <code>property(<jsf>BEAN_excludeProperties_put</jsf>, beanClassName, properties)</code>.
* </ul>
*
- * @param values The values to add to this property.
+ * @param beanClassName The bean class name. Can be a simple name, fully-qualified name, or <js>"*"</js>.
+ * @param properties Comma-delimited list of property names.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beanFilters
- * @see BeanContext#BEAN_beanFilters_add
+ * @see BeanContext#BEAN_excludeProperties
*/
- public BeanContextBuilder beanFilters(Object...values) {
- return addTo(BEAN_beanFilters, values);
+ public BeanContextBuilder excludeProperties(String beanClassName, String properties) {
+ return addTo(BEAN_excludeProperties, beanClassName, properties);
}
/**
- * Configuration property: Add to bean filters.
- *
- * <p>
- * Same as {@link #beanFilters(Object...)} but takes in an array of classes.
+ * Configuration property: Ignore invocation errors on getters.
*
- * @param values The values to add to this property.
- * @return This object (for method chaining).
- */
- public BeanContextBuilder beanFilters(Class<?>...values) {
- return addTo(BEAN_beanFilters, values);
- }
-
- /**
- * Configuration property: Remove from bean filters.
+ * <p>
+ * If <jk>true</jk>, errors thrown when calling bean getter methods will silently be ignored.
+ * Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_beanFilters</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_beanFilters_remove</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreInvocationExceptionsOnGetters</jsf>, value)</code>.
* </ul>
*
- * @param values The values to remove from this property.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beanFilters
- * @see BeanContext#BEAN_beanFilters_remove
+ * @see BeanContext#BEAN_ignoreInvocationExceptionsOnGetters
*/
- public BeanContextBuilder beanFiltersRemove(Object...values) {
- return removeFrom(BEAN_beanFilters, values);
+ public BeanContextBuilder ignoreInvocationExceptionsOnGetters(boolean value) {
+ return set(BEAN_ignoreInvocationExceptionsOnGetters, value);
}
/**
- * Configuration property: Add to POJO swaps.
+ * Configuration property: Ignore invocation errors on setters.
+ *
+ * <p>
+ * If <jk>true</jk>, errors thrown when calling bean setter methods will silently be ignored.
+ * Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_pojoSwaps</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_pojoSwaps_add</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreInvocationExceptionsOnSetters</jsf>, value)</code>.
* </ul>
*
- * @param values The values to add to this property.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_pojoSwaps
- * @see BeanContext#BEAN_pojoSwaps_add
+ * @see BeanContext#BEAN_ignoreInvocationExceptionsOnSetters
*/
- public BeanContextBuilder pojoSwaps(Object...values) {
- return addTo(BEAN_pojoSwaps, values);
+ public BeanContextBuilder ignoreInvocationExceptionsOnSetters(boolean value) {
+ return set(BEAN_ignoreInvocationExceptionsOnSetters, value);
}
/**
- * Configuration property: Add to POJO swaps.
+ * Configuration property: Ignore properties without setters.
+ *
+ * <p>
+ * If <jk>true</jk>, trying to set a value on a bean property without a setter will silently be ignored.
+ * Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_pojoSwaps</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_pojoSwaps_add</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignorePropertiesWithoutSetters</jsf>, value)</code>.
* </ul>
*
- * @param values The values to add to this property.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_pojoSwaps
- * @see BeanContext#BEAN_pojoSwaps_add
+ * @see BeanContext#BEAN_ignorePropertiesWithoutSetters
*/
- public BeanContextBuilder pojoSwaps(Class<?>...values) {
- return addTo(BEAN_pojoSwaps, values);
+ public BeanContextBuilder ignorePropertiesWithoutSetters(boolean value) {
+ return set(BEAN_ignorePropertiesWithoutSetters, value);
}
/**
- * Configuration property: POJO swaps to apply to Java objects.
+ * Configuration property: Ignore unknown properties.
*
* <p>
- * There are two category of classes that can be passed in through this method:
- * <ul>
- * <li>Subclasses of {@link PojoSwap}.
- * <li>Implementations of {@link Surrogate}.
- * </ul>
+ * If <jk>true</jk>, trying to set a value on a non-existent bean property will silently be ignored.
+ * Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_pojoSwaps</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreUnknownBeanProperties</jsf>, value)</code>.
* </ul>
- *
- * @param append
- * If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
- * @param values The new value for this property.
+ *
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_pojoSwaps
+ * @see BeanContext#BEAN_ignoreUnknownBeanProperties
*/
- public BeanContextBuilder pojoSwaps(boolean append, Object...values) {
- return set(append, BEAN_pojoSwaps, values);
+ public BeanContextBuilder ignoreUnknownBeanProperties(boolean value) {
+ return set(BEAN_ignoreUnknownBeanProperties, value);
}
/**
- * Configuration property: Remove from POJO swaps.
+ * Configuration property: Ignore unknown properties with null values.
+ *
+ * <p>
+ * If <jk>true</jk>, trying to set a <jk>null</jk> value on a non-existent bean property will silently be ignored.
+ * Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_pojoSwaps</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_pojoSwaps_remove</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreUnknownNullBeanProperties</jsf>, value)</code>.
* </ul>
*
- * @param values The values to remove from this property.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_pojoSwaps
- * @see BeanContext#BEAN_pojoSwaps_remove
+ * @see BeanContext#BEAN_ignoreUnknownNullBeanProperties
*/
- public BeanContextBuilder pojoSwapsRemove(Object...values) {
- return removeFrom(BEAN_pojoSwaps, values);
+ public BeanContextBuilder ignoreUnknownNullBeanProperties(boolean value) {
+ return set(BEAN_ignoreUnknownNullBeanProperties, value);
}
/**
- * Configuration property: Bean property namer
+ * Configuration property: Implementation classes for interfaces and abstract classes.
*
- * <p>
- * The class to use for calculating bean property names.
- *
- * @param value The new value for this setting.
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_implClasses</jsf>, interfaceClass, implClass)</code>
+ * or <code>property(<jsf>BEAN_implClasses_put</jsf>, interfaceClass, implClass)</code>.
+ * </ul>
+ *
+ * @param interfaceClass The interface class.
+ * @param implClass The implementation class.
+ * @param <I> The class type of the interface.
* @return This object (for method chaining).
+ * @see BeanContext#BEAN_implClasses
*/
- public BeanContextBuilder propertyNamer(Class<? extends PropertyNamer> value) {
- return set(BEAN_propertyNamer, value);
+ public <I> BeanContextBuilder implClass(Class<I> interfaceClass, Class<? extends I> implClass) {
+ return addTo(BEAN_implClasses, interfaceClass.getName(), implClass);
}
/**
@@ -819,22 +689,21 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
- * Configuration property: Implementation classes for interfaces and abstract classes.
+ * Configuration property: Explicitly specify visible bean properties.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_implClasses</jsf>, interfaceClass, implClass)</code>
- * or <code>property(<jsf>BEAN_implClasses_put</jsf>, interfaceClass, implClass)</code>.
+ * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_includeProperties</jsf>, beanClass.getName(), properties)</code>
+ * or <code>property(<jsf>BEAN_includeProperties_put</jsf>, beanClass.getName(), properties)</code>.
* </ul>
*
- * @param interfaceClass The interface class.
- * @param implClass The implementation class.
- * @param <I> The class type of the interface.
+ * @param beanClass The bean class.
+ * @param properties Comma-delimited list of property names.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_implClasses
+ * @see BeanContext#BEAN_includeProperties
*/
- public <I> BeanContextBuilder implClass(Class<I> interfaceClass, Class<? extends I> implClass) {
- return addTo(BEAN_implClasses, interfaceClass.getName(), implClass);
+ public BeanContextBuilder includeProperties(Class<?> beanClass, String properties) {
+ return addTo(BEAN_includeProperties, beanClass.getName(), properties);
}
/**
@@ -884,233 +753,334 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
- * Configuration property: Explicitly specify visible bean properties.
+ * Configuration property: Locale.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_includeProperties</jsf>, beanClass.getName(), properties)</code>
- * or <code>property(<jsf>BEAN_includeProperties_put</jsf>, beanClass.getName(), properties)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_locale</jsf>, value)</code>.
* </ul>
*
- * @param beanClass The bean class.
- * @param properties Comma-delimited list of property names.
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_includeProperties
+ * @see BeanContext#BEAN_locale
*/
- public BeanContextBuilder includeProperties(Class<?> beanClass, String properties) {
- return addTo(BEAN_includeProperties, beanClass.getName(), properties);
+ public BeanContextBuilder locale(Locale value) {
+ return set(BEAN_locale, value);
}
/**
- * Configuration property: Exclude specified properties from beans.
+ * Configuration property: Media type.
*
* <p>
- * Specifies to exclude the specified list of properties for the specified bean classes.
+ * Specifies a default media type value for serializer and parser sessions.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_mediaType</jsf>, value)</code>.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see BeanContext#BEAN_mediaType
+ */
+ public BeanContextBuilder mediaType(MediaType value) {
+ return set(BEAN_mediaType, value);
+ }
+
+ /**
+ * Configuration property: Look for bean methods with the specified minimum visibility.
*
* <p>
- * The keys are either fully-qualified or simple class names, and the values are comma-delimited lists of property
- * names.
- * The key <js>"*"</js> means all bean classes.
+ * Methods are not considered bean getters/setters unless they meet the minimum visibility requirements.
+ * For example, if the visibility is <code>PUBLIC</code> and the bean method is <jk>protected</jk>, then the method
+ * will not be interpreted as a bean getter or setter.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_methodVisibility</jsf>, value)</code>.
+ * <li>Use {@link Visibility#NONE} to prevent bean methods from being interpreted as bean properties altogether.
+ * </ul>
+ *
+ * @param value The new value for this property.
+ * @return This object (for method chaining).
+ * @see BeanContext#BEAN_methodVisibility
+ */
+ public BeanContextBuilder methodVisibility(Visibility value) {
+ return set(BEAN_methodVisibility, value);
+ }
+
+ /**
+ * Configuration property: Classes to be excluded from consideration as being beans.
*
* <p>
- * For example, <code>{Bean1:<js>"foo,bar"</js>}</code> means don't serialize the <code>foo</code> and <code>bar</code>
- * properties on the specified bean.
+ * Not-bean classes are typically converted to <code>Strings</code> during serialization even if they appear to be
+ * bean-like.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_excludeProperties</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_notBeanClasses</jsf>, values)</code>.
+ * </ul>
+ *
+ * @param append
+ * If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
+ * @param values The new value for this property.
+ * @return This object (for method chaining).
+ * @see BeanContext#BEAN_notBeanClasses
+ */
+ public BeanContextBuilder notBeanClasses(boolean append, Object...values) {
+ return set(append, BEAN_notBeanClasses, values);
+ }
+
+ /**
+ * Configuration property: Add to classes that should not be considered beans.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanClasses</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_notBeanClasses_add</jsf>, values)</code>.
+ * </ul>
+ *
+ * @param values The values to add to this property.
+ * @return This object (for method chaining).
+ * @see BeanContext#BEAN_notBeanClasses
+ * @see BeanContext#BEAN_notBeanClasses_add
+ */
+ public BeanContextBuilder notBeanClasses(Class<?>...values) {
+ return addTo(BEAN_notBeanClasses, values);
+ }
+
+ /**
+ * Configuration property: Add to classes that should not be considered beans.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanClasses</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_notBeanClasses_add</jsf>, values)</code>.
+ * </ul>
+ *
+ * @param values The values to add to this property.
+ * @return This object (for method chaining).
+ * @see BeanContext#BEAN_notBeanClasses
+ * @see BeanContext#BEAN_notBeanClasses_add
+ */
+ public BeanContextBuilder notBeanClasses(Object...values) {
+ return addTo(BEAN_notBeanClasses, values);
+ }
+
+ /**
+ * Configuration property: Remove from classes that should not be considered beans.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_notBeanClasses</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_notBeanClasses_remove</jsf>, values)</code>.
* </ul>
*
+ * @param values The values to remove from this property.
+ * @return This object (for method chaining).
+ * @see BeanContext#BEAN_notBeanClasses
+ * @see BeanContext#BEAN_notBeanClasses_remove
+ */
+ public BeanContextBuilder notBeanClassesRemove(Object...values) {
+ return removeFrom(BEAN_notBeanClasses, values);
+ }
+
+ /**
+ * Configuration property: Packages whose classes should not be considered beans.
+ *
+ * <p>
+ * When specified, the current list of ignore packages are appended to.
+ *
+ * <p>
+ * Any classes within these packages will be serialized to strings using {@link Object#toString()}.
+ *
+ * <p>
+ * Note that you can specify prefix patterns to include all subpackages.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_notBeanPackages</jsf>, values)</code>.
+ * </ul>
+ *
+ * @param append
+ * If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
* @param values The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_excludeProperties
+ * @see BeanContext#BEAN_notBeanPackages
*/
- public BeanContextBuilder excludeProperties(Map<String,String> values) {
- return set(BEAN_excludeProperties, values);
+ public BeanContextBuilder notBeanPackages(boolean append, Object...values) {
+ return set(append, BEAN_notBeanPackages, values);
}
/**
- * Configuration property: Exclude specified properties from beans.
+ * Configuration property: Add to packages whose classes should not be considered beans.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_excludeProperties</jsf>, beanClassName, properties)</code>
- * or <code>property(<jsf>BEAN_excludeProperties_put</jsf>, beanClassName, properties)</code>.
+ * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanPackages</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_notBeanPackages_add</jsf>, s)</code>.
* </ul>
*
- * @param beanClassName The bean class name. Can be a simple name, fully-qualified name, or <js>"*"</js>.
- * @param properties Comma-delimited list of property names.
+ * @param values The values to add to this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_excludeProperties
+ * @see BeanContext#BEAN_notBeanPackages_add
*/
- public BeanContextBuilder excludeProperties(String beanClassName, String properties) {
- return addTo(BEAN_excludeProperties, beanClassName, properties);
+ public BeanContextBuilder notBeanPackages(Object...values) {
+ return addTo(BEAN_notBeanPackages, values);
}
/**
- * Configuration property: Exclude specified properties from beans.
+ * Configuration property: Add to packages whose classes should not be considered beans.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_excludeProperties</jsf>, beanClass.getName(), properties)</code>
- * or <code>property(<jsf>BEAN_excludeProperties_put</jsf>, beanClass.getName(), properties)</code>.
+ * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanPackages</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_notBeanPackages_add</jsf>, s)</code>.
+ * </ul>
+ *
+ * @param values The values to add to this property.
+ * @return This object (for method chaining).
+ * @see BeanContext#BEAN_notBeanPackages_add
+ */
+ public BeanContextBuilder notBeanPackages(String...values) {
+ return addTo(BEAN_notBeanPackages, values);
+ }
+
+ /**
+ * Configuration property: Remove from packages whose classes should not be considered beans.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_notBeanPackages</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_notBeanPackages_remove</jsf>, s)</code>.
* </ul>
*
- * @param beanClass The bean class.
- * @param properties Comma-delimited list of property names.
+ * @param values The values to remove from this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_excludeProperties
+ * @see BeanContext#BEAN_notBeanPackages
+ * @see BeanContext#BEAN_notBeanPackages_remove
*/
- public BeanContextBuilder excludeProperties(Class<?> beanClass, String properties) {
- return addTo(BEAN_excludeProperties, beanClass.getName(), properties);
+ public BeanContextBuilder notBeanPackagesRemove(Object...values) {
+ return removeFrom(BEAN_notBeanPackages, values);
}
/**
- * Configuration property: Bean lookup dictionary.
- *
- * <h6 class='figure'>Example:</h6>
+ * Configuration property: POJO swaps to apply to Java objects.
+ *
+ * <p>
+ * There are two category of classes that can be passed in through this method:
+ * <ul>
+ * <li>Subclasses of {@link PojoSwap}.
+ * <li>Implementations of {@link Surrogate}.
+ * </ul>
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanDictionary</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_pojoSwaps</jsf>, values)</code>.
* </ul>
*
* @param append
* If <jk>true</jk>, the previous value is appended to. Otherwise, the previous value is replaced.
- * @param values
- * The new value for this property.
- * <br>Values can be any of the following types:
- * <ul>
- * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.typeName()}.
- * <li>Any subclass of {@link BeanDictionaryList} containing a collection of bean classes with type name
- * annotations.
- * <li>Any subclass of {@link BeanDictionaryMap} containing a mapping of type names to classes without type name
- * annotations.
- * <li>Any array or collection of the types above:
- * </ul>
+ * @param values The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beanDictionary
+ * @see BeanContext#BEAN_pojoSwaps
*/
- public BeanContextBuilder beanDictionary(boolean append, Object...values) {
- return set(append, BEAN_beanDictionary, values);
+ public BeanContextBuilder pojoSwaps(boolean append, Object...values) {
+ return set(append, BEAN_pojoSwaps, values);
}
/**
- * Configuration property: Bean lookup dictionary.
- *
- * <p>
- * The list of classes that make up the bean dictionary in this bean context.
- *
- * <p>
- * A dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred
- * through reflection.
- * <br>The names are defined through the {@link Bean#typeName()} annotation defined on the bean class.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode'>
- * BeanContext bc = BeanContext.<jsf>create</jsf>().beanDictionary(Bar.<jk>class</jk>, Baz.<jk>class</jk>).build();
- * </p>
+ * Configuration property: Add to POJO swaps.
*
- * <p>
* <h5 class='section'>Notes:</h5>
- * <ul class='spaced-list'>
- * <li>Properties:
- * <ul>
- * <li>{@link BeanContext#BEAN_beanDictionary}
- * <li>{@link BeanContext#BEAN_beanDictionary_add}
- * <li>{@link BeanContext#BEAN_beanDictionary_remove}
- * </ul>
- * <li>Annotations:
- * <ul>
- * <li>{@link Bean#beanDictionary()}
- * <li>{@link BeanProperty#beanDictionary()}
- * </ul>
- * <li>Methods:
- * <ul>
- * <li>{@link BeanContextBuilder#beanDictionary(Object...)}
- * <li>{@link BeanContextBuilder#beanDictionary(boolean,Object...)}
- * <li>{@link BeanContextBuilder#beanDictionaryRemove(Object...)}
- * </ul>
- * <li>Values can consist of any of the following types:
- * <ul>
- * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.typeName()}.
- * <li>Any subclass of {@link BeanDictionaryList} containing a collection of bean classes with type name
- * annotations.
- * <li>Any subclass of {@link BeanDictionaryMap} containing a mapping of type names to classes without type name
- * annotations.
- * </ul>
- * <li>See <a class='doclink' href='../../../overview-summary.html#juneau-marshall.BeanDictionaries'>Bean Names and Dictionaries</a>
- * for more information.
- * </ul>
+ * <ul>
+ * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_pojoSwaps</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_pojoSwaps_add</jsf>, values)</code>.
+ * </ul>
*
* @param values The values to add to this property.
* @return This object (for method chaining).
+ * @see BeanContext#BEAN_pojoSwaps
+ * @see BeanContext#BEAN_pojoSwaps_add
*/
- public BeanContextBuilder beanDictionary(Object...values) {
- return addTo(BEAN_beanDictionary, values);
+ public BeanContextBuilder pojoSwaps(Class<?>...values) {
+ return addTo(BEAN_pojoSwaps, values);
}
/**
- * Configuration property: Bean lookup dictionary.
- *
- * <p>
- * Same as calling {@link #beanDictionary(Object...)} but with an array of classes.
+ * Configuration property: Add to POJO swaps.
+ *
+ * <h5 class='section'>Notes:</h5>
+ * <ul>
+ * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_pojoSwaps</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_pojoSwaps_add</jsf>, values)</code>.
+ * </ul>
*
* @param values The values to add to this property.
* @return This object (for method chaining).
+ * @see BeanContext#BEAN_pojoSwaps
+ * @see BeanContext#BEAN_pojoSwaps_add
*/
- public BeanContextBuilder beanDictionary(Class<?>...values) {
- return addTo(BEAN_beanDictionary, values);
+ public BeanContextBuilder pojoSwaps(Object...values) {
+ return addTo(BEAN_pojoSwaps, values);
}
/**
- * Configuration property: Remove from bean dictionary.
+ * Configuration property: Remove from POJO swaps.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_beanDictionary</jsf>, values)</code>
- * or <code>property(<jsf>BEAN_beanDictionary_remove</jsf>, values)</code>.
+ * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_pojoSwaps</jsf>, values)</code>
+ * or <code>property(<jsf>BEAN_pojoSwaps_remove</jsf>, values)</code>.
* </ul>
*
* @param values The values to remove from this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beanDictionary
- * @see BeanContext#BEAN_beanDictionary_remove
+ * @see BeanContext#BEAN_pojoSwaps
+ * @see BeanContext#BEAN_pojoSwaps_remove
*/
- public BeanContextBuilder beanDictionaryRemove(Object...values) {
- return removeFrom(BEAN_beanDictionary, values);
+ public BeanContextBuilder pojoSwapsRemove(Object...values) {
+ return removeFrom(BEAN_pojoSwaps, values);
}
/**
- * Configuration property: Name to use for the bean type properties used to represent a bean type.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanTypePropertyName</jsf>, value)</code>.
- * </ul>
+ * Configuration property: Bean property namer
*
- * @param value The new value for this property.
+ * <p>
+ * The class to use for calculating bean property names.
+ *
+ * @param value The new value for this setting.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_beanTypePropertyName
*/
- public BeanContextBuilder beanTypePropertyName(String value) {
- return set(BEAN_beanTypePropertyName, value);
+ public BeanContextBuilder propertyNamer(Class<? extends PropertyNamer> value) {
+ return set(BEAN_propertyNamer, value);
}
/**
- * Configuration property: Locale.
+ * Configuration property: Sort bean properties in alphabetical order.
+ *
+ * <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.
+ * On IBM JVMs, the bean properties are ordered based on their ordering in the Java file.
+ * On Oracle JVMs, the bean properties are not ordered (which follows the official JVM specs).
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_locale</jsf>, value)</code>.
+ * <li>
+ * This is equivalent to calling <code>property(<jsf>BEAN_sortProperties</jsf>, value)</code>.
+ * <li>
+ * This property is disabled by default so that IBM JVM users don't have to use {@link Bean @Bean} annotations
+ * to force bean properties to be in a particular order and can just alter the order of the fields/methods
+ * in the Java file.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_locale
+ * @see BeanContext#BEAN_sortProperties
*/
- public BeanContextBuilder locale(Locale value) {
- return set(BEAN_locale, value);
+ public BeanContextBuilder sortProperties(boolean value) {
+ return set(BEAN_sortProperties, value);
}
/**
@@ -1128,57 +1098,87 @@ public class BeanContextBuilder extends ContextBuilder {
public BeanContextBuilder timeZone(TimeZone value) {
return set(BEAN_timeZone, value);
}
-
+
/**
- * Configuration property: Media type.
+ * Configuration property: Use interface proxies.
*
* <p>
- * Specifies a default media type value for serializer and parser sessions.
+ * If <jk>true</jk>, then interfaces will be instantiated as proxy classes through the use of an
+ * {@link InvocationHandler} if there is no other way of instantiating them.
*
* <h5 class='section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_mediaType</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_useInterfaceProxies</jsf>, value)</code>.
* </ul>
*
* @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_mediaType
+ * @see BeanContext#BEAN_useInterfaceProxies
*/
- public BeanContextBuilder mediaType(MediaType value) {
- return set(BEAN_mediaType, value);
+ public BeanContextBuilder useInterfaceProxies(boolean value) {
+ return set(BEAN_useInterfaceProxies, value);
}
-
+
/**
- * Configuration property: Debug mode.
- *
- * <p>
- * Enables the following additional information during serialization:
- * <ul class='spaced-list'>
- * <li>
- * When bean getters throws exceptions, the exception includes the object stack information
- * in order to determine how that method was invoked.
- * <li>
- * Enables {@link Serializer#SERIALIZER_detectRecursions}.
- * </ul>
+ * Configuration property: Use Java {@link Introspector} for determining bean properties.
*
* <p>
- * Enables the following additional information during parsing:
- * <ul class='spaced-list'>
- * <li>
- * When bean setters throws exceptions, the exception includes the object stack information
- * in order to determine how that method was invoked.
- * </ul>
+ * Using the built-in Java bean introspector will not pick up fields or non-standard getters/setters.
*
- * <h5 class='section'>Notes:</h5>
+ * <h5 class 'section'>Notes:</h5>
* <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_debug</jsf>, value)</code>.
+ * <li>This is equivalent to calling <code>property(<jsf>BEAN_useJavaBeanIntrospector</jsf>, value)</code>.
+ * <li>Most {@link Bean @Bean} annotations will be ignored if you enable this setting.
* </ul>
*
+ * @param value The new value for this property.
* @return This object (for method chaining).
- * @see BeanContext#BEAN_debug
+ * @see BeanContext#BEAN_useJavaBeanIntrospector
*/
- public BeanContextBuilder debug() {
- return set(BEAN_debug, true);
+ public BeanContextBuilder useJavaBeanIntrospector(boolean value) {
+ return set(BEAN_useJavaBeanIntrospector, value);
+ }
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder set(String name, Object value) {
+ super.set(name, value);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder set(boolean append, String name, Object value) {
+ super.set(append, name, value);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder set(Map<String,Object> properties) {
+ super.set(properties);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder add(Map<String,Object> properties) {
+ super.add(properties);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder addTo(String name, Object value) {
+ super.addTo(name, value);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder addTo(String name, String key, Object value) {
+ super.addTo(name, key, value);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder removeFrom(String name, Object value) {
+ super.removeFrom(name, value);
+ return this;
}
@Override /* ContextBuilder */
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
index d908d72..5e597af 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
@@ -49,38 +49,38 @@ public class CsvParserBuilder extends ParserBuilder {
//--------------------------------------------------------------------------------
@Override /* ParserBuilder */
- public CsvParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public CsvParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public CsvParserBuilder strict(boolean value) {
- super.strict(value);
+ public CsvParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public CsvParserBuilder strict() {
- super.strict();
+ public CsvParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public CsvParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public CsvParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public CsvParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public CsvParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public CsvParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public CsvParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
index bfede9a..8bce8ac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
@@ -50,14 +50,14 @@ public class CsvSerializerBuilder extends SerializerBuilder {
//--------------------------------------------------------------------------------
@Override /* SerializerBuilder */
- public CsvSerializerBuilder maxDepth(int value) {
- super.maxDepth(value);
+ public CsvSerializerBuilder abridged(boolean value) {
+ super.abridged(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder initialDepth(int value) {
- super.initialDepth(value);
+ public CsvSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@@ -74,26 +74,26 @@ public class CsvSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder useWhitespace(boolean value) {
- super.useWhitespace(value);
+ public CsvSerializerBuilder initialDepth(int value) {
+ super.initialDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder ws() {
- super.ws();
+ public CsvSerializerBuilder listener(Class<? extends SerializerListener> value) {
+ super.listener(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder maxIndent(int value) {
- super.maxIndent(value);
+ public CsvSerializerBuilder maxDepth(int value) {
+ super.maxDepth(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public CsvSerializerBuilder maxIndent(int value) {
+ super.maxIndent(value);
return this;
}
@@ -104,14 +104,20 @@ public class CsvSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder sq() {
- super.sq();
+ public CsvSerializerBuilder sortCollections(boolean value) {
+ super.sortCollections(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder trimNullProperties(boolean value) {
- super.trimNullProperties(value);
+ public CsvSerializerBuilder sortMaps(boolean value) {
+ super.sortMaps(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public CsvSerializerBuilder sq() {
+ super.sq();
return this;
}
@@ -128,20 +134,20 @@ public class CsvSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public CsvSerializerBuilder trimNullProperties(boolean value) {
+ super.trimNullProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder uriContext(UriContext value) {
- super.uriContext(value);
+ public CsvSerializerBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder uriResolution(UriResolution value) {
- super.uriResolution(value);
+ public CsvSerializerBuilder uriContext(UriContext value) {
+ super.uriContext(value);
return this;
}
@@ -152,26 +158,20 @@ public class CsvSerializerBuilder extends SerializerBuilder {
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder sortCollections(boolean value) {
- super.sortCollections(value);
- return this;
- }
-
- @Override /* SerializerBuilder */
- public CsvSerializerBuilder sortMaps(boolean value) {
- super.sortMaps(value);
+ public CsvSerializerBuilder uriResolution(UriResolution value) {
+ super.uriResolution(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public CsvSerializerBuilder useWhitespace(boolean value) {
+ super.useWhitespace(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder listener(Class<? extends SerializerListener> value) {
- super.listener(value);
+ public CsvSerializerBuilder ws() {
+ super.ws();
return this;
}
@@ -386,42 +386,6 @@ public class CsvSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public CsvSerializerBuilder includeProperties(Map<String,String> values) {
- super.includeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public CsvSerializerBuilder includeProperties(String beanClassName, String properties) {
- super.includeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public CsvSerializerBuilder includeProperties(Class<?> beanClass, String properties) {
- super.includeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public CsvSerializerBuilder excludeProperties(Map<String,String> values) {
- super.excludeProperties(values);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public CsvSerializerBuilder excludeProperties(String beanClassName, String properties) {
- super.excludeProperties(beanClassName, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
- public CsvSerializerBuilder excludeProperties(Class<?> beanClass, String properties) {
- super.excludeProperties(beanClass, properties);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public CsvSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/45640a1a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
index 06f2dab..e676fcb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
@@ -78,38 +78,38 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* ParserBuilder */
- public HtmlParserBuilder trimStrings(boolean value) {
- super.trimStrings(value);
+ public HtmlParserBuilder fileCharset(String value) {
+ super.fileCharset(value);
return this;
}
@Override /* ParserBuilder */
- public HtmlParserBuilder strict(boolean value) {
- super.strict(value);
+ public HtmlParserBuilder inputStreamCharset(String value) {
+ super.inputStreamCharset(value);
return this;
}
@Override /* ParserBuilder */
- public HtmlParserBuilder strict() {
- super.strict();
+ public HtmlParserBuilder listener(Class<? extends ParserListener> value) {
+ super.listener(value);
return this;
}
@Override /* ParserBuilder */
- public HtmlParserBuilder inputStreamCharset(String value) {
- super.inputStreamCharset(value);
+ public HtmlParserBuilder strict() {
+ super.strict();
return this;
}
@Override /* ParserBuilder */
- public HtmlParserBuilder fileCharset(String value) {
- super.fileCharset(value);
+ public HtmlParserBuilder strict(boolean value) {
+ super.strict(value);
return this;
}
@Override /* ParserBuilder */
- public HtmlParserBuilder listener(Class<? extends ParserListener> value) {
- super.listener(value);
+ public HtmlParserBuilder trimStrings(boolean value) {
+ super.trimStrings(value);
return this;
}