This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6a76e11 Correctly reflect the default JsonLibrary in doco
6a76e11 is described below
commit 6a76e11ddf27bff7a25b2aff0120968cef47dc7c
Author: Franky <[email protected]>
AuthorDate: Thu Nov 26 17:55:46 2020 +1030
Correctly reflect the default JsonLibrary in doco
According to source the default is actually Jackson, not XStream. I
confirmed this by debugging a route that included `.unmarshal().json()`.
The default is set in JsonDataFormat.java
---
docs/user-manual/modules/ROOT/pages/json.adoc | 28 +++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/json.adoc
b/docs/user-manual/modules/ROOT/pages/json.adoc
index 1e9de04..78d73c5 100644
--- a/docs/user-manual/modules/ROOT/pages/json.adoc
+++ b/docs/user-manual/modules/ROOT/pages/json.adoc
@@ -15,10 +15,10 @@ http://jettison.codehaus.org/[Jettsion]
Every library requires adding the special camel component (see
"Dependency..." paragraphs further down). By default Camel uses the
-XStream library.
+Jackson library.
-[[JSON-UsingJSONdataformatwiththeXStreamlibrary]]
-== Using JSON data format with the XStream library
+[[JSON-UsingJSONdataformatwiththeJacksonlibrary]]
+== Using JSON data format with the Jackson library
[source,java]
------------------------------------------------------------
@@ -28,14 +28,14 @@ from("activemq:My.Queue").
to("mqseries:Another.Queue");
------------------------------------------------------------
-[[JSON-UsingJSONdataformatwiththeJacksonlibrary]]
-== Using JSON data format with the Jackson library
+[[JSON-UsingJSONdataformatwiththeXStreamlibrary]]
+== Using JSON data format with the XStream library
[source,java]
------------------------------------------------------------
// lets turn Object messages into json then send to MQSeries
from("activemq:My.Queue").
- marshal().json(JsonLibrary.Jackson).
+ marshal().json(JsonLibrary.XStream).
to("mqseries:Another.Queue");
------------------------------------------------------------
@@ -530,11 +530,11 @@ The `camel-jackson` type converter integrates with JAXB
which means you
can annotate POJO class with JAXB annotations that Jackson can
leverage.
-[[JSON-DependenciesforXStream]]
-== Dependencies for XStream
+[[JSON-DependenciesforJackson]]
+== Dependencies for Jackson
To use JSON in your camel routes you need to add the a dependency on
-*camel-xstream* which implements this data format.
+*camel-jackson* which implements this data format.
If you use maven you could just add the following to your pom.xml,
substituting the version number for the latest & greatest release (see
@@ -544,16 +544,16 @@ the download page for the latest versions).
----------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xstream</artifactId>
+ <artifactId>camel-jackson</artifactId>
<version>x.x.x</version>
</dependency>
----------------------------------------
-[[JSON-DependenciesforJackson]]
-== Dependencies for Jackson
+[[JSON-DependenciesforXStream]]
+== Dependencies for XStream
To use JSON in your camel routes you need to add the a dependency on
-*camel-jackson* which implements this data format.
+*camel-xstream* which implements this data format.
If you use maven you could just add the following to your pom.xml,
substituting the version number for the latest & greatest release (see
@@ -563,7 +563,7 @@ the download page for the latest versions).
----------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</artifactId>
+ <artifactId>camel-xstream</artifactId>
<version>x.x.x</version>
</dependency>
----------------------------------------
