This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e5ce2525c311ffc7bbc3aacf9d0036ef7d1bb2f1
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed May 23 11:22:32 2018 +0200
Regen
---
.../src/main/docs/json-fastjson-dataformat.adoc | 3 ++-
.../camel-gson/src/main/docs/json-gson-dataformat.adoc | 3 ++-
.../camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc | 3 ++-
.../camel-xstream/src/main/docs/json-xstream-dataformat.adoc | 3 ++-
.../src/main/resources/camel-connector-schema.json | 2 +-
.../myfoo-connector/src/main/resources/camel-connector.json | 4 ++--
.../fastjson/springboot/FastjsonDataFormatConfiguration.java | 12 ++++++++++++
.../gson/springboot/GsonDataFormatConfiguration.java | 12 ++++++++++++
.../johnzon/springboot/JohnzonDataFormatConfiguration.java | 12 ++++++++++++
.../xstream/springboot/JsonDataFormatConfiguration.java | 12 ++++++++++++
10 files changed, 59 insertions(+), 7 deletions(-)
diff --git
a/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
b/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
index f59a302..c19c462 100644
--- a/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
+++ b/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
@@ -17,7 +17,7 @@ from("activemq:My.Queue").
// dataformat options: START
-The JSon Fastjson dataformat supports 18 options which are listed below.
+The JSon Fastjson dataformat supports 19 options which are listed below.
@@ -25,6 +25,7 @@ The JSon Fastjson dataformat supports 18 options which are
listed below.
|===
| Name | Default | Java Type | Description
| objectMapper | | String | Lookup and use the existing ObjectMapper with the
given id when using Jackson.
+| useDefaultObjectMapper | true | Boolean | Whether to lookup and use default
Jackson ObjectMapper from the registry.
| prettyPrint | false | Boolean | To enable pretty printing output nicely
formatted. Is by default false.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when
unarmshalling
diff --git a/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
b/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
index e8e58d9..ab1fda1 100644
--- a/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
+++ b/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
@@ -17,7 +17,7 @@ from("activemq:My.Queue").
// dataformat options: START
-The JSon GSon dataformat supports 18 options which are listed below.
+The JSon GSon dataformat supports 19 options which are listed below.
@@ -25,6 +25,7 @@ The JSon GSon dataformat supports 18 options which are listed
below.
|===
| Name | Default | Java Type | Description
| objectMapper | | String | Lookup and use the existing ObjectMapper with the
given id when using Jackson.
+| useDefaultObjectMapper | true | Boolean | Whether to lookup and use default
Jackson ObjectMapper from the registry.
| prettyPrint | false | Boolean | To enable pretty printing output nicely
formatted. Is by default false.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when
unarmshalling
diff --git
a/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
b/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
index f9e77c4..24cdffd4 100644
--- a/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
+++ b/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
@@ -18,7 +18,7 @@ from("activemq:My.Queue").
// dataformat options: START
-The JSon Johnzon dataformat supports 18 options which are listed below.
+The JSon Johnzon dataformat supports 19 options which are listed below.
@@ -26,6 +26,7 @@ The JSon Johnzon dataformat supports 18 options which are
listed below.
|===
| Name | Default | Java Type | Description
| objectMapper | | String | Lookup and use the existing ObjectMapper with the
given id when using Jackson.
+| useDefaultObjectMapper | true | Boolean | Whether to lookup and use default
Jackson ObjectMapper from the registry.
| prettyPrint | false | Boolean | To enable pretty printing output nicely
formatted. Is by default false.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when
unarmshalling
diff --git
a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
index 39e4b80..0114aeb 100644
--- a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
@@ -26,7 +26,7 @@ Maven users will need to add the following dependency to their
### Options
// dataformat options: START
-The JSon XStream dataformat supports 18 options which are listed below.
+The JSon XStream dataformat supports 19 options which are listed below.
@@ -34,6 +34,7 @@ The JSon XStream dataformat supports 18 options which are
listed below.
|===
| Name | Default | Java Type | Description
| objectMapper | | String | Lookup and use the existing ObjectMapper with the
given id when using Jackson.
+| useDefaultObjectMapper | true | Boolean | Whether to lookup and use default
Jackson ObjectMapper from the registry.
| prettyPrint | false | Boolean | To enable pretty printing output nicely
formatted. Is by default false.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when
unarmshalling
diff --git
a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
index 2e8f53d..22d8a53 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
@@ -14,7 +14,7 @@
"javaType":"org.myfoo.connector.MyFooComponent",
"groupId":"org.apache.camel",
"artifactId":"myfoo-connector",
- "version":"2.21.0-SNAPSHOT"
+ "version":"2.21.2-SNAPSHOT"
},
"componentProperties":{
diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json
b/platforms/myfoo-connector/src/main/resources/camel-connector.json
index 23b289d..c376b38 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector.json
@@ -2,14 +2,14 @@
"baseScheme" : "timer",
"baseGroupId" : "org.apache.camel",
"baseArtifactId" : "camel-core",
- "baseVersion" : "2.21.0-SNAPSHOT",
+ "baseVersion" : "2.21.2-SNAPSHOT",
"baseJavaType" : "org.apache.camel.component.timer.TimerComponent",
"name" : "MyFoo",
"scheme" : "my-foo",
"javaType" : "org.myfoo.connector.MyFooComponent",
"groupId" : "org.myfoo",
"artifactId" : "myfoo-connector",
- "version" : "2.21.0-SNAPSHOT",
+ "version" : "2.21.2-SNAPSHOT",
"description" : "Something cool",
"labels" : [ "foo", "timer" ],
"pattern" : "From",
diff --git
a/platforms/spring-boot/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
b/platforms/spring-boot/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
index 5643c6f..815f9dc 100644
---
a/platforms/spring-boot/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
@@ -40,6 +40,10 @@ public class FastjsonDataFormatConfiguration
*/
private String objectMapper;
/**
+ * Whether to lookup and use default Jackson ObjectMapper from the
registry.
+ */
+ private Boolean useDefaultObjectMapper = true;
+ /**
* To enable pretty printing output nicely formatted. Is by default false.
*/
private Boolean prettyPrint = false;
@@ -156,6 +160,14 @@ public class FastjsonDataFormatConfiguration
this.objectMapper = objectMapper;
}
+ public Boolean getUseDefaultObjectMapper() {
+ return useDefaultObjectMapper;
+ }
+
+ public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) {
+ this.useDefaultObjectMapper = useDefaultObjectMapper;
+ }
+
public Boolean getPrettyPrint() {
return prettyPrint;
}
diff --git
a/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
b/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
index 8333261..8a3a392 100644
---
a/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
@@ -40,6 +40,10 @@ public class GsonDataFormatConfiguration
*/
private String objectMapper;
/**
+ * Whether to lookup and use default Jackson ObjectMapper from the
registry.
+ */
+ private Boolean useDefaultObjectMapper = true;
+ /**
* To enable pretty printing output nicely formatted. Is by default false.
*/
private Boolean prettyPrint = false;
@@ -156,6 +160,14 @@ public class GsonDataFormatConfiguration
this.objectMapper = objectMapper;
}
+ public Boolean getUseDefaultObjectMapper() {
+ return useDefaultObjectMapper;
+ }
+
+ public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) {
+ this.useDefaultObjectMapper = useDefaultObjectMapper;
+ }
+
public Boolean getPrettyPrint() {
return prettyPrint;
}
diff --git
a/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
b/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
index 7b4cf33..d982857 100644
---
a/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
@@ -40,6 +40,10 @@ public class JohnzonDataFormatConfiguration
*/
private String objectMapper;
/**
+ * Whether to lookup and use default Jackson ObjectMapper from the
registry.
+ */
+ private Boolean useDefaultObjectMapper = true;
+ /**
* To enable pretty printing output nicely formatted. Is by default false.
*/
private Boolean prettyPrint = false;
@@ -156,6 +160,14 @@ public class JohnzonDataFormatConfiguration
this.objectMapper = objectMapper;
}
+ public Boolean getUseDefaultObjectMapper() {
+ return useDefaultObjectMapper;
+ }
+
+ public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) {
+ this.useDefaultObjectMapper = useDefaultObjectMapper;
+ }
+
public Boolean getPrettyPrint() {
return prettyPrint;
}
diff --git
a/platforms/spring-boot/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
b/platforms/spring-boot/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
index beb2701..6d6b57a 100644
---
a/platforms/spring-boot/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
@@ -40,6 +40,10 @@ public class JsonDataFormatConfiguration
*/
private String objectMapper;
/**
+ * Whether to lookup and use default Jackson ObjectMapper from the
registry.
+ */
+ private Boolean useDefaultObjectMapper = true;
+ /**
* To enable pretty printing output nicely formatted. Is by default false.
*/
private Boolean prettyPrint = false;
@@ -156,6 +160,14 @@ public class JsonDataFormatConfiguration
this.objectMapper = objectMapper;
}
+ public Boolean getUseDefaultObjectMapper() {
+ return useDefaultObjectMapper;
+ }
+
+ public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) {
+ this.useDefaultObjectMapper = useDefaultObjectMapper;
+ }
+
public Boolean getPrettyPrint() {
return prettyPrint;
}
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
