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 19:32:33 UTC
[2/2] juneau git commit: Clean up javadocs.
Clean up javadocs.
Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/db1bfb1d
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/db1bfb1d
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/db1bfb1d
Branch: refs/heads/master
Commit: db1bfb1da76ae14e68e2cb61ee1ad48e716e495a
Parents: 34c9be0
Author: JamesBognar <ja...@apache.org>
Authored: Sun Jan 7 14:32:27 2018 -0500
Committer: JamesBognar <ja...@apache.org>
Committed: Sun Jan 7 14:32:27 2018 -0500
----------------------------------------------------------------------
.../apache/juneau/jena/RdfParserBuilder.java | 6 -
.../juneau/jena/RdfSerializerBuilder.java | 6 -
.../java/org/apache/juneau/BeanContext.java | 254 ++++++-
.../org/apache/juneau/BeanContextBuilder.java | 32 +-
.../main/java/org/apache/juneau/BeanMap.java | 7 +-
.../main/java/org/apache/juneau/BeanMeta.java | 2 +-
.../org/apache/juneau/csv/CsvParserBuilder.java | 6 -
.../apache/juneau/csv/CsvSerializerBuilder.java | 6 -
.../apache/juneau/html/HtmlParserBuilder.java | 6 -
.../juneau/html/HtmlSerializerBuilder.java | 6 -
.../SimpleUonPartSerializerBuilder.java | 6 -
.../juneau/httppart/UonPartParserBuilder.java | 6 -
.../httppart/UonPartSerializerBuilder.java | 6 -
.../org/apache/juneau/jso/JsoParserBuilder.java | 6 -
.../apache/juneau/jso/JsoSerializerBuilder.java | 6 -
.../apache/juneau/json/JsonParserBuilder.java | 6 -
.../json/JsonSchemaSerializerBuilder.java | 6 -
.../juneau/json/JsonSerializerBuilder.java | 6 -
.../juneau/msgpack/MsgPackParserBuilder.java | 6 -
.../msgpack/MsgPackSerializerBuilder.java | 6 -
.../org/apache/juneau/parser/ParserBuilder.java | 6 -
.../juneau/parser/ParserGroupBuilder.java | 6 -
.../plaintext/PlainTextParserBuilder.java | 6 -
.../plaintext/PlainTextSerializerBuilder.java | 6 -
.../juneau/serializer/SerializerBuilder.java | 6 -
.../serializer/SerializerGroupBuilder.java | 6 -
.../juneau/soap/SoapXmlSerializerBuilder.java | 6 -
.../juneau/transform/BeanFilterBuilder.java | 2 +
.../org/apache/juneau/uon/UonParserBuilder.java | 6 -
.../apache/juneau/uon/UonSerializerBuilder.java | 6 -
.../urlencoding/UrlEncodingParserBuilder.java | 6 -
.../UrlEncodingSerializerBuilder.java | 6 -
.../org/apache/juneau/xml/XmlParserBuilder.java | 6 -
.../juneau/xml/XmlSchemaSerializerBuilder.java | 6 -
.../apache/juneau/xml/XmlSerializerBuilder.java | 6 -
.../juneau/yaml/proto/YamlParserBuilder.java | 6 -
.../yaml/proto/YamlSerializerBuilder.java | 6 -
.../src/main/javadoc/resources/juneau-doc.css | 2 +-
.../juneau/rest/client/RestClientBuilder.java | 6 -
.../java/org/apache/juneau/rest/RestChild.java | 2 +-
.../org/apache/juneau/rest/RestContext.java | 733 +++++++++----------
.../apache/juneau/rest/RestContextBuilder.java | 6 -
.../java/org/apache/juneau/rest/package.html | 26 +-
43 files changed, 577 insertions(+), 687 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 adbaf34..8ad124f 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
@@ -584,12 +584,6 @@ public class RdfParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public RdfParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public RdfParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 25f4efb..c0968ca 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
@@ -776,12 +776,6 @@ public class RdfSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public RdfSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public RdfSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 9099910..0e9ea1f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -233,6 +233,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>String</code> ({@link Visibility})
* <li><b>Default:</b> <js>"PUBLIC"</js>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beanClassVisibility(Visibility)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -252,6 +256,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>String</code> ({@link Visibility})
* <li><b>Default:</b> <js>"PUBLIC"</js>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beanConstructorVisibility(Visibility)}
+ * </ul>
* </ul>
*/
public static final String BEAN_beanConstructorVisibility = PREFIX + "beanConstructorVisibility.s";
@@ -265,6 +273,19 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>List<Class></code>
* <li><b>Default:</b> empty list
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link Bean#beanDictionary()}
+ * <li class='ja'>{@link BeanProperty#beanDictionary()}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beanDictionary(Class...)}
+ * <li class='jm'>{@link BeanContextBuilder#beanDictionary(Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#beanDictionary(boolean,Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#beanDictionaryRemove(Object...)}
+ * <li class='jm'>{@link BeanFilterBuilder#beanDictionary(Class...)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -284,23 +305,6 @@ public class BeanContext extends Context {
* <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()}.
@@ -334,6 +338,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>String</code> ({@link Visibility})
* <li><b>Default:</b> <js>"PUBLIC"</js>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beanFieldVisibility(Visibility)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -356,6 +364,17 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>List<Class></code>
* <li><b>Default:</b> empty list
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link Bean}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beanFilters(Class...)}
+ * <li class='jm'>{@link BeanContextBuilder#beanFilters(Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#beanFilters(boolean,Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#beanFiltersRemove(Object...)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -399,6 +418,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beanMapPutReturnsOldValue(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -420,6 +443,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beansRequireDefaultConstructor(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -440,6 +467,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beansRequireSerializable(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -460,6 +491,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beansRequireSettersForGetters(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -478,6 +513,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>true</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beansRequireSomeProperties(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -498,6 +537,14 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>String</code>
* <li><b>Default:</b> <js>"_type"</js>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link Bean#typePropertyName()}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#beanTypePropertyName(String)}
+ * </ul>
* </ul>
*/
public static final String BEAN_beanTypePropertyName = PREFIX + "beanTypePropertyName.s";
@@ -511,6 +558,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#debug()}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -535,23 +586,6 @@ public class BeanContext extends Context {
public static final String BEAN_debug = PREFIX + "debug.b";
/**
- * Configuration property: Default parser to use when converting <code>Strings</code> to POJOs.
- *
- * <h5 class='section'>Property:</h5>
- * <ul>
- * <li><b>Name:</b> <js>"BeanContext.defaultParser.c"</js>
- * <li><b>Data type:</b> <code>Class</code>
- * <li><b>Default:</b> {@link JsonSerializer}
- * <li><b>Session-overridable:</b> <jk>false</jk>
- * </ul>
- *
- * <h5 class='section'>Description:</h5>
- * <p>
- * Used in the in the {@link BeanSession#convertToType(Object, Class)} method.
- */
- public static final String BEAN_defaultParser = PREFIX + "defaultParser.c";
-
- /**
* Configuration property: Exclude specified properties from beans.
*
* <h5 class='section'>Property:</h5>
@@ -560,6 +594,17 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Map<String,String></code>
* <li><b>Default:</b> <code>{}</code>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link Bean#excludeProperties()}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#excludeProperties(Class, String)}
+ * <li class='jm'>{@link BeanContextBuilder#excludeProperties(String, String)}
+ * <li class='jm'>{@link BeanContextBuilder#excludeProperties(Map)}
+ * <li class='jm'>{@link BeanFilterBuilder#excludeProperties(String...)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -589,6 +634,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#ignoreInvocationExceptionsOnGetters(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -607,6 +656,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#ignoreInvocationExceptionsOnSetters(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -625,6 +678,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>true</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#ignorePropertiesWithoutSetters(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -643,6 +700,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#ignoreUnknownBeanProperties(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -661,6 +722,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>true</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#ignoreUnknownNullBeanProperties(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -679,6 +744,11 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Map<String,Class></code>
* <li><b>Default:</b> empty map
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#implClasses(Map)}
+ * <li class='jm'>{@link BeanContextBuilder#implClass(Class, Class)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -698,6 +768,18 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Map<String,String></code>
* <li><b>Default:</b> <code>{}</code>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link Bean#properties()}
+ * <li class='ja'>{@link BeanProperty#properties()}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#includeProperties(Class, String)}
+ * <li class='jm'>{@link BeanContextBuilder#includeProperties(String, String)}
+ * <li class='jm'>{@link BeanContextBuilder#includeProperties(Map)}
+ * <li class='jm'>{@link BeanFilterBuilder#properties(String...)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -727,11 +809,11 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>String</code> ({@link Locale})
* <li><b>Default:</b> <jk>null</jk> (defaults to {@link Locale#getDefault()})
* <li><b>Session-overridable:</b> <jk>true</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#locale(Locale)}
+ * </ul>
* </ul>
- *
- * <h5 class='section'>Description:</h5>
- * <p>
- * Used in the in the {@link BeanSession#convertToType(Object, Class)} method.
*/
public static final String BEAN_locale = PREFIX + "locale.s";
@@ -744,6 +826,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>String</code> ({@link MediaType})
* <li><b>Default:</b> <jk>null</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#mediaType(MediaType)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -761,6 +847,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>String</code> ({@link Visibility})
* <li><b>Default:</b> <js>"PUBLIC"</js>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#methodVisibility(Visibility)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -780,6 +870,17 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Set<Class></code>
* <li><b>Default:</b> empty set
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link BeanIgnore}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#notBeanClasses(Class...)}
+ * <li class='jm'>{@link BeanContextBuilder#notBeanClasses(Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#notBeanClasses(boolean, Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#notBeanClassesRemove(Object...)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -818,6 +919,13 @@ public class BeanContext extends Context {
* <li><code>java.util.*</code>
* </ul>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#notBeanPackages(Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#notBeanPackages(String...)}
+ * <li class='jm'>{@link BeanContextBuilder#notBeanPackages(boolean, Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#notBeanPackagesRemove(Object...)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -851,6 +959,18 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>List<Class></code>
* <li><b>Default:</b> empty list
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link Swap}
+ * <li class='ja'>{@link Swaps}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#pojoSwaps(Class...)}
+ * <li class='jm'>{@link BeanContextBuilder#pojoSwaps(Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#pojoSwaps(boolean, Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#pojoSwapsRemove(Object...)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -879,6 +999,40 @@ public class BeanContext extends Context {
public static final String BEAN_pojoSwaps_remove = PREFIX + "pojoSwaps.lc/remove";
/**
+ * Configuration property: Bean property namer
+ *
+ * <h5 class='section'>Property:</h5>
+ * <ul>
+ * <li><b>Name:</b> <js>"BeanContext.propertyNamer.c"</js>
+ * <li><b>Data type:</b> <code>Class<? <jk>implements</jk> {@link PropertyNamer}></code>
+ * <li><b>Default:</b> {@link PropertyNamerDefault}
+ * <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link Bean#propertyNamer()}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#propertyNamer(Class)}
+ * <li class='jm'>{@link BeanFilterBuilder#propertyNamer(PropertyNamer)}
+ * </ul>
+ * </ul>
+ *
+ * <h5 class='section'>Description:</h5>
+ * <p>
+ * The class to use for calculating bean property names.
+ *
+ * <p>
+ * Predefined classes:
+ * <ul>
+ * <li>{@link PropertyNamerDefault} - Default.
+ * <li>{@link PropertyNamerDLC} - Dashed-lower-case names.
+ * <li>{@link PropertyNamerULC} - Dashed-upper-case names.
+ * </ul>
+ */
+ public static final String BEAN_propertyNamer = PREFIX + "propertyNamer.c";
+
+ /**
* Configuration property: Sort bean properties in alphabetical order.
*
* <h5 class='section'>Property:</h5>
@@ -887,6 +1041,15 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Annotations:</b>
+ * <ul>
+ * <li class='ja'>{@link Bean#sort()}
+ * </ul>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#sortProperties(boolean)}
+ * <li class='jm'>{@link BeanFilterBuilder#sortProperties(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -912,6 +1075,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>String</code> ({@link Locale})
* <li><b>Default:</b> <jk>null</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#timeZone(TimeZone)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -929,6 +1096,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>true</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#useInterfaceProxies(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -947,6 +1118,10 @@ public class BeanContext extends Context {
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>false</jk>
+ * <li><b>Methods:</b>
+ * <ul>
+ * <li class='jm'>{@link BeanContextBuilder#useJavaBeanIntrospector(boolean)}
+ * </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
@@ -1032,6 +1207,7 @@ public class BeanContext extends Context {
final TimeZone timeZone;
final MediaType mediaType;
final Map<String,String[]> includeProperties, excludeProperties;
+ final PropertyNamer propertyNamer;
final Map<Class,ClassMeta> cmCache;
final ClassMeta<Object> cmObject; // Reusable ClassMeta that represents general Objects.
@@ -1077,6 +1253,8 @@ public class BeanContext extends Context {
beanFieldVisibility = getProperty(BEAN_beanFieldVisibility, Visibility.class, PUBLIC);
notBeanClasses = getClassArrayProperty(BEAN_notBeanClasses, DEFAULT_NOTBEAN_CLASSES);
+
+ propertyNamer = getInstanceProperty(BEAN_propertyNamer, PropertyNamer.class, PropertyNamerDefault.class);
List<String> l1 = new LinkedList<>();
List<String> l2 = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 ed092af..73784e3 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
@@ -785,6 +785,19 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
+ * Configuration property: Bean property namer
+ *
+ * <p>
+ * The class to use for calculating bean property names.
+ *
+ * @param value The new value for this setting.
+ * @return This object (for method chaining).
+ */
+ public BeanContextBuilder propertyNamer(Class<? extends PropertyNamer> value) {
+ return set(BEAN_propertyNamer, value);
+ }
+
+ /**
* Configuration property: Implementation classes for interfaces and abstract classes.
*
* <p>
@@ -1085,25 +1098,6 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
- * Configuration property: Default parser to use when converting <code>Strings</code> to POJOs.
- *
- * <p>
- * Used in the in the {@link BeanSession#convertToType(Object, Class)} method.
- *
- * <h5 class='section'>Notes:</h5>
- * <ul>
- * <li>This is equivalent to calling <code>property(<jsf>BEAN_defaultParser</jsf>, value)</code>.
- * </ul>
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- * @see BeanContext#BEAN_defaultParser
- */
- public BeanContextBuilder defaultParser(Class<?> value) {
- return set(BEAN_defaultParser, value);
- }
-
- /**
* Configuration property: Locale.
*
* <h5 class='section'>Notes:</h5>
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index c925bb9..2b714f3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -316,12 +316,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
}
/**
- * Convenience method for setting multiple property values by passing in JSON (or other) text.
- *
- * <p>
- * Typically the input is going to be JSON, although the actual data type depends on the default parser specified by
- * the {@link BeanContext#BEAN_defaultParser} property value on the config that created the context that created
- * this map.
+ * Convenience method for setting multiple property values by passing in JSON text.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 42708f9..5750b56 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -256,7 +256,7 @@ public class BeanMeta<T> {
fixedBeanProps.addAll(Arrays.asList(includeProperties));
if (propertyNamer == null)
- propertyNamer = new PropertyNamerDefault();
+ propertyNamer = ctx.propertyNamer;
// First populate the properties with those specified in the bean annotation to
// ensure that ordering first.
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 fd6c462..d908d72 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
@@ -325,12 +325,6 @@ public class CsvParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public CsvParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public CsvParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 27f2c34..bfede9a 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
@@ -452,12 +452,6 @@ public class CsvSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public CsvSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public CsvSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 ca9ebe9..06f2dab 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
@@ -354,12 +354,6 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* BeanContextBuilder */
- public HtmlParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public HtmlParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 db92409..584a02f 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
@@ -586,12 +586,6 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public HtmlSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public HtmlSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 2582b28..0e1666e 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
@@ -470,12 +470,6 @@ public class SimpleUonPartSerializerBuilder extends UonPartSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public SimpleUonPartSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public SimpleUonPartSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 44b9340..3fd38f9 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
@@ -334,12 +334,6 @@ public class UonPartParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
- public UonPartParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UonPartParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 cb9ffa0..c65eeda 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
@@ -500,12 +500,6 @@ public class UonPartSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public UonPartSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UonPartSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 d623bf3..3d53cb5 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
@@ -326,12 +326,6 @@ public class JsoParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public JsoParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public JsoParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 ca0f3f3..70ef906 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
@@ -452,12 +452,6 @@ public class JsoSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public JsoSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public JsoSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 7bfa74f..84110e1 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
@@ -327,12 +327,6 @@ public class JsonParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public JsonParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public JsonParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 272826e..de6278c 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
@@ -464,12 +464,6 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public JsonSchemaSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public JsonSchemaSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 53f6b83..4b9bd09 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
@@ -505,12 +505,6 @@ public class JsonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public JsonSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public JsonSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 525a4d6..773edae 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
@@ -326,12 +326,6 @@ public class MsgPackParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public MsgPackParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public MsgPackParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 398054e..c5188bf 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
@@ -452,12 +452,6 @@ public class MsgPackSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public MsgPackSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public MsgPackSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 bde51ec..14ea714 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
@@ -423,12 +423,6 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public ParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public ParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 30444d9..f1a0a43 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
@@ -462,12 +462,6 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public ParserGroupBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public ParserGroupBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 5e81d37..10f4f62 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
@@ -326,12 +326,6 @@ public class PlainTextParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public PlainTextParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public PlainTextParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 eaf155e..bfe0fae 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
@@ -452,12 +452,6 @@ public class PlainTextSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public PlainTextSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public PlainTextSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 c5102a3..4cb4471 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
@@ -767,12 +767,6 @@ public class SerializerBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public SerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public SerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 acc5edc..aeed1c4 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
@@ -634,12 +634,6 @@ public class SerializerGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public SerializerGroupBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public SerializerGroupBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 a98feff..beb20ba 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
@@ -502,12 +502,6 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public SoapXmlSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public SoapXmlSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
index 71003e7..d663acf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
@@ -46,6 +46,8 @@ import org.apache.juneau.*;
*/
public abstract class BeanFilterBuilder {
+ private String TODO = "Need to convert to property builder";
+
Class<?> beanClass;
String typeName;
String[] properties, excludeProperties;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 7ced0cc..f37d6ec 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
@@ -357,12 +357,6 @@ public class UonParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public UonParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UonParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 c4acd9d..4641185 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
@@ -507,12 +507,6 @@ public class UonSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public UonSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UonSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 f07cfb3..7b7b3e0 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
@@ -379,12 +379,6 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
- public UrlEncodingParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UrlEncodingParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 dd73fef..aec1631 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
@@ -546,12 +546,6 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public UrlEncodingSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public UrlEncodingSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 d1a2603..5157b81 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
@@ -463,12 +463,6 @@ public class XmlParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public XmlParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public XmlParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 f009225..985993a 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
@@ -488,12 +488,6 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
- public XmlSchemaSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public XmlSchemaSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 e126689..a057f7e 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
@@ -605,12 +605,6 @@ public class XmlSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public XmlSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public XmlSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 1bb43e4..69df83d 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
@@ -326,12 +326,6 @@ public class YamlParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
- public YamlParserBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public YamlParserBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 10d5d86..29a14bb 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
@@ -505,12 +505,6 @@ public class YamlSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
- public YamlSerializerBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public YamlSerializerBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/juneau-doc/src/main/javadoc/resources/juneau-doc.css
----------------------------------------------------------------------
diff --git a/juneau-doc/src/main/javadoc/resources/juneau-doc.css b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
index b441fdd..fa7e598 100755
--- a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
+++ b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
@@ -298,7 +298,7 @@ l {
font-size: 1.2em;
}
-.spaced-list li { padding:5px; }
+.spaced-list>li { padding:5px; }
.footer .spaced-list ul { margin:0 }
/* Documentation Tree */
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/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 0c967e7..01779bf 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
@@ -1444,12 +1444,6 @@ public class RestClientBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
- public RestClientBuilder defaultParser(Class<?> value) {
- super.defaultParser(value);
- return this;
- }
-
- @Override /* BeanContextBuilder */
public RestClientBuilder locale(Locale value) {
super.locale(value);
return this;
http://git-wip-us.apache.org/repos/asf/juneau/blob/db1bfb1d/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java
index 8817192..2c5e607 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java
@@ -26,7 +26,7 @@ public class RestChild {
* @param path The child resource path relative to the parent resource URI.
* @param resource
* The child resource.
- * <br>Can either be a Class (which will be instantiated using the registered {@link RestResourceResolver},
+ * <br>Can either be a Class (which will be instantiated using the registered {@link RestResourceResolver})
* or an already-instantiated object.
*/
public RestChild(String path, Object resource) {