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 2019/11/20 12:09:15 UTC
[juneau] branch master updated: Rename beanDictionary to dictionary
in various places.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 9c06524 Rename beanDictionary to dictionary in various places.
9c06524 is described below
commit 9c0652463da9bcdbeebe73820ce29d3c613472f5
Author: JamesBognar <ja...@apache.org>
AuthorDate: Wed Nov 20 07:09:02 2019 -0500
Rename beanDictionary to dictionary in various places.
---
.../apache/juneau/BeanConfigAnnotationTest.java | 6 +-
.../test/java/org/apache/juneau/BeanMapTest.java | 6 +-
.../org/apache/juneau/a/rttests/RoundTripTest.java | 10 +-
.../org/apache/juneau/html/CommonParserTest.java | 2 +-
.../org/apache/juneau/json/CommonParserTest.java | 4 +-
.../apache/juneau/uon/CommonParser_UonTest.java | 2 +-
.../urlencoding/CommonParser_UrlEncodingTest.java | 2 +-
.../java/org/apache/juneau/utils/PojoRestTest.java | 2 +-
.../org/apache/juneau/jena/RdfParserBuilder.java | 42 ++++++++
.../apache/juneau/jena/RdfSerializerBuilder.java | 42 ++++++++
.../main/java/org/apache/juneau/BeanContext.java | 16 +--
.../java/org/apache/juneau/BeanContextBuilder.java | 120 +++++++++++++++++++++
.../java/org/apache/juneau/BeanDictionaryList.java | 2 +-
.../java/org/apache/juneau/BeanDictionaryMap.java | 2 +-
.../org/apache/juneau/BeanTraverseBuilder.java | 42 ++++++++
.../org/apache/juneau/annotation/BeanConfig.java | 47 ++++++++
.../apache/juneau/annotation/BeanConfigApply.java | 7 ++
.../org/apache/juneau/csv/CsvParserBuilder.java | 42 ++++++++
.../apache/juneau/csv/CsvSerializerBuilder.java | 42 ++++++++
.../juneau/html/HtmlDocSerializerBuilder.java | 42 ++++++++
.../org/apache/juneau/html/HtmlParserBuilder.java | 42 ++++++++
.../juneau/html/HtmlSchemaSerializerBuilder.java | 42 ++++++++
.../apache/juneau/html/HtmlSerializerBuilder.java | 42 ++++++++
.../html/HtmlStrippedDocSerializerBuilder.java | 42 ++++++++
.../org/apache/juneau/jso/JsoParserBuilder.java | 42 ++++++++
.../apache/juneau/jso/JsoSerializerBuilder.java | 42 ++++++++
.../org/apache/juneau/json/JsonParserBuilder.java | 42 ++++++++
.../juneau/json/JsonSchemaSerializerBuilder.java | 42 ++++++++
.../apache/juneau/json/JsonSerializerBuilder.java | 42 ++++++++
.../jsonschema/JsonSchemaGeneratorBuilder.java | 42 ++++++++
.../juneau/msgpack/MsgPackParserBuilder.java | 42 ++++++++
.../juneau/msgpack/MsgPackSerializerBuilder.java | 42 ++++++++
.../apache/juneau/oapi/OpenApiParserBuilder.java | 42 ++++++++
.../juneau/oapi/OpenApiSerializerBuilder.java | 42 ++++++++
.../juneau/parser/InputStreamParserBuilder.java | 42 ++++++++
.../org/apache/juneau/parser/ParserBuilder.java | 42 ++++++++
.../apache/juneau/parser/ParserGroupBuilder.java | 42 ++++++++
.../apache/juneau/parser/ReaderParserBuilder.java | 42 ++++++++
.../juneau/plaintext/PlainTextParserBuilder.java | 42 ++++++++
.../plaintext/PlainTextSerializerBuilder.java | 42 ++++++++
.../serializer/OutputStreamSerializerBuilder.java | 42 ++++++++
.../juneau/serializer/SerializerBuilder.java | 42 ++++++++
.../juneau/serializer/SerializerGroupBuilder.java | 42 ++++++++
.../juneau/serializer/WriterSerializerBuilder.java | 42 ++++++++
.../juneau/soap/SoapXmlSerializerBuilder.java | 42 ++++++++
.../org/apache/juneau/uon/UonParserBuilder.java | 42 ++++++++
.../apache/juneau/uon/UonSerializerBuilder.java | 42 ++++++++
.../urlencoding/UrlEncodingParserBuilder.java | 42 ++++++++
.../urlencoding/UrlEncodingSerializerBuilder.java | 42 ++++++++
.../org/apache/juneau/xml/XmlParserBuilder.java | 42 ++++++++
.../apache/juneau/xml/XmlSerializerBuilder.java | 42 ++++++++
.../xmlschema/XmlSchemaSerializerBuilder.java | 42 ++++++++
juneau-doc/docs/ReleaseNotes/6.1.0.html | 4 +-
juneau-doc/docs/ReleaseNotes/8.1.2.html | 2 +
.../02.juneau-marshall/12.BeanDictionaries.html | 10 +-
.../21.XmlDetails/04.BeanTypeNameAnnotation.html | 2 +-
.../juneau/rest/client/RestClientBuilder.java | 42 ++++++++
.../org/apache/juneau/rest/RestContextBuilder.java | 42 ++++++++
58 files changed, 1891 insertions(+), 35 deletions(-)
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
index 33b4777..3c15df8 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
@@ -105,9 +105,9 @@ public class BeanConfigAnnotationTest {
@BeanConfig(
beanClassVisibility="$X{PRIVATE}",
beanConstructorVisibility="$X{PRIVATE}",
- beanDictionary={A1.class,A2.class},
- beanDictionary_replace={A1.class,A2.class,A3.class},
- beanDictionary_remove=A2.class,
+ dictionary={A1.class,A2.class},
+ dictionary_replace={A1.class,A2.class,A3.class},
+ dictionary_remove=A2.class,
beanFieldVisibility="$X{PRIVATE}",
beanFilters={A1.class,A2.class},
beanFilters_replace={A1.class,A2.class,A3.class},
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index ecb6383..cafb3a2 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -33,7 +33,7 @@ public class BeanMapTest {
JsonSerializer serializer = SimpleJsonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build();
BeanContext bc = BeanContext.create()
- .beanDictionary(MyBeanDictionaryMap.class)
+ .dictionary(MyBeanDictionaryMap.class)
.build();
BeanSession session = bc.createSession();
@@ -477,7 +477,7 @@ public class BeanMapTest {
m.put("b", new D2());
assertEquals("default", t.b.s);
- JsonParser p = JsonParser.create().beanDictionary(D2.class).build();
+ JsonParser p = JsonParser.create().dictionary(D2.class).build();
m.put("lb1", new ObjectList("[{_type:'D2',s:'foobar'}]", p));
assertEquals(ObjectList.class.getName(), t.lb1.getClass().getName());
assertEquals(D2.class.getName(), t.lb1.get(0).getClass().getName());
@@ -673,7 +673,7 @@ public class BeanMapTest {
assertEquals(HEnum.THREE, t7.getEnum2());
// Create instance directly from JSON.
- JsonParser p = JsonParser.create().beanDictionary(H.class).build();
+ JsonParser p = JsonParser.create().dictionary(H.class).build();
t7 = (H)p.parse("{_type:'H',enum1:'THREE',enum2:'ONE'}", Object.class);
assertEquals("{_type:'H',enum1:'THREE',enum2:'ONE'}", serializer.serialize(t7));
assertEquals(HEnum.THREE, t7.enum1);
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
index 385f211..5c17736 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
@@ -205,8 +205,8 @@ public abstract class RoundTripTest {
p.implClass(e.getKey(), e.getValue());
}
}
- this.s = s.beanFilters(getBeanFilters()).pojoSwaps(getPojoSwaps()).beanDictionary((Object[])getDictionary()).add(getProperties()).build();
- this.p = p == null ? null : p.beanFilters(getBeanFilters()).pojoSwaps(getPojoSwaps()).beanDictionary((Object[])getDictionary()).add(getProperties()).build();
+ this.s = s.beanFilters(getBeanFilters()).pojoSwaps(getPojoSwaps()).dictionary((Object[])getDictionary()).add(getProperties()).build();
+ this.p = p == null ? null : p.beanFilters(getBeanFilters()).pojoSwaps(getPojoSwaps()).dictionary((Object[])getDictionary()).add(getProperties()).build();
this.validateXmlWhitespace = (flags & CHECK_XML_WHITESPACE) > 0;
this.validateXml = (flags & VALIDATE_XML) > 0;
this.returnOriginalObject = (flags & RETURN_ORIGINAL_OBJECT) > 0;
@@ -273,10 +273,10 @@ public abstract class RoundTripTest {
p = p.builder().pojoSwaps(c).build();
}
- protected void beanDictionary(Object...c) {
- s = s.builder().beanDictionary(c).build();
+ protected void dictionary(Object...c) {
+ s = s.builder().dictionary(c).build();
if (p != null)
- p = p.builder().beanDictionary(c).build();
+ p = p.builder().dictionary(c).build();
}
public boolean isValidationOnly() {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/CommonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/CommonParserTest.java
index 7592707..b926bb2 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/CommonParserTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/CommonParserTest.java
@@ -29,7 +29,7 @@ public class CommonParserTest {
//====================================================================================================
@Test
public void testFromSerializer() throws Exception {
- ReaderParser p = HtmlParser.create().beanDictionary(A1.class).build();
+ ReaderParser p = HtmlParser.create().dictionary(A1.class).build();
Map m = null;
String in;
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
index d9169b6..04c7923 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
@@ -29,7 +29,7 @@ public class CommonParserTest {
//====================================================================================================
@Test
public void testFromSerializer() throws Exception {
- ReaderParser p = JsonParser.create().beanDictionary(A1.class).build();
+ ReaderParser p = JsonParser.create().dictionary(A1.class).build();
Map m = null;
m = (Map)p.parse("{a:1}", Object.class);
@@ -83,7 +83,7 @@ public class CommonParserTest {
tl.add(new A3("name0","value0"));
tl.add(new A3("name1","value1"));
b.list = tl;
- String json = JsonSerializer.create().addBeanTypes(true).addRootType().beanDictionary(A1.class).build().serialize(b);
+ String json = JsonSerializer.create().addBeanTypes(true).addRootType().dictionary(A1.class).build().serialize(b);
b = (A1)p.parse(json, Object.class);
assertEquals("value1", b.list.get(1).value);
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
index c9f9e04..ee7e068 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
@@ -24,7 +24,7 @@ import org.junit.*;
@SuppressWarnings({"rawtypes","serial"})
public class CommonParser_UonTest {
- ReaderParser p = UonParser.create().beanDictionary(A1.class).build();
+ ReaderParser p = UonParser.create().dictionary(A1.class).build();
ReaderParser pe = UonParser.DEFAULT_DECODING;
//====================================================================================================
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
index 62b3425..bf4773e 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
@@ -27,7 +27,7 @@ import org.junit.*;
@SuppressWarnings({"rawtypes","serial"})
public class CommonParser_UrlEncodingTest {
- ReaderParser p = UrlEncodingParser.create().beanDictionary(A1.class).build();
+ ReaderParser p = UrlEncodingParser.create().dictionary(A1.class).build();
//====================================================================================================
// testFromSerializer
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoRestTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoRestTest.java
index 42c7b7c..6390405 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoRestTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/PojoRestTest.java
@@ -94,7 +94,7 @@ public class PojoRestTest {
assertEquals(expectedValue, s);
// Parse it back to Java objects.
- p = (Person)JsonParser.create().beanDictionary(Person.class).build().parse(s, Object.class);
+ p = (Person)JsonParser.create().dictionary(Person.class).build().parse(s, Object.class);
expectedValue = "city B";
s = p.addresses[1].city;
assertEquals(expectedValue, s);
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 3b41a47..f898fd5 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
@@ -816,36 +816,42 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -966,6 +972,42 @@ public class RdfParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ public RdfParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> RdfParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 792cb7e..5f236e6 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
@@ -1060,36 +1060,42 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RdfSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -1210,6 +1216,42 @@ public class RdfSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public RdfSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RdfSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> RdfSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 cbf4442..1690ed2 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
@@ -248,12 +248,12 @@ public class BeanContext extends Context {
* </ul>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link BeanContextBuilder#beanDictionary(Object...)}
- * <li class='jm'>{@link BeanContextBuilder#beanDictionary(Class...)}
- * <li class='jm'>{@link BeanContextBuilder#beanDictionaryReplace(Object...)}
- * <li class='jm'>{@link BeanContextBuilder#beanDictionaryReplace(Class...)}
- * <li class='jm'>{@link BeanContextBuilder#beanDictionaryRemove(Object...)}
- * <li class='jm'>{@link BeanContextBuilder#beanDictionaryRemove(Class...)}
+ * <li class='jm'>{@link BeanContextBuilder#dictionary(Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#dictionary(Class...)}
+ * <li class='jm'>{@link BeanContextBuilder#dictionaryReplace(Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#dictionaryReplace(Class...)}
+ * <li class='jm'>{@link BeanContextBuilder#dictionaryRemove(Object...)}
+ * <li class='jm'>{@link BeanContextBuilder#dictionaryRemove(Class...)}
* <li class='jm'>{@link BeanFilterBuilder#dictionary(Class...)}
* </ul>
* </ul>
@@ -286,7 +286,7 @@ public class BeanContext extends Context {
* <jc>// Create a parser and tell it which classes to try to resolve.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .beanDictionary(Foo.<jk>class</jk>, Bar.<jk>class</jk>)
+ * .dictionary(Foo.<jk>class</jk>, Bar.<jk>class</jk>)
* .build();
*
* <jc>// Same, but use property.</jc>
@@ -304,7 +304,7 @@ public class BeanContext extends Context {
* <jc>// Use the predefined HTML5 bean dictionary which is a BeanDictionaryList.</jc>
* ReaderParser p = HtmlParser
* .<jsm>create</jsm>()
- * .beanDictionary(HtmlBeanDictionary.<jk>class</jk>)
+ * .dictionary(HtmlBeanDictionary.<jk>class</jk>)
* .build();
* </p>
*
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 18f8733..1bd803e 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
@@ -146,7 +146,9 @@ public class BeanContextBuilder extends ContextBuilder {
* @param values
* The values to add to this property.
* @return This object (for method chaining).
+ * @deprecated Use {@link #dictionary(Object...)}
*/
+ @Deprecated
public BeanContextBuilder beanDictionary(Object...values) {
return addTo(BEAN_beanDictionary, values);
}
@@ -164,7 +166,9 @@ public class BeanContextBuilder extends ContextBuilder {
* @param values
* The values to add to this property.
* @return This object (for method chaining).
+ * @deprecated Use {@link #dictionary(Class...)}
*/
+ @Deprecated
public BeanContextBuilder beanDictionary(Class<?>...values) {
return addTo(BEAN_beanDictionary, values);
}
@@ -182,7 +186,9 @@ public class BeanContextBuilder extends ContextBuilder {
* @param values
* The new values for this property.
* @return This object (for method chaining).
+ * @deprecated Use {@link #dictionaryReplace(Class...)}
*/
+ @Deprecated
public BeanContextBuilder beanDictionaryReplace(Class<?>...values) {
return set(BEAN_beanDictionary, values);
}
@@ -200,7 +206,9 @@ public class BeanContextBuilder extends ContextBuilder {
* @param values
* The new values for this property.
* @return This object (for method chaining).
+ * @deprecated Use {@link #dictionaryReplace(Object...)}
*/
+ @Deprecated
public BeanContextBuilder beanDictionaryReplace(Object...values) {
return set(BEAN_beanDictionary, values);
}
@@ -218,7 +226,9 @@ public class BeanContextBuilder extends ContextBuilder {
* @param values
* The values to remove from this property.
* @return This object (for method chaining).
+ * @deprecated Use {@link #dictionaryRemove(Class...)}
*/
+ @Deprecated
public BeanContextBuilder beanDictionaryRemove(Class<?>...values) {
return removeFrom(BEAN_beanDictionary, values);
}
@@ -236,7 +246,9 @@ public class BeanContextBuilder extends ContextBuilder {
* @param values
* The values to remove from this property.
* @return This object (for method chaining).
+ * @deprecated Use {@link #dictionaryRemove(Object...)}
*/
+ @Deprecated
public BeanContextBuilder beanDictionaryRemove(Object...values) {
return removeFrom(BEAN_beanDictionary, values);
}
@@ -634,6 +646,114 @@ public class BeanContextBuilder extends ContextBuilder {
}
/**
+ * Configuration property: Bean dictionary.
+ *
+ * <p>
+ * Adds to the list of classes that make up the bean dictionary in this bean context.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
+ * </ul>
+ *
+ * @param values
+ * The values to add to this property.
+ * @return This object (for method chaining).
+ */
+ public BeanContextBuilder dictionary(Object...values) {
+ return addTo(BEAN_beanDictionary, values);
+ }
+
+ /**
+ * Configuration property: Bean dictionary.
+ *
+ * <p>
+ * Same as {@link #beanDictionary(Object...)} but takes in an array of classes.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
+ * </ul>
+ *
+ * @param values
+ * The values to add to this property.
+ * @return This object (for method chaining).
+ */
+ public BeanContextBuilder dictionary(Class<?>...values) {
+ return addTo(BEAN_beanDictionary, values);
+ }
+
+ /**
+ * Configuration property: Bean dictionary.
+ *
+ * <p>
+ * Same as {@link #beanDictionary(Object...)} but replaces the existing value.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
+ * </ul>
+ *
+ * @param values
+ * The new values for this property.
+ * @return This object (for method chaining).
+ */
+ public BeanContextBuilder dictionaryReplace(Class<?>...values) {
+ return set(BEAN_beanDictionary, values);
+ }
+
+ /**
+ * Configuration property: Bean dictionary.
+ *
+ * <p>
+ * Same as {@link #beanDictionary(Object...)} but replaces the existing value.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
+ * </ul>
+ *
+ * @param values
+ * The new values for this property.
+ * @return This object (for method chaining).
+ */
+ public BeanContextBuilder dictionaryReplace(Object...values) {
+ return set(BEAN_beanDictionary, values);
+ }
+
+ /**
+ * Configuration property: Bean dictionary.
+ *
+ * <p>
+ * Removes from the list of classes that make up the bean dictionary in this bean context.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
+ * </ul>
+ *
+ * @param values
+ * The values to remove from this property.
+ * @return This object (for method chaining).
+ */
+ public BeanContextBuilder dictionaryRemove(Class<?>...values) {
+ return removeFrom(BEAN_beanDictionary, values);
+ }
+
+ /**
+ * Configuration property: Bean dictionary.
+ *
+ * <p>
+ * Removes from the list of classes that make up the bean dictionary in this bean context.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
+ * </ul>
+ *
+ * @param values
+ * The values to remove from this property.
+ * @return This object (for method chaining).
+ */
+ public BeanContextBuilder dictionaryRemove(Object...values) {
+ return removeFrom(BEAN_beanDictionary, values);
+ }
+
+ /**
* Configuration property: Debug mode.
*
* <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
index 6ea0d2b..965d2a2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
@@ -41,7 +41,7 @@ import org.apache.juneau.annotation.*;
* <jc>// Use it in a parser.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .beanDictionary(MyBeanDictionaryList.<jk>class</jk>)
+ * .dictionary(MyBeanDictionaryList.<jk>class</jk>)
* .build();
* </p>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
index ca46127..d7fb31c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
@@ -49,7 +49,7 @@ import org.apache.juneau.annotation.*;
* <jc>// Use it in a parser.</jc>
* ReaderParser p = JsonParser
* .<jsm>create</jsm>()
- * .beanDictionary(MyBeanDictionaryMap.<jk>class</jk>)
+ * .dictionary(MyBeanDictionaryMap.<jk>class</jk>)
* .build();
* </p>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
index 9e9ae17..4ed58fa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
@@ -181,36 +181,42 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public BeanTraverseBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public BeanTraverseBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public BeanTraverseBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public BeanTraverseBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public BeanTraverseBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public BeanTraverseBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -331,6 +337,42 @@ public class BeanTraverseBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public BeanTraverseBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public BeanTraverseBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public BeanTraverseBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public BeanTraverseBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public BeanTraverseBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public BeanTraverseBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> BeanTraverseBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index 82f3c1e..fdf61e3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -133,7 +133,9 @@ public @interface BeanConfig {
* <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
* <li class='link'>{@doc juneau-marshall.BeanDictionaries}
* </ul>
+ * @deprecated Use {@link #dictionary()}
*/
+ @Deprecated
Class<?>[] beanDictionary() default {};
/**
@@ -142,7 +144,9 @@ public @interface BeanConfig {
* <ul class='seealso'>
* <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
* </ul>
+ * @deprecated Use {@link #dictionary_replace()}
*/
+ @Deprecated
Class<?>[] beanDictionary_replace() default {};
/**
@@ -151,7 +155,9 @@ public @interface BeanConfig {
* <ul class='seealso'>
* <li class='jf'>{@link BeanContext#BEAN_beanDictionary_remove}
* </ul>
+ * @deprecated Use {@link #dictionary_remove()}
*/
+ @Deprecated
Class<?>[] beanDictionary_remove() default {};
/**
@@ -587,6 +593,47 @@ public @interface BeanConfig {
String debug() default "";
/**
+ * Configuration property: Bean dictionary.
+ *
+ * <p>
+ * The list of classes that make up the bean dictionary in this bean context.
+ *
+ * <p>
+ * A dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred
+ * through reflection.
+ * <br>The names are defined through the {@link Bean#typeName() @Bean(typeName)} annotation defined on the bean class.
+ * <br>For example, if a class <c>Foo</c> has a type-name of <js>"myfoo"</js>, then it would end up serialized
+ * as <js>"{_type:'myfoo',...}"</js>.
+ *
+ * <p>
+ * This setting tells the parsers which classes to look for when resolving <js>"_type"</js> attributes.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
+ * <li class='link'>{@doc juneau-marshall.BeanDictionaries}
+ * </ul>
+ */
+ Class<?>[] dictionary() default {};
+
+ /**
+ * Configuration property: Add to bean dictionary.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary}
+ * </ul>
+ */
+ Class<?>[] dictionary_replace() default {};
+
+ /**
+ * Configuration property: Remove from bean dictionary.
+ *
+ * <ul class='seealso'>
+ * <li class='jf'>{@link BeanContext#BEAN_beanDictionary_remove}
+ * </ul>
+ */
+ Class<?>[] dictionary_remove() default {};
+
+ /**
* Configuration property: POJO examples.
*
* <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
index 90bbf48..91e85f5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigApply.java
@@ -39,6 +39,7 @@ public class BeanConfigApply extends ConfigApply<BeanConfig> {
super(c, r);
}
+ @SuppressWarnings("deprecation")
@Override
public void apply(AnnotationInfo<BeanConfig> ai, PropertyStoreBuilder psb) {
BeanConfig a = ai.getAnnotation();
@@ -52,6 +53,12 @@ public class BeanConfigApply extends ConfigApply<BeanConfig> {
psb.set(BEAN_beanDictionary, a.beanDictionary_replace());
if (a.beanDictionary_remove().length != 0)
psb.removeFrom(BEAN_beanDictionary, a.beanDictionary_remove());
+ if (a.dictionary().length != 0)
+ psb.addTo(BEAN_beanDictionary, a.dictionary());
+ if (a.dictionary_replace().length != 0)
+ psb.set(BEAN_beanDictionary, a.dictionary_replace());
+ if (a.dictionary_remove().length != 0)
+ psb.removeFrom(BEAN_beanDictionary, a.dictionary_remove());
if (! a.beanFieldVisibility().isEmpty())
psb.set(BEAN_beanFieldVisibility, visibility(a.beanFieldVisibility(), "beanFieldVisibility"));
if (a.beanFilters().length != 0)
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 fe56f31..5eb6af7 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
@@ -136,36 +136,42 @@ public class CsvParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -286,6 +292,42 @@ public class CsvParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ public CsvParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> CsvParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 9f47875..c8751b2 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
@@ -262,36 +262,42 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public CsvSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -412,6 +418,42 @@ public class CsvSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public CsvSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public CsvSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> CsvSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
index 7e9cc29..c5848b1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
@@ -783,36 +783,42 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlDocSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlDocSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlDocSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlDocSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlDocSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlDocSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -933,6 +939,42 @@ public class HtmlDocSerializerBuilder extends HtmlStrippedDocSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public HtmlDocSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlDocSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlDocSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlDocSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlDocSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlDocSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> HtmlDocSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 2aeed2f..e2e2e6e 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
@@ -158,36 +158,42 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -308,6 +314,42 @@ public class HtmlParserBuilder extends XmlParserBuilder {
}
@Override /* BeanContextBuilder */
+ public HtmlParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> HtmlParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
index 65278de..9d94a58 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
@@ -431,36 +431,42 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSchemaSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSchemaSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSchemaSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSchemaSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSchemaSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSchemaSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -563,6 +569,42 @@ public class HtmlSchemaSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public HtmlSchemaSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSchemaSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSchemaSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSchemaSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSchemaSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSchemaSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> HtmlSchemaSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 0a2c924..71beb43 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
@@ -436,36 +436,42 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -586,6 +592,42 @@ public class HtmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public HtmlSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> HtmlSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
index 7359b1b..8c248a5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
@@ -347,36 +347,42 @@ public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlStrippedDocSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlStrippedDocSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlStrippedDocSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlStrippedDocSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlStrippedDocSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public HtmlStrippedDocSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -497,6 +503,42 @@ public class HtmlStrippedDocSerializerBuilder extends HtmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public HtmlStrippedDocSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlStrippedDocSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlStrippedDocSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlStrippedDocSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlStrippedDocSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public HtmlStrippedDocSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> HtmlStrippedDocSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 39ca654..819e929 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
@@ -129,36 +129,42 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -279,6 +285,42 @@ public class JsoParserBuilder extends InputStreamParserBuilder {
}
@Override /* BeanContextBuilder */
+ public JsoParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> JsoParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 b2df9d3..16ddb1d 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
@@ -219,36 +219,42 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsoSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -369,6 +375,42 @@ public class JsoSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public JsoSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsoSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> JsoSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 c8767b4..59eb09c 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
@@ -174,36 +174,42 @@ public class JsonParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -324,6 +330,42 @@ public class JsonParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ public JsonParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> JsonParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 5fc818d..f5dfbf0 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
@@ -461,36 +461,42 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -611,6 +617,42 @@ public class JsonSchemaSerializerBuilder extends JsonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public JsonSchemaSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> JsonSchemaSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 71f5631..636bd1a 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
@@ -351,36 +351,42 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -501,6 +507,42 @@ public class JsonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public JsonSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> JsonSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
index b583b2a..79b8aac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
@@ -323,36 +323,42 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaGeneratorBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaGeneratorBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaGeneratorBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaGeneratorBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaGeneratorBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public JsonSchemaGeneratorBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -473,6 +479,42 @@ public class JsonSchemaGeneratorBuilder extends BeanTraverseBuilder {
}
@Override /* BeanContextBuilder */
+ public JsonSchemaGeneratorBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaGeneratorBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaGeneratorBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaGeneratorBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaGeneratorBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public JsonSchemaGeneratorBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> JsonSchemaGeneratorBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 2b251c2..16f96e6 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
@@ -129,36 +129,42 @@ public class MsgPackParserBuilder extends InputStreamParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -279,6 +285,42 @@ public class MsgPackParserBuilder extends InputStreamParserBuilder {
}
@Override /* BeanContextBuilder */
+ public MsgPackParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> MsgPackParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 17b11aa..fb74c33 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
@@ -219,36 +219,42 @@ public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public MsgPackSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -369,6 +375,42 @@ public class MsgPackSerializerBuilder extends OutputStreamSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public MsgPackSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public MsgPackSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> MsgPackSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
index 6d2d15e..296ce63 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
@@ -111,36 +111,42 @@ public class OpenApiParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -261,6 +267,42 @@ public class OpenApiParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ public OpenApiParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> OpenApiParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
index cc8f7f6..5739e03 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
@@ -263,36 +263,42 @@ public class OpenApiSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OpenApiSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -413,6 +419,42 @@ public class OpenApiSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public OpenApiSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OpenApiSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> OpenApiSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
index d2ed414..35c93f3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
@@ -160,36 +160,42 @@ public class InputStreamParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public InputStreamParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public InputStreamParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public InputStreamParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public InputStreamParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public InputStreamParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public InputStreamParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -310,6 +316,42 @@ public class InputStreamParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public InputStreamParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public InputStreamParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public InputStreamParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public InputStreamParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public InputStreamParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public InputStreamParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> InputStreamParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 3cc6fef..2e5fccf 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
@@ -239,36 +239,42 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -389,6 +395,42 @@ public class ParserBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public ParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> ParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 df8e84f..809ae60 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
@@ -383,36 +383,42 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserGroupBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserGroupBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserGroupBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserGroupBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserGroupBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ParserGroupBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -533,6 +539,42 @@ public class ParserGroupBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public ParserGroupBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserGroupBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserGroupBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserGroupBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserGroupBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ParserGroupBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> ParserGroupBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
index 6cb4604..bb1b086 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
@@ -159,36 +159,42 @@ public abstract class ReaderParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ReaderParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ReaderParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ReaderParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ReaderParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ReaderParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public ReaderParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -309,6 +315,42 @@ public abstract class ReaderParserBuilder extends ParserBuilder {
}
@Override /* BeanContextBuilder */
+ public ReaderParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ReaderParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ReaderParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ReaderParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ReaderParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public ReaderParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> ReaderParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 dea9a08..9b220fd 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
@@ -136,36 +136,42 @@ public class PlainTextParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -286,6 +292,42 @@ public class PlainTextParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ public PlainTextParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> PlainTextParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 143c6c4..3f85480 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
@@ -262,36 +262,42 @@ public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public PlainTextSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -412,6 +418,42 @@ public class PlainTextSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public PlainTextSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public PlainTextSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> PlainTextSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
index c6ec567..95143cf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
@@ -100,36 +100,42 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OutputStreamSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OutputStreamSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OutputStreamSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OutputStreamSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OutputStreamSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public OutputStreamSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -250,6 +256,42 @@ public class OutputStreamSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public OutputStreamSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OutputStreamSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OutputStreamSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OutputStreamSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OutputStreamSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public OutputStreamSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> OutputStreamSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 50e70b9..ce180ad 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
@@ -514,36 +514,42 @@ public class SerializerBuilder extends BeanTraverseBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -664,6 +670,42 @@ public class SerializerBuilder extends BeanTraverseBuilder {
}
@Override /* BeanContextBuilder */
+ public SerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> SerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 6529538..b563d73 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
@@ -688,36 +688,42 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerGroupBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerGroupBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerGroupBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerGroupBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerGroupBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SerializerGroupBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -838,6 +844,42 @@ public class SerializerGroupBuilder extends BeanTraverseBuilder {
}
@Override /* BeanContextBuilder */
+ public SerializerGroupBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerGroupBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerGroupBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerGroupBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerGroupBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SerializerGroupBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> SerializerGroupBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
index 3628502..f516a2f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
@@ -209,36 +209,42 @@ public class WriterSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public WriterSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public WriterSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public WriterSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public WriterSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public WriterSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public WriterSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -359,6 +365,42 @@ public class WriterSerializerBuilder extends SerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public WriterSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public WriterSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public WriterSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public WriterSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public WriterSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public WriterSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> WriterSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 961dd72..6b60425 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
@@ -281,36 +281,42 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SoapXmlSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SoapXmlSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SoapXmlSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SoapXmlSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SoapXmlSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public SoapXmlSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -431,6 +437,42 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public SoapXmlSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> SoapXmlSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 2c10800..4b7d3a5 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
@@ -211,36 +211,42 @@ public class UonParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -361,6 +367,42 @@ public class UonParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UonParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> UonParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 c3afa26..8c7934d 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
@@ -353,36 +353,42 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UonSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -503,6 +509,42 @@ public class UonSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UonSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UonSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> UonSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 5a790de..692fcaf 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
@@ -156,36 +156,42 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -306,6 +312,42 @@ public class UrlEncodingParserBuilder extends UonParserBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> UrlEncodingParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 53e8563..18df130 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
@@ -325,36 +325,42 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public UrlEncodingSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -475,6 +481,42 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public UrlEncodingSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> UrlEncodingSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 9469057..fb314d8 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
@@ -314,36 +314,42 @@ public class XmlParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlParserBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlParserBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlParserBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlParserBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlParserBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlParserBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -464,6 +470,42 @@ public class XmlParserBuilder extends ReaderParserBuilder {
}
@Override /* BeanContextBuilder */
+ public XmlParserBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlParserBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlParserBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlParserBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlParserBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlParserBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> XmlParserBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 261461b..09233c5 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
@@ -462,36 +462,42 @@ public class XmlSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -612,6 +618,42 @@ public class XmlSerializerBuilder extends WriterSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public XmlSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> XmlSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
index 7d9d137..a1422ec 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
@@ -305,36 +305,42 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSchemaSerializerBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSchemaSerializerBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSchemaSerializerBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSchemaSerializerBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSchemaSerializerBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public XmlSchemaSerializerBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -455,6 +461,42 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder {
}
@Override /* BeanContextBuilder */
+ public XmlSchemaSerializerBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSchemaSerializerBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSchemaSerializerBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSchemaSerializerBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSchemaSerializerBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public XmlSchemaSerializerBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> XmlSchemaSerializerBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
diff --git a/juneau-doc/docs/ReleaseNotes/6.1.0.html b/juneau-doc/docs/ReleaseNotes/6.1.0.html
index 45f587c..1b34a57 100644
--- a/juneau-doc/docs/ReleaseNotes/6.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.1.0.html
@@ -173,7 +173,7 @@
of classes annotated with {@link oaj.annotation.Bean#typeName() @Bean(typeName)}.
<li>New {@link oaj.BeanDictionaryMap} class can be used for defining reusable sets of bean dictionaries consisting
of classes not annotated with {@link oaj.annotation.Bean#typeName() @Bean(typeName)}.
- <li>New {@link oaj.annotation.Bean#beanDictionary() @Bean(beanDictionary)} annotation.
+ <li>New <dc>@Bean(beanDictionary)</dc> annotation.
</ul>
<li>Removed restriction on getters and setters to be prefixed with "getX/setX/isX" if a <dc>@BeanProperty(name)</dc> annotation is used.
<li>Improvements to ATOM DTO:
@@ -205,7 +205,7 @@
<br>Equivalently, the {@link oaj.parser.InputStreamParser#parse(Object,Class)} method can now
read the output from this method.
<li>Eliminated the <c><ja>@Bean</ja>(subTypeProperty)</c> and <c><ja>@Bean</ja>(subTypes)</c> annotations
- and replaced them with the ability to define subtypes using the existing {@link oaj.annotation.Bean#beanDictionary() @Bean(beanDictionary)}
+ and replaced them with the ability to define subtypes using the existing <dc>@Bean(beanDictionary)</dc>
annotation on parent classes and interfaces.
<br>This has the added benefit of simplifying the overall code.
<li>The <dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> setting is now enabled by default.
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.2.html b/juneau-doc/docs/ReleaseNotes/8.1.2.html
index 8d9e77b..9397603 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.2.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.2.html
@@ -31,6 +31,8 @@
{@link oaj.marshall.CharMarshall} and {@link oaj.marshall.StreamMarshall} now have public constructors.
<li>
{@link oaj.annotation.Beanp @Beanp} replaces {@link oaj.annotation.BeanProperty @BeanProperty} with shorter syntax.
+ <li>
+ Shortened names for {@link oaj.annotation.Bean#dictionary @Bean(dictionary)} and {@link oaj.BeanContextBuilder#dictionary(Class...)}.
</ul>
<h5 class='topic w800'>juneau-rest-server</h5>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/12.BeanDictionaries.html b/juneau-doc/docs/Topics/02.juneau-marshall/12.BeanDictionaries.html
index e82745a..56e5281 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/12.BeanDictionaries.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/12.BeanDictionaries.html
@@ -86,13 +86,13 @@ Bean Names and Dictionaries
Bean dictionaries are registered through the following:
</p>
<ul class='javatree'>
- <li class='ja'>{@link oaj.annotation.BeanProperty#beanDictionary() BeanProperty(beanDictionary)}
+ <li class='ja'>{@link oaj.annotation.Beanp#dictionary() Beanp(dictionary)}
- On individual bean properties through the annotation.
- <li class='ja'>{@link oaj.annotation.Bean#beanDictionary() Bean(beanDictionary)}
+ <li class='ja'>{@link oaj.annotation.Bean#dictionary() Bean(dictionary)}
- On all properties on a bean and all subclasses.
<li class='jf'>{@link oaj.BeanContext#BEAN_beanDictionary}
- Configuration property on serializers and parsers.
- <li class='jm'>{@link oaj.BeanContextBuilder#beanDictionary(Object...)}
+ <li class='jm'>{@link oaj.BeanContextBuilder#dictionary(Object...)}
- Builder method on serializers and parsers.
</ul>
<p>
@@ -108,7 +108,7 @@ Bean Names and Dictionaries
<jc>// Create a parser and tell it which classes to try to resolve.</jc>
ReaderParser p = JsonParser
.<jsm>create</jsm>()
- .beanDictionary(Foo.<jk>class</jk>, Bar.<jk>class</jk>)
+ .dictionary(Foo.<jk>class</jk>, Bar.<jk>class</jk>)
.build();
<jc>// Same, but use property.</jc>
@@ -121,7 +121,7 @@ Bean Names and Dictionaries
<jc>// Use the predefined HTML5 bean dictionary which is a BeanDictionaryList.</jc>
ReaderParser p = HtmlParser
.<jsm>create</jsm>()
- .beanDictionary(HtmlBeanDictionary.<jk>class</jk>)
+ .dictionary(HtmlBeanDictionary.<jk>class</jk>)
.build();
</p>
<p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/04.BeanTypeNameAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/04.BeanTypeNameAnnotation.html
index c111052..a62ee8d 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/04.BeanTypeNameAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/04.BeanTypeNameAnnotation.html
@@ -119,7 +119,7 @@
</div>
<p>
Beans with type names are often used in conjunction with the
- {@link oaj.annotation.Bean#beanDictionary() @Bean(beanDictionary)} and
+ {@link oaj.annotation.Bean#dictionary() @Bean(dictionary)} and
{@link oaj.annotation.Beanp#dictionary() @Beanp(dictionary)}
annotations so that the beans can be resolved at parse time.
These annotations are not necessary during serialization, but are needed during parsing in order to
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 984749c..a7461df 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
@@ -2287,36 +2287,42 @@ public class RestClientBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestClientBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestClientBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestClientBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestClientBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestClientBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestClientBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -2443,6 +2449,42 @@ public class RestClientBuilder extends BeanContextBuilder {
}
@Override /* BeanContextBuilder */
+ public RestClientBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestClientBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestClientBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestClientBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestClientBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestClientBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> RestClientBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;
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 21751cf..f1ce853 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
@@ -2357,36 +2357,42 @@ public class RestContextBuilder extends BeanContextBuilder implements ServletCon
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestContextBuilder beanDictionary(Class<?>...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestContextBuilder beanDictionary(Object...values) {
super.beanDictionary(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestContextBuilder beanDictionaryReplace(Class<?>...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestContextBuilder beanDictionaryReplace(Object...values) {
super.beanDictionaryReplace(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestContextBuilder beanDictionaryRemove(Class<?>...values) {
super.beanDictionaryRemove(values);
return this;
}
@Override /* BeanContextBuilder */
+ @Deprecated
public RestContextBuilder beanDictionaryRemove(Object...values) {
super.beanDictionaryRemove(values);
return this;
@@ -2508,6 +2514,42 @@ public class RestContextBuilder extends BeanContextBuilder implements ServletCon
}
@Override /* BeanContextBuilder */
+ public RestContextBuilder dictionary(Class<?>...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestContextBuilder dictionary(Object...values) {
+ super.dictionary(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestContextBuilder dictionaryReplace(Class<?>...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestContextBuilder dictionaryReplace(Object...values) {
+ super.dictionaryReplace(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestContextBuilder dictionaryRemove(Class<?>...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
+ public RestContextBuilder dictionaryRemove(Object...values) {
+ super.dictionaryRemove(values);
+ return this;
+ }
+
+ @Override /* BeanContextBuilder */
public <T> RestContextBuilder example(Class<T> c, T o) {
super.example(c, o);
return this;