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 459c7b686 Rename marshalls to marshallers
459c7b686 is described below
commit 459c7b686fe7dffab38fb535ccb5a0c87dcf142c
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Sun Jun 26 11:48:15 2022 -0400
Rename marshalls to marshallers
---
eclipse-preferences/user-dictionary.txt | 2 +-
.../apache/juneau/{marshall => marshaller}/N3.java | 4 +-
.../juneau/{marshall => marshaller}/NTriple.java | 4 +-
.../juneau/{marshall => marshaller}/RdfXml.java | 4 +-
.../{marshall => marshaller}/RdfXmlAbbrev.java | 4 +-
.../juneau/{marshall => marshaller}/Turtle.java | 4 +-
.../java/org/apache/juneau/MarshalledFilter.java | 4 +-
.../main/java/org/apache/juneau/cp/Messages.java | 2 +-
.../org/apache/juneau/internal/StringUtils.java | 2 +-
.../CharMarshaller.java} | 20 ++---
.../juneau/{marshall => marshaller}/Csv.java | 4 +-
.../juneau/{marshall => marshaller}/Html.java | 4 +-
.../juneau/{marshall => marshaller}/Json.java | 4 +-
.../Marshall.java => marshaller/Marshaller.java} | 40 ++++-----
.../juneau/{marshall => marshaller}/MsgPack.java | 4 +-
.../juneau/{marshall => marshaller}/OpenApi.java | 4 +-
.../juneau/{marshall => marshaller}/PlainText.java | 4 +-
.../{marshall => marshaller}/SimpleJson.java | 4 +-
.../StreamMarshaller.java} | 20 ++---
.../juneau/{marshall => marshaller}/Uon.java | 4 +-
.../{marshall => marshaller}/UrlEncoding.java | 4 +-
.../juneau/{marshall => marshaller}/Xml.java | 4 +-
.../{marshall => marshaller}/package-info.java | 4 +-
.../org/apache/juneau/reflect/AnnotationInfo.java | 2 +-
.../main/java/org/apache/juneau/utils/Console.java | 16 ++--
juneau-doc/docs/ReleaseNotes/7.2.0.html | 32 +++----
juneau-doc/docs/ReleaseNotes/8.1.0.html | 8 +-
juneau-doc/docs/ReleaseNotes/8.1.2.html | 2 +-
juneau-doc/docs/Topics/01.Overview.html | 2 +-
.../Topics/02.juneau-marshall/03.jm.Marshalls.html | 17 ++--
juneau-doc/docs/Topics/03.juneau-marshall-rdf.html | 2 +-
.../04.jrs.HttpParts/01.jrs.PartMarshallers.html | 2 +-
.../01.jrc.PojoMarshalling.html | 2 +-
.../Topics/17.Glossaries/01.g.LanguageSupport.html | 26 +++---
juneau-doc/juneau-doc.jar | Bin 40047 -> 40049 bytes
juneau-doc/pom.xml | 2 +-
.../apache/juneau/doc/internal/DocGenerator.java | 2 +-
juneau-doc/src/main/javadoc/overview.html | 95 ++++++++++-----------
juneau-doc/src/main/javadoc/resources/docs.txt | 2 +-
.../src/main/javadoc/resources/fragments/toc.html | 2 +-
.../org/apache/juneau/rest/client/RestClient.java | 22 ++---
.../apache/juneau/rest/mock/MockRestClient.java | 10 +--
.../java/org/apache/juneau/rest/RestRequest.java | 2 +-
.../rest/swagger/BasicSwaggerProviderSession.java | 2 +-
.../org/apache/juneau/testutils/pojos/ABean.java | 2 +-
.../apache/juneau/ReadWriteOnlyPropertiesTest.java | 2 +-
.../annotation/BeanConfigAnnotation_Test.java | 2 +-
.../org/apache/juneau/annotation/Bean_Test.java | 2 +-
.../http/remote/Remote_ContentAnnotation_Test.java | 2 +-
.../remote/Remote_ResponseAnnotation_Test.java | 2 +-
.../org/apache/juneau/http/remote/Remote_Test.java | 2 +-
.../juneau/{marshall => marshaller}/Csv_Test.java | 2 +-
.../juneau/{marshall => marshaller}/Html_Test.java | 2 +-
.../juneau/{marshall => marshaller}/Json_Test.java | 2 +-
.../{marshall => marshaller}/Marshall_Test.java | 4 +-
.../{marshall => marshaller}/MsgPack_Test.java | 2 +-
.../juneau/{marshall => marshaller}/N3_Test.java | 2 +-
.../{marshall => marshaller}/NTriple_Test.java | 2 +-
.../{marshall => marshaller}/OpenApi_Test.java | 2 +-
.../{marshall => marshaller}/PlainText_Test.java | 2 +-
.../RdfXmlAbbrev_Test.java | 2 +-
.../{marshall => marshaller}/RdfXml_Test.java | 2 +-
.../{marshall => marshaller}/SimpleJson_Test.java | 2 +-
.../{marshall => marshaller}/Turtle_Test.java | 2 +-
.../juneau/{marshall => marshaller}/Uon_Test.java | 2 +-
.../{marshall => marshaller}/UrlEncoding_Test.java | 2 +-
.../juneau/{marshall => marshaller}/Xml_Test.java | 2 +-
.../juneau/rest/annotation/Content_Test.java | 2 +-
.../juneau/rest/client/RestCallException_Test.java | 2 +-
.../rest/client/RestClient_BasicCalls_Test.java | 2 +-
.../client/RestClient_Config_RestClient_Test.java | 8 +-
.../rest/client/RestClient_Headers_Test.java | 2 +-
.../rest/client/RestClient_Marshalls_Test.java | 4 +-
.../rest/helper/ResourceDescription_Test.java | 2 +-
.../transforms/StackTraceElementSwapTest.java | 2 +-
75 files changed, 235 insertions(+), 241 deletions(-)
diff --git a/eclipse-preferences/user-dictionary.txt
b/eclipse-preferences/user-dictionary.txt
index 7fdd67304..208754fcf 100644
--- a/eclipse-preferences/user-dictionary.txt
+++ b/eclipse-preferences/user-dictionary.txt
@@ -489,7 +489,7 @@ bpx
bpi
tooltip
templated
-marshall
+marshaller
dto
svl
mantra
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/N3.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/N3.java
similarity index 99%
rename from
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/N3.java
rename to
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/N3.java
index 7c82e8598..796f8ee1e 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/N3.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/N3.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -46,7 +46,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class N3 extends CharMarshall {
+public class N3 extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/NTriple.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/NTriple.java
similarity index 99%
rename from
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/NTriple.java
rename to
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/NTriple.java
index 9f49969e8..88ca16dfe 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/NTriple.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/NTriple.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -46,7 +46,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class NTriple extends CharMarshall {
+public class NTriple extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXml.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXml.java
similarity index 99%
rename from
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXml.java
rename to
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXml.java
index c91aa587e..97080baee 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXml.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXml.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -46,7 +46,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class RdfXml extends CharMarshall {
+public class RdfXml extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXmlAbbrev.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXmlAbbrev.java
similarity index 99%
rename from
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXmlAbbrev.java
rename to
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXmlAbbrev.java
index 6a31f1153..243916d70 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXmlAbbrev.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXmlAbbrev.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -46,7 +46,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class RdfXmlAbbrev extends CharMarshall {
+public class RdfXmlAbbrev extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/Turtle.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/Turtle.java
similarity index 99%
rename from
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/Turtle.java
rename to
juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/Turtle.java
index dd23adfe1..de0197aed 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/Turtle.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/Turtle.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -46,7 +46,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class Turtle extends CharMarshall {
+public class Turtle extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
index 8f7a177a2..8e40b4d04 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java
@@ -23,10 +23,10 @@ import org.apache.juneau.annotation.*;
* Parent class for all non-bean filters.
*
* <p>
- * Marshall filters are used to control aspects of how POJOs are handled
during serialization and parsing.
+ * Marshalled filters are used to control aspects of how POJOs are handled
during serialization and parsing.
*
* <p>
- * Marshall filters are created by {@link Builder} which is the programmatic
equivalent to the {@link Marshalled @Marshalled}
+ * Marshalled filters are created by {@link Builder} which is the programmatic
equivalent to the {@link Marshalled @Marshalled}
* annotation.
*
* <ul class='seealso'>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
index 9bbfe468d..f38994137 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
@@ -25,7 +25,7 @@ import java.util.concurrent.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.parser.ParseException;
import org.apache.juneau.utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
index f2fa5b3a2..0f25de38b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -34,7 +34,7 @@ import javax.xml.bind.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.parser.ParseException;
import org.apache.juneau.reflect.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/CharMarshaller.java
similarity index 84%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/CharMarshaller.java
index f054aeffd..a4a79abfb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/CharMarshaller.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.lang.reflect.*;
@@ -19,14 +19,14 @@ import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
/**
- * A subclass of {@link Marshall} for character-based serializers and parsers.
+ * A subclass of {@link Marshaller} for character-based serializers and
parsers.
*
* <ul class='seealso'>
* <li class='link'>{@doc jm.Marshalls}
* <li class='extlink'>{@source}
* </ul>
*/
-public class CharMarshall extends Marshall {
+public class CharMarshaller extends Marshaller {
private final ReaderParser p;
private final WriterSerializer s;
@@ -41,7 +41,7 @@ public class CharMarshall extends Marshall {
* The parser to use for parsing input.
* <br>Must not be <jk>null</jk>.
*/
- public CharMarshall(WriterSerializer s, ReaderParser p) {
+ public CharMarshaller(WriterSerializer s, ReaderParser p) {
super(s, p);
this.s = s;
this.p = p;
@@ -55,22 +55,22 @@ public class CharMarshall extends Marshall {
*
* <h5 class='section'>Examples:</h5>
* <p class='bjava'>
- * Marshall <jv>marshall</jv> = Json.<jsf>DEFAULT</jsf>;
+ * Marshaller <jv>marshaller</jv> = Json.<jsf>DEFAULT</jsf>;
*
* <jc>// Parse into a string.</jc>
- * String <jv>string</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
String.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>marshaller</jv>
.read(<jv>json</jv>, String.<jk>class</jk>);
*
* <jc>// Parse into a bean.</jc>
- * MyBean <jv>bean</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
MyBean.<jk>class</jk>);
*
* <jc>// Parse into a bean array.</jc>
- * MyBean[] <jv>beanArray</jv> =
<jv>marshall</jv>.read(<jv>json</jv>, MyBean[].<jk>class</jk>);
+ * MyBean[] <jv>beanArray</jv> = <jv>marshaller</jv>
.read(<jv>json</jv>, MyBean[].<jk>class</jk>);
*
* <jc>// Parse into a linked-list of objects.</jc>
- * List <jv>list</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
LinkedList.<jk>class</jk>);
+ * List <jv>list</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
LinkedList.<jk>class</jk>);
*
* <jc>// Parse into a map of object keys/values.</jc>
- * Map <jv>map</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
TreeMap.<jk>class</jk>);
+ * Map <jv>map</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
TreeMap.<jk>class</jk>);
* </p>
*
* @param <T> The class type of the object being created.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Csv.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Csv.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Csv.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Csv.java
index 81fcc64f3..08b619ddf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Csv.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Csv.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -29,7 +29,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class Csv extends CharMarshall {
+public class Csv extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Html.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Html.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Html.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Html.java
index f0c51ab1a..544d7effd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Html.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Html.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -45,7 +45,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class Html extends CharMarshall {
+public class Html extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Json.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Json.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json.java
index cd0f987cc..7da83e1fa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Json.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -45,7 +45,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class Json extends CharMarshall {
+public class Json extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Marshall.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Marshaller.java
similarity index 84%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Marshall.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Marshaller.java
index 3a8b8f9ce..23d94b74b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Marshall.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Marshaller.java
@@ -1,4 +1,4 @@
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
//
***************************************************************************************************************************
// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
@@ -30,7 +30,7 @@ import org.apache.juneau.serializer.*;
* <h5 class='figure'>Examples:</h5>
* <p class='bjava'>
* <jc>// Using instance.</jc>
- * Marshall <jv>json</jv> = <jk>new</jk> Json();
+ * Marshaller <jv>json</jv> = <jk>new</jk> Json();
* MyPojo <jv>myPojo</jv> = <jv>json</jv>.read(<jv>string</jv>,
MyPojo.<jk>class</jk>);
* String <jv>string</jv> = <jv>json</jv>.write(<jv>myPojo</jv>);
* </p>
@@ -45,7 +45,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public abstract class Marshall {
+public abstract class Marshaller {
private final Serializer s;
private final Parser p;
@@ -60,24 +60,24 @@ public abstract class Marshall {
* The parser to use for parsing input.
* <br>Must not be <jk>null</jk>.
*/
- protected Marshall(Serializer s, Parser p) {
+ protected Marshaller(Serializer s, Parser p) {
this.s = s;
this.p = p;
}
/**
- * Returns the serializer associated with this marshall.
+ * Returns the serializer associated with this marshaller.
*
- * @return The serializer associated with this marshall.
+ * @return The serializer associated with this marshaller.
*/
public Serializer getSerializer() {
return s;
}
/**
- * Returns the parser associated with this marshall.
+ * Returns the parser associated with this marshaller.
*
- * @return The parser associated with this marshall.
+ * @return The parser associated with this marshaller.
*/
public Parser getParser() {
return p;
@@ -119,22 +119,22 @@ public abstract class Marshall {
*
* <h5 class='section'>Examples:</h5>
* <p class='bjava'>
- * Marshall <jv>marshall</jv> = Json.<jsf>DEFAULT</jsf>;
+ * Marshaller <jv>marshaller</jv> = Json.<jsf>DEFAULT</jsf>;
*
* <jc>// Parse into a linked-list of strings.</jc>
- * List <jv>list1</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List <jv>list1</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of beans.</jc>
- * List <jv>list2</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * List <jv>list2</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of linked-lists of strings.</jc>
- * List <jv>list3</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List <jv>list3</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a map of string keys/values.</jc>
- * Map <jv>map1</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
+ * Map <jv>map1</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a map containing string keys and values of
lists containing beans.</jc>
- * Map <jv>map2</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>,
MyBean.<jk>class</jk>);
+ * Map <jv>map2</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>,
MyBean.<jk>class</jk>);
* </p>
*
* <p>
@@ -198,22 +198,22 @@ public abstract class Marshall {
*
* <h5 class='section'>Examples:</h5>
* <p class='bjava'>
- * Marshall <jv>marshall</jv> = Json.<jsf>DEFAULT</jsf>;
+ * Marshaller <jv>marshaller</jv> = Json.<jsf>DEFAULT</jsf>;
*
* <jc>// Parse into a string.</jc>
- * String <jv>string</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
String.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>marshaller</jv>
.read(<jv>json</jv>, String.<jk>class</jk>);
*
* <jc>// Parse into a bean.</jc>
- * MyBean <jv>bean</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
MyBean.<jk>class</jk>);
*
* <jc>// Parse into a bean array.</jc>
- * MyBean[] <jv>beanArray</jv> =
<jv>marshall</jv>.read(<jv>json</jv>, MyBean[].<jk>class</jk>);
+ * MyBean[] <jv>beanArray</jv> = <jv>marshaller</jv>
.read(<jv>json</jv>, MyBean[].<jk>class</jk>);
*
* <jc>// Parse into a linked-list of objects.</jc>
- * List <jv>list</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
LinkedList.<jk>class</jk>);
+ * List <jv>list</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
LinkedList.<jk>class</jk>);
*
* <jc>// Parse into a map of object keys/values.</jc>
- * Map <jv>map</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
TreeMap.<jk>class</jk>);
+ * Map <jv>map</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
TreeMap.<jk>class</jk>);
* </p>
*
* @param <T> The class type of the object being created.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/MsgPack.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/MsgPack.java
similarity index 98%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/MsgPack.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/MsgPack.java
index e7c3bd4d5..4ee6a559f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/MsgPack.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/MsgPack.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -44,7 +44,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class MsgPack extends StreamMarshall {
+public class MsgPack extends StreamMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/OpenApi.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/OpenApi.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
index 04cf029b3..47eac0064 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/OpenApi.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -45,7 +45,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class OpenApi extends CharMarshall {
+public class OpenApi extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/PlainText.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/PlainText.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/PlainText.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/PlainText.java
index 6cd79cc1a..1aae834aa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/PlainText.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/PlainText.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -45,7 +45,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class PlainText extends CharMarshall {
+public class PlainText extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/SimpleJson.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/SimpleJson.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/SimpleJson.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/SimpleJson.java
index 86a39a727..9a1a16667 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/SimpleJson.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/SimpleJson.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -45,7 +45,7 @@ import org.apache.juneau.serializer.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class SimpleJson extends CharMarshall {
+public class SimpleJson extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/StreamMarshall.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/StreamMarshaller.java
similarity index 85%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/StreamMarshall.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/StreamMarshaller.java
index 4af67fec5..1c0c5bc25 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/StreamMarshall.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/StreamMarshaller.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -20,14 +20,14 @@ import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
/**
- * A subclass of {@link Marshall} for stream-based serializers and parsers.
+ * A subclass of {@link Marshaller} for stream-based serializers and parsers.
*
* <ul class='seealso'>
* <li class='link'>{@doc jm.Marshalls}
* <li class='extlink'>{@source}
* </ul>
*/
-public class StreamMarshall extends Marshall {
+public class StreamMarshaller extends Marshaller {
private final OutputStreamSerializer s;
private final InputStreamParser p;
@@ -42,7 +42,7 @@ public class StreamMarshall extends Marshall {
* The parser to use for parsing input.
* <br>Must not be <jk>null</jk>.
*/
- public StreamMarshall(OutputStreamSerializer s, InputStreamParser p) {
+ public StreamMarshaller(OutputStreamSerializer s, InputStreamParser p) {
super(s, p);
this.s = s;
this.p = p;
@@ -56,22 +56,22 @@ public class StreamMarshall extends Marshall {
*
* <h5 class='section'>Examples:</h5>
* <p class='bjava'>
- * Marshall <jv>marshall</jv> = Json.<jsf>DEFAULT</jsf>;
+ * Marshaller <jv>marshaller</jv> = Json.<jsf>DEFAULT</jsf>;
*
* <jc>// Parse into a string.</jc>
- * String <jv>string</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
String.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>marshaller</jv>
.read(<jv>json</jv>, String.<jk>class</jk>);
*
* <jc>// Parse into a bean.</jc>
- * MyBean <jv>bean</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
MyBean.<jk>class</jk>);
*
* <jc>// Parse into a bean array.</jc>
- * MyBean[] <jv>beanArray</jv> =
<jv>marshall</jv>.read(<jv>json</jv>, MyBean[].<jk>class</jk>);
+ * MyBean[] <jv>beanArray</jv> = <jv>marshaller</jv>
.read(<jv>json</jv>, MyBean[].<jk>class</jk>);
*
* <jc>// Parse into a linked-list of objects.</jc>
- * List <jv>list</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
LinkedList.<jk>class</jk>);
+ * List <jv>list</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
LinkedList.<jk>class</jk>);
*
* <jc>// Parse into a map of object keys/values.</jc>
- * Map <jv>map</jv> = <jv>marshall</jv>.read(<jv>json</jv>,
TreeMap.<jk>class</jk>);
+ * Map <jv>map</jv> = <jv>marshaller</jv> .read(<jv>json</jv>,
TreeMap.<jk>class</jk>);
* </p>
*
* @param <T> The class type of the object being created.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Uon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Uon.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Uon.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Uon.java
index 967bc5e03..3148862a9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Uon.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Uon.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -45,7 +45,7 @@ import org.apache.juneau.uon.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class Uon extends CharMarshall {
+public class Uon extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/UrlEncoding.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/UrlEncoding.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/UrlEncoding.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/UrlEncoding.java
index 368e5b0fa..61e861036 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/UrlEncoding.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/UrlEncoding.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -45,7 +45,7 @@ import org.apache.juneau.urlencoding.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class UrlEncoding extends CharMarshall {
+public class UrlEncoding extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Xml.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Xml.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Xml.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Xml.java
index 757b7f916..e6650bb35 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Xml.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Xml.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import java.io.*;
import java.lang.reflect.*;
@@ -45,7 +45,7 @@ import org.apache.juneau.xml.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class Xml extends CharMarshall {
+public class Xml extends CharMarshaller {
/**
* Default reusable instance.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/package-info.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/package-info.java
similarity index 95%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/package-info.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/package-info.java
index 655603a8f..5f3f083f8 100755
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/package-info.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/package-info.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
/**
- * HTTP Response Beans
+ * Marshallers
*/
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
index 6c1ac52f5..a328cb925 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
@@ -26,7 +26,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.svl.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Console.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Console.java
index 066f95496..d2b188954 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Console.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Console.java
@@ -14,11 +14,11 @@ package org.apache.juneau.utils;
import java.text.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
/**
* A utility for logging formatted messages to the console.
- * Uses the {@link SimpleJson} marshall for serializing objects so any
+ * Uses the {@link SimpleJson} marshaller for serializing objects so any
* POJOs can be used as format arguments.
*/
public class Console {
@@ -27,7 +27,7 @@ public class Console {
* Prints a message with arguments to {@link System#out}.
*
* <p>
- * Arguments are automatically converted to strings using the {@link
SimpleJson} marshall.
+ * Arguments are automatically converted to strings using the {@link
SimpleJson} marshaller.
*
* <p>
* Useful for debug messages.
@@ -38,7 +38,7 @@ public class Console {
* </p>
*
* @param msg The {@link MessageFormat}-styled message.
- * @param args The arguments sent to the the formatter after running
them through the {@link SimpleJson} marshall.
+ * @param args The arguments sent to the the formatter after running
them through the {@link SimpleJson} marshaller.
*/
public static final void out(String msg, Object...args) {
System.out.println(format(msg, args));
@@ -48,7 +48,7 @@ public class Console {
* Prints a message with arguments to {@link System#err}.
*
* <p>
- * Arguments are automatically converted to strings using the {@link
SimpleJson} marshall.
+ * Arguments are automatically converted to strings using the {@link
SimpleJson} marshaller.
*
* <p>
* Useful for debug messages.
@@ -59,7 +59,7 @@ public class Console {
* </p>
*
* @param msg The {@link MessageFormat}-styled message.
- * @param args The arguments sent to the the formatter after running
them through the {@link SimpleJson} marshall.
+ * @param args The arguments sent to the the formatter after running
them through the {@link SimpleJson} marshaller.
*/
public static final void err(String msg, Object...args) {
System.err.println(format(msg, args)); // NOT DEBUG
@@ -69,7 +69,7 @@ public class Console {
* Formats a message with arguments.
*
* <p>
- * Arguments are automatically converted to strings using the {@link
SimpleJson} marshall.
+ * Arguments are automatically converted to strings using the {@link
SimpleJson} marshaller.
*
* <p>
* Useful for debug messages.
@@ -80,7 +80,7 @@ public class Console {
* </p>
*
* @param msg The {@link MessageFormat}-styled message.
- * @param args The arguments sent to the the formatter after running
them through the {@link SimpleJson} marshall.
+ * @param args The arguments sent to the the formatter after running
them through the {@link SimpleJson} marshaller.
* @return This object.
*/
public static final String format(String msg, Object...args) {
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.0.html
b/juneau-doc/docs/ReleaseNotes/7.2.0.html
index 8bc84929a..974086c0c 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.0.html
@@ -213,27 +213,27 @@
String string = Json.<jsf>DEFAULT</jsf>.write(myPojo);
</p>
<ul class='doctree'>
- <li class='jac'>{@link oaj.marshall.Marshall}
+ <li class='jac'>{@del oaj.marshall.Marshall}
<ul>
- <li class='jac'>{@link
oaj.marshall.CharMarshall}
+ <li class='jac'>{@del
oaj.marshall.CharMarshall}
<ul>
- <li class='jc'>{@link
oaj.marshall.Html}
- <li class='jc'>{@link
oaj.marshall.Json}
- <li class='jc'>{@link
oaj.marshall.PlainText}
- <li class='jc'>{@link
oaj.marshall.SimpleJson}
- <li class='jc'>{@link
oaj.marshall.Uon}
- <li class='jc'>{@link
oaj.marshall.UrlEncoding}
- <li class='jc'>{@link
oaj.marshall.Xml}
- <li class='jc'>{@link
oaj.marshall.N3}
- <li class='jc'>{@link
oaj.marshall.NTriple}
- <li class='jc'>{@link
oaj.marshall.RdfXml}
- <li class='jc'>{@link
oaj.marshall.RdfXmlAbbrev}
- <li class='jc'>{@link
oaj.marshall.Turtle}
+ <li class='jc'>{@del
oaj.marshall.Html}
+ <li class='jc'>{@del
oaj.marshall.Json}
+ <li class='jc'>{@del
oaj.marshall.PlainText}
+ <li class='jc'>{@del
oaj.marshall.SimpleJson}
+ <li class='jc'>{@del
oaj.marshall.Uon}
+ <li class='jc'>{@del
oaj.marshall.UrlEncoding}
+ <li class='jc'>{@del
oaj.marshall.Xml}
+ <li class='jc'>{@del
oaj.marshall.N3}
+ <li class='jc'>{@del
oaj.marshall.NTriple}
+ <li class='jc'>{@del
oaj.marshall.RdfXml}
+ <li class='jc'>{@del
oaj.marshall.RdfXmlAbbrev}
+ <li class='jc'>{@del
oaj.marshall.Turtle}
</ul>
- <li class='jac'>{@link
oaj.marshall.StreamMarshall}
+ <li class='jac'>{@del
oaj.marshall.StreamMarshall}
<ul>
<li class='jc'>{@del
oaj.marshall.Jso}
- <li class='jc'>{@link
oaj.marshall.MsgPack}
+ <li class='jc'>{@del
oaj.marshall.MsgPack}
</ul>
</ul>
</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.0.html
b/juneau-doc/docs/ReleaseNotes/8.1.0.html
index f3e2030ce..6ffc13d92 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.0.html
@@ -77,11 +77,11 @@
<li>
New convenience debugging methods on Marshall API:
<ul class='javatree'>
- <li class='jc'>{@link oaj.marshall.Marshall}
+ <li class='jc'>{@del oaj.marshall.Marshall}
<ul>
- <li class='jm'>{@link
oaj.marshall.Marshall#format(String,Object...) format(String,Object...)} -
<c>MessageFormat</c>-style formatter.
- <li class='jm'>{@link
oaj.marshall.Marshall#out(String,Object...) out(String,Object...)} - Prints
<c>MessageFormat</c>-style messages to STDOUT.
- <li class='jm'>{@link
oaj.marshall.Marshall#err(String,Object...) err(String,Object...)} - Prints
<c>MessageFormat</c>-style messages to STDERR.
+ <li class='jm'>{@del
oaj.marshall.Marshall#format(String,Object...) format(String,Object...)} -
<c>MessageFormat</c>-style formatter.
+ <li class='jm'>{@del
oaj.marshall.Marshall#out(String,Object...) out(String,Object...)} - Prints
<c>MessageFormat</c>-style messages to STDOUT.
+ <li class='jm'>{@del
oaj.marshall.Marshall#err(String,Object...) err(String,Object...)} - Prints
<c>MessageFormat</c>-style messages to STDERR.
</ul>
</ul>
<li>
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.2.html
b/juneau-doc/docs/ReleaseNotes/8.1.2.html
index 41a2debe9..258c7867d 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.2.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.2.html
@@ -41,7 +41,7 @@
<li class='jm'>{@del
oaj.ObjectList#parse(CharSequence)}
</ul>
<li>
- {@link oaj.marshall.CharMarshall} and {@link
oaj.marshall.StreamMarshall} now have public constructors.
+ {@del oaj.marshall.CharMarshall} and {@link
oaj.marshall.StreamMarshall} now have public constructors.
<li>
{@link oaj.annotation.Beanp @Beanp} replaces {@del
oaj.annotation.BeanProperty @BeanProperty}.
<li>
diff --git a/juneau-doc/docs/Topics/01.Overview.html
b/juneau-doc/docs/Topics/01.Overview.html
index d0f48cb1a..eb58d2d87 100644
--- a/juneau-doc/docs/Topics/01.Overview.html
+++ b/juneau-doc/docs/Topics/01.Overview.html
@@ -35,7 +35,7 @@
<ul>
<li>Serializers and parsers for various
languages.
<li>Marshalling support for HTTP
headers/parts/requests/responses.
- <li>Marshall-based assertions for
simplified unit testing.
+ <li>Marshaller-based assertions for
simplified unit testing.
</ul>
</td>
<td>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/03.jm.Marshalls.html
b/juneau-doc/docs/Topics/02.juneau-marshall/03.jm.Marshalls.html
index 0ecf29bb4..7cf1adb83 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/03.jm.Marshalls.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/03.jm.Marshalls.html
@@ -13,22 +13,19 @@
***************************************************************************************************************************/
-->
-{title:'Marshalls'}
+{title:'Marshallers'}
<div class='topic'>
<p>
- {@link oaj.marshall.Marshall Marshalls} are simple pairings of
a {@link oaj.serializer.Serializer}
+ {@link oaj.marshaller.Marshaller Marshallers} are simple
pairings of a {@link oaj.serializer.Serializer}
and {@link oaj.parser.Parser} with convenience methods for
serializing and parsing POJOs.
</p>
<ul class='javatree'>
- <li class='jac'>{@link oaj.marshall.Marshall}
+ <li class='jac'>{@link oaj.marshaller.Marshaller}
<ul class='javatreec'>
- <li class='jm'>{@link
oaj.marshall.Marshall#read(Object,Class) read(Object,Class)}
- <li class='jm'>{@link
oaj.marshall.Marshall#read(Object,Type,Type...) read(Object,Type,Type...)}
- <li class='jm'>{@link
oaj.marshall.Marshall#write(Object) write(Object)}
- <li class='jm'>{@link
oaj.marshall.Marshall#write(Object,Object) write(Object,Object)}
- <li class='jm'>{@link
oaj.marshall.Marshall#toString(Object) toString(Object)}
- <li class='jm'>{@link
oaj.marshall.Marshall#println(Object) println(Object)}
+ <li class='jm'>{@link
oaj.marshaller.Marshaller#read(Object,Class) read(Object,Class)}
+ <li class='jm'>{@link
oaj.marshaller.Marshaller#read(Object,Type,Type...) read(Object,Type,Type...)}
+ <li class='jm'>{@link
oaj.marshaller.Marshaller#write(Object,Object) write(Object,Object)}
</ul>
</li>
</ul>
@@ -36,7 +33,7 @@
Marshalls are often cleaner to use on-the-fly since they have
simplified names.
</p>
<p>
- The following shows the {@link oaj.marshall.Json} marshall in
action:
+ The following shows the {@link oaj.marshaller.Json} marshaller
in action:
</p>
<h5 class='figure'>Examples:</h5>
<p class='bjava'>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
b/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
index b5a4241c3..d5d05b019 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
@@ -30,7 +30,7 @@
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bcode w500'>
- | org.apache.juneau.marshall.rdf_{@property
juneauVersion}.jar
+ | org.apache.juneau.marshaller.rdf_{@property
juneauVersion}.jar
</p>
<p>
The <c>juneau-marshall-rdf</c> library provides additional
serializers and parsers for RDF.
diff --git
a/juneau-doc/docs/Topics/06.juneau-rest-server/04.jrs.HttpParts/01.jrs.PartMarshallers.html
b/juneau-doc/docs/Topics/06.juneau-rest-server/04.jrs.HttpParts/01.jrs.PartMarshallers.html
index f959c8a71..ec1b85759 100644
---
a/juneau-doc/docs/Topics/06.juneau-rest-server/04.jrs.HttpParts/01.jrs.PartMarshallers.html
+++
b/juneau-doc/docs/Topics/06.juneau-rest-server/04.jrs.HttpParts/01.jrs.PartMarshallers.html
@@ -17,7 +17,7 @@
<div class='topic'>
<p>
- Juneau comes with three basic marshall types for serializing
and parsing Header, Query, Form, and Path parts:
+ Juneau comes with three basic marshaller types for serializing
and parsing Header, Query, Form, and Path parts:
</p>
<ul class='javatree'>
<li class='jic'>{@link oaj.httppart.HttpPartSerializer}
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html
index bf1d2b316..5bbf46cac 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html
@@ -101,7 +101,7 @@
<ul>
<li class='jm'>{@link
oajrc.RestClient.Builder#serializer(Serializer) serializer(Serializer)}
<li class='jm'>{@link
oajrc.RestClient.Builder#parser(Parser) parser(Parser)}
- <li class='jm'>{@link
oajrc.RestClient.Builder#marshall(Marshall) marshall(Marshall)}
+ <li class='jm'>{@link
oajrc.RestClient.Builder#marshaller(Marshaller) marshaller(Marshaller)}
</ul>
</ul>
diff --git a/juneau-doc/docs/Topics/17.Glossaries/01.g.LanguageSupport.html
b/juneau-doc/docs/Topics/17.Glossaries/01.g.LanguageSupport.html
index 22734c37a..9b142ed07 100644
--- a/juneau-doc/docs/Topics/17.Glossaries/01.g.LanguageSupport.html
+++ b/juneau-doc/docs/Topics/17.Glossaries/01.g.LanguageSupport.html
@@ -31,7 +31,7 @@
<td><c>text/html</c></td>
<td><ul><li class='jc'>{@link
oaj.html.HtmlSerializer}<li class='jc'>{@link
oaj.html.HtmlStrippedDocSerializer}<li class='jc'>{@link
oaj.html.HtmlDocSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.html.HtmlParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.Html}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.Html}</ul></td>
<td>{@doc jm.HtmlDetails HTML Details}</td>
</tr>
<tr>
@@ -45,14 +45,14 @@
<td><c>application/json</c><br><c>text/json</c></td>
<td><ul><li class='jc'>{@link
oaj.json.JsonSerializer}<li class='jc'>{@link
oaj.json.JsonSerializer.Readable}<li class='jc'>{@link
oaj.json.JsonSerializer.ReadableSafe}</ul></td>
<td><ul><li class='jc'>{@link
oaj.json.JsonParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.Json}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.Json}</ul></td>
<td>{@doc jm.JsonDetails JSON Details}</td>
</tr>
<tr>
<td><c>application/json+simple</c><br><c>text/json+simple</c></td>
<td><ul><li class='jc'>{@link
oaj.json.SimpleJsonSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.json.JsonParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.SimpleJson}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.SimpleJson}</ul></td>
<td>{@doc jm.SimplifiedJson Simplified JSON}</td>
</tr>
<tr>
@@ -66,28 +66,28 @@
<td><c>octal/msgpack</c></td>
<td><ul><li class='jc'>{@link
oaj.msgpack.MsgPackSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.msgpack.MsgPackParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.MsgPack}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.MsgPack}</ul></td>
<td>{@doc jm.MsgPackDetails MessagePack Details}</td>
</tr>
<tr>
<td><c>text/n3</c></td>
<td><ul><li class='jc'>{@link
oaj.jena.N3Serializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.jena.N3Parser}</ul></td>
- <td><ul><li class='jc'>{@link oaj.marshall.N3}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.N3}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
<td><c>text/n-triple</c></td>
<td><ul><li class='jc'>{@link
oaj.jena.NTripleSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.jena.NTripleParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.NTriple}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.NTriple}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
<td><c>text/openapi</c></td>
<td><ul><li class='jc'>{@link
oaj.oapi.OpenApiSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.oapi.OpenApiParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.OpenApi}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.OpenApi}</ul></td>
<td>{@doc jm.OpenApiDetails OpenAPI Details}</td>
</tr>
<tr>
@@ -101,14 +101,14 @@
<td><c>text/xml+rdf<c></td>
<td><ul><li class='jc'>{@link
oaj.jena.RdfXmlSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.jena.RdfXmlParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.RdfXml}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.RdfXml}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
<td><c>text/xml+rdf+abbrev</c></td>
<td><ul><li class='jc'>{@link
oaj.jena.RdfXmlAbbrevSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.jena.RdfXmlParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.RdfXmlAbbrev}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.RdfXmlAbbrev}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
@@ -122,28 +122,28 @@
<td><c>text/turtle</c></td>
<td><ul><li class='jc'>{@link
oaj.jena.TurtleSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.jena.TurtleParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.Turtle}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.Turtle}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
<td><c>text/uon</c></td>
<td><ul><li class='jc'>{@link
oaj.uon.UonSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.uon.UonParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.Uon}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.Uon}</ul></td>
<td>{@doc jm.UonDetails UON Details}</td>
</tr>
<tr>
<td><c>application/x-www-form-urlencoded</c></td>
<td><ul><li class='jc'>{@link
oaj.urlencoding.UrlEncodingSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.urlencoding.UrlEncodingParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.UrlEncoding}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.UrlEncoding}</ul></td>
<td>{@doc jm.UrlEncodingDetails URL-Encoding
Details}</td>
</tr>
<tr>
<td><c>text/xml</c></td>
<td><ul><li class='jc'>{@link oaj.xml.XmlSerializer}<li
class='jc'>{@link oaj.xml.XmlDocSerializer}</ul></td>
<td><ul><li class='jc'>{@link
oaj.xml.XmlParser}</ul></td>
- <td><ul><li class='jc'>{@link
oaj.marshall.Xml}</ul></td>
+ <td><ul><li class='jc'>{@link
oaj.marshaller.Xml}</ul></td>
<td>{@doc jm.XmlDetails XML Details}</td>
</tr>
</table>
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
index 7a1e2eb07..e541d159e 100644
Binary files a/juneau-doc/juneau-doc.jar and b/juneau-doc/juneau-doc.jar differ
diff --git a/juneau-doc/pom.xml b/juneau-doc/pom.xml
index 2ca3f5956..d0c3f0e4e 100644
--- a/juneau-doc/pom.xml
+++ b/juneau-doc/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau</artifactId>
- <version>9.0-B1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>juneau-doc</artifactId>
diff --git
a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
index 102a6315b..c6d4d7177 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
@@ -20,7 +20,7 @@ import java.nio.file.*;
import java.util.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
/**
* Utility for generating the overview.html page.
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index d532a4185..26f61cd16 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -173,7 +173,7 @@
<ol>
<li><p><a class='doclink'
href='#juneau-marshall.jm.BeanContexts'>Bean Contexts</a><span
class='update'>updated: <b>9.0.0</b></span></p>
<li><p><a class='doclink'
href='#juneau-marshall.jm.SerializersAndParsers'>Serializers and
Parsers</a><span class='update'>updated: <b>9.0.0</b></span></p>
- <li><p><a class='doclink'
href='#juneau-marshall.jm.Marshalls'>Marshalls</a></p>
+ <li><p><a class='doclink'
href='#juneau-marshall.jm.Marshalls'>Marshallers</a></p>
<li><p><a class='doclink'
href='#juneau-marshall.jm.JavaBeansSupport'>Java Beans Support</a><span
class='update'>created: 8.2.0, updated: <b>9.0.0</b></span></p>
<ol>
<li><p><a class='doclink'
href='#juneau-marshall.jm.JavaBeansSupport.jm.BeanAnnotation'>@Bean
Annotation</a><span class='update'>updated: 8.2.0,<b>9.0.0</b></span></p>
@@ -550,7 +550,7 @@
<ul>
<li>Serializers and parsers for various
languages.
<li>Marshalling support for HTTP
headers/parts/requests/responses.
- <li>Marshall-based assertions for
simplified unit testing.
+ <li>Marshaller-based assertions for
simplified unit testing.
</ul>
</td>
<td>
@@ -2297,22 +2297,19 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-marshall.jm.Marshalls' id='juneau-marshall.jm.Marshalls'>2.3 -
Marshalls</a></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-marshall.jm.Marshalls' id='juneau-marshall.jm.Marshalls'>2.3 -
Marshallers</a></h3>
<div class='topic'><!-- START: 2.3 - juneau-marshall.jm.Marshalls -->
<div class='topic'>
<p>
- {@link org.apache.juneau.marshall.Marshall Marshalls} are
simple pairings of a {@link org.apache.juneau.serializer.Serializer}
+ {@link org.apache.juneau.marshaller.Marshaller Marshallers} are
simple pairings of a {@link org.apache.juneau.serializer.Serializer}
and {@link org.apache.juneau.parser.Parser} with convenience
methods for serializing and parsing POJOs.
</p>
<ul class='javatree'>
- <li class='jac'>{@link org.apache.juneau.marshall.Marshall}
+ <li class='jac'>{@link org.apache.juneau.marshaller.Marshaller}
<ul class='javatreec'>
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#read(Object,Class) read(Object,Class)}
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#read(Object,Type,Type...)
read(Object,Type,Type...)}
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#write(Object) write(Object)}
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#write(Object,Object) write(Object,Object)}
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#toString(Object) toString(Object)}
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#println(Object) println(Object)}
+ <li class='jm'>{@link
org.apache.juneau.marshaller.Marshaller#read(Object,Class) read(Object,Class)}
+ <li class='jm'>{@link
org.apache.juneau.marshaller.Marshaller#read(Object,Type,Type...)
read(Object,Type,Type...)}
+ <li class='jm'>{@link
org.apache.juneau.marshaller.Marshaller#write(Object,Object)
write(Object,Object)}
</ul>
</li>
</ul>
@@ -2320,7 +2317,7 @@
Marshalls are often cleaner to use on-the-fly since they have
simplified names.
</p>
<p>
- The following shows the {@link org.apache.juneau.marshall.Json}
marshall in action:
+ The following shows the {@link
org.apache.juneau.marshaller.Json} marshaller in action:
</p>
<h5 class='figure'>Examples:</h5>
<p class='bjava'>
@@ -13036,7 +13033,7 @@
</p>
<h5 class='figure'>OSGi Module</h5>
<p class='bcode w500'>
- org.apache.juneau.marshall.rdf_{@property juneauVersion}.jar
+ org.apache.juneau.marshaller.rdf_{@property juneauVersion}.jar
</p>
<p>
The <c>juneau-marshall-rdf</c> library provides additional
serializers and parsers for RDF.
@@ -17476,7 +17473,7 @@
<div class='topic'><!-- START: 6.4.1 -
juneau-rest-server.jrs.HttpParts.jrs.PartMarshallers -->
<div class='topic'>
<p>
- Juneau comes with three basic marshall types for serializing
and parsing Header, Query, Form, and Path parts:
+ Juneau comes with three basic marshaller types for serializing
and parsing Header, Query, Form, and Path parts:
</p>
<ul class='javatree'>
<li class='jic'>{@link
org.apache.juneau.httppart.HttpPartSerializer}
@@ -23012,7 +23009,7 @@
<ul>
<li class='jm'>{@link
org.apache.juneau.rest.client.RestClient.Builder#serializer(Serializer)
serializer(Serializer)}
<li class='jm'>{@link
org.apache.juneau.rest.client.RestClient.Builder#parser(Parser) parser(Parser)}
- <li class='jm'>{@link
org.apache.juneau.rest.client.RestClient.Builder#marshall(Marshall)
marshall(Marshall)}
+ <li class='jm'>{@link
org.apache.juneau.rest.client.RestClient.Builder#marshaller(Marshaller)
marshaller(Marshaller)}
</ul>
</ul>
@@ -28333,7 +28330,7 @@
<td><c>text/html</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.html.HtmlSerializer}<li class='jc'>{@link
org.apache.juneau.html.HtmlStrippedDocSerializer}<li class='jc'>{@link
org.apache.juneau.html.HtmlDocSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.html.HtmlParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.Html}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.Html}</ul></td>
<td>{@doc jm.HtmlDetails HTML Details}</td>
</tr>
<tr>
@@ -28347,14 +28344,14 @@
<td><c>application/json</c><br><c>text/json</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.json.JsonSerializer}<li class='jc'>{@link
org.apache.juneau.json.JsonSerializer.Readable}<li class='jc'>{@link
org.apache.juneau.json.JsonSerializer.ReadableSafe}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.json.JsonParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.Json}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.Json}</ul></td>
<td>{@doc jm.JsonDetails JSON Details}</td>
</tr>
<tr>
<td><c>application/json+simple</c><br><c>text/json+simple</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.json.SimpleJsonSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.json.JsonParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.SimpleJson}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.SimpleJson}</ul></td>
<td>{@doc jm.SimplifiedJson Simplified JSON}</td>
</tr>
<tr>
@@ -28368,28 +28365,28 @@
<td><c>octal/msgpack</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.msgpack.MsgPackSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.msgpack.MsgPackParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.MsgPack}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.MsgPack}</ul></td>
<td>{@doc jm.MsgPackDetails MessagePack Details}</td>
</tr>
<tr>
<td><c>text/n3</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.N3Serializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.N3Parser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.N3}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.N3}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
<td><c>text/n-triple</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.NTripleSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.NTripleParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.NTriple}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.NTriple}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
<td><c>text/openapi</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.oapi.OpenApiSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.oapi.OpenApiParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.OpenApi}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.OpenApi}</ul></td>
<td>{@doc jm.OpenApiDetails OpenAPI Details}</td>
</tr>
<tr>
@@ -28403,14 +28400,14 @@
<td><c>text/xml+rdf<c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.RdfXmlSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.RdfXmlParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.RdfXml}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.RdfXml}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
<td><c>text/xml+rdf+abbrev</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.RdfXmlAbbrevSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.RdfXmlParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.RdfXmlAbbrev}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.RdfXmlAbbrev}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
@@ -28424,28 +28421,28 @@
<td><c>text/turtle</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.TurtleSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.jena.TurtleParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.Turtle}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.Turtle}</ul></td>
<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
</tr>
<tr>
<td><c>text/uon</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.uon.UonSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.uon.UonParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.Uon}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.Uon}</ul></td>
<td>{@doc jm.UonDetails UON Details}</td>
</tr>
<tr>
<td><c>application/x-www-form-urlencoded</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.urlencoding.UrlEncodingSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.urlencoding.UrlEncodingParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.UrlEncoding}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.UrlEncoding}</ul></td>
<td>{@doc jm.UrlEncodingDetails URL-Encoding
Details}</td>
</tr>
<tr>
<td><c>text/xml</c></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.xml.XmlSerializer}<li class='jc'>{@link
org.apache.juneau.xml.XmlDocSerializer}</ul></td>
<td><ul><li class='jc'>{@link
org.apache.juneau.xml.XmlParser}</ul></td>
- <td><ul><li class='jc'>{@link
org.apache.juneau.marshall.Xml}</ul></td>
+ <td><ul><li class='jc'>{@link
org.apache.juneau.marshaller.Xml}</ul></td>
<td>{@doc jm.XmlDetails XML Details}</td>
</tr>
</table>
@@ -34686,27 +34683,27 @@
String string = Json.<jsf>DEFAULT</jsf>.write(myPojo);
</p>
<ul class='doctree'>
- <li class='jac'>{@link
org.apache.juneau.marshall.Marshall}
+ <li class='jac'>{@del
org.apache.juneau.marshall.Marshall}
<ul>
- <li class='jac'>{@link
org.apache.juneau.marshall.CharMarshall}
+ <li class='jac'>{@del
org.apache.juneau.marshall.CharMarshall}
<ul>
- <li class='jc'>{@link
org.apache.juneau.marshall.Html}
- <li class='jc'>{@link
org.apache.juneau.marshall.Json}
- <li class='jc'>{@link
org.apache.juneau.marshall.PlainText}
- <li class='jc'>{@link
org.apache.juneau.marshall.SimpleJson}
- <li class='jc'>{@link
org.apache.juneau.marshall.Uon}
- <li class='jc'>{@link
org.apache.juneau.marshall.UrlEncoding}
- <li class='jc'>{@link
org.apache.juneau.marshall.Xml}
- <li class='jc'>{@link
org.apache.juneau.marshall.N3}
- <li class='jc'>{@link
org.apache.juneau.marshall.NTriple}
- <li class='jc'>{@link
org.apache.juneau.marshall.RdfXml}
- <li class='jc'>{@link
org.apache.juneau.marshall.RdfXmlAbbrev}
- <li class='jc'>{@link
org.apache.juneau.marshall.Turtle}
+ <li class='jc'>{@del
org.apache.juneau.marshall.Html}
+ <li class='jc'>{@del
org.apache.juneau.marshall.Json}
+ <li class='jc'>{@del
org.apache.juneau.marshall.PlainText}
+ <li class='jc'>{@del
org.apache.juneau.marshall.SimpleJson}
+ <li class='jc'>{@del
org.apache.juneau.marshall.Uon}
+ <li class='jc'>{@del
org.apache.juneau.marshall.UrlEncoding}
+ <li class='jc'>{@del
org.apache.juneau.marshall.Xml}
+ <li class='jc'>{@del
org.apache.juneau.marshall.N3}
+ <li class='jc'>{@del
org.apache.juneau.marshall.NTriple}
+ <li class='jc'>{@del
org.apache.juneau.marshall.RdfXml}
+ <li class='jc'>{@del
org.apache.juneau.marshall.RdfXmlAbbrev}
+ <li class='jc'>{@del
org.apache.juneau.marshall.Turtle}
</ul>
- <li class='jac'>{@link
org.apache.juneau.marshall.StreamMarshall}
+ <li class='jac'>{@del
org.apache.juneau.marshall.StreamMarshall}
<ul>
<li class='jc'>{@del
org.apache.juneau.marshall.Jso}
- <li class='jc'>{@link
org.apache.juneau.marshall.MsgPack}
+ <li class='jc'>{@del
org.apache.juneau.marshall.MsgPack}
</ul>
</ul>
</ul>
@@ -35374,11 +35371,11 @@
<li>
New convenience debugging methods on Marshall API:
<ul class='javatree'>
- <li class='jc'>{@link
org.apache.juneau.marshall.Marshall}
+ <li class='jc'>{@del
org.apache.juneau.marshall.Marshall}
<ul>
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#format(String,Object...)
format(String,Object...)} - <c>MessageFormat</c>-style formatter.
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#out(String,Object...)
out(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDOUT.
- <li class='jm'>{@link
org.apache.juneau.marshall.Marshall#err(String,Object...)
err(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDERR.
+ <li class='jm'>{@del
org.apache.juneau.marshall.Marshall#format(String,Object...)
format(String,Object...)} - <c>MessageFormat</c>-style formatter.
+ <li class='jm'>{@del
org.apache.juneau.marshall.Marshall#out(String,Object...)
out(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDOUT.
+ <li class='jm'>{@del
org.apache.juneau.marshall.Marshall#err(String,Object...)
err(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDERR.
</ul>
</ul>
<li>
@@ -35784,7 +35781,7 @@
<li class='jm'>{@del
org.apache.juneau.ObjectList#parse(CharSequence)}
</ul>
<li>
- {@link org.apache.juneau.marshall.CharMarshall} and
{@link org.apache.juneau.marshall.StreamMarshall} now have public constructors.
+ {@del org.apache.juneau.marshall.CharMarshall} and
{@link org.apache.juneau.marshall.StreamMarshall} now have public constructors.
<li>
{@link org.apache.juneau.annotation.Beanp @Beanp}
replaces {@del org.apache.juneau.annotation.BeanProperty @BeanProperty}.
<li>
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt
b/juneau-doc/src/main/javadoc/resources/docs.txt
index c472014ec..bcd9be849 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -124,7 +124,7 @@ jm.JsonParsers =
#juneau-marshall.jm.JsonDetails.jm.JsonParsers, Overview > june
jm.JsonSchemaDetails = #juneau-marshall.jm.JsonSchemaDetails, Overview >
juneau-marshall > JSON-Schema Support
jm.JsonSerializers = #juneau-marshall.jm.JsonDetails.jm.JsonSerializers,
Overview > juneau-marshall > JSON Details > JSON Serializers
jm.MarshallingUris = #juneau-marshall.jm.MarshallingUris, Overview >
juneau-marshall > URIs
-jm.Marshalls = #juneau-marshall.jm.Marshalls, Overview > juneau-marshall >
Marshalls
+jm.Marshalls = #juneau-marshall.jm.Marshalls, Overview > juneau-marshall >
Marshallers
jm.MsgPackDetails = #juneau-marshall.jm.MsgPackDetails, Overview >
juneau-marshall > MessagePack Details
jm.MsgPackParsers = #juneau-marshall.jm.MsgPackDetails.jm.MsgPackParsers,
Overview > juneau-marshall > MessagePack Details > MessagePack Parsers
jm.MsgPackSerializers =
#juneau-marshall.jm.MsgPackDetails.jm.MsgPackSerializers, Overview >
juneau-marshall > MessagePack Details > MessagePack Serializers
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
index 3b7eae738..c9e83ba65 100644
--- a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
+++ b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
@@ -27,7 +27,7 @@
<ol>
<li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-marshall.jm.BeanContexts'>Bean Contexts</a><span
class='update'>updated: <b>9.0.0</b></span></p>
<li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-marshall.jm.SerializersAndParsers'>Serializers and
Parsers</a><span class='update'>updated: <b>9.0.0</b></span></p>
- <li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-marshall.jm.Marshalls'>Marshalls</a></p>
+ <li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-marshall.jm.Marshalls'>Marshallers</a></p>
<li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-marshall.jm.JavaBeansSupport'>Java Beans
Support</a><span class='update'>created: 8.2.0, updated: <b>9.0.0</b></span></p>
<ol>
<li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-marshall.jm.JavaBeansSupport.jm.BeanAnnotation'>@Bean
Annotation</a><span class='update'>updated: 8.2.0,<b>9.0.0</b></span></p>
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 6469d0768..7374f1741 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -77,7 +77,7 @@ import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.msgpack.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.objecttools.*;
@@ -318,7 +318,7 @@ import org.apache.juneau.xml.*;
* <ul>
* <li class='jm'>{@link Builder#serializer(Serializer)
serializer(Serializer)}
* <li class='jm'>{@link Builder#parser(Parser) parser(Parser)}
- * <li class='jm'>{@link Builder#marshall(Marshall)
marshall(Marshall)}
+ * <li class='jm'>{@link Builder#marshaller(Marshaller)
marshaller(Marshaller)}
* </ul>
* </ul>
*
@@ -3977,11 +3977,11 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
}
/**
- * <i><l>RestClient</l> configuration property: </i>
Marshall
+ * <i><l>RestClient</l> configuration property: </i>
Marshaller
*
* <p>
* Shortcut for specifying the serializers and parsers
- * using the serializer and parser defined in a marshall.
+ * using the serializer and parser defined in a marshaller.
*
* <ul class='notes'>
* <li class='note'>When using this method that takes in a
pre-instantiated serializers and parsers, the serializer property setters (e.g.
{@link #sortCollections()}),
@@ -3990,10 +3990,10 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jc>// Create a client that uses Simplified-JSON
transport using an existing marshall.</jc>
+ * <jc>// Create a client that uses Simplified-JSON
transport using an existing marshaller.</jc>
* RestClient <jv>client</jv> = RestClient
* .<jsm>create</jsm>()
- *
.marshall(SimpleJson.<jsf>DEFAULT_READABLE</jsf>)
+ *
.marshaller(SimpleJson.<jsf>DEFAULT_READABLE</jsf>)
* .build();
* </p>
*
@@ -4001,7 +4001,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
@FluentSetter
- public Builder marshall(Marshall value) {
+ public Builder marshaller(Marshaller value) {
if (value != null)
serializer(value.getSerializer()).parser(value.getParser());
return this;
@@ -4012,7 +4012,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
*
* <p>
* Shortcut for specifying the serializers and parsers
- * using the serializer and parser defined in a marshall.
+ * using the serializer and parser defined in a marshaller.
*
* <ul class='notes'>
* <li class='note'>When using this method that takes in a
pre-instantiated serializers and parsers, the serializer property setters (e.g.
{@link #sortCollections()}),
@@ -4024,7 +4024,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* <jc>// Create a client that uses JSON and XML transport
using existing marshalls.</jc>
* RestClient <jv>client</jv> = RestClient
* .<jsm>create</jsm>()
- * .marshall(Json.<jsf>DEFAULT_READABLE</jsf>,
Xml.<jsf>DEFAULT_READABLE</jsf>)
+ * .marshaller(Json.<jsf>DEFAULT_READABLE</jsf>,
Xml.<jsf>DEFAULT_READABLE</jsf>)
* .build();
* </p>
*
@@ -4032,8 +4032,8 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* @return This object.
*/
@FluentSetter
- public Builder marshalls(Marshall...value) {
- for (Marshall m : value)
+ public Builder marshallers(Marshaller...value) {
+ for (Marshaller m : value)
if (m != null)
serializer(m.getSerializer()).parser(m.getParser());
return this;
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index eb7b383d3..cfef3328b 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -53,7 +53,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.remote.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
@@ -1376,14 +1376,14 @@ public class MockRestClient extends RestClient
implements HttpClientConnection {
}
@Override /* GENERATED -
org.apache.juneau.rest.client.RestClient.Builder */
- public Builder marshall(Marshall value) {
- super.marshall(value);
+ public Builder marshaller(Marshaller value) {
+ super.marshaller(value);
return this;
}
@Override /* GENERATED -
org.apache.juneau.rest.client.RestClient.Builder */
- public Builder marshalls(Marshall...value) {
- super.marshalls(value);
+ public Builder marshallers(Marshaller...value) {
+ super.marshallers(value);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index f664ff620..1969ae315 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -63,7 +63,7 @@ import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.jsonschema.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
index 6600a06cd..563c984cc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
@@ -36,7 +36,7 @@ import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.jsonschema.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/ABean.java
b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/ABean.java
index 0eaf0208d..15ad099cd 100644
---
a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/ABean.java
+++
b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/pojos/ABean.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.testutils.pojos;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
public class ABean {
public int a;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
b/juneau-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
index cfdb023b6..8d0550dcf 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
@@ -19,7 +19,7 @@ import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java
index 0ea127fc2..b5efa019d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java
@@ -23,7 +23,7 @@ import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
import org.apache.juneau.swap.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/Bean_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/Bean_Test.java
index 64e0b51f9..adead1ca7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/annotation/Bean_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/annotation/Bean_Test.java
@@ -17,7 +17,7 @@ import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
index 20733526f..ba3d019c9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java
@@ -28,7 +28,7 @@ import org.apache.juneau.http.annotation.Content;
import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.http.part.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
index e5a3bdeda..20159fd34 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java
@@ -21,7 +21,7 @@ import java.io.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.annotation.Response;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.RestResponse;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index 2d94b1a92..0ba753891 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -28,7 +28,7 @@ import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.header.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/Csv_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
similarity index 98%
rename from juneau-utest/src/test/java/org/apache/juneau/marshall/Csv_Test.java
rename to juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
index c51de8d6e..1572aaaf5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/Csv_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/Html_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Html_Test.java
similarity index 98%
rename from juneau-utest/src/test/java/org/apache/juneau/marshall/Html_Test.java
rename to juneau-utest/src/test/java/org/apache/juneau/marshaller/Html_Test.java
index 62e4c7f34..9a742b9ac 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/Html_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Html_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/Json_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json_Test.java
similarity index 98%
rename from juneau-utest/src/test/java/org/apache/juneau/marshall/Json_Test.java
rename to juneau-utest/src/test/java/org/apache/juneau/marshaller/Json_Test.java
index 2c2a1df30..fe02addc7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/Json_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Json_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/Marshall_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Marshall_Test.java
similarity index 95%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/Marshall_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/Marshall_Test.java
index 7ef643184..e3a81008f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/Marshall_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Marshall_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
@@ -20,7 +20,7 @@ public class Marshall_Test {
@Test
public void basic() {
- Marshall m = SimpleJson.DEFAULT;
+ Marshaller m = SimpleJson.DEFAULT;
assertObject(m.getParser()).isNotNull();
assertObject(m.getSerializer()).isNotNull();
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/MsgPack_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/MsgPack_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/MsgPack_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/MsgPack_Test.java
index 8f5c75a7f..4d20f00a7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/MsgPack_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/MsgPack_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/marshall/N3_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/N3_Test.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/marshall/N3_Test.java
rename to juneau-utest/src/test/java/org/apache/juneau/marshaller/N3_Test.java
index f6283de72..5aaf5cecc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/N3_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/N3_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/NTriple_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/NTriple_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/NTriple_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/NTriple_Test.java
index 4804409e0..a603cf83b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/NTriple_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/NTriple_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/OpenApi_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/OpenApi_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/OpenApi_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/OpenApi_Test.java
index 0a48a145c..db7b5bdf9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/OpenApi_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/OpenApi_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/PlainText_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/PlainText_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/PlainText_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/PlainText_Test.java
index 6df78889e..77bd7a8b8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/PlainText_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/PlainText_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/RdfXmlAbbrev_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/RdfXmlAbbrev_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/RdfXmlAbbrev_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/RdfXmlAbbrev_Test.java
index c4c442a87..5f01d7056 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/marshall/RdfXmlAbbrev_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/RdfXmlAbbrev_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/RdfXml_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/RdfXml_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/RdfXml_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/RdfXml_Test.java
index cc1a6dbac..2e55d8e9d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/RdfXml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/RdfXml_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/SimpleJson_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/SimpleJson_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/SimpleJson_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/SimpleJson_Test.java
index 57ce43f9c..f919d06d8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/SimpleJson_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/SimpleJson_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/Turtle_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Turtle_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/Turtle_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/Turtle_Test.java
index 15e368551..41a4ecde1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/Turtle_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Turtle_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/Uon_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Uon_Test.java
similarity index 98%
rename from juneau-utest/src/test/java/org/apache/juneau/marshall/Uon_Test.java
rename to juneau-utest/src/test/java/org/apache/juneau/marshaller/Uon_Test.java
index cf2f34c97..81b11933f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/Uon_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Uon_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/UrlEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/UrlEncoding_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/marshall/UrlEncoding_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/marshaller/UrlEncoding_Test.java
index dcbff2c04..80e5e770b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/marshall/UrlEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/UrlEncoding_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshall/Xml_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Xml_Test.java
similarity index 98%
rename from juneau-utest/src/test/java/org/apache/juneau/marshall/Xml_Test.java
rename to juneau-utest/src/test/java/org/apache/juneau/marshaller/Xml_Test.java
index cfa41856f..71c285993 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshall/Xml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Xml_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.marshall;
+package org.apache.juneau.marshaller;
import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Content_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Content_Test.java
index 48b40665b..b47f18257 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Content_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Content_Test.java
@@ -25,7 +25,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.testutils.pojos.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
index 00dbaae2d..c3a7eb236 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
@@ -19,7 +19,7 @@ import static org.junit.runners.MethodSorters.*;
import java.io.*;
import org.apache.http.entity.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
index f033bd10e..f982f7f16 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
@@ -30,7 +30,7 @@ import org.apache.http.*;
import org.apache.http.client.utils.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.part.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index d0efeed2e..93826caf5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -37,7 +37,7 @@ import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.http.response.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.httppart.*;
import org.apache.juneau.rest.mock.*;
@@ -354,15 +354,15 @@ public class RestClient_Config_RestClient_Test {
}
@Test
- public void a08_marshall() throws Exception {
- RestClient rc =
MockRestClient.create(A.class).marshall(Xml.DEFAULT).build();
+ public void a08_marshaller() throws Exception {
+ RestClient rc =
MockRestClient.create(A.class).marshaller(Xml.DEFAULT).build();
ABean b =
rc.post("/echoBody",bean).run().cacheContent().assertContent().is("<object><f>1</f></object>").getContent().as(ABean.class);
assertObject(b).isSameJsonAs(bean);
}
@Test
public void a09_marshalls() throws Exception {
- final RestClient x =
MockRestClient.create(A.class).marshalls(Xml.DEFAULT,Json.DEFAULT).build();
+ final RestClient x =
MockRestClient.create(A.class).marshallers(Xml.DEFAULT,Json.DEFAULT).build();
assertThrown(()->x.post("/echoBody",bean).run()).asMessage().is("Content-Type
not specified on request. Cannot match correct serializer. Use
contentType(String) or mediaType(String) to specify transport language.");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
index 8128ea2f2..015b97641 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
@@ -24,7 +24,7 @@ import java.util.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
import org.apache.juneau.rest.logging.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
index a9e21715d..7bd4d1ec5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
@@ -19,7 +19,7 @@ import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.http.annotation.Content;
import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.http.header.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.config.*;
import org.apache.juneau.rest.mock.*;
@@ -181,7 +181,7 @@ public class RestClient_Marshalls_Test {
@Test
public void d03_nullMarshalls() throws Exception {
- RestClient x =
client().marshall(null).marshalls(Json.DEFAULT,null).build();
+ RestClient x =
client().marshaller(null).marshallers(Json.DEFAULT,null).build();
x.post("/a01",bean).header("X-Accept","application/json").header("X-Content-Type","application/json").run().assertCode().is(200).getContent().as(Bean.class).check();
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java
index ac24745d1..2acac3f49 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/helper/ResourceDescription_Test.java
@@ -15,7 +15,7 @@ package org.apache.juneau.rest.helper;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.beans.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/StackTraceElementSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/StackTraceElementSwapTest.java
index 2d26b6daa..dea5c1c6a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/StackTraceElementSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/StackTraceElementSwapTest.java
@@ -15,7 +15,7 @@ package org.apache.juneau.transforms;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
-import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshaller.*;
import org.junit.*;
/**
