You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/07/30 07:02:53 UTC
[camel] 03/03: Regen with new json docs for include
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
commit 34aa0d1371f30a44d1e4ed345237fc8ab5cc415b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 30 09:01:56 2018 +0200
Regen with new json docs for include
---
bom/camel-bom/pom.xml | 5 +++++
.../camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc | 4 ++--
components/camel-gson/src/main/docs/json-gson-dataformat.adoc | 4 ++--
.../camel-jackson/src/main/docs/json-jackson-dataformat.adoc | 4 ++--
.../camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc | 4 ++--
.../camel-xstream/src/main/docs/json-xstream-dataformat.adoc | 2 +-
components/camel-xstream/src/main/docs/xstream-dataformat.adoc | 2 +-
.../fastjson/springboot/FastjsonDataFormatConfiguration.java | 2 +-
.../component/gson/springboot/GsonDataFormatConfiguration.java | 2 +-
.../jackson/springboot/JacksonDataFormatConfiguration.java | 2 +-
.../jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java | 2 +-
.../johnzon/springboot/JohnzonDataFormatConfiguration.java | 2 +-
.../dataformat/xstream/springboot/JsonDataFormatConfiguration.java | 2 +-
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 7 ++++++-
14 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index c9a6604..b751d19 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -78,6 +78,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-as2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-asn1</artifactId>
<version>${project.version}</version>
</dependency>
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 2f2e14d..7b8c9b6 100644
--- a/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
+++ b/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
@@ -30,7 +30,7 @@ The JSon Fastjson dataformat supports 19 options, which are listed below.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when unarmshalling
| jsonView | | Class<?> | When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations
-| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NOT_NULL
+| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL
| allowJmsType | false | Boolean | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to.
| collectionTypeName | | String | Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows to use different collection types than java.util.Collection based as default.
| useList | false | Boolean | To unarmshal to a List of Map or a List of Pojo.
@@ -88,7 +88,7 @@ The component supports 20 options, which are listed below.
This is enabled by default. | | Boolean
| *camel.dataformat.json-fastjson.include* | If you want to marshal a pojo to JSON, and the pojo has some fields with
null values. And you want to skip these null values, you can set this
- option to NOT_NULL | | String
+ option to NON_NULL | | String
| *camel.dataformat.json-fastjson.json-view* | When marshalling a POJO to JSON you might want to exclude certain fields
from the JSON output. With Jackson you can use JSON views to accomplish
this. This option is to refer to the class which has JsonView annotations | | Class
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 c3704f4..f65d5bb 100644
--- a/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
+++ b/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
@@ -30,7 +30,7 @@ The JSon GSon dataformat supports 19 options, which are listed below.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when unarmshalling
| jsonView | | Class<?> | When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations
-| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NOT_NULL
+| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL
| allowJmsType | false | Boolean | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to.
| collectionTypeName | | String | Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows to use different collection types than java.util.Collection based as default.
| useList | false | Boolean | To unarmshal to a List of Map or a List of Pojo.
@@ -87,7 +87,7 @@ The component supports 20 options, which are listed below.
| *camel.dataformat.json-gson.enabled* | Enable json-gson dataformat | true | Boolean
| *camel.dataformat.json-gson.include* | If you want to marshal a pojo to JSON, and the pojo has some fields with
null values. And you want to skip these null values, you can set this
- option to NOT_NULL | | String
+ option to NON_NULL | | String
| *camel.dataformat.json-gson.json-view* | When marshalling a POJO to JSON you might want to exclude certain fields
from the JSON output. With Jackson you can use JSON views to accomplish
this. This option is to refer to the class which has JsonView annotations | | Class
diff --git a/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc b/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
index 1bd5f7e..e15aafc 100644
--- a/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
+++ b/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
@@ -31,7 +31,7 @@ The JSon Jackson dataformat supports 19 options, which are listed below.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when unarmshalling
| jsonView | | Class<?> | When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations
-| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NOT_NULL
+| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL
| allowJmsType | false | Boolean | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to.
| collectionTypeName | | String | Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows to use different collection types than java.util.Collection based as default.
| useList | false | Boolean | To unarmshal to a List of Map or a List of Pojo.
@@ -88,7 +88,7 @@ The component supports 20 options, which are listed below.
| *camel.dataformat.json-jackson.enabled* | Enable json-jackson dataformat | true | Boolean
| *camel.dataformat.json-jackson.include* | If you want to marshal a pojo to JSON, and the pojo has some fields with
null values. And you want to skip these null values, you can set this
- option to NOT_NULL | | String
+ option to NON_NULL | | String
| *camel.dataformat.json-jackson.json-view* | When marshalling a POJO to JSON you might want to exclude certain fields
from the JSON output. With Jackson you can use JSON views to accomplish
this. This option is to refer to the class which has JsonView annotations | | Class
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 9d005e4..7009894 100644
--- a/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
+++ b/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
@@ -31,7 +31,7 @@ The JSon Johnzon dataformat supports 19 options, which are listed below.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when unarmshalling
| jsonView | | Class<?> | When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations
-| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NOT_NULL
+| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL
| allowJmsType | false | Boolean | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to.
| collectionTypeName | | String | Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows to use different collection types than java.util.Collection based as default.
| useList | false | Boolean | To unarmshal to a List of Map or a List of Pojo.
@@ -88,7 +88,7 @@ The component supports 20 options, which are listed below.
| *camel.dataformat.json-johnzon.enabled* | Enable json-johnzon dataformat | true | Boolean
| *camel.dataformat.json-johnzon.include* | If you want to marshal a pojo to JSON, and the pojo has some fields with
null values. And you want to skip these null values, you can set this
- option to NOT_NULL | | String
+ option to NON_NULL | | String
| *camel.dataformat.json-johnzon.json-view* | When marshalling a POJO to JSON you might want to exclude certain fields
from the JSON output. With Jackson you can use JSON views to accomplish
this. This option is to refer to the class which has JsonView annotations | | Class
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 0ecfbd6..a339557 100644
--- a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
@@ -39,7 +39,7 @@ The JSon XStream dataformat supports 19 options, which are listed below.
| library | XStream | JsonLibrary | Which json library to use.
| unmarshalTypeName | | String | Class name of the java type to use when unarmshalling
| jsonView | | Class<?> | When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations
-| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NOT_NULL
+| include | | String | If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL
| allowJmsType | false | Boolean | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to.
| collectionTypeName | | String | Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows to use different collection types than java.util.Collection based as default.
| useList | false | Boolean | To unarmshal to a List of Map or a List of Pojo.
diff --git a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
index 65947c7..1b7bf8b 100644
--- a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
@@ -87,7 +87,7 @@ The component supports 31 options, which are listed below.
| *camel.dataformat.json-xstream.enabled* | Enable json-xstream dataformat | true | Boolean
| *camel.dataformat.json-xstream.include* | If you want to marshal a pojo to JSON, and the pojo has some fields with
null values. And you want to skip these null values, you can set this
- option to NOT_NULL | | String
+ option to NON_NULL | | String
| *camel.dataformat.json-xstream.json-view* | When marshalling a POJO to JSON you might want to exclude certain fields
from the JSON output. With Jackson you can use JSON views to accomplish
this. This option is to refer to the class which has JsonView annotations | | Class
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 e9fadc0..835be69 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
@@ -69,7 +69,7 @@ public class FastjsonDataFormatConfiguration
/**
* If you want to marshal a pojo to JSON, and the pojo has some fields with
* null values. And you want to skip these null values, you can set this
- * option to NOT_NULL
+ * option to NON_NULL
*/
private String include;
/**
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 6d59f0f..bd24500 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
@@ -69,7 +69,7 @@ public class GsonDataFormatConfiguration
/**
* If you want to marshal a pojo to JSON, and the pojo has some fields with
* null values. And you want to skip these null values, you can set this
- * option to NOT_NULL
+ * option to NON_NULL
*/
private String include;
/**
diff --git a/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
index 76c5041..d4f67f1 100644
--- a/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -69,7 +69,7 @@ public class JacksonDataFormatConfiguration
/**
* If you want to marshal a pojo to JSON, and the pojo has some fields with
* null values. And you want to skip these null values, you can set this
- * option to NOT_NULL
+ * option to NON_NULL
*/
private String include;
/**
diff --git a/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java
index 7b45f70..604f28e 100644
--- a/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatConfiguration.java
@@ -58,7 +58,7 @@ public class JacksonXMLDataFormatConfiguration
/**
* If you want to marshal a pojo to JSON, and the pojo has some fields with
* null values. And you want to skip these null values, you can set this
- * option to NOT_NULL
+ * option to NON_NULL
*/
private String include;
/**
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 33b05d6..05ffe26 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
@@ -69,7 +69,7 @@ public class JohnzonDataFormatConfiguration
/**
* If you want to marshal a pojo to JSON, and the pojo has some fields with
* null values. And you want to skip these null values, you can set this
- * option to NOT_NULL
+ * option to NON_NULL
*/
private String include;
/**
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 455f60e..3af3467 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
@@ -69,7 +69,7 @@ public class JsonDataFormatConfiguration
/**
* If you want to marshal a pojo to JSON, and the pojo has some fields with
* null values. And you want to skip these null values, you can set this
- * option to NOT_NULL
+ * option to NON_NULL
*/
private String include;
/**
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 95ff998..0fbc2aa 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>com.github.dozermapper</groupId>
<artifactId>dozer-core</artifactId>
- <version>6.2.0</version>
+ <version>6.3.0</version>
</dependency>
<dependency>
<groupId>com.google.code.scriptengines</groupId>
@@ -274,6 +274,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-as2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-asn1</artifactId>
<version>${project.version}</version>
</dependency>