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 346a1a9 Replace addBeanTypeProperties with addBeanTypes
346a1a9 is described below
commit 346a1a95e50203a2829106e26b892b137cab1297
Author: JamesBognar <[email protected]>
AuthorDate: Sun Mar 25 16:28:46 2018 -0400
Replace addBeanTypeProperties with addBeanTypes
---
.../java/org/apache/juneau/BeanFilterTest.java | 2 +-
.../test/java/org/apache/juneau/BeanMapTest.java | 2 +-
.../java/org/apache/juneau/ComboRoundTripTest.java | 42 ++++++++++-----------
.../src/test/java/org/apache/juneau/TestUtils.java | 8 ++--
.../a/rttests/RoundTripAddClassAttrsTest.java | 20 +++++-----
.../juneau/a/rttests/RoundTripBeanMapsTest.java | 2 +-
.../org/apache/juneau/a/rttests/RoundTripTest.java | 44 +++++++++++-----------
.../a/rttests/RoundTripTransformBeansTest.java | 2 +-
.../apache/juneau/config/ConfigInterfaceTest.java | 2 +-
.../juneau/dto/jsonschema/JsonSchemaTest.java | 6 +--
.../org/apache/juneau/html/CommonParserTest.java | 2 +-
.../org/apache/juneau/jena/CommonParserTest.java | 2 +-
.../org/apache/juneau/json/CommonParserTest.java | 2 +-
.../apache/juneau/uon/CommonParser_UonTest.java | 2 +-
.../urlencoding/CommonParser_UrlEncodingTest.java | 2 +-
.../java/org/apache/juneau/utils/PojoRestTest.java | 6 +--
.../apache/juneau/yaml/proto/CommonParserTest.java | 2 +-
.../java/org/apache/juneau/jena/Constants.java | 2 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 14 +++----
.../apache/juneau/jena/RdfSerializerBuilder.java | 10 ++++-
.../apache/juneau/jena/RdfSerializerSession.java | 14 +++----
.../apache/juneau/csv/CsvSerializerBuilder.java | 10 ++++-
.../org/apache/juneau/html/HtmlSerializer.java | 14 +++----
.../apache/juneau/html/HtmlSerializerBuilder.java | 10 ++++-
.../apache/juneau/html/HtmlSerializerSession.java | 16 ++++----
.../httppart/SimpleUonPartSerializerBuilder.java | 10 ++++-
.../juneau/httppart/UonPartSerializerBuilder.java | 10 ++++-
.../apache/juneau/jso/JsoSerializerBuilder.java | 10 ++++-
.../juneau/json/JsonSchemaSerializerBuilder.java | 10 ++++-
.../org/apache/juneau/json/JsonSerializer.java | 14 +++----
.../apache/juneau/json/JsonSerializerBuilder.java | 10 ++++-
.../apache/juneau/json/JsonSerializerSession.java | 14 +++----
.../apache/juneau/msgpack/MsgPackSerializer.java | 14 +++----
.../juneau/msgpack/MsgPackSerializerBuilder.java | 10 ++++-
.../juneau/msgpack/MsgPackSerializerSession.java | 14 +++----
.../plaintext/PlainTextSerializerBuilder.java | 10 ++++-
.../org/apache/juneau/serializer/Serializer.java | 28 +++++++-------
.../juneau/serializer/SerializerBuilder.java | 25 ++++++++++--
.../juneau/serializer/SerializerGroupBuilder.java | 25 ++++++++++--
.../juneau/serializer/SerializerSession.java | 16 ++++----
.../juneau/soap/SoapXmlSerializerBuilder.java | 10 ++++-
.../java/org/apache/juneau/uon/UonSerializer.java | 16 ++++----
.../apache/juneau/uon/UonSerializerBuilder.java | 10 ++++-
.../apache/juneau/uon/UonSerializerSession.java | 14 +++----
.../urlencoding/UrlEncodingSerializerBuilder.java | 10 ++++-
.../juneau/xml/XmlSchemaSerializerBuilder.java | 10 ++++-
.../java/org/apache/juneau/xml/XmlSerializer.java | 14 +++----
.../apache/juneau/xml/XmlSerializerBuilder.java | 10 ++++-
.../apache/juneau/xml/XmlSerializerSession.java | 14 +++----
.../apache/juneau/yaml/proto/YamlSerializer.java | 14 +++----
.../juneau/yaml/proto/YamlSerializerBuilder.java | 10 ++++-
.../juneau/yaml/proto/YamlSerializerSession.java | 14 +++----
juneau-doc/src/main/javadoc/overview.html | 19 ++++++----
.../juneau/rest/test/InterfaceProxyResource.java | 2 +-
.../org/apache/juneau/rest/test/TestUtils.java | 1 +
.../juneau/rest/test/ThirdPartyProxyResource.java | 2 +-
.../juneau/rest/test/InterfaceProxyTest.java | 16 ++++----
.../juneau/rest/test/ThirdPartyProxyTest.java | 18 ++++-----
.../juneau/rest/client/RestClientBuilder.java | 25 ++++++++++--
59 files changed, 419 insertions(+), 268 deletions(-)
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanFilterTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanFilterTest.java
index f75458e..815c812 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanFilterTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanFilterTest.java
@@ -27,7 +27,7 @@ public class BeanFilterTest {
//====================================================================================================
@Test
public void testSubTypes() throws Exception {
- JsonSerializer s =
JsonSerializer.DEFAULT_LAX.builder().addRootType().build();
+ JsonSerializer s =
JsonSerializer.DEFAULT_LAX.builder().addBeanTypes().addRootType().build();
JsonParser p = JsonParser.DEFAULT;
A1 a1 = new A1();
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
index ecfe74d..bb29ed1 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -31,7 +31,7 @@ import org.junit.*;
@SuppressWarnings({"unchecked","rawtypes","serial"})
public class BeanMapTest {
- JsonSerializer serializer =
JsonSerializer.DEFAULT_LAX.builder().addRootType().build();
+ JsonSerializer serializer =
JsonSerializer.DEFAULT_LAX.builder().addBeanTypes().addRootType().build();
BeanContext bc = BeanContext.create()
.beanDictionary(MyBeanDictionaryMap.class)
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboRoundTripTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboRoundTripTest.java
index 99bbca5..a40f916 100644
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboRoundTripTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/ComboRoundTripTest.java
@@ -258,7 +258,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// JSON
//--------------------------------------------------------------------------------
- WriterSerializer sJson =
JsonSerializer.DEFAULT_LAX.builder().addRootType().build();
+ WriterSerializer sJson =
JsonSerializer.DEFAULT_LAX.builder().addBeanTypes().addRootType().build();
ReaderParser pJson = JsonParser.DEFAULT;
@Test
@@ -279,7 +279,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// JSON - 't' property
//--------------------------------------------------------------------------------
- WriterSerializer sJsonT =
JsonSerializer.create().ssq().beanTypePropertyName("t").addRootType().build();
+ WriterSerializer sJsonT =
JsonSerializer.create().ssq().beanTypePropertyName("t").addBeanTypes().addRootType().build();
ReaderParser pJsonT =
JsonParser.create().beanTypePropertyName("t").build();
@Test
@@ -300,7 +300,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// JSON - Readable
//--------------------------------------------------------------------------------
- WriterSerializer sJsonR =
JsonSerializer.DEFAULT_LAX_READABLE.builder().addRootType().build();
+ WriterSerializer sJsonR =
JsonSerializer.DEFAULT_LAX_READABLE.builder().addBeanTypes().addRootType().build();
ReaderParser pJsonR = JsonParser.DEFAULT;
@Test
@@ -321,7 +321,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// XML
//--------------------------------------------------------------------------------
- WriterSerializer sXml =
XmlSerializer.DEFAULT_SQ.builder().addRootType().build();
+ WriterSerializer sXml =
XmlSerializer.DEFAULT_SQ.builder().addBeanTypes().addRootType().build();
ReaderParser pXml = XmlParser.DEFAULT;
@Test
@@ -342,7 +342,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// XML - 't' property
//--------------------------------------------------------------------------------
- WriterSerializer sXmlT =
XmlSerializer.create().sq().beanTypePropertyName("t").addRootType().build();
+ WriterSerializer sXmlT =
XmlSerializer.create().sq().beanTypePropertyName("t").addBeanTypes().addRootType().build();
ReaderParser pXmlT =
XmlParser.create().beanTypePropertyName("t").build();
@Test
@@ -363,7 +363,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// XML - Readable
//--------------------------------------------------------------------------------
- WriterSerializer sXmlR =
XmlSerializer.DEFAULT_SQ_READABLE.builder().addRootType().build();
+ WriterSerializer sXmlR =
XmlSerializer.DEFAULT_SQ_READABLE.builder().addBeanTypes().addRootType().build();
ReaderParser pXmlR = XmlParser.DEFAULT;
@Test
@@ -384,7 +384,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// XML - Namespaces
//--------------------------------------------------------------------------------
- WriterSerializer sXmlNs =
XmlSerializer.DEFAULT_NS_SQ.builder().addRootType().build();
+ WriterSerializer sXmlNs =
XmlSerializer.DEFAULT_NS_SQ.builder().addBeanTypes().addRootType().build();
ReaderParser pXmlNs = XmlParser.DEFAULT;
@Test
@@ -405,7 +405,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// HTML
//--------------------------------------------------------------------------------
- WriterSerializer sHtml =
HtmlSerializer.DEFAULT_SQ.builder().addRootType().build();
+ WriterSerializer sHtml =
HtmlSerializer.DEFAULT_SQ.builder().addBeanTypes().addRootType().build();
ReaderParser pHtml = HtmlParser.DEFAULT;
@Test
@@ -426,7 +426,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// HTML - 't' property
//--------------------------------------------------------------------------------
- WriterSerializer sHtmlT =
HtmlSerializer.create().sq().beanTypePropertyName("t").addRootType().build();
+ WriterSerializer sHtmlT =
HtmlSerializer.create().sq().beanTypePropertyName("t").addBeanTypes().addRootType().build();
ReaderParser pHtmlT =
HtmlParser.create().beanTypePropertyName("t").build();
@Test
@@ -447,7 +447,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// HTML - Readable
//--------------------------------------------------------------------------------
- WriterSerializer sHtmlR =
HtmlSerializer.DEFAULT_SQ_READABLE.builder().addRootType().build();
+ WriterSerializer sHtmlR =
HtmlSerializer.DEFAULT_SQ_READABLE.builder().addBeanTypes().addRootType().build();
ReaderParser pHtmlR = HtmlParser.DEFAULT;
@Test
@@ -468,7 +468,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UON
//--------------------------------------------------------------------------------
- WriterSerializer sUon =
UonSerializer.DEFAULT.builder().addRootType().build();
+ WriterSerializer sUon =
UonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build();
ReaderParser pUon = UonParser.DEFAULT;
@Test
@@ -489,7 +489,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UON - 't' property
//--------------------------------------------------------------------------------
- WriterSerializer sUonT =
UonSerializer.create().beanTypePropertyName("t").addRootType().build();
+ WriterSerializer sUonT =
UonSerializer.create().beanTypePropertyName("t").addBeanTypes().addRootType().build();
ReaderParser pUonT =
UonParser.create().beanTypePropertyName("t").build();
@Test
@@ -510,7 +510,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UON - Readable
//--------------------------------------------------------------------------------
- WriterSerializer sUonR =
UonSerializer.DEFAULT_READABLE.builder().addRootType().build();
+ WriterSerializer sUonR =
UonSerializer.DEFAULT_READABLE.builder().addBeanTypes().addRootType().build();
ReaderParser pUonR = UonParser.DEFAULT;
@Test
@@ -531,7 +531,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UrlEncoding
//--------------------------------------------------------------------------------
- WriterSerializer sUrlEncoding =
UrlEncodingSerializer.DEFAULT.builder().addRootType().build();
+ WriterSerializer sUrlEncoding =
UrlEncodingSerializer.DEFAULT.builder().addBeanTypes().addRootType().build();
ReaderParser pUrlEncoding = UrlEncodingParser.DEFAULT;
@Test
@@ -552,7 +552,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UrlEncoding - 't' property
//--------------------------------------------------------------------------------
- WriterSerializer sUrlEncodingT =
UrlEncodingSerializer.create().beanTypePropertyName("t").addRootType().build();
+ WriterSerializer sUrlEncodingT =
UrlEncodingSerializer.create().beanTypePropertyName("t").addBeanTypes().addRootType().build();
ReaderParser pUrlEncodingT =
UrlEncodingParser.create().beanTypePropertyName("t").build();
@Test
@@ -573,7 +573,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UrlEncoding - Readable
//--------------------------------------------------------------------------------
- WriterSerializer sUrlEncodingR =
UrlEncodingSerializer.DEFAULT_READABLE.builder().addRootType().build();
+ WriterSerializer sUrlEncodingR =
UrlEncodingSerializer.DEFAULT_READABLE.builder().addBeanTypes().addRootType().build();
ReaderParser pUrlEncodingR = UrlEncodingParser.DEFAULT;
@Test
@@ -594,7 +594,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// MsgPack
//--------------------------------------------------------------------------------
- OutputStreamSerializer sMsgPack =
MsgPackSerializer.DEFAULT_SPACED_HEX.builder().addRootType().build();
+ OutputStreamSerializer sMsgPack =
MsgPackSerializer.DEFAULT_SPACED_HEX.builder().addBeanTypes().addRootType().build();
InputStreamParser pMsgPack = MsgPackParser.DEFAULT_SPACED_HEX;
@Test
@@ -620,7 +620,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// MsgPack - 't' property
//--------------------------------------------------------------------------------
- OutputStreamSerializer sMsgPackT =
MsgPackSerializer.create().beanTypePropertyName("t").addRootType().build();
+ OutputStreamSerializer sMsgPackT =
MsgPackSerializer.create().beanTypePropertyName("t").addBeanTypes().addRootType().build();
InputStreamParser pMsgPackT =
MsgPackParser.create().beanTypePropertyName("t").build();
@Test
@@ -646,7 +646,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// RdfXml
//--------------------------------------------------------------------------------
- WriterSerializer sRdfXml =
RdfSerializer.DEFAULT_XMLABBREV.builder().addRootType().build();
+ WriterSerializer sRdfXml =
RdfSerializer.DEFAULT_XMLABBREV.builder().addBeanTypes().addRootType().build();
ReaderParser pRdfXml = RdfParser.DEFAULT_XML;
@Test
@@ -667,7 +667,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// RdfXml - 't' property
//--------------------------------------------------------------------------------
- WriterSerializer sRdfXmlT =
RdfSerializer.create().language(LANG_RDF_XML_ABBREV).beanTypePropertyName("t").addRootType().build();
+ WriterSerializer sRdfXmlT =
RdfSerializer.create().language(LANG_RDF_XML_ABBREV).beanTypePropertyName("t").addBeanTypes().addRootType().build();
ReaderParser pRdfXmlT =
RdfParser.create().beanTypePropertyName("t").build();
@Test
@@ -688,7 +688,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// RdfXml - Readable
//--------------------------------------------------------------------------------
- WriterSerializer sRdfXmlR =
RdfSerializer.create().language(LANG_RDF_XML_ABBREV).ws().addRootType().build();
+ WriterSerializer sRdfXmlR =
RdfSerializer.create().language(LANG_RDF_XML_ABBREV).ws().addBeanTypes().addRootType().build();
ReaderParser pRdfXmlR = RdfParser.DEFAULT_XML;
@Test
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
index 2e4c024..394df41 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
@@ -43,7 +43,7 @@ public class TestUtils {
private static JsonSerializer js = JsonSerializer.create()
.ssq()
.trimNullProperties(false)
- .addRootType()
+ .addBeanTypes().addRootType()
.build();
private static JsonSerializer jsSorted = JsonSerializer.create()
@@ -51,21 +51,21 @@ public class TestUtils {
.sortCollections()
.sortMaps()
.trimNullProperties(false)
- .addRootType()
+ .addBeanTypes().addRootType()
.build();
private static JsonSerializer js2 = JsonSerializer.create()
.ssq()
.pojoSwaps(IteratorSwap.class, EnumerationSwap.class)
- .addRootType()
+ .addBeanTypes().addRootType()
.build();
private static JsonSerializer js3 = JsonSerializer.create()
.ssq()
.pojoSwaps(IteratorSwap.class, EnumerationSwap.class)
.sortProperties()
- .addRootType()
+ .addBeanTypes().addRootType()
.build();
private static final BeanSession beanSession =
BeanContext.DEFAULT.createSession();
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
index 9d7e717..383683a 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
@@ -41,61 +41,61 @@ public class RoundTripAddClassAttrsTest extends
RoundTripTest {
return Arrays.asList(new Object[][] {
{ /* 0 */
"JsonSerializer.DEFAULT/JsonParser.DEFAULT",
-
JsonSerializer.create().addBeanTypeProperties(true).addRootType(),
+
JsonSerializer.create().addBeanTypes(true).addRootType(),
new
JsonParserBuilder().useInterfaceProxies(false),
0
},
{ /* 1 */
"JsonSerializer.DEFAULT_LAX/JsonParser.DEFAULT",
- new
JsonSerializerBuilder().ssq().addBeanTypeProperties(true).addRootType(),
+ new
JsonSerializerBuilder().ssq().addBeanTypes(true).addRootType(),
new
JsonParserBuilder().useInterfaceProxies(false),
0
},
{ /* 2 */
"JsonSerializer.DEFAULT_SQ/JsonParser.DEFAULT",
- new
JsonSerializerBuilder().ssq().addBeanTypeProperties(true).addRootType(),
+ new
JsonSerializerBuilder().ssq().addBeanTypes(true).addRootType(),
new
JsonParserBuilder().useInterfaceProxies(false),
0
},
{ /* 3 */
"XmlSerializer.DEFAULT/XmlParser.DEFAULT",
- new
XmlSerializerBuilder().addBeanTypeProperties(true).addRootType(),
+ new
XmlSerializerBuilder().addBeanTypes(true).addRootType(),
new
XmlParserBuilder().useInterfaceProxies(false),
CHECK_XML_WHITESPACE | VALIDATE_XML
},
{ /* 4 */
"HtmlSerializer.DEFAULT/HtmlParser.DEFAULT",
- new
HtmlSerializerBuilder().addBeanTypeProperties(true).addRootType(),
+ new
HtmlSerializerBuilder().addBeanTypes(true).addRootType(),
new
HtmlParserBuilder().useInterfaceProxies(false),
CHECK_XML_WHITESPACE
},
{ /* 5 */
"UonSerializer.DEFAULT_ENCODING/UonParser.DEFAULT_DECODING",
- new
UonSerializerBuilder().encoding().addBeanTypeProperties(true).addRootType(),
+ new
UonSerializerBuilder().encoding().addBeanTypes(true).addRootType(),
new
UonParserBuilder().decoding().useInterfaceProxies(false),
0
},
{ /* 6 */
"UonSerializer.DEFAULT/UonParser.DEFAULT",
- new
UonSerializerBuilder().addBeanTypeProperties(true).addRootType(),
+ new
UonSerializerBuilder().addBeanTypes(true).addRootType(),
new
UonParserBuilder().useInterfaceProxies(false),
0
},
{ /* 7 */
"UrlEncodingSerializer.DEFAULT/UrlEncodingParser.DEFAULT",
- new
UrlEncodingSerializerBuilder().addBeanTypeProperties(true).addRootType(),
+ new
UrlEncodingSerializerBuilder().addBeanTypes(true).addRootType(),
new
UrlEncodingParserBuilder().useInterfaceProxies(false),
0
},
{ /* 8 */
"RdfSerializer.Xml/RdfParser.Xml",
- new
RdfSerializerBuilder().addBeanTypeProperties(true).addRootType(),
+ new
RdfSerializerBuilder().addBeanTypes(true).addRootType(),
new
RdfParserBuilder().useInterfaceProxies(false),
0
},
{ /* 9 */
"MsgPackSerializer.DEFAULT/MsgPackParser.DEFAULT",
- new
MsgPackSerializerBuilder().addBeanTypeProperties(true).addRootType(),
+ new
MsgPackSerializerBuilder().addBeanTypes(true).addRootType(),
new
MsgPackParserBuilder().useInterfaceProxies(false),
0
}
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
index 06b828c..8b07deb 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
@@ -216,7 +216,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
//====================================================================================================
@Test
public void testSubTypesUsingAnnotation() throws Exception {
- JsonSerializer js =
JsonSerializer.create().ssq().pojoSwaps(XMLGregorianCalendarSwap.class).addRootType().build();
+ JsonSerializer js =
JsonSerializer.create().ssq().pojoSwaps(XMLGregorianCalendarSwap.class).addBeanTypes().addRootType().build();
// Skip validation-only tests
if (isValidationOnly())
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
index 7b09074..fb929ef 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
@@ -49,121 +49,121 @@ public abstract class RoundTripTest {
// Full round-trip testing
{ /* 0 */
"Json - default",
-
JsonSerializer.create().trimNullProperties(false).addRootType(),
+
JsonSerializer.create().trimNullProperties(false).addBeanTypes().addRootType(),
JsonParser.create(),
0
},
{ /* 1 */
"Json - lax",
-
JsonSerializer.create().ssq().trimNullProperties(false).addRootType(),
+
JsonSerializer.create().ssq().trimNullProperties(false).addBeanTypes().addRootType(),
JsonParser.create(),
0
},
{ /* 2 */
"Json - lax, readable",
-
JsonSerializer.create().ssq().ws().trimNullProperties(false).addRootType(),
+
JsonSerializer.create().ssq().ws().trimNullProperties(false).addBeanTypes().addRootType(),
JsonParser.create(),
0
},
{ /* 3 */
"Xml - namespaces, validation, readable",
-
XmlSerializer.create().ns().sq().trimNullProperties(false).addNamespaceUrisToRoot().useWhitespace().addRootType(),
+
XmlSerializer.create().ns().sq().trimNullProperties(false).addNamespaceUrisToRoot().useWhitespace().addBeanTypes().addRootType(),
XmlParser.create(),
CHECK_XML_WHITESPACE | VALIDATE_XML
},
{ /* 4 */
"Xml - no namespaces, validation",
-
XmlSerializer.create().sq().trimNullProperties(false).addRootType(),
+
XmlSerializer.create().sq().trimNullProperties(false).addBeanTypes().addRootType(),
XmlParser.create(),
CHECK_XML_WHITESPACE
},
{ /* 5 */
"Html - default",
-
HtmlSerializer.create().trimNullProperties(false).addRootType(),
+
HtmlSerializer.create().trimNullProperties(false).addBeanTypes().addRootType(),
HtmlParser.create(),
CHECK_XML_WHITESPACE
},
{ /* 6 */
"Html - readable",
-
HtmlSerializer.create().sq().ws().trimNullProperties(false).addRootType(),
+
HtmlSerializer.create().sq().ws().trimNullProperties(false).addBeanTypes().addRootType(),
HtmlParser.create(),
CHECK_XML_WHITESPACE
},
{ /* 7 */
"Html - with key/value headers",
-
HtmlSerializer.create().addKeyValueTableHeaders().addRootType(),
+
HtmlSerializer.create().addKeyValueTableHeaders().addBeanTypes().addRootType(),
HtmlParser.create(),
CHECK_XML_WHITESPACE
},
{ /* 8 */
"Uon - default",
-
UonSerializer.create().trimNullProperties(false).addRootType(),
+
UonSerializer.create().trimNullProperties(false).addBeanTypes().addRootType(),
UonParser.create(),
0
},
{ /* 9 */
"Uon - readable",
-
UonSerializer.create().ws().trimNullProperties(false).addRootType(),
+
UonSerializer.create().ws().trimNullProperties(false).addBeanTypes().addRootType(),
UonParser.create(),
0
},
{ /* 10 */
"Uon - encoded",
-
UonSerializer.create().encoding().trimNullProperties(false).addRootType(),
+
UonSerializer.create().encoding().trimNullProperties(false).addBeanTypes().addRootType(),
UonParser.create().decoding(),
0
},
{ /* 11 */
"UrlEncoding - default",
-
UrlEncodingSerializer.create().trimNullProperties(false).addRootType(),
+
UrlEncodingSerializer.create().trimNullProperties(false).addBeanTypes().addRootType(),
UrlEncodingParser.create(),
0
},
{ /* 12 */
"UrlEncoding - readable",
-
UrlEncodingSerializer.create().ws().trimNullProperties(false).addRootType(),
+
UrlEncodingSerializer.create().ws().trimNullProperties(false).addBeanTypes().addRootType(),
UrlEncodingParser.create(),
0
},
{ /* 13 */
"UrlEncoding - expanded params",
-
UrlEncodingSerializer.create().expandedParams().addRootType(),
+
UrlEncodingSerializer.create().expandedParams().addBeanTypes().addRootType(),
UrlEncodingParser.create().expandedParams(true),
0
},
{ /* 14 */
"Rdf.Xml",
-
RdfSerializer.create().trimNullProperties(false).addLiteralTypes().addRootType(),
+
RdfSerializer.create().trimNullProperties(false).addLiteralTypes().addBeanTypes().addRootType(),
RdfParser.create().xml(),
0
},
{ /* 15 */
"Rdf.XmlAbbrev",
-
RdfSerializer.create().xmlabbrev().trimNullProperties(false).addLiteralTypes().addRootType(),
+
RdfSerializer.create().xmlabbrev().trimNullProperties(false).addLiteralTypes().addBeanTypes().addRootType(),
RdfParser.create().xml(),
0
},
{ /* 16 */
"Rdf.Turtle",
-
RdfSerializer.create().turtle().trimNullProperties(false).addLiteralTypes().addRootType(),
+
RdfSerializer.create().turtle().trimNullProperties(false).addLiteralTypes().addBeanTypes().addRootType(),
RdfParser.create().turtle(),
0
},
{ /* 17 */
"Rdf.NTriple",
-
RdfSerializer.create().ntriple().trimNullProperties(false).addLiteralTypes().addRootType(),
+
RdfSerializer.create().ntriple().trimNullProperties(false).addLiteralTypes().addBeanTypes().addRootType(),
RdfParser.create().ntriple(),
0
},
{ /* 18 */
"Rdf.N3",
-
RdfSerializer.create().n3().trimNullProperties(false).addLiteralTypes().addRootType(),
+
RdfSerializer.create().n3().trimNullProperties(false).addLiteralTypes().addBeanTypes().addRootType(),
RdfParser.create().n3(),
0
},
{ /* 19 */
"MsgPack",
-
MsgPackSerializer.create().trimNullProperties(false).addRootType(),
+
MsgPackSerializer.create().trimNullProperties(false).addBeanTypes().addRootType(),
MsgPackParser.create(),
0
},
@@ -171,13 +171,13 @@ public abstract class RoundTripTest {
// Validation testing only
{ /* 20 */
"Json schema",
-
JsonSchemaSerializer.create().trimNullProperties(false).addRootType(),
+
JsonSchemaSerializer.create().trimNullProperties(false).addBeanTypes().addRootType(),
null,
RETURN_ORIGINAL_OBJECT
},
{ /* 21 */
"Xml schema",
-
XmlSchemaSerializer.create().trimNullProperties(false).addRootType(),
+
XmlSchemaSerializer.create().trimNullProperties(false).addBeanTypes().addRootType(),
XmlValidatorParser.create(),
RETURN_ORIGINAL_OBJECT | CHECK_XML_WHITESPACE
},
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
index f8cb087..409ce97 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
@@ -267,7 +267,7 @@ public class RoundTripTransformBeansTest extends
RoundTripTest {
//====================================================================================================
@Test
public void testSubTypeWithGenerics() throws Exception {
- JsonSerializer s =
JsonSerializer.DEFAULT.builder().addRootType().build();
+ JsonSerializer s =
JsonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build();
C1 c1 = C3.create();
String r = s.serialize(c1);
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
index 3e0ef7f..5bae201 100644
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
@@ -28,7 +28,7 @@ public class ConfigInterfaceTest {
ConfigInterface proxy;
public ConfigInterfaceTest() throws Exception {
- cf =
Config.create().serializer(JsonSerializer.DEFAULT_LAX.builder().addRootType().build()).build();
+ cf =
Config.create().serializer(JsonSerializer.DEFAULT_LAX.builder().addBeanTypes().addRootType().build()).build();
proxy = cf.getSectionAsInterface("A", ConfigInterface.class);
}
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
index 21adcd0..3b9849b 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
@@ -23,7 +23,7 @@ public class JsonSchemaTest {
@Test
public void testSchema1() throws Exception {
- JsonSerializer s =
JsonSerializer.create().ssq().ws().addBeanTypeProperties(false).build();
+ JsonSerializer s =
JsonSerializer.create().ssq().ws().addBeanTypes(false).build();
JsonParser p = JsonParser.DEFAULT;
String r;
Schema t, t2;
@@ -117,7 +117,7 @@ public class JsonSchemaTest {
@Test
public void testSchema2() throws Exception {
- JsonSerializer s =
JsonSerializer.create().ssq().ws().addBeanTypeProperties(false).build();
+ JsonSerializer s =
JsonSerializer.create().ssq().ws().addBeanTypes(false).build();
JsonParser p = JsonParser.DEFAULT;
String r;
Schema t, t2;
@@ -154,7 +154,7 @@ public class JsonSchemaTest {
@Test
public void testToString() throws Exception {
- JsonSerializer s =
JsonSerializer.create().ssq().ws().addBeanTypeProperties(false).build();
+ JsonSerializer s =
JsonSerializer.create().ssq().ws().addBeanTypes(false).build();
JsonParser p = JsonParser.DEFAULT;
String r;
Schema t, t2;
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
index b297176..5bcb46b 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
@@ -63,7 +63,7 @@ public class CommonParserTest {
t2.add(new A3("name0","value0"));
t2.add(new A3("name1","value1"));
t1.list = t2;
- in =
HtmlSerializer.create().addBeanTypeProperties(true).addRootType().build().serialize(t1);
+ in =
HtmlSerializer.create().addBeanTypes(true).addRootType().build().serialize(t1);
t1 = (A1)p.parse(in, Object.class);
assertEquals("value1", t1.list.get(1).value);
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
index ac2639b..64d201e 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
@@ -109,7 +109,7 @@ public class CommonParserTest {
t2.add(new A3("name1","value1"));
t1.list = t2;
- s =
getBasicSerializer().addBeanTypeProperties(true).addRootType().build();
+ s =
getBasicSerializer().addBeanTypes(true).addRootType().build();
in = strip(s.serialize(t1));
assertEquals("<rdf:Description><jp:_type>A1</jp:_type><jp:list><rdf:Seq><rdf:li
rdf:parseType='Resource'><jp:name>name0</jp:name><jp:value>value0</jp:value></rdf:li><rdf:li
rdf:parseType='Resource'><jp:name>name1</jp:name><jp:value>value1</jp:value></rdf:li></rdf:Seq></jp:list></rdf:Description>",
in);
in = wrap(in);
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
index 8adb000..e5d581d 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
@@ -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().addBeanTypeProperties(true).addRootType().beanDictionary(A1.class).build().serialize(b);
+ String json =
JsonSerializer.create().addBeanTypes(true).addRootType().beanDictionary(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-test/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
index dd3c5fd..e897a83 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
@@ -69,7 +69,7 @@ public class CommonParser_UonTest {
tl.add(new A3("name1","value1"));
b.list = tl;
- in =
UonSerializer.create().addBeanTypeProperties(true).addRootType().build().serialize(b);
+ in =
UonSerializer.create().addBeanTypes(true).addRootType().build().serialize(b);
b = (A1)p.parse(in, Object.class);
assertEquals("value1", b.list.get(1).value);
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
index 12556a4..f9e9e23 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
@@ -72,7 +72,7 @@ public class CommonParser_UrlEncodingTest {
tl.add(new A3("name1","value1"));
b.list = tl;
- in =
UrlEncodingSerializer.create().addBeanTypeProperties(true).addRootType().build().serialize(b);
+ in =
UrlEncodingSerializer.create().addBeanTypes(true).addRootType().build().serialize(b);
b = (A1)p.parse(in, Object.class);
assertEquals("value1", b.list.get(1).value);
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java
index bb3c265..d7fd1c0 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java
@@ -71,7 +71,7 @@ public class PojoRestTest {
model.put("/person1", p);
// Make sure it got stored correctly.
- JsonSerializer serializer =
JsonSerializer.create().ssq().addBeanTypeProperties(false).addRootType().build();
+ JsonSerializer serializer =
JsonSerializer.create().ssq().addBeanTypes(false).addRootType().build();
assertEquals("{person1:{name:'some
name',age:123,addresses:[{street:'street A',city:'city A',state:'state
A',zip:12345,isCurrent:true},{street:'street B',city:'city B',state:'state
B',zip:12345,isCurrent:false}]}}", serializer.serialize(model.getRootObject()));
// Get the original Person object back.
@@ -82,7 +82,7 @@ public class PojoRestTest {
Address a3 = (Address)model.get("/person1/addresses/1");
assertEquals("city B", a3.city);
- serializer =
JsonSerializer.DEFAULT_LAX.builder().addRootType().build();
+ serializer =
JsonSerializer.DEFAULT_LAX.builder().addBeanTypes().addRootType().build();
p = new Person("some name", 123,
new Address("street A", "city A", "state A", 12345,
true),
new Address("street B", "city B", "state B", 12345,
false)
@@ -115,7 +115,7 @@ public class PojoRestTest {
model.put("addresses/0", new Address("street D", "city D",
"state D", 12345, false));
model.put("addresses/1", new Address("street E", "city E",
"state E", 12345, false));
model.put("addresses/2", new Address("street F", "city F",
"state F", 12345, false));
- serializer =
JsonSerializer.create().ssq().addBeanTypeProperties(false).build();
+ serializer = JsonSerializer.create().ssq().build();
s = serializer.serialize(p);
expectedValue = "{name:'some
name',age:123,addresses:[{street:'street D',city:'city D',state:'state
D',zip:12345,isCurrent:false},{street:'street E',city:'city E',state:'state
E',zip:12345,isCurrent:false},{street:'street F',city:'city F',state:'state
F',zip:12345,isCurrent:false}]}";
assertEquals(expectedValue, s);
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/yaml/proto/CommonParserTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/yaml/proto/CommonParserTest.java
index 0d1c62a..91ac71b 100755
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/yaml/proto/CommonParserTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/yaml/proto/CommonParserTest.java
@@ -83,7 +83,7 @@ public class CommonParserTest {
tl.add(new A3("name0","value0"));
tl.add(new A3("name1","value1"));
b.list = tl;
- String json =
YamlSerializer.create().addBeanTypeProperties(true).addRootType().beanDictionary(A1.class).build().serialize(b);
+ String json =
YamlSerializer.create().addBeanTypes(true).addRootType().beanDictionary(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-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
index 852dc20..fe87d17 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
@@ -70,7 +70,7 @@ public final class Constants {
* Property added to bean resources to identify the class type.
*
* <p>
- * Added if {@link Serializer#SERIALIZER_addBeanTypeProperties} setting
is enabled.
+ * Added if {@link Serializer#SERIALIZER_addBeanTypes} setting is
enabled.
*/
public static final String RDF_juneauNs_TYPE = "_type";
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index c3ed0ff..e577122 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -58,13 +58,13 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon {
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b>
<js>"RdfSerializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"RdfSerializer.addBeanTypes.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
RdfSerializerBuilder#addBeanTypeProperties(boolean)}
+ * <li class='jm'>{@link
RdfSerializerBuilder#addBeanTypes(boolean)}
* </ul>
* </ul>
*
@@ -74,10 +74,10 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypeProperties} setting and is
+ * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*/
- public static final String RDF_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String RDF_addBeanTypes = PREFIX + "addBeanTypes.b";
/**
* Configuration property: Add XSI data types to
non-<code>String</code> literals.
@@ -302,7 +302,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon {
useXmlNamespaces,
looseCollections,
autoDetectNamespaces,
- addBeanTypeProperties;
+ addBeanTypes;
final String rdfLanguage;
final Namespace juneauNs;
final Namespace juneauBpNs;
@@ -347,7 +347,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon {
juneauBpNs = getProperty(RDF_juneauBpNs, Namespace.class,
DEFAULT_JUNEAUBP_NS);
collectionFormat = getProperty(RDF_collectionFormat,
RdfCollectionFormat.class, RdfCollectionFormat.DEFAULT);
namespaces = getProperty(RDF_namespaces, Namespace[].class, new
Namespace[0]);
- addBeanTypeProperties =
getBooleanProperty(RDF_addBeanTypeProperties,
getBooleanProperty(SERIALIZER_addBeanTypeProperties, true));
+ addBeanTypes = getBooleanProperty(RDF_addBeanTypes,
getBooleanProperty(SERIALIZER_addBeanTypes, false));
Map<String,Object> m = new LinkedHashMap<>();
for (String k : getPropertyKeys("RdfCommon"))
@@ -407,7 +407,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon {
.append("juneauBpNs", juneauBpNs)
.append("collectionFormat", collectionFormat)
.append("namespaces", namespaces)
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
);
}
}
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 6f5ab72..0d821a8 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
@@ -460,8 +460,14 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public RdfSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public RdfSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 146ce38..06ffa7c 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -44,7 +44,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
useXmlNamespaces,
looseCollections,
autoDetectNamespaces,
- addBeanTypeProperties;
+ addBeanTypes;
private final Property pRoot, pValue;
private final Model model;
private final RDFWriter writer;
@@ -76,7 +76,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
useXmlNamespaces = getProperty(RDF_useXmlNamespaces,
boolean.class, ctx.useXmlNamespaces);
autoDetectNamespaces = getProperty(RDF_autoDetectNamespaces,
boolean.class, ctx.autoDetectNamespaces);
namespaces = getInstanceArrayProperty(RDF_namespaces,
Namespace.class, ctx.namespaces);
- addBeanTypeProperties = getProperty(RDF_addBeanTypeProperties,
boolean.class, ctx.addBeanTypeProperties);
+ addBeanTypes = getProperty(RDF_addBeanTypes, boolean.class,
ctx.addBeanTypes);
model = ModelFactory.createDefaultModel();
addModelPrefix(juneauNs);
addModelPrefix(juneauBpNs);
@@ -110,7 +110,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
public ObjectMap asMap() {
return super.asMap()
.append("RdfSerializerSession", new ObjectMap()
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
.append("addLiteralTypes", addLiteralTypes)
.append("addRootProperty", addRootProperty)
.append("autoDetectNamespaces",
autoDetectNamespaces)
@@ -132,13 +132,13 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
}
/**
- * Returns the {@link Serializer#SERIALIZER_addBeanTypeProperties}
setting value for this session.
+ * Returns the {@link Serializer#SERIALIZER_addBeanTypes} setting value
for this session.
*
- * @return The {@link Serializer#SERIALIZER_addBeanTypeProperties}
setting value for this session.
+ * @return The {@link Serializer#SERIALIZER_addBeanTypes} setting value
for this session.
*/
@Override /* SerializerSession */
- public final boolean isAddBeanTypeProperties() {
- return addBeanTypeProperties;
+ public final boolean isAddBeanTypes() {
+ return addBeanTypes;
}
/*
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 da2978f..fc49c41 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
@@ -86,8 +86,14 @@ public class CsvSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public CsvSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public CsvSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index d7d82ac..6c38957 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -135,13 +135,13 @@ public class HtmlSerializer extends XmlSerializer {
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b>
<js>"HtmlSerializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"HtmlSerializer.addBeanTypes.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
HtmlSerializerBuilder#addBeanTypeProperties(boolean)}
+ * <li class='jm'>{@link
HtmlSerializerBuilder#addBeanTypes(boolean)}
* </ul>
* </ul>
*
@@ -151,10 +151,10 @@ public class HtmlSerializer extends XmlSerializer {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypeProperties} setting and is
+ * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*/
- public static final String HTML_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String HTML_addBeanTypes = PREFIX +
"addBeanTypes.b";
/**
* Configuration property: Add key/value headers on bean/map tables.
@@ -632,7 +632,7 @@ public class HtmlSerializer extends XmlSerializer {
lookForLabelParameters,
detectLinksInStrings,
addKeyValueTableHeaders,
- addBeanTypeProperties;
+ addBeanTypes;
final String labelParameter;
private volatile HtmlSchemaDocSerializer schemaSerializer;
@@ -679,7 +679,7 @@ public class HtmlSerializer extends XmlSerializer {
detectLinksInStrings =
getBooleanProperty(HTML_detectLinksInStrings, true);
labelParameter = getStringProperty(HTML_labelParameter,
"label");
addKeyValueTableHeaders =
getBooleanProperty(HTML_addKeyValueTableHeaders, false);
- addBeanTypeProperties =
getBooleanProperty(HTML_addBeanTypeProperties,
getBooleanProperty(SERIALIZER_addBeanTypeProperties, true));
+ addBeanTypes = getBooleanProperty(HTML_addBeanTypes,
getBooleanProperty(SERIALIZER_addBeanTypes, false));
}
@Override /* Context */
@@ -724,7 +724,7 @@ public class HtmlSerializer extends XmlSerializer {
.append("detectLinksInStrings",
detectLinksInStrings)
.append("labelParameter", labelParameter)
.append("addKeyValueTableHeaders",
addKeyValueTableHeaders)
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
);
}
}
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 2386040..c82f1c7 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
@@ -231,8 +231,14 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public HtmlSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public HtmlSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index d8e2700..5bb1124 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -42,7 +42,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
detectLinksInStrings,
lookForLabelParameters,
addKeyValueTableHeaders,
- addBeanTypeProperties;
+ addBeanTypes;
private final Pattern urlPattern =
Pattern.compile("http[s]?\\:\\/\\/.*");
private final Pattern labelPattern;
@@ -65,7 +65,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
detectLinksInStrings = getProperty(HTML_detectLinksInStrings,
boolean.class, ctx.detectLinksInStrings);
lookForLabelParameters =
getProperty(HTML_detectLabelParameters, boolean.class,
ctx.lookForLabelParameters);
addKeyValueTableHeaders =
getProperty(HTML_addKeyValueTableHeaders, boolean.class,
ctx.addKeyValueTableHeaders);
- addBeanTypeProperties = getProperty(HTML_addBeanTypeProperties,
boolean.class, ctx.addBeanTypeProperties);
+ addBeanTypes = getProperty(HTML_addBeanTypes, boolean.class,
ctx.addBeanTypes);
String labelParameter = getProperty(HTML_labelParameter,
String.class, ctx.labelParameter);
labelPattern = Pattern.compile("[\\?\\&]" +
Pattern.quote(labelParameter) + "=([^\\&]*)");
}
@@ -74,7 +74,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
public ObjectMap asMap() {
return super.asMap()
.append("HtmlSerializerSession", new ObjectMap()
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
.append("addKeyValueTableHeaders",
addKeyValueTableHeaders)
.append("anchorText", anchorText)
.append("detectLinksInStrings",
detectLinksInStrings)
@@ -177,13 +177,13 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
}
/**
- * Returns the {@link HtmlSerializer#HTML_addBeanTypeProperties}
setting value for this session.
+ * Returns the {@link HtmlSerializer#HTML_addBeanTypes} setting value
for this session.
*
- * @return The {@link HtmlSerializer#HTML_addBeanTypeProperties}
setting value for this session.
+ * @return The {@link HtmlSerializer#HTML_addBeanTypes} setting value
for this session.
*/
@Override /* SerializerSession */
- public final boolean isAddBeanTypeProperties() {
- return addBeanTypeProperties;
+ public final boolean isAddBeanTypes() {
+ return addBeanTypes;
}
@Override /* XmlSerializer */
@@ -299,7 +299,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
sType = aType;
String typeName = null;
- if (isAddBeanTypeProperties() && ! eType.equals(aType))
+ if (isAddBeanTypes() && ! eType.equals(aType))
typeName = aType.getDictionaryName();
// Swap if necessary
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
index 6bc4bea..ce18d95 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimpleUonPartSerializerBuilder.java
@@ -75,8 +75,14 @@ public class SimpleUonPartSerializerBuilder extends
UonPartSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder addBeanTypeProperties(boolean
value) {
- super.addBeanTypeProperties(value);
+ public SimpleUonPartSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public SimpleUonPartSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
index 8b6a923..b9dad90 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/UonPartSerializerBuilder.java
@@ -51,8 +51,14 @@ public class UonPartSerializerBuilder extends
UonSerializerBuilder {
//--------------------------------------------------------------------------------
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public UonPartSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public UonPartSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
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 2eda5db..ad0b299 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
@@ -56,8 +56,14 @@ public class JsoSerializerBuilder extends
OutputStreamSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public JsoSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public JsoSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
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 ab64e54..52f8b49 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
@@ -80,8 +80,14 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder addBeanTypeProperties(boolean value)
{
- super.addBeanTypeProperties(value);
+ public JsonSchemaSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public JsonSchemaSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index d02af26..68f631b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -99,13 +99,13 @@ public class JsonSerializer extends WriterSerializer {
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b>
<js>"JsonSerializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"JsonSerializer.addBeanTypes.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
JsonSerializerBuilder#addBeanTypeProperties(boolean)}
+ * <li class='jm'>{@link
JsonSerializerBuilder#addBeanTypes(boolean)}
* </ul>
* </ul>
*
@@ -115,10 +115,10 @@ public class JsonSerializer extends WriterSerializer {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypeProperties} setting and is
+ * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*/
- public static final String JSON_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String JSON_addBeanTypes = PREFIX +
"addBeanTypes.b";
/**
* Configuration property: Prefix solidus <js>'/'</js> characters with
escapes.
@@ -361,7 +361,7 @@ public class JsonSerializer extends WriterSerializer {
final boolean
simpleMode,
escapeSolidus,
- addBeanTypeProperties;
+ addBeanTypes;
private volatile JsonSchemaSerializer schemaSerializer;
@@ -405,7 +405,7 @@ public class JsonSerializer extends WriterSerializer {
simpleMode = getBooleanProperty(JSON_simpleMode, false);
escapeSolidus = getBooleanProperty(JSON_escapeSolidus, false);
- addBeanTypeProperties =
getBooleanProperty(JSON_addBeanTypeProperties,
getBooleanProperty(SERIALIZER_addBeanTypeProperties, true));
+ addBeanTypes = getBooleanProperty(JSON_addBeanTypes,
getBooleanProperty(SERIALIZER_addBeanTypes, false));
}
@Override /* Context */
@@ -455,7 +455,7 @@ public class JsonSerializer extends WriterSerializer {
.append("JsonSerializer", new ObjectMap()
.append("simpleMode", simpleMode)
.append("escapeSolidus", escapeSolidus)
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
);
}
}
\ No newline at end of file
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 de46352..0750ec3 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
@@ -181,8 +181,14 @@ public class JsonSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public JsonSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public JsonSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index d792f6c..1d398ef 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -33,7 +33,7 @@ public class JsonSerializerSession extends
WriterSerializerSession {
private final boolean
simpleMode,
escapeSolidus,
- addBeanTypeProperties;
+ addBeanTypes;
/**
* Create a new session using properties specified in the context.
@@ -51,14 +51,14 @@ public class JsonSerializerSession extends
WriterSerializerSession {
super(ctx, args);
simpleMode = getProperty(JSON_simpleMode, boolean.class,
ctx.simpleMode);
escapeSolidus = getProperty(JSON_escapeSolidus, boolean.class,
ctx.escapeSolidus);
- addBeanTypeProperties = getProperty(JSON_addBeanTypeProperties,
boolean.class, ctx.addBeanTypeProperties);
+ addBeanTypes = getProperty(JSON_addBeanTypes, boolean.class,
ctx.addBeanTypes);
}
@Override /* Session */
public ObjectMap asMap() {
return super.asMap()
.append("JsonSerializerSession", new ObjectMap()
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
.append("escapeSolidus", escapeSolidus)
.append("simpleMode", simpleMode)
);
@@ -236,13 +236,13 @@ public class JsonSerializerSession extends
WriterSerializerSession {
/**
- * Returns the {@link JsonSerializer#JSON_addBeanTypeProperties}
setting value for this session.
+ * Returns the {@link JsonSerializer#JSON_addBeanTypes} setting value
for this session.
*
- * @return The {@link JsonSerializer#JSON_addBeanTypeProperties}
setting value for this session.
+ * @return The {@link JsonSerializer#JSON_addBeanTypes} setting value
for this session.
*/
@Override /* SerializerSession */
- protected final boolean isAddBeanTypeProperties() {
- return addBeanTypeProperties;
+ protected final boolean isAddBeanTypes() {
+ return addBeanTypes;
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index 6a4c1b5..7a06304 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -37,13 +37,13 @@ public class MsgPackSerializer extends
OutputStreamSerializer {
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b>
<js>"MsgPackSerializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"MsgPackSerializer.addBeanTypes.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
MsgPackSerializerBuilder#addBeanTypeProperties(boolean)}
+ * <li class='jm'>{@link
MsgPackSerializerBuilder#addBeanTypes(boolean)}
* </ul>
* </ul>
*
@@ -53,10 +53,10 @@ public class MsgPackSerializer extends
OutputStreamSerializer {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypeProperties} setting and is
+ * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*/
- public static final String MSGPACK_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String MSGPACK_addBeanTypes = PREFIX +
"addBeanTypes.b";
//-------------------------------------------------------------------------------------------------------------------
@@ -111,7 +111,7 @@ public class MsgPackSerializer extends
OutputStreamSerializer {
//-------------------------------------------------------------------------------------------------------------------
final boolean
- addBeanTypeProperties;
+ addBeanTypes;
/**
* Constructor.
@@ -120,7 +120,7 @@ public class MsgPackSerializer extends
OutputStreamSerializer {
*/
public MsgPackSerializer(PropertyStore ps) {
super(ps, "octal/msgpack");
- this.addBeanTypeProperties =
getBooleanProperty(MSGPACK_addBeanTypeProperties,
getBooleanProperty(SERIALIZER_addBeanTypeProperties, true));
+ this.addBeanTypes = getBooleanProperty(MSGPACK_addBeanTypes,
getBooleanProperty(SERIALIZER_addBeanTypes, false));
}
@Override /* Context */
@@ -153,7 +153,7 @@ public class MsgPackSerializer extends
OutputStreamSerializer {
public ObjectMap asMap() {
return super.asMap()
.append("MsgPackSerializer", new ObjectMap()
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
);
}
}
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 e35bcd9..a6cf321 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
@@ -56,8 +56,14 @@ public class MsgPackSerializerBuilder extends
OutputStreamSerializerBuilder {
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public MsgPackSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public MsgPackSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index a60aa5b..db77b0b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -31,7 +31,7 @@ import org.apache.juneau.transform.*;
public final class MsgPackSerializerSession extends
OutputStreamSerializerSession {
private final boolean
- addBeanTypeProperties;
+ addBeanTypes;
/**
* Create a new session using properties specified in the context.
@@ -47,25 +47,25 @@ public final class MsgPackSerializerSession extends
OutputStreamSerializerSessio
*/
protected MsgPackSerializerSession(MsgPackSerializer ctx,
SerializerSessionArgs args) {
super(ctx, args);
- addBeanTypeProperties =
getProperty(MSGPACK_addBeanTypeProperties, boolean.class,
ctx.addBeanTypeProperties);
+ addBeanTypes = getProperty(MSGPACK_addBeanTypes, boolean.class,
ctx.addBeanTypes);
}
@Override /* Session */
public ObjectMap asMap() {
return super.asMap()
.append("MsgPackSerializerSession", new ObjectMap()
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
);
}
/**
- * Returns the {@link MsgPackSerializer#MSGPACK_addBeanTypeProperties}
setting value for this session.
+ * Returns the {@link MsgPackSerializer#MSGPACK_addBeanTypes} setting
value for this session.
*
- * @return The {@link MsgPackSerializer#MSGPACK_addBeanTypeProperties}
setting value for this session.
+ * @return The {@link MsgPackSerializer#MSGPACK_addBeanTypes} setting
value for this session.
*/
@Override /* SerializerSession */
- protected final boolean isAddBeanTypeProperties() {
- return addBeanTypeProperties;
+ protected final boolean isAddBeanTypes() {
+ return addBeanTypes;
}
@Override /* SerializerSession */
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 01da4cc..5f4895f 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
@@ -86,8 +86,14 @@ public class PlainTextSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public PlainTextSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public PlainTextSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 2d666d7..315e668 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -51,13 +51,14 @@ public abstract class Serializer extends BeanContext {
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b> <js>"Serializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"Serializer.addBeanTypes.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
SerializerBuilder#addBeanTypeProperties(boolean)}
+ * <li class='jm'>{@link
SerializerBuilder#addBeanTypes()}
+ * <li class='jm'>{@link
SerializerBuilder#addBeanTypes(boolean)}
* </ul>
* </ul>
*
@@ -75,21 +76,21 @@ public abstract class Serializer extends BeanContext {
* Note the differences between the following settings:
* <ul>
* <li class='jf'>{@link #SERIALIZER_addRootType} - Affects
whether <js>'_type'</js> is added to root node.
- * <li class='jf'>{@link #SERIALIZER_addBeanTypeProperties} -
Affects whether <js>'_type'</js> is added to any nodes.
+ * <li class='jf'>{@link #SERIALIZER_addBeanTypes} - Affects
whether <js>'_type'</js> is added to any nodes.
* </ul>
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
- * <jc>// Create a serializer that never adds _type to nodes.</jc>
+ * <jc>// Create a serializer that adds _type to nodes.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .addBeanTypeProperties(<jk>false</jk>)
+ * .addBeanTypes()
* .build();
*
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_addBeanTypeProperties</jsf>,
<jk>false</jk>)
+ * .set(<jsf>SERIALIZER_addBeanTypes</jsf>, <jk>true</jk>)
* .build();
*
* <jc>// A map of objects we want to serialize.</jc>
@@ -99,12 +100,11 @@ public abstract class Serializer extends BeanContext {
* Map<String,Object> m = new HashMap<>();
* m.put(<js>"foo"</js>, <jk>new</jk> MyBean());
*
- * <jc>// Will not contain '_type' attribute even though type name
is on bean and we're serializing</jc>
- * <jc>// a map of generic objects.</jc>
+ * <jc>// Will contain '_type' attribute.</jc>
* String json = s.serialize(m);
* </p>
*/
- public static final String SERIALIZER_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String SERIALIZER_addBeanTypes = PREFIX +
"addBeanTypes.b";
/**
* Configuration property: Add type attribute to root nodes.
@@ -135,7 +135,7 @@ public abstract class Serializer extends BeanContext {
* Note the differences between the following settings:
* <ul>
* <li class='jf'>{@link #SERIALIZER_addRootType} - Affects
whether <js>'_type'</js> is added to root node.
- * <li class='jf'>{@link #SERIALIZER_addBeanTypeProperties} -
Affects whether <js>'_type'</js> is added to any nodes.
+ * <li class='jf'>{@link #SERIALIZER_addBeanTypes} - Affects
whether <js>'_type'</js> is added to any nodes.
* </ul>
*
* <h5 class='section'>Example:</h5>
@@ -846,7 +846,7 @@ public abstract class Serializer extends BeanContext {
final boolean
detectRecursions,
ignoreRecursions,
- addBeanTypeProperties,
+ addBeanTypes,
trimNulls,
trimEmptyCollections,
trimEmptyMaps,
@@ -870,7 +870,7 @@ public abstract class Serializer extends BeanContext {
initialDepth = getIntegerProperty(SERIALIZER_initialDepth, 0);
detectRecursions =
getBooleanProperty(SERIALIZER_detectRecursions, false);
ignoreRecursions =
getBooleanProperty(SERIALIZER_ignoreRecursions, false);
- addBeanTypeProperties =
getBooleanProperty(SERIALIZER_addBeanTypeProperties, true);
+ addBeanTypes = getBooleanProperty(SERIALIZER_addBeanTypes,
false);
trimNulls = getBooleanProperty(SERIALIZER_trimNullProperties,
true);
trimEmptyCollections =
getBooleanProperty(SERIALIZER_trimEmptyCollections, false);
trimEmptyMaps = getBooleanProperty(SERIALIZER_trimEmptyMaps,
false);
@@ -1039,7 +1039,7 @@ public abstract class Serializer extends BeanContext {
.append("initialDepth", initialDepth)
.append("detectRecursions", detectRecursions)
.append("ignoreRecursions", ignoreRecursions)
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
.append("trimNulls", trimNulls)
.append("trimEmptyCollections",
trimEmptyCollections)
.append("trimEmptyMaps", trimEmptyMaps)
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 ca8b3d4..f6bd81b 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
@@ -54,16 +54,33 @@ public class SerializerBuilder extends BeanContextBuilder {
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypes}
* </ul>
*
* @param value
* The new value for this property.
- * <br>The default is <jk>true</jk>.
+ * <br>The default is <jk>false</jk>.
+ * @return This object (for method chaining).
+ */
+ public SerializerBuilder addBeanTypes(boolean value) {
+ return set(SERIALIZER_addBeanTypes, value);
+ }
+
+ /**
+ * Configuration property: Add <js>"_type"</js> properties when needed.
+ *
+ * <p>
+ * Shortcut for calling <code>addBeanTypes(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypes}
+ * </ul>
+ *
* @return This object (for method chaining).
*/
- public SerializerBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public SerializerBuilder addBeanTypes() {
+ return set(SERIALIZER_addBeanTypes, true);
}
/**
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 cdfa00e..8049cea 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
@@ -140,16 +140,33 @@ public class SerializerGroupBuilder extends
BeanContextBuilder {
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypes}
* </ul>
*
* @param value
* The new value for this property.
- * <br>The default is <jk>true</jk>.
+ * <br>The default is <jk>false</jk>.
+ * @return This object (for method chaining).
+ */
+ public SerializerGroupBuilder addBeanTypes(boolean value) {
+ return set(SERIALIZER_addBeanTypes, value);
+ }
+
+ /**
+ * Configuration property: Add <js>"_type"</js> properties when needed.
+ *
+ * <p>
+ * Shortcut for calling <code>addBeanTypes(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypes}
+ * </ul>
+ *
* @return This object (for method chaining).
*/
- public SerializerGroupBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public SerializerGroupBuilder addBeanTypes() {
+ return set(SERIALIZER_addBeanTypes, true);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index f3da967..0b92d8f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -53,7 +53,7 @@ public abstract class SerializerSession extends BeanSession {
private final boolean
detectRecursions,
ignoreRecursions,
- addBeanTypeProperties,
+ addBeanTypes,
trimNulls,
trimEmptyCollections,
trimEmptyMaps,
@@ -101,7 +101,7 @@ public abstract class SerializerSession extends BeanSession
{
initialDepth = getProperty(SERIALIZER_initialDepth, int.class,
ctx.initialDepth);
detectRecursions = getProperty(SERIALIZER_detectRecursions,
boolean.class, ctx.detectRecursions);
ignoreRecursions = getProperty(SERIALIZER_ignoreRecursions,
boolean.class, ctx.ignoreRecursions);
- addBeanTypeProperties =
getProperty(SERIALIZER_addBeanTypeProperties, boolean.class,
ctx.addBeanTypeProperties);
+ addBeanTypes = getProperty(SERIALIZER_addBeanTypes,
boolean.class, ctx.addBeanTypes);
trimNulls = getProperty(SERIALIZER_trimNullProperties,
boolean.class, ctx.trimNulls);
trimEmptyCollections =
getProperty(SERIALIZER_trimEmptyCollections, boolean.class,
ctx.trimEmptyCollections);
trimEmptyMaps = getProperty(SERIALIZER_trimEmptyMaps,
boolean.class, ctx.trimEmptyMaps);
@@ -146,7 +146,7 @@ public abstract class SerializerSession extends BeanSession
{
.append("initialDepth", initialDepth)
.append("detectRecursions", detectRecursions)
.append("ignoreRecursions", ignoreRecursions)
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
.append("trimNulls", trimNulls)
.append("trimEmptyCollections",
trimEmptyCollections)
.append("trimEmptyMaps", trimEmptyMaps)
@@ -336,12 +336,12 @@ public abstract class SerializerSession extends
BeanSession {
}
/**
- * Returns the {@link Serializer#SERIALIZER_addBeanTypeProperties}
setting value for this session.
+ * Returns the {@link Serializer#SERIALIZER_addBeanTypes} setting value
for this session.
*
- * @return The {@link Serializer#SERIALIZER_addBeanTypeProperties}
setting value for this session.
+ * @return The {@link Serializer#SERIALIZER_addBeanTypes} setting value
for this session.
*/
- protected boolean isAddBeanTypeProperties() {
- return addBeanTypeProperties;
+ protected boolean isAddBeanTypes() {
+ return addBeanTypes;
}
/**
@@ -812,7 +812,7 @@ public abstract class SerializerSession extends BeanSession
{
if (eType == aType)
return null;
- if (! isAddBeanTypeProperties())
+ if (! isAddBeanTypes())
return null;
String eTypeTn = eType.getDictionaryName();
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 ae2025d..00eb5b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
@@ -70,8 +70,14 @@ public class SoapXmlSerializerBuilder extends
XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public SoapXmlSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public SoapXmlSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index 0e8a920..8fb6d47 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -126,13 +126,13 @@ public class UonSerializer extends WriterSerializer {
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b>
<js>"UonSerializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"UonSerializer.addBeanTypes.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
- * <li><b>Default:</b> <jk>true</jk>
+ * <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
UonSerializerBuilder#addBeanTypeProperties(boolean)}
+ * <li class='jm'>{@link
UonSerializerBuilder#addBeanTypes(boolean)}
* </ul>
* </ul>
*
@@ -142,10 +142,10 @@ public class UonSerializer extends WriterSerializer {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypeProperties} setting and is
+ * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*/
- public static final String UON_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String UON_addBeanTypes = PREFIX + "addBeanTypes.b";
/**
* Configuration property: Encode non-valid URI characters.
@@ -305,7 +305,7 @@ public class UonSerializer extends WriterSerializer {
final boolean
encodeChars,
- addBeanTypeProperties;
+ addBeanTypes;
final ParamFormat
paramFormat;
@@ -348,7 +348,7 @@ public class UonSerializer extends WriterSerializer {
public UonSerializer(PropertyStore ps, String produces,
String...accept) {
super(ps, produces, accept);
encodeChars = getBooleanProperty(UON_encoding, false);
- addBeanTypeProperties =
getBooleanProperty(UON_addBeanTypeProperties,
getBooleanProperty(SERIALIZER_addBeanTypeProperties, true));
+ addBeanTypes = getBooleanProperty(UON_addBeanTypes,
getBooleanProperty(SERIALIZER_addBeanTypes, false));
paramFormat = getProperty(UON_paramFormat, ParamFormat.class,
ParamFormat.UON);
}
@@ -388,7 +388,7 @@ public class UonSerializer extends WriterSerializer {
return super.asMap()
.append("UonSerializer", new ObjectMap()
.append("encodeChars", encodeChars)
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
.append("paramFormat", paramFormat)
);
}
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 1656007..e5c40cd 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
@@ -162,8 +162,14 @@ public class UonSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public UonSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public UonSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index 28e7b89..a633b08 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -32,7 +32,7 @@ public class UonSerializerSession extends
WriterSerializerSession {
private final boolean
encodeChars,
- addBeanTypeProperties,
+ addBeanTypes,
plainTextParams;
/**
@@ -49,7 +49,7 @@ public class UonSerializerSession extends
WriterSerializerSession {
public UonSerializerSession(UonSerializer ctx, Boolean encode,
SerializerSessionArgs args) {
super(ctx, args);
encodeChars = encode == null ? getProperty(UON_encoding,
boolean.class, ctx.encodeChars) : encode;
- addBeanTypeProperties = getProperty(UON_addBeanTypeProperties,
boolean.class, ctx.addBeanTypeProperties);
+ addBeanTypes = getProperty(UON_addBeanTypes, boolean.class,
ctx.addBeanTypes);
plainTextParams = getProperty(UON_paramFormat,
ParamFormat.class, ctx.paramFormat) == ParamFormat.PLAINTEXT;
}
@@ -57,20 +57,20 @@ public class UonSerializerSession extends
WriterSerializerSession {
public ObjectMap asMap() {
return super.asMap()
.append("UonSerializerSession", new ObjectMap()
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
.append("encodeChars", encodeChars)
.append("plainTextParams", plainTextParams)
);
}
/**
- * Returns the {@link UonSerializer#UON_addBeanTypeProperties} setting
value for this session.
+ * Returns the {@link UonSerializer#UON_addBeanTypes} setting value for
this session.
*
- * @return The {@link UonSerializer#UON_addBeanTypeProperties} setting
value for this session.
+ * @return The {@link UonSerializer#UON_addBeanTypes} setting value for
this session.
*/
@Override /* SerializerSession */
- public final boolean isAddBeanTypeProperties() {
- return addBeanTypeProperties;
+ public final boolean isAddBeanTypes() {
+ return addBeanTypes;
}
/**
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 1259b88..59b62db 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
@@ -115,8 +115,14 @@ public class UrlEncodingSerializerBuilder extends
UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder addBeanTypeProperties(boolean
value) {
- super.addBeanTypeProperties(value);
+ public UrlEncodingSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public UrlEncodingSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
index 46a956d..de7541e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java
@@ -92,8 +92,14 @@ public class XmlSchemaSerializerBuilder extends
XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public XmlSchemaSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public XmlSchemaSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index bffdc1a..b3e204a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -121,13 +121,13 @@ public class XmlSerializer extends WriterSerializer {
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b>
<js>"XmlSerializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"XmlSerializer.addBeanTypes.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
XmlSerializerBuilder#addBeanTypeProperties(boolean)}
+ * <li class='jm'>{@link
XmlSerializerBuilder#addBeanTypes(boolean)}
* </ul>
* </ul>
*
@@ -137,10 +137,10 @@ public class XmlSerializer extends WriterSerializer {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypeProperties} setting and is
+ * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*/
- public static final String XML_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String XML_addBeanTypes = PREFIX + "addBeanTypes.b";
/**
* Configuration property: Add namespace URLs to the root element.
@@ -453,7 +453,7 @@ public class XmlSerializer extends WriterSerializer {
autoDetectNamespaces,
enableNamespaces,
addNamespaceUrlsToRoot,
- addBeanTypeProperties;
+ addBeanTypes;
final Namespace defaultNamespace;
@@ -505,7 +505,7 @@ public class XmlSerializer extends WriterSerializer {
enableNamespaces = getBooleanProperty(XML_enableNamespaces,
false);
addNamespaceUrlsToRoot =
getBooleanProperty(XML_addNamespaceUrisToRoot, false);
defaultNamespace = getInstanceProperty(XML_defaultNamespace,
Namespace.class, DEFAULT_JUNEAU_NAMESPACE);
- addBeanTypeProperties =
getBooleanProperty(XML_addBeanTypeProperties,
getBooleanProperty(SERIALIZER_addBeanTypeProperties, true));
+ addBeanTypes = getBooleanProperty(XML_addBeanTypes,
getBooleanProperty(SERIALIZER_addBeanTypes, false));
xsNamespace = getInstanceProperty(XML_xsNamespace,
Namespace.class, DEFAULT_XS_NAMESPACE);
namespaces = getInstanceArrayProperty(XML_namespaces,
Namespace.class, new Namespace[0]);
}
@@ -556,7 +556,7 @@ public class XmlSerializer extends WriterSerializer {
.append("defaultNamespace", defaultNamespace)
.append("xsNamespace", xsNamespace)
.append("namespaces", namespaces)
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
);
}
}
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 596ccaa..0d4cc84 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
@@ -258,8 +258,14 @@ public class XmlSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public XmlSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public XmlSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index a931151..68684f9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -41,7 +41,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
autoDetectNamespaces,
enableNamespaces,
addNamespaceUrlsToRoot,
- addBeanTypeProperties;
+ addBeanTypes;
Namespace
defaultNamespace;
@@ -67,7 +67,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
enableNamespaces = getProperty(XML_enableNamespaces,
boolean.class, ctx.enableNamespaces);
autoDetectNamespaces = getProperty(XML_autoDetectNamespaces,
boolean.class, ctx.autoDetectNamespaces);
addNamespaceUrlsToRoot =
getProperty(XML_addNamespaceUrisToRoot, boolean.class,
ctx.addNamespaceUrlsToRoot);
- addBeanTypeProperties = getProperty(XML_addBeanTypeProperties,
boolean.class, ctx.addBeanTypeProperties);
+ addBeanTypes = getProperty(XML_addBeanTypes, boolean.class,
ctx.addBeanTypes);
namespaces = getInstanceArrayProperty(XML_namespaces,
Namespace.class, ctx.namespaces);
defaultNamespace =
findDefaultNamespace(getInstanceProperty(XML_defaultNamespace, Namespace.class,
ctx.defaultNamespace));
xsNamespace = getInstanceProperty(XML_xsNamespace,
Namespace.class, ctx.xsNamespace);
@@ -95,7 +95,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
public ObjectMap asMap() {
return super.asMap()
.append("XmlSerializerSession", new ObjectMap()
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
.append("addNamespaceUrlsToRoot",
addNamespaceUrlsToRoot)
.append("autoDetectNamespaces",
autoDetectNamespaces)
.append("defaultNamespace", defaultNamespace)
@@ -125,13 +125,13 @@ public class XmlSerializerSession extends
WriterSerializerSession {
}
/**
- * Returns the {@link XmlSerializer#XML_addBeanTypeProperties} setting
value for this session.
+ * Returns the {@link XmlSerializer#XML_addBeanTypes} setting value for
this session.
*
- * @return The {@link XmlSerializer#XML_addBeanTypeProperties} setting
value for this session.
+ * @return The {@link XmlSerializer#XML_addBeanTypes} setting value for
this session.
*/
@Override /* SerializerSession */
- protected boolean isAddBeanTypeProperties() {
- return addBeanTypeProperties;
+ protected boolean isAddBeanTypes() {
+ return addBeanTypes;
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializer.java
index 0e107be..2dc7618 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializer.java
@@ -91,13 +91,13 @@ public class YamlSerializer extends WriterSerializer {
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b>
<js>"JsonSerializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"JsonSerializer.addBeanTypes.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
JsonSerializerBuilder#addBeanTypeProperties(boolean)}
+ * <li class='jm'>{@link
JsonSerializerBuilder#addBeanTypes(boolean)}
* </ul>
* </ul>
*
@@ -107,10 +107,10 @@ public class YamlSerializer extends WriterSerializer {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypeProperties} setting and is
+ * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*/
- public static final String YAML_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String YAML_addBeanTypes = PREFIX +
"addBeanTypes.b";
/**
* Configuration property: Prefix solidus <js>'/'</js> characters with
escapes.
@@ -256,7 +256,7 @@ public class YamlSerializer extends WriterSerializer {
final boolean
simpleMode,
escapeSolidus,
- addBeanTypeProperties;
+ addBeanTypes;
/**
* Constructor.
@@ -297,7 +297,7 @@ public class YamlSerializer extends WriterSerializer {
super(ps, produces, accept);
simpleMode = getBooleanProperty(YAML_simpleMode, false);
escapeSolidus = getBooleanProperty(YAML_escapeSolidus, false);
- addBeanTypeProperties =
getBooleanProperty(YAML_addBeanTypeProperties,
getBooleanProperty(SERIALIZER_addBeanTypeProperties, true));
+ addBeanTypes = getBooleanProperty(YAML_addBeanTypes,
getBooleanProperty(SERIALIZER_addBeanTypes, false));
}
@Override /* Context */
@@ -337,7 +337,7 @@ public class YamlSerializer extends WriterSerializer {
.append("YamlSerializer", new ObjectMap()
.append("simpleMode", simpleMode)
.append("escapeSolidus", escapeSolidus)
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
index 1c42a60..cb3c8f8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerBuilder.java
@@ -142,8 +142,14 @@ public class YamlSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public YamlSerializerBuilder addBeanTypes(boolean value) {
+ super.addBeanTypes(value);
+ return this;
+ }
+
+ @Override /* SerializerBuilder */
+ public YamlSerializerBuilder addBeanTypes() {
+ super.addBeanTypes();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java
index 21436d8..2f10f67 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java
@@ -31,7 +31,7 @@ import org.apache.juneau.transform.*;
public class YamlSerializerSession extends WriterSerializerSession {
private final boolean
- addBeanTypeProperties;
+ addBeanTypes;
/**
* Create a new session using properties specified in the context.
@@ -47,14 +47,14 @@ public class YamlSerializerSession extends
WriterSerializerSession {
*/
protected YamlSerializerSession(YamlSerializer ctx,
SerializerSessionArgs args) {
super(ctx, args);
- addBeanTypeProperties = getProperty(YAML_addBeanTypeProperties,
boolean.class, ctx.addBeanTypeProperties);
+ addBeanTypes = getProperty(YAML_addBeanTypes, boolean.class,
ctx.addBeanTypes);
}
@Override /* Session */
public ObjectMap asMap() {
return super.asMap()
.append("YamlSerializerSession", new ObjectMap()
- .append("addBeanTypeProperties",
addBeanTypeProperties)
+ .append("addBeanTypes", addBeanTypes)
);
}
@@ -221,13 +221,13 @@ public class YamlSerializerSession extends
WriterSerializerSession {
/**
- * Returns the {@link #YAML_addBeanTypeProperties} setting value for
this session.
+ * Returns the {@link #YAML_addBeanTypes} setting value for this
session.
*
- * @return The {@link #YAML_addBeanTypeProperties} setting value for
this session.
+ * @return The {@link #YAML_addBeanTypes} setting value for this
session.
*/
@Override /* SerializerSession */
- protected final boolean isAddBeanTypeProperties() {
- return addBeanTypeProperties;
+ protected final boolean isAddBeanTypes() {
+ return addBeanTypes;
}
/**
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index a3c7c12..17f34b6 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -1128,7 +1128,7 @@
<ul class='doctree'>
<li class='jc'>{@link
org.apache.juneau.serializer.Serializer}
<ul>
- <li class='jf'>{@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addBeanTypeProperties
SERIALIZER_addBeanTypeProperties}
+ <li class='jf'>{@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addBeanTypes
SERIALIZER_addBeanTypes}
<li class='jf'>{@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addRootType
SERIALIZER_addRootType}
<li class='jf'>{@link
org.apache.juneau.serializer.Serializer#SERIALIZER_detectRecursions
SERIALIZER_detectRecursions}
<li class='jf'>{@link
org.apache.juneau.serializer.Serializer#SERIALIZER_ignoreRecursions
SERIALIZER_ignoreRecursions}
@@ -3161,7 +3161,7 @@
<li class='info'>
Serialized type names are DISABLED by default.
They must be enabled on the serializer using
the
- {@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addBeanTypeProperties}
+ {@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addBeanTypes}
configuration property.
</ul>
@@ -4067,7 +4067,7 @@
<li class='link'><a class='doclink'
href='#juneau-marshall.ConfigurableProperties.CommonSerializer'>Common
Serializer Properties</a>
<li class='jc'>{@link
org.apache.juneau.json.JsonSerializer}
<ul>
- <li class='jf'>{@link
org.apache.juneau.json.JsonSerializer#JSON_addBeanTypeProperties
JSON_addBeanTypeProperties}
+ <li class='jf'>{@link
org.apache.juneau.json.JsonSerializer#JSON_addBeanTypes JSON_addBeanTypes}
<li class='jf'>{@link
org.apache.juneau.json.JsonSerializer#JSON_escapeSolidus JSON_escapeSolidus}
<li class='jf'>{@link
org.apache.juneau.json.JsonSerializer#JSON_simpleMode JSON_simpleMode}
</ul>
@@ -4779,7 +4779,7 @@
<li class='link'><a class='doclink'
href='#juneau-marshall.ConfigurableProperties.CommonSerializer'>Common
Serializer Properties</a>
<li class='jc'>{@link
org.apache.juneau.xml.XmlSerializer}
<ul>
- <li class='jf'>{@link
org.apache.juneau.xml.XmlSerializer#XML_addBeanTypeProperties
XML_addBeanTypeProperties}
+ <li class='jf'>{@link
org.apache.juneau.xml.XmlSerializer#XML_addBeanTypes XML_addBeanTypes}
<li class='jf'>{@link
org.apache.juneau.xml.XmlSerializer#XML_addNamespaceUrisToRoot
XML_addNamespaceUrisToRoot}
<li class='jf'>{@link
org.apache.juneau.xml.XmlSerializer#XML_autoDetectNamespaces
XML_autoDetectNamespaces}
<li class='jf'>{@link
org.apache.juneau.xml.XmlSerializer#XML_defaultNamespace XML_defaultNamespace}
@@ -7103,7 +7103,7 @@
<li class='link'><a class='doclink'
href='#juneau-marshall.ConfigurableProperties.CommonSerializer'>Common
Serializer Properties</a>
<li class='jc'>{@link
org.apache.juneau.html.HtmlSerializer}
<ul>
- <li class='jf'>{@link
org.apache.juneau.html.HtmlSerializer#HTML_addBeanTypeProperties
HTML_addBeanTypeProperties}
+ <li class='jf'>{@link
org.apache.juneau.html.HtmlSerializer#HTML_addBeanTypes HTML_addBeanTypes}
<li class='jf'>{@link
org.apache.juneau.html.HtmlSerializer#HTML_addKeyValueTableHeaders
HTML_addKeyValueTableHeaders}
<li class='jf'>{@link
org.apache.juneau.html.HtmlSerializer#HTML_detectLabelParameters
HTML_detectLabelParameters}
<li class='jf'>{@link
org.apache.juneau.html.HtmlSerializer#HTML_detectLinksInStrings
HTML_detectLinksInStrings}
@@ -7357,7 +7357,7 @@
<li class='link'><a class='doclink'
href='#juneau-marshall.ConfigurableProperties.CommonSerializer'>Common
Serializer Properties</a>
<li class='jc'>{@link
org.apache.juneau.uon.UonSerializer}
<ul>
- <li class='jf'>{@link
org.apache.juneau.uon.UonSerializer#UON_addBeanTypeProperties
UON_addBeanTypeProperties}
+ <li class='jf'>{@link
org.apache.juneau.uon.UonSerializer#UON_addBeanTypes UON_addBeanTypes}
<li class='jf'>{@link
org.apache.juneau.uon.UonSerializer#UON_encoding UON_encoding}
<li class='jf'>{@link
org.apache.juneau.uon.UonSerializer#UON_paramFormat UON_paramFormat}
</ul>
@@ -7638,7 +7638,7 @@
<li class='link'><a class='doclink'
href='#juneau-marshall.ConfigurableProperties.CommonSerializer'>Common
Serializer Properties</a>
<li class='jc'>{@link
org.apache.juneau.msgpack.MsgPackSerializer}
<ul>
- <li class='jf'>{@link
org.apache.juneau.msgpack.MsgPackSerializer#MSGPACK_addBeanTypeProperties
MSGPACK_addBeanTypeProperties}
+ <li class='jf'>{@link
org.apache.juneau.msgpack.MsgPackSerializer#MSGPACK_addBeanTypes
MSGPACK_addBeanTypes}
</ul>
</ul>
<p>
@@ -7888,7 +7888,7 @@
</ul>
<li class='jc'>{@link
org.apache.juneau.jena.RdfSerializer}
<ul>
- <li class='jf'>{@link
org.apache.juneau.jena.RdfSerializer#RDF_addBeanTypeProperties
RDF_addBeanTypeProperties}
+ <li class='jf'>{@link
org.apache.juneau.jena.RdfSerializer#RDF_addBeanTypes RDF_addBeanTypes}
<li class='jf'>{@link
org.apache.juneau.jena.RdfSerializer#RDF_addLiteralTypes RDF_addLiteralTypes}
<li class='jf'>{@link
org.apache.juneau.jena.RdfSerializer#RDF_addRootProperty RDF_addRootProperty}
<li class='jf'>{@link
org.apache.juneau.jena.RdfSerializer#RDF_autoDetectNamespaces
RDF_autoDetectNamespaces}
@@ -21288,6 +21288,9 @@
</ul>
<li>
The <jsf>SERIALIZER_abridged</jsf> setting has
been replaced with {@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addRootType
SERIALIZER_addRootType}
+ <li>
+ The <jsf>SERIALIZER_addBeanTypeProperties</jsf>
setting has been replaced with {@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addBeanTypes
SERIALIZER_addBeanTypes}
+ and is disabled by default.
</ul>
<h5 class='topic w800'>juneau-dto</h5>
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java
index 1171e7f..0841635 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java
@@ -30,7 +30,7 @@ import org.apache.juneau.utils.*;
*/
@RestResource(
path="/testInterfaceProxyResource",
- flags={Serializer.SERIALIZER_addRootType}
+ flags={Serializer.SERIALIZER_addRootType,
Serializer.SERIALIZER_addBeanTypes}
)
public class InterfaceProxyResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TestUtils.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TestUtils.java
index 2eef776..d790e4c 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TestUtils.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TestUtils.java
@@ -30,6 +30,7 @@ public class TestUtils {
private static JsonSerializer js2 = JsonSerializer.create()
.ssq()
.pojoSwaps(IteratorSwap.class, EnumerationSwap.class)
+ .addBeanTypes()
.addRootType()
.build();
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java
index 988de6d..e0c4878 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java
@@ -35,7 +35,7 @@ import org.apache.juneau.utils.*;
*/
@RestResource(
path="/testThirdPartyProxy",
- flags={Serializer.SERIALIZER_addRootType}
+ flags={Serializer.SERIALIZER_addRootType,
Serializer.SERIALIZER_addBeanTypes}
)
@SuppressWarnings("serial")
public class ThirdPartyProxyResource extends BasicRestServletJena {
diff --git
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java
index f3b9dd1..48cc453 100644
---
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java
+++
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/InterfaceProxyTest.java
@@ -40,14 +40,14 @@ public class InterfaceProxyTest extends RestTestcase {
@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
return Arrays.asList(new Object[][] {
- { /* 0 */ "Json",
JsonSerializer.DEFAULT.builder().addRootType().build(), JsonParser.DEFAULT },
- { /* 1 */ "Xml",
XmlSerializer.DEFAULT.builder().addRootType().build(), XmlParser.DEFAULT },
- { /* 2 */ "Mixed",
JsonSerializer.DEFAULT.builder().addRootType().build(), XmlParser.DEFAULT },
- { /* 3 */ "Html",
HtmlSerializer.DEFAULT.builder().addRootType().build(), HtmlParser.DEFAULT },
- { /* 4 */ "MessagePack",
MsgPackSerializer.DEFAULT.builder().addRootType().build(),
MsgPackParser.DEFAULT },
- { /* 5 */ "UrlEncoding",
UrlEncodingSerializer.DEFAULT.builder().addRootType().build(),
UrlEncodingParser.DEFAULT },
- { /* 6 */ "Uon",
UonSerializer.DEFAULT.builder().addRootType().build(), UonParser.DEFAULT },
- { /* 7 */ "RdfXml",
RdfSerializer.DEFAULT_XMLABBREV.builder().addRootType().build(),
RdfParser.DEFAULT_XML },
+ { /* 0 */ "Json",
JsonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
JsonParser.DEFAULT },
+ { /* 1 */ "Xml",
XmlSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
XmlParser.DEFAULT },
+ { /* 2 */ "Mixed",
JsonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
XmlParser.DEFAULT },
+ { /* 3 */ "Html",
HtmlSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
HtmlParser.DEFAULT },
+ { /* 4 */ "MessagePack",
MsgPackSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
MsgPackParser.DEFAULT },
+ { /* 5 */ "UrlEncoding",
UrlEncodingSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
UrlEncodingParser.DEFAULT },
+ { /* 6 */ "Uon",
UonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
UonParser.DEFAULT },
+ { /* 7 */ "RdfXml",
RdfSerializer.DEFAULT_XMLABBREV.builder().addBeanTypes().addRootType().build(),
RdfParser.DEFAULT_XML },
});
}
diff --git
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ThirdPartyProxyTest.java
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ThirdPartyProxyTest.java
index 8f1b9f6..ce50720 100644
---
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ThirdPartyProxyTest.java
+++
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/ThirdPartyProxyTest.java
@@ -46,14 +46,14 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
return Arrays.asList(new Object[][] {
- { /* 0 */ "Json",
JsonSerializer.DEFAULT.builder().addRootType().build(), JsonParser.DEFAULT },
- { /* 1 */ "Xml",
XmlSerializer.DEFAULT.builder().addRootType().build(), XmlParser.DEFAULT },
- { /* 2 */ "Mixed",
JsonSerializer.DEFAULT.builder().addRootType().build(), XmlParser.DEFAULT },
- { /* 3 */ "Html",
HtmlSerializer.DEFAULT.builder().addRootType().build(), HtmlParser.DEFAULT },
- { /* 4 */ "MessagePack",
MsgPackSerializer.DEFAULT.builder().addRootType().build(),
MsgPackParser.DEFAULT },
- { /* 5 */ "UrlEncoding",
UrlEncodingSerializer.DEFAULT.builder().addRootType().build(),
UrlEncodingParser.DEFAULT },
- { /* 6 */ "Uon",
UonSerializer.DEFAULT.builder().addRootType().build(), UonParser.DEFAULT },
- { /* 7 */ "RdfXml",
RdfSerializer.DEFAULT_XMLABBREV.builder().addRootType().build(),
RdfParser.DEFAULT_XML },
+ { /* 0 */ "Json",
JsonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
JsonParser.DEFAULT },
+ { /* 1 */ "Xml",
XmlSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
XmlParser.DEFAULT },
+ { /* 2 */ "Mixed",
JsonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
XmlParser.DEFAULT },
+ { /* 3 */ "Html",
HtmlSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
HtmlParser.DEFAULT },
+ { /* 4 */ "MessagePack",
MsgPackSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
MsgPackParser.DEFAULT },
+ { /* 5 */ "UrlEncoding",
UrlEncodingSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
UrlEncodingParser.DEFAULT },
+ { /* 6 */ "Uon",
UonSerializer.DEFAULT.builder().addBeanTypes().addRootType().build(),
UonParser.DEFAULT },
+ { /* 7 */ "RdfXml",
RdfSerializer.DEFAULT_XMLABBREV.builder().addBeanTypes().addRootType().build(),
RdfParser.DEFAULT_XML },
});
}
@@ -62,7 +62,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
public ThirdPartyProxyTest(String label, Serializer serializer, Parser
parser) {
proxy = getCached(label, ThirdPartyProxy.class);
if (proxy == null) {
- this.proxy = getClient(label, serializer,
parser).builder().partSerializer(UonPartSerializer.DEFAULT.builder().addRootType().build()).build().getRemoteableProxy(ThirdPartyProxy.class,
null, serializer, parser);
+ this.proxy = getClient(label, serializer,
parser).builder().partSerializer(UonPartSerializer.DEFAULT.builder().addBeanTypes().addRootType().build()).build().getRemoteableProxy(ThirdPartyProxy.class,
null, serializer, parser);
cache(label, proxy);
}
}
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 bb95098..553fc0b 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
@@ -1142,16 +1142,33 @@ public class RestClientBuilder extends
BeanContextBuilder {
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypes}
* </ul>
*
* @param value
* The new value for this property.
- * <br>The default is <jk>true</jk>.
+ * <br>The default is <jk>false</jk>.
+ * @return This object (for method chaining).
+ */
+ public RestClientBuilder addBeanTypes(boolean value) {
+ return set(SERIALIZER_addBeanTypes, value);
+ }
+
+ /**
+ * Configuration property: Add <js>"_type"</js> properties when needed.
+ *
+ * <p>
+ * Shortcut for calling <code>addBeanTypes(<jk>true</jk>)</code>.
+ *
+ * <h5 class='section'>See Also:</h5>
+ * <ul>
+ * <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypes}
+ * </ul>
+ *
* @return This object (for method chaining).
*/
- public RestClientBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public RestClientBuilder addBeanTypes() {
+ return set(SERIALIZER_addBeanTypes, true);
}
/**
--
To stop receiving notification emails like this one, please contact
[email protected].
