juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [1/5] juneau git commit: Sort methods in builder classes.
Date Sun, 07 Jan 2018 21:28:33 GMT
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>&lt;\/script&gt;</xt>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>JSON_simpleMode</jsf>,
value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>JSON_escapeSolidus</jsf>,
value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see #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>&lt;\/script&gt;</xt>.
+	 * If <jk>true</jk>, JSON attribute names will only be quoted when necessary.
+	 * Otherwise, they are always quoted.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
-	 * 	<li>This is equivalent to calling <code>property(<jsf>JSON_escapeSolidus</jsf>,
value)</code>.
+	 * 	<li>This is equivalent to calling <code>property(<jsf>JSON_simpleMode</jsf>,
value)</code>.
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
 	 * @return This object (for method chaining).
-	 * @see #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.*;



Mime
View raw message