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 14011d1 Replace abridged with addRootNode
14011d1 is described below
commit 14011d13c33aff6d4986d3559fc1896828e5cec1
Author: JamesBognar <[email protected]>
AuthorDate: Sat Mar 24 14:23:12 2018 -0400
Replace abridged with addRootNode
---
.../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 | 4 +
.../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 | 4 +-
.../java/org/apache/juneau/html/BasicHtmlTest.java | 10 +--
.../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 +-
.../java/org/apache/juneau/utils/PojoRestTest.java | 4 +-
.../apache/juneau/yaml/proto/CommonParserTest.java | 2 +-
.../apache/juneau/jena/RdfSerializerBuilder.java | 12 +--
.../apache/juneau/csv/CsvSerializerBuilder.java | 12 +--
.../apache/juneau/html/HtmlSerializerBuilder.java | 12 +--
.../httppart/SimpleUonPartSerializerBuilder.java | 12 +--
.../juneau/httppart/UonPartSerializerBuilder.java | 12 +--
.../apache/juneau/jso/JsoSerializerBuilder.java | 12 +--
.../juneau/json/JsonSchemaSerializerBuilder.java | 12 +--
.../apache/juneau/json/JsonSerializerBuilder.java | 12 +--
.../juneau/msgpack/MsgPackSerializerBuilder.java | 12 +--
.../plaintext/PlainTextSerializerBuilder.java | 12 +--
.../org/apache/juneau/serializer/Serializer.java | 85 +++++++++++-----------
.../juneau/serializer/SerializerBuilder.java | 42 +++++------
.../juneau/serializer/SerializerGroupBuilder.java | 42 +++++------
.../juneau/serializer/SerializerSession.java | 12 +--
.../juneau/soap/SoapXmlSerializerBuilder.java | 12 +--
.../apache/juneau/uon/UonSerializerBuilder.java | 12 +--
.../urlencoding/UrlEncodingSerializerBuilder.java | 12 +--
.../juneau/xml/XmlSchemaSerializerBuilder.java | 12 +--
.../apache/juneau/xml/XmlSerializerBuilder.java | 12 +--
.../juneau/yaml/proto/YamlSerializerBuilder.java | 12 +--
juneau-doc/src/main/javadoc/overview.html | 4 +-
.../juneau/examples/rest/PetStoreResource.java | 3 +-
.../juneau/rest/test/InterfaceProxyResource.java | 13 ++--
.../org/apache/juneau/rest/test/TestUtils.java | 1 +
.../juneau/rest/test/ThirdPartyProxyResource.java | 4 +-
.../juneau/rest/test/InterfaceProxyTest.java | 16 ++--
.../juneau/rest/test/ThirdPartyProxyTest.java | 18 ++---
.../juneau/rest/client/RestClientBuilder.java | 42 +++++------
44 files changed, 311 insertions(+), 309 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 4b1071d..f75458e 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;
+ JsonSerializer s =
JsonSerializer.DEFAULT_LAX.builder().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 af8cb96..ecfe74d 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;
+ JsonSerializer serializer =
JsonSerializer.DEFAULT_LAX.builder().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 7b24e13..99bbca5 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;
+ WriterSerializer sJson =
JsonSerializer.DEFAULT_LAX.builder().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").build();
+ WriterSerializer sJsonT =
JsonSerializer.create().ssq().beanTypePropertyName("t").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;
+ WriterSerializer sJsonR =
JsonSerializer.DEFAULT_LAX_READABLE.builder().addRootType().build();
ReaderParser pJsonR = JsonParser.DEFAULT;
@Test
@@ -321,7 +321,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// XML
//--------------------------------------------------------------------------------
- WriterSerializer sXml = XmlSerializer.DEFAULT_SQ;
+ WriterSerializer sXml =
XmlSerializer.DEFAULT_SQ.builder().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").build();
+ WriterSerializer sXmlT =
XmlSerializer.create().sq().beanTypePropertyName("t").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;
+ WriterSerializer sXmlR =
XmlSerializer.DEFAULT_SQ_READABLE.builder().addRootType().build();
ReaderParser pXmlR = XmlParser.DEFAULT;
@Test
@@ -384,7 +384,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// XML - Namespaces
//--------------------------------------------------------------------------------
- WriterSerializer sXmlNs = XmlSerializer.DEFAULT_NS_SQ;
+ WriterSerializer sXmlNs =
XmlSerializer.DEFAULT_NS_SQ.builder().addRootType().build();
ReaderParser pXmlNs = XmlParser.DEFAULT;
@Test
@@ -405,7 +405,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// HTML
//--------------------------------------------------------------------------------
- WriterSerializer sHtml = HtmlSerializer.DEFAULT_SQ;
+ WriterSerializer sHtml =
HtmlSerializer.DEFAULT_SQ.builder().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").build();
+ WriterSerializer sHtmlT =
HtmlSerializer.create().sq().beanTypePropertyName("t").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;
+ WriterSerializer sHtmlR =
HtmlSerializer.DEFAULT_SQ_READABLE.builder().addRootType().build();
ReaderParser pHtmlR = HtmlParser.DEFAULT;
@Test
@@ -468,7 +468,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UON
//--------------------------------------------------------------------------------
- WriterSerializer sUon = UonSerializer.DEFAULT;
+ WriterSerializer sUon =
UonSerializer.DEFAULT.builder().addRootType().build();
ReaderParser pUon = UonParser.DEFAULT;
@Test
@@ -489,7 +489,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UON - 't' property
//--------------------------------------------------------------------------------
- WriterSerializer sUonT =
UonSerializer.create().beanTypePropertyName("t").build();
+ WriterSerializer sUonT =
UonSerializer.create().beanTypePropertyName("t").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;
+ WriterSerializer sUonR =
UonSerializer.DEFAULT_READABLE.builder().addRootType().build();
ReaderParser pUonR = UonParser.DEFAULT;
@Test
@@ -531,7 +531,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UrlEncoding
//--------------------------------------------------------------------------------
- WriterSerializer sUrlEncoding = UrlEncodingSerializer.DEFAULT;
+ WriterSerializer sUrlEncoding =
UrlEncodingSerializer.DEFAULT.builder().addRootType().build();
ReaderParser pUrlEncoding = UrlEncodingParser.DEFAULT;
@Test
@@ -552,7 +552,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// UrlEncoding - 't' property
//--------------------------------------------------------------------------------
- WriterSerializer sUrlEncodingT =
UrlEncodingSerializer.create().beanTypePropertyName("t").build();
+ WriterSerializer sUrlEncodingT =
UrlEncodingSerializer.create().beanTypePropertyName("t").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;
+ WriterSerializer sUrlEncodingR =
UrlEncodingSerializer.DEFAULT_READABLE.builder().addRootType().build();
ReaderParser pUrlEncodingR = UrlEncodingParser.DEFAULT;
@Test
@@ -594,7 +594,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// MsgPack
//--------------------------------------------------------------------------------
- OutputStreamSerializer sMsgPack = MsgPackSerializer.DEFAULT_SPACED_HEX;
+ OutputStreamSerializer sMsgPack =
MsgPackSerializer.DEFAULT_SPACED_HEX.builder().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").build();
+ OutputStreamSerializer sMsgPackT =
MsgPackSerializer.create().beanTypePropertyName("t").addRootType().build();
InputStreamParser pMsgPackT =
MsgPackParser.create().beanTypePropertyName("t").build();
@Test
@@ -646,7 +646,7 @@ public abstract class ComboRoundTripTest {
//--------------------------------------------------------------------------------
// RdfXml
//--------------------------------------------------------------------------------
- WriterSerializer sRdfXml = RdfSerializer.DEFAULT_XMLABBREV;
+ WriterSerializer sRdfXml =
RdfSerializer.DEFAULT_XMLABBREV.builder().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").build();
+ WriterSerializer sRdfXmlT =
RdfSerializer.create().language(LANG_RDF_XML_ABBREV).beanTypePropertyName("t").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().build();
+ WriterSerializer sRdfXmlR =
RdfSerializer.create().language(LANG_RDF_XML_ABBREV).ws().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 1c4baa2..2e4c024 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,6 +43,7 @@ public class TestUtils {
private static JsonSerializer js = JsonSerializer.create()
.ssq()
.trimNullProperties(false)
+ .addRootType()
.build();
private static JsonSerializer jsSorted = JsonSerializer.create()
@@ -50,18 +51,21 @@ public class TestUtils {
.sortCollections()
.sortMaps()
.trimNullProperties(false)
+ .addRootType()
.build();
private static JsonSerializer js2 = JsonSerializer.create()
.ssq()
.pojoSwaps(IteratorSwap.class, EnumerationSwap.class)
+ .addRootType()
.build();
private static JsonSerializer js3 = JsonSerializer.create()
.ssq()
.pojoSwaps(IteratorSwap.class, EnumerationSwap.class)
.sortProperties()
+ .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 a878736..9d7e717 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),
+
JsonSerializer.create().addBeanTypeProperties(true).addRootType(),
new
JsonParserBuilder().useInterfaceProxies(false),
0
},
{ /* 1 */
"JsonSerializer.DEFAULT_LAX/JsonParser.DEFAULT",
- new
JsonSerializerBuilder().ssq().addBeanTypeProperties(true),
+ new
JsonSerializerBuilder().ssq().addBeanTypeProperties(true).addRootType(),
new
JsonParserBuilder().useInterfaceProxies(false),
0
},
{ /* 2 */
"JsonSerializer.DEFAULT_SQ/JsonParser.DEFAULT",
- new
JsonSerializerBuilder().ssq().addBeanTypeProperties(true),
+ new
JsonSerializerBuilder().ssq().addBeanTypeProperties(true).addRootType(),
new
JsonParserBuilder().useInterfaceProxies(false),
0
},
{ /* 3 */
"XmlSerializer.DEFAULT/XmlParser.DEFAULT",
- new
XmlSerializerBuilder().addBeanTypeProperties(true),
+ new
XmlSerializerBuilder().addBeanTypeProperties(true).addRootType(),
new
XmlParserBuilder().useInterfaceProxies(false),
CHECK_XML_WHITESPACE | VALIDATE_XML
},
{ /* 4 */
"HtmlSerializer.DEFAULT/HtmlParser.DEFAULT",
- new
HtmlSerializerBuilder().addBeanTypeProperties(true),
+ new
HtmlSerializerBuilder().addBeanTypeProperties(true).addRootType(),
new
HtmlParserBuilder().useInterfaceProxies(false),
CHECK_XML_WHITESPACE
},
{ /* 5 */
"UonSerializer.DEFAULT_ENCODING/UonParser.DEFAULT_DECODING",
- new
UonSerializerBuilder().encoding().addBeanTypeProperties(true),
+ new
UonSerializerBuilder().encoding().addBeanTypeProperties(true).addRootType(),
new
UonParserBuilder().decoding().useInterfaceProxies(false),
0
},
{ /* 6 */
"UonSerializer.DEFAULT/UonParser.DEFAULT",
- new
UonSerializerBuilder().addBeanTypeProperties(true),
+ new
UonSerializerBuilder().addBeanTypeProperties(true).addRootType(),
new
UonParserBuilder().useInterfaceProxies(false),
0
},
{ /* 7 */
"UrlEncodingSerializer.DEFAULT/UrlEncodingParser.DEFAULT",
- new
UrlEncodingSerializerBuilder().addBeanTypeProperties(true),
+ new
UrlEncodingSerializerBuilder().addBeanTypeProperties(true).addRootType(),
new
UrlEncodingParserBuilder().useInterfaceProxies(false),
0
},
{ /* 8 */
"RdfSerializer.Xml/RdfParser.Xml",
- new
RdfSerializerBuilder().addBeanTypeProperties(true),
+ new
RdfSerializerBuilder().addBeanTypeProperties(true).addRootType(),
new
RdfParserBuilder().useInterfaceProxies(false),
0
},
{ /* 9 */
"MsgPackSerializer.DEFAULT/MsgPackParser.DEFAULT",
- new
MsgPackSerializerBuilder().addBeanTypeProperties(true),
+ new
MsgPackSerializerBuilder().addBeanTypeProperties(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 8a3d125..06b828c 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).build();
+ JsonSerializer js =
JsonSerializer.create().ssq().pojoSwaps(XMLGregorianCalendarSwap.class).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 c3a0de2..7b09074 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),
+
JsonSerializer.create().trimNullProperties(false).addRootType(),
JsonParser.create(),
0
},
{ /* 1 */
"Json - lax",
-
JsonSerializer.create().ssq().trimNullProperties(false),
+
JsonSerializer.create().ssq().trimNullProperties(false).addRootType(),
JsonParser.create(),
0
},
{ /* 2 */
"Json - lax, readable",
-
JsonSerializer.create().ssq().ws().trimNullProperties(false),
+
JsonSerializer.create().ssq().ws().trimNullProperties(false).addRootType(),
JsonParser.create(),
0
},
{ /* 3 */
"Xml - namespaces, validation, readable",
-
XmlSerializer.create().ns().sq().trimNullProperties(false).addNamespaceUrisToRoot().useWhitespace(),
+
XmlSerializer.create().ns().sq().trimNullProperties(false).addNamespaceUrisToRoot().useWhitespace().addRootType(),
XmlParser.create(),
CHECK_XML_WHITESPACE | VALIDATE_XML
},
{ /* 4 */
"Xml - no namespaces, validation",
-
XmlSerializer.create().sq().trimNullProperties(false),
+
XmlSerializer.create().sq().trimNullProperties(false).addRootType(),
XmlParser.create(),
CHECK_XML_WHITESPACE
},
{ /* 5 */
"Html - default",
-
HtmlSerializer.create().trimNullProperties(false),
+
HtmlSerializer.create().trimNullProperties(false).addRootType(),
HtmlParser.create(),
CHECK_XML_WHITESPACE
},
{ /* 6 */
"Html - readable",
-
HtmlSerializer.create().sq().ws().trimNullProperties(false),
+
HtmlSerializer.create().sq().ws().trimNullProperties(false).addRootType(),
HtmlParser.create(),
CHECK_XML_WHITESPACE
},
{ /* 7 */
"Html - with key/value headers",
-
HtmlSerializer.create().addKeyValueTableHeaders(),
+
HtmlSerializer.create().addKeyValueTableHeaders().addRootType(),
HtmlParser.create(),
CHECK_XML_WHITESPACE
},
{ /* 8 */
"Uon - default",
-
UonSerializer.create().trimNullProperties(false),
+
UonSerializer.create().trimNullProperties(false).addRootType(),
UonParser.create(),
0
},
{ /* 9 */
"Uon - readable",
-
UonSerializer.create().ws().trimNullProperties(false),
+
UonSerializer.create().ws().trimNullProperties(false).addRootType(),
UonParser.create(),
0
},
{ /* 10 */
"Uon - encoded",
-
UonSerializer.create().encoding().trimNullProperties(false),
+
UonSerializer.create().encoding().trimNullProperties(false).addRootType(),
UonParser.create().decoding(),
0
},
{ /* 11 */
"UrlEncoding - default",
-
UrlEncodingSerializer.create().trimNullProperties(false),
+
UrlEncodingSerializer.create().trimNullProperties(false).addRootType(),
UrlEncodingParser.create(),
0
},
{ /* 12 */
"UrlEncoding - readable",
-
UrlEncodingSerializer.create().ws().trimNullProperties(false),
+
UrlEncodingSerializer.create().ws().trimNullProperties(false).addRootType(),
UrlEncodingParser.create(),
0
},
{ /* 13 */
"UrlEncoding - expanded params",
- UrlEncodingSerializer.create().expandedParams(),
+
UrlEncodingSerializer.create().expandedParams().addRootType(),
UrlEncodingParser.create().expandedParams(true),
0
},
{ /* 14 */
"Rdf.Xml",
-
RdfSerializer.create().trimNullProperties(false).addLiteralTypes(),
+
RdfSerializer.create().trimNullProperties(false).addLiteralTypes().addRootType(),
RdfParser.create().xml(),
0
},
{ /* 15 */
"Rdf.XmlAbbrev",
-
RdfSerializer.create().xmlabbrev().trimNullProperties(false).addLiteralTypes(),
+
RdfSerializer.create().xmlabbrev().trimNullProperties(false).addLiteralTypes().addRootType(),
RdfParser.create().xml(),
0
},
{ /* 16 */
"Rdf.Turtle",
-
RdfSerializer.create().turtle().trimNullProperties(false).addLiteralTypes(),
+
RdfSerializer.create().turtle().trimNullProperties(false).addLiteralTypes().addRootType(),
RdfParser.create().turtle(),
0
},
{ /* 17 */
"Rdf.NTriple",
-
RdfSerializer.create().ntriple().trimNullProperties(false).addLiteralTypes(),
+
RdfSerializer.create().ntriple().trimNullProperties(false).addLiteralTypes().addRootType(),
RdfParser.create().ntriple(),
0
},
{ /* 18 */
"Rdf.N3",
-
RdfSerializer.create().n3().trimNullProperties(false).addLiteralTypes(),
+
RdfSerializer.create().n3().trimNullProperties(false).addLiteralTypes().addRootType(),
RdfParser.create().n3(),
0
},
{ /* 19 */
"MsgPack",
-
MsgPackSerializer.create().trimNullProperties(false),
+
MsgPackSerializer.create().trimNullProperties(false).addRootType(),
MsgPackParser.create(),
0
},
@@ -171,13 +171,13 @@ public abstract class RoundTripTest {
// Validation testing only
{ /* 20 */
"Json schema",
-
JsonSchemaSerializer.create().trimNullProperties(false),
+
JsonSchemaSerializer.create().trimNullProperties(false).addRootType(),
null,
RETURN_ORIGINAL_OBJECT
},
{ /* 21 */
"Xml schema",
-
XmlSchemaSerializer.create().trimNullProperties(false),
+
XmlSchemaSerializer.create().trimNullProperties(false).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 d9a9905..f8cb087 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;
+ JsonSerializer s =
JsonSerializer.DEFAULT.builder().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 e1ff988..3e0ef7f 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
@@ -17,6 +17,7 @@ import static org.apache.juneau.TestUtils.*;
import java.util.*;
+import org.apache.juneau.json.*;
import org.apache.juneau.test.pojos.*;
import org.apache.juneau.utils.*;
import org.junit.*;
@@ -27,8 +28,7 @@ public class ConfigInterfaceTest {
ConfigInterface proxy;
public ConfigInterfaceTest() throws Exception {
- ConfigBuilder configFileBuilder = new ConfigBuilder();
- cf = configFileBuilder.build();
+ cf =
Config.create().serializer(JsonSerializer.DEFAULT_LAX.builder().addRootType().build()).build();
proxy = cf.getSectionAsInterface("A", ConfigInterface.class);
}
diff --git
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
index 775da1a..e5cde23 100644
---
a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
+++
b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
@@ -33,9 +33,9 @@ import org.junit.runners.*;
public class BasicHtmlTest {
private static final HtmlSerializer
- s1 = HtmlSerializer.DEFAULT_SQ,
- s2 = HtmlSerializer.DEFAULT_SQ_READABLE,
- s3 = HtmlSerializer.DEFAULT_SQ.builder().abridged().build();
+ s1 = HtmlSerializer.DEFAULT_SQ.builder().addRootType().build(),
+ s2 =
HtmlSerializer.DEFAULT_SQ_READABLE.builder().addRootType().build(),
+ s3 = HtmlSerializer.DEFAULT_SQ.builder().build();
private static final HtmlParser parser = HtmlParser.DEFAULT;
@Parameterized.Parameters
@@ -2630,7 +2630,7 @@ public class BasicHtmlTest {
public void c1_serializeAbridged() {
try {
String r = s3.serialize(input.in);
- assertEquals(input.label + " serialize-abridged
failed", input.e3, r);
+ assertEquals(input.label + " serialize-addRootType
failed", input.e3, r);
} catch (AssertionError e) {
throw e;
} catch (Throwable e) {
@@ -2644,7 +2644,7 @@ public class BasicHtmlTest {
String r = s3.serialize(input.in);
Object o = parser.parse(r, input.type);
r = s3.serialize(o);
- assertEquals(input.label + " parse-abridged failed",
input.e3, r);
+ assertEquals(input.label + " parse-addRootType failed",
input.e3, r);
} catch (AssertionError e) {
throw e;
} catch (Throwable e) {
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 136cc4e..b297176 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).build().serialize(t1);
+ in =
HtmlSerializer.create().addBeanTypeProperties(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 3874e55..ac2639b 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).build();
+ s =
getBasicSerializer().addBeanTypeProperties(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 f9fd606..8adb000 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).beanDictionary(A1.class).build().serialize(b);
+ String json =
JsonSerializer.create().addBeanTypeProperties(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 7d73b96..dd3c5fd 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).build().serialize(b);
+ in =
UonSerializer.create().addBeanTypeProperties(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 8164090..bb3c265 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).build();
+ JsonSerializer serializer =
JsonSerializer.create().ssq().addBeanTypeProperties(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;
+ serializer =
JsonSerializer.DEFAULT_LAX.builder().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)
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 fbba78f..0d1c62a 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).beanDictionary(A1.class).build().serialize(b);
+ String json =
YamlSerializer.create().addBeanTypeProperties(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/RdfSerializerBuilder.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 4e33691..6f5ab72 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,20 +460,20 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public RdfSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder abridged() {
- super.abridged();
+ public RdfSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public RdfSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public RdfSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
index b977d80..da2978f 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,20 +86,20 @@ public class CsvSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public CsvSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder abridged() {
- super.abridged();
+ public CsvSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public CsvSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public CsvSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
index d2c0265..2386040 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,20 +231,20 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public HtmlSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder abridged() {
- super.abridged();
+ public HtmlSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public HtmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public HtmlSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
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 50261e3..6bc4bea 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,20 +75,20 @@ public class SimpleUonPartSerializerBuilder extends
UonPartSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public SimpleUonPartSerializerBuilder addBeanTypeProperties(boolean
value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder abridged() {
- super.abridged();
+ public SimpleUonPartSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public SimpleUonPartSerializerBuilder addBeanTypeProperties(boolean
value) {
- super.addBeanTypeProperties(value);
+ public SimpleUonPartSerializerBuilder addRootType() {
+ super.addRootType();
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 7ab3aba..8b6a923 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,20 +51,20 @@ public class UonPartSerializerBuilder extends
UonSerializerBuilder {
//--------------------------------------------------------------------------------
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public UonPartSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder abridged() {
- super.abridged();
+ public UonPartSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public UonPartSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public UonPartSerializerBuilder addRootType() {
+ super.addRootType();
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 4db69fa..2eda5db 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,20 +56,20 @@ public class JsoSerializerBuilder extends
OutputStreamSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public JsoSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder abridged() {
- super.abridged();
+ public JsoSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public JsoSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public JsoSerializerBuilder addRootType() {
+ super.addRootType();
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 545638c..ab64e54 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,20 +80,20 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public JsonSchemaSerializerBuilder addBeanTypeProperties(boolean value)
{
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder abridged() {
- super.abridged();
+ public JsonSchemaSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSchemaSerializerBuilder addBeanTypeProperties(boolean value)
{
- super.addBeanTypeProperties(value);
+ public JsonSchemaSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
index 32e3e13..de46352 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,20 +181,20 @@ public class JsonSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public JsonSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder abridged() {
- super.abridged();
+ public JsonSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public JsonSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public JsonSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
index 024cb0f..e35bcd9 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,20 +56,20 @@ public class MsgPackSerializerBuilder extends
OutputStreamSerializerBuilder {
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public MsgPackSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder abridged() {
- super.abridged();
+ public MsgPackSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public MsgPackSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public MsgPackSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
index 07da65b..01da4cc 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,20 +86,20 @@ public class PlainTextSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public PlainTextSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder abridged() {
- super.abridged();
+ public PlainTextSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public PlainTextSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public PlainTextSerializerBuilder addRootType() {
+ super.addRootType();
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 8c71722..2d666d7 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
@@ -47,123 +47,120 @@ public abstract class Serializer extends BeanContext {
private static final String PREFIX = "Serializer.";
/**
- * Configuration property: Abridged output.
+ * Configuration property: Add <js>"_type"</js> properties when needed.
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b> <js>"Serializer.abridged.b"</js>
+ * <li><b>Name:</b> <js>"Serializer.addBeanTypeProperties.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
- * <li><b>Default:</b> <jk>false</jk>
+ * <li><b>Default:</b> <jk>true</jk>
* <li><b>Session-overridable:</b> <jk>true</jk>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
SerializerBuilder#abridged(boolean)}
- * <li class='jm'>{@link
SerializerBuilder#abridged()}
+ * <li class='jm'>{@link
SerializerBuilder#addBeanTypeProperties(boolean)}
* </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
* <p>
- * When enabled, it is assumed that the parser knows the exact Java
POJO type being parsed, and therefore top-level
- * type information that might normally be included to determine the
data type will not be serialized.
+ * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
+ * through reflection.
*
* <p>
- * For example, when serializing a top-level POJO with a {@link
Bean#typeName() @Bean.typeName()} value, a
- * <js>'_type'</js> attribute will only be added when this setting is
enabled.
+ * This is used to recreate the correct objects during parsing if the
object types cannot be inferred.
+ * <br>For example, when serializing a
<code>Map<String,Object></code> field where the bean class cannot be
determined from
+ * the type of the values.
*
* <p>
* Note the differences between the following settings:
* <ul>
- * <li class='jf'>{@link #SERIALIZER_abridged} - Affects whether
<js>'_type'</js> is added to root node.
+ * <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.
* </ul>
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
- * <jc>// Create a serializer that doesn't add _type to root
node.</jc>
+ * <jc>// Create a serializer that never adds _type to nodes.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .abridged()
+ * .addBeanTypeProperties(<jk>false</jk>)
* .build();
*
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_abridged</jsf>, <jk>true</jk>)
+ * .set(<jsf>SERIALIZER_addBeanTypeProperties</jsf>,
<jk>false</jk>)
* .build();
*
- * <jc>// The bean we want to serialize.</jc>
+ * <jc>// A map of objects we want to serialize.</jc>
* <ja>@Bean</ja>(typeName=<js>"mybean"</js>)
* <jk>public class</jk> MyBean {...}
*
- * <jc>// Will not contain '_type' attribute even though there's a
type name on the bean.</jc>
- * String json = s.serialize(<jk>new</jk> MyBean());
- *
- * <jc>// '_type' wasn't needed on the parse side because we know
the type being parsed.</jc>
- * MyBean myBean = JsonParser.<jsf>DEFAULT</jsf>.parse(json,
MyBean.<jk>class</jk>);
+ * 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>
+ * String json = s.serialize(m);
* </p>
*/
- public static final String SERIALIZER_abridged = PREFIX + "abridged.b";
+ public static final String SERIALIZER_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
/**
- * Configuration property: Add <js>"_type"</js> properties when needed.
+ * Configuration property: Add type attribute to root nodes.
*
* <h5 class='section'>Property:</h5>
* <ul>
- * <li><b>Name:</b> <js>"Serializer.addBeanTypeProperties.b"</js>
+ * <li><b>Name:</b> <js>"Serializer.addRootType.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#addRootType(boolean)}
+ * <li class='jm'>{@link
SerializerBuilder#addRootType()}
* </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
* <p>
- * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
- * through reflection.
+ * When disabled, it is assumed that the parser knows the exact Java
POJO type being parsed, and therefore top-level
+ * type information that might normally be included to determine the
data type will not be serialized.
*
* <p>
- * This is used to recreate the correct objects during parsing if the
object types cannot be inferred.
- * <br>For example, when serializing a
<code>Map<String,Object></code> field where the bean class cannot be
determined from
- * the type of the values.
+ * For example, when serializing a top-level POJO with a {@link
Bean#typeName() @Bean.typeName()} value, a
+ * <js>'_type'</js> attribute will only be added when this setting is
enabled.
*
* <p>
* Note the differences between the following settings:
* <ul>
- * <li class='jf'>{@link #SERIALIZER_abridged} - Affects whether
<js>'_type'</js> is added to root node.
+ * <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.
* </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 root node.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .addBeanTypeProperties(<jk>false</jk>)
+ * .addRootType()
* .build();
*
* <jc>// Same, but use property.</jc>
* WriterSerializer s = JsonSerializer
* .<jsm>create</jsm>()
- * .set(<jsf>SERIALIZER_addBeanTypeProperties</jsf>,
<jk>false</jk>)
+ * .set(<jsf>SERIALIZER_addRootType</jsf>, <jk>true</jk>)
* .build();
*
- * <jc>// A map of objects we want to serialize.</jc>
+ * <jc>// The bean we want to serialize.</jc>
* <ja>@Bean</ja>(typeName=<js>"mybean"</js>)
* <jk>public class</jk> MyBean {...}
*
- * 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>
- * String json = s.serialize(m);
+ * <jc>// Will contain '_type' attribute.</jc>
+ * String json = s.serialize(<jk>new</jk> MyBean());
* </p>
*/
- public static final String SERIALIZER_addBeanTypeProperties = PREFIX +
"addBeanTypeProperties.b";
+ public static final String SERIALIZER_addRootType = PREFIX +
"addRootType.b";
/**
* Configuration property: Automatically detect POJO recursions.
@@ -856,7 +853,7 @@ public abstract class Serializer extends BeanContext {
trimStrings,
sortCollections,
sortMaps,
- abridged;
+ addRootType;
final UriContext uriContext;
final UriResolution uriResolution;
final UriRelativity uriRelativity;
@@ -880,7 +877,7 @@ public abstract class Serializer extends BeanContext {
trimStrings = getBooleanProperty(SERIALIZER_trimStrings, false);
sortCollections =
getBooleanProperty(SERIALIZER_sortCollections, false);
sortMaps = getBooleanProperty(SERIALIZER_sortMaps, false);
- abridged = getBooleanProperty(SERIALIZER_abridged, false);
+ addRootType = getBooleanProperty(SERIALIZER_addRootType, false);
uriContext = getProperty(SERIALIZER_uriContext,
UriContext.class, UriContext.DEFAULT);
uriResolution = getProperty(SERIALIZER_uriResolution,
UriResolution.class, UriResolution.NONE);
uriRelativity = getProperty(SERIALIZER_uriRelativity,
UriRelativity.class, UriRelativity.RESOURCE);
@@ -1049,7 +1046,7 @@ public abstract class Serializer extends BeanContext {
.append("trimStrings", trimStrings)
.append("sortCollections", sortCollections)
.append("sortMaps", sortMaps)
- .append("parserKnowsRootTypes", abridged)
+ .append("addRootType", addRootType)
.append("uriContext", uriContext)
.append("uriResolution", uriResolution)
.append("uriRelativity", uriRelativity)
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 91a1c5c..ca8b3d4 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
@@ -46,62 +46,62 @@ public class SerializerBuilder extends BeanContextBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Abridged output.
+ * Configuration property: Add <js>"_type"</js> properties when needed.
*
* <p>
- * When enabled, it is assumed that the parser knows the exact Java
POJO type being parsed, and therefore top-level
- * type information that might normally be included to determine the
data type will not be serialized.
+ * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
+ * through reflection.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link Serializer#SERIALIZER_abridged}
+ * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
* </ul>
*
* @param value
* The new value for this property.
- * <br>The default is <jk>false</jk>.
+ * <br>The default is <jk>true</jk>.
* @return This object (for method chaining).
*/
- public SerializerBuilder abridged(boolean value) {
- return set(SERIALIZER_abridged, value);
+ public SerializerBuilder addBeanTypeProperties(boolean value) {
+ return set(SERIALIZER_addBeanTypeProperties, value);
}
/**
- * Configuration property: Abridged output.
+ * Configuration property: Add type attribute to root nodes.
*
* <p>
- * Shortcut for calling <code>abridged(<jk>true</jk>)</code>.
+ * When disabled, it is assumed that the parser knows the exact Java
POJO type being parsed, and therefore top-level
+ * type information that might normally be included to determine the
data type will not be serialized.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link Serializer#SERIALIZER_abridged}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addRootType}
* </ul>
*
+ * @param value
+ * The new value for this property.
+ * <br>The default is <jk>false</jk>.
* @return This object (for method chaining).
*/
- public SerializerBuilder abridged() {
- return set(SERIALIZER_abridged, true);
+ public SerializerBuilder addRootType(boolean value) {
+ return set(SERIALIZER_addRootType, value);
}
/**
- * Configuration property: Add <js>"_type"</js> properties when needed.
+ * Configuration property: Add type attribute to root nodes.
*
* <p>
- * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
- * through reflection.
+ * Shortcut for calling <code>addRootType(<jk>true</jk>)</code>.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addRootType}
* </ul>
*
- * @param value
- * The new value for this property.
- * <br>The default is <jk>true</jk>.
* @return This object (for method chaining).
*/
- public SerializerBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public SerializerBuilder addRootType() {
+ return set(SERIALIZER_addRootType, 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 c2e771b..cdfa00e 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
@@ -132,62 +132,62 @@ public class SerializerGroupBuilder extends
BeanContextBuilder {
//--------------------------------------------------------------------------------
/**
- * Configuration property: Abridged output.
+ * Configuration property: Add <js>"_type"</js> properties when needed.
*
* <p>
- * When enabled, it is assumed that the parser knows the exact Java
POJO type being parsed, and therefore top-level
- * type information that might normally be included to determine the
data type will not be serialized.
+ * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
+ * through reflection.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link Serializer#SERIALIZER_abridged}
+ * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
* </ul>
*
* @param value
* The new value for this property.
- * <br>The default is <jk>false</jk>.
+ * <br>The default is <jk>true</jk>.
* @return This object (for method chaining).
*/
- public SerializerGroupBuilder abridged(boolean value) {
- return set(SERIALIZER_abridged, value);
+ public SerializerGroupBuilder addBeanTypeProperties(boolean value) {
+ return set(SERIALIZER_addBeanTypeProperties, value);
}
/**
- * Configuration property: Abridged output.
+ * Configuration property: Add type attribute to root nodes.
*
* <p>
- * Shortcut for calling <code>abridged(<jk>true</jk>)</code>.
+ * When disabled, it is assumed that the parser knows the exact Java
POJO type being parsed, and therefore top-level
+ * type information that might normally be included to determine the
data type will not be serialized.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link Serializer#SERIALIZER_abridged}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addRootType}
* </ul>
*
+ * @param value
+ * The new value for this property.
+ * <br>The default is <jk>false</jk>.
* @return This object (for method chaining).
*/
- public SerializerGroupBuilder abridged() {
- return set(SERIALIZER_abridged, true);
+ public SerializerGroupBuilder addRootType(boolean value) {
+ return set(SERIALIZER_addRootType, value);
}
/**
- * Configuration property: Add <js>"_type"</js> properties when needed.
+ * Configuration property: Add type attribute to root nodes.
*
* <p>
- * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
- * through reflection.
+ * Shortcut for calling <code>addRootType(<jk>true</jk>)</code>.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addRootType}
* </ul>
*
- * @param value
- * The new value for this property.
- * <br>The default is <jk>true</jk>.
* @return This object (for method chaining).
*/
- public SerializerGroupBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public SerializerGroupBuilder addRootType() {
+ return set(SERIALIZER_addRootType, 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 dce03a4..e45eeb0 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
@@ -60,7 +60,7 @@ public abstract class SerializerSession extends BeanSession {
trimStrings,
sortCollections,
sortMaps,
- abridged;
+ addRootType;
private final UriResolver uriResolver;
private final Map<Object,Object> set;
// Contains the current objects in the current branch of the model.
@@ -108,7 +108,7 @@ public abstract class SerializerSession extends BeanSession
{
trimStrings = getProperty(SERIALIZER_trimStrings,
boolean.class, ctx.trimStrings);
sortCollections = getProperty(SERIALIZER_sortCollections,
boolean.class, ctx.sortMaps);
sortMaps = getProperty(SERIALIZER_sortMaps, boolean.class,
ctx.sortMaps);
- abridged = getProperty(SERIALIZER_abridged, boolean.class,
ctx.abridged);
+ addRootType = getProperty(SERIALIZER_addRootType,
boolean.class, ctx.addRootType);
uriResolution = getInstanceProperty(SERIALIZER_uriResolution,
UriResolution.class, ctx.uriResolution);
uriRelativity = getInstanceProperty(SERIALIZER_uriRelativity,
UriRelativity.class, ctx.uriRelativity);
listenerClass = getProperty(SERIALIZER_listener, Class.class,
ctx.listener);
@@ -153,7 +153,7 @@ public abstract class SerializerSession extends BeanSession
{
.append("trimStrings", trimStrings)
.append("sortCollections", sortCollections)
.append("sortMaps", sortMaps)
- .append("abridged", abridged)
+ .append("addRootType", addRootType)
.append("uriResolver", uriResolver)
);
}
@@ -846,15 +846,15 @@ public abstract class SerializerSession extends
BeanSession {
* Returns the parser-side expected type for the object.
*
* <p>
- * The return value depends on the {@link
Serializer#SERIALIZER_abridged} setting.
- * When enabled, the parser already knows the Java POJO type being
parsed, so there is
+ * The return value depends on the {@link
Serializer#SERIALIZER_addRootType} setting.
+ * When disabled, the parser already knows the Java POJO type being
parsed, so there is
* no reason to add <js>"_type"</js> attributes to the root-level
object.
*
* @param o The object to get the expected type on.
* @return The expected type.
*/
protected final ClassMeta<?> getExpectedRootType(Object o) {
- return abridged ? getClassMetaForObject(o) : object();
+ return addRootType ? object() : getClassMetaForObject(o);
}
/**
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 dd63769..ae2025d 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,20 +70,20 @@ public class SoapXmlSerializerBuilder extends
XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public SoapXmlSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder abridged() {
- super.abridged();
+ public SoapXmlSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public SoapXmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public SoapXmlSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
index d121114..1656007 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,20 +162,20 @@ public class UonSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public UonSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder abridged() {
- super.abridged();
+ public UonSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public UonSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public UonSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
index b45f82c..1259b88 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,20 +115,20 @@ public class UrlEncodingSerializerBuilder extends
UonSerializerBuilder {
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public UrlEncodingSerializerBuilder addBeanTypeProperties(boolean
value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder abridged() {
- super.abridged();
+ public UrlEncodingSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public UrlEncodingSerializerBuilder addBeanTypeProperties(boolean
value) {
- super.addBeanTypeProperties(value);
+ public UrlEncodingSerializerBuilder addRootType() {
+ super.addRootType();
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 94b1a7b..46a956d 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,20 +92,20 @@ public class XmlSchemaSerializerBuilder extends
XmlSerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public XmlSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder abridged() {
- super.abridged();
+ public XmlSchemaSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSchemaSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public XmlSchemaSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
index 40f028a..596ccaa 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,20 +258,20 @@ public class XmlSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public XmlSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder abridged() {
- super.abridged();
+ public XmlSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public XmlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public XmlSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
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 1813d4d..1c42a60 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,20 +142,20 @@ public class YamlSerializerBuilder extends
WriterSerializerBuilder {
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder abridged(boolean value) {
- super.abridged(value);
+ public YamlSerializerBuilder addBeanTypeProperties(boolean value) {
+ super.addBeanTypeProperties(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder abridged() {
- super.abridged();
+ public YamlSerializerBuilder addRootType(boolean value) {
+ super.addRootType(value);
return this;
}
@Override /* SerializerBuilder */
- public YamlSerializerBuilder addBeanTypeProperties(boolean value) {
- super.addBeanTypeProperties(value);
+ public YamlSerializerBuilder addRootType() {
+ super.addRootType();
return this;
}
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 14849a4..a3c7c12 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -1128,8 +1128,8 @@
<ul class='doctree'>
<li class='jc'>{@link
org.apache.juneau.serializer.Serializer}
<ul>
- <li class='jf'>{@link
org.apache.juneau.serializer.Serializer#SERIALIZER_abridged SERIALIZER_abridged}
<li class='jf'>{@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addBeanTypeProperties
SERIALIZER_addBeanTypeProperties}
+ <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}
<li class='jf'>{@link
org.apache.juneau.serializer.Serializer#SERIALIZER_initialDepth
SERIALIZER_initialDepth}
@@ -21286,6 +21286,8 @@
<li class='jf'>{@link
org.apache.juneau.BeanContext#BEAN_fluentSetters}
<li class='ja'>{@link
org.apache.juneau.annotation.Bean#fluentSetters()}
</ul>
+ <li>
+ The <jsf>SERIALIZER_abridged</jsf> setting has
been replaced with {@link
org.apache.juneau.serializer.Serializer#SERIALIZER_addRootType
SERIALIZER_addRootType}
</ul>
<h5 class='topic w800'>juneau-dto</h5>
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
index 3fdd450..5ca3a92 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
@@ -66,8 +66,7 @@ import org.apache.juneau.transforms.*;
"<link rel='icon' href='$U{servlet:/htdocs/cat.png}'/>"
}
),
- staticFiles={"htdocs:htdocs"},
- flags={Serializer.SERIALIZER_abridged}
+ staticFiles={"htdocs:htdocs"}
)
public class PetStoreResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
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 192cc98..1171e7f 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
@@ -19,18 +19,19 @@ import static org.apache.juneau.http.HttpMethodName.*;
import java.util.*;
-import org.apache.juneau.json.*;
import org.apache.juneau.microservice.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.test.pojos.*;
+import org.apache.juneau.serializer.*;
import org.apache.juneau.utils.*;
-import org.junit.*;
/**
- * Tests inteface proxies exposed through <code>@RestMethod(name=PROXY)</code>
+ * Tests interface proxies exposed through <code>@RestMethod(name=PROXY)</code>
*/
@RestResource(
- path="/testInterfaceProxyResource")
+ path="/testInterfaceProxyResource",
+ flags={Serializer.SERIALIZER_addRootType}
+)
public class InterfaceProxyResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
@@ -732,8 +733,4 @@ public class InterfaceProxyResource extends
BasicRestServletJena {
}
};
}
-
- private static void assertObjectEquals(String e, Object o) {
- Assert.assertEquals(e, JsonSerializer.DEFAULT_LAX.toString(o));
- }
}
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 89e0f51..2eef776 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)
+ .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 045ee8a..988de6d 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
@@ -27,13 +27,15 @@ import org.apache.juneau.microservice.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.test.pojos.*;
+import org.apache.juneau.serializer.*;
import org.apache.juneau.utils.*;
/**
* JUnit automated testcase resource.
*/
@RestResource(
- path="/testThirdPartyProxy"
+ path="/testThirdPartyProxy",
+ flags={Serializer.SERIALIZER_addRootType}
)
@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 e9940d1..f3b9dd1 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,
JsonParser.DEFAULT },
- { /* 1 */ "Xml", XmlSerializer.DEFAULT,
XmlParser.DEFAULT },
- { /* 2 */ "Mixed", JsonSerializer.DEFAULT,
XmlParser.DEFAULT },
- { /* 3 */ "Html", HtmlSerializer.DEFAULT,
HtmlParser.DEFAULT },
- { /* 4 */ "MessagePack", MsgPackSerializer.DEFAULT,
MsgPackParser.DEFAULT },
- { /* 5 */ "UrlEncoding", UrlEncodingSerializer.DEFAULT,
UrlEncodingParser.DEFAULT },
- { /* 6 */ "Uon", UonSerializer.DEFAULT,
UonParser.DEFAULT },
- { /* 7 */ "RdfXml", RdfSerializer.DEFAULT_XMLABBREV,
RdfParser.DEFAULT_XML },
+ { /* 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 },
});
}
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 5cfb02c..8f1b9f6 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,
JsonParser.DEFAULT },
- { /* 1 */ "Xml", XmlSerializer.DEFAULT,
XmlParser.DEFAULT },
- { /* 2 */ "Mixed", JsonSerializer.DEFAULT,
XmlParser.DEFAULT },
- { /* 3 */ "Html", HtmlSerializer.DEFAULT,
HtmlParser.DEFAULT },
- { /* 4 */ "MessagePack", MsgPackSerializer.DEFAULT,
MsgPackParser.DEFAULT },
- { /* 5 */ "UrlEncoding", UrlEncodingSerializer.DEFAULT,
UrlEncodingParser.DEFAULT },
- { /* 6 */ "Uon", UonSerializer.DEFAULT,
UonParser.DEFAULT },
- { /* 7 */ "RdfXml", RdfSerializer.DEFAULT_XMLABBREV,
RdfParser.DEFAULT_XML },
+ { /* 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 },
});
}
@@ -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.class).build().getRemoteableProxy(ThirdPartyProxy.class,
null, serializer, parser);
+ this.proxy = getClient(label, serializer,
parser).builder().partSerializer(UonPartSerializer.DEFAULT.builder().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 ec72ae5..bb95098 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
@@ -1134,62 +1134,62 @@ public class RestClientBuilder extends
BeanContextBuilder {
}
/**
- * Configuration property: Abridged output.
+ * Configuration property: Add <js>"_type"</js> properties when needed.
*
* <p>
- * When enabled, it is assumed that the parser knows the exact Java
POJO type being parsed, and therefore top-level
- * type information that might normally be included to determine the
data type will not be serialized.
+ * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
+ * through reflection.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link Serializer#SERIALIZER_abridged}
+ * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
* </ul>
*
* @param value
* The new value for this property.
- * <br>The default is <jk>false</jk>.
+ * <br>The default is <jk>true</jk>.
* @return This object (for method chaining).
*/
- public RestClientBuilder abridged(boolean value) {
- return set(SERIALIZER_abridged, value);
+ public RestClientBuilder addBeanTypeProperties(boolean value) {
+ return set(SERIALIZER_addBeanTypeProperties, value);
}
/**
- * Configuration property: Abridged output.
+ * Configuration property: Add type attribute to root nodes.
*
* <p>
- * Shortcut for calling <code>abridged(<jk>true</jk>)</code>.
+ * When disabled, it is assumed that the parser knows the exact Java
POJO type being parsed, and therefore top-level
+ * type information that might normally be included to determine the
data type will not be serialized.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link Serializer#SERIALIZER_abridged}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addRootType}
* </ul>
*
+ * @param value
+ * The new value for this property.
+ * <br>The default is <jk>false</jk>.
* @return This object (for method chaining).
*/
- public RestClientBuilder abridged() {
- return set(SERIALIZER_abridged, true);
+ public RestClientBuilder addRootType(boolean value) {
+ return set(SERIALIZER_addRootType, value);
}
/**
- * Configuration property: Add <js>"_type"</js> properties when needed.
+ * Configuration property: Add type attribute to root nodes.
*
* <p>
- * If <jk>true</jk>, then <js>"_type"</js> properties will be added to
beans if their type cannot be inferred
- * through reflection.
+ * Shortcut for calling <code>addRootType(<jk>true</jk>)</code>.
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jf'>{@link
Serializer#SERIALIZER_addBeanTypeProperties}
+ * <li class='jf'>{@link Serializer#SERIALIZER_addRootType}
* </ul>
*
- * @param value
- * The new value for this property.
- * <br>The default is <jk>true</jk>.
* @return This object (for method chaining).
*/
- public RestClientBuilder addBeanTypeProperties(boolean value) {
- return set(SERIALIZER_addBeanTypeProperties, value);
+ public RestClientBuilder addRootType() {
+ return set(SERIALIZER_addRootType, true);
}
/**
--
To stop receiving notification emails like this one, please contact
[email protected].