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 909e978 Regen 909e978 is described below commit 909e97836b15fab9456c088d2f84ceda5eb924e8 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Apr 18 09:02:23 2019 +0200 Regen --- components/camel-bindy/src/main/docs/bindy-dataformat.adoc | 6 +++--- components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc | 4 ++-- components/readme.adoc | 2 +- docs/components/modules/ROOT/pages/bindy-dataformat.adoc | 8 ++++---- docs/components/modules/ROOT/pages/json-fastjson-dataformat.adoc | 3 +-- docs/components/modules/ROOT/pages/json-gson-dataformat.adoc | 3 +-- docs/components/modules/ROOT/pages/json-jackson-dataformat.adoc | 3 +-- docs/components/modules/ROOT/pages/json-johnzon-dataformat.adoc | 3 +-- docs/components/modules/ROOT/pages/jsonApi-dataformat.adoc | 4 ++-- docs/components/modules/ROOT/pages/xstream-dataformat.adoc | 3 +-- docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc | 4 +--- .../jsonapi/springboot/JsonApiDataFormatConfiguration.java | 8 ++++++++ 12 files changed, 26 insertions(+), 25 deletions(-) diff --git a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc index 9bfb8f4..4a79052 100644 --- a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc +++ b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc @@ -97,19 +97,19 @@ The component supports 18 options, which are listed below. | *camel.dataformat.bindy-csv.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.bindy-csv.enabled* | Enable bindy-csv dataformat | true | Boolean | *camel.dataformat.bindy-csv.locale* | To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default | | String -| *camel.dataformat.bindy-csv.type* | Whether to use csv, fixed or key value pairs mode. | | BindyType +| *camel.dataformat.bindy-csv.type* | Whether to use Csv, Fixed, or KeyValue. | | String | *camel.dataformat.bindy-csv.unwrap-single-instance* | When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List. | true | Boolean | *camel.dataformat.bindy-fixed.class-type* | Name of model class to use. | | String | *camel.dataformat.bindy-fixed.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.bindy-fixed.enabled* | Enable bindy-fixed dataformat | true | Boolean | *camel.dataformat.bindy-fixed.locale* | To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default | | String -| *camel.dataformat.bindy-fixed.type* | Whether to use csv, fixed or key value pairs mode. | | BindyType +| *camel.dataformat.bindy-fixed.type* | Whether to use Csv, Fixed, or KeyValue. | | String | *camel.dataformat.bindy-fixed.unwrap-single-instance* | When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List. | true | Boolean | *camel.dataformat.bindy-kvp.class-type* | Name of model class to use. | | String | *camel.dataformat.bindy-kvp.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.bindy-kvp.enabled* | Enable bindy-kvp dataformat | true | Boolean | *camel.dataformat.bindy-kvp.locale* | To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default | | String -| *camel.dataformat.bindy-kvp.type* | Whether to use csv, fixed or key value pairs mode. | | BindyType +| *camel.dataformat.bindy-kvp.type* | Whether to use Csv, Fixed, or KeyValue. | | String | *camel.dataformat.bindy-kvp.unwrap-single-instance* | When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List. | true | Boolean |=== // spring-boot-auto-configure options: END diff --git a/components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc b/components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc index 16a3315..568d1a4 100644 --- a/components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc +++ b/components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc @@ -14,8 +14,8 @@ The jsonApi dataformat supports 3 options, which are listed below. [width="100%",cols="2s,1m,1m,6",options="header"] |=== | Name | Default | Java Type | Description -| dataFormatTypes | | Class[] | -| mainFormatType | | Class | +| dataFormatTypes | | Class[] | The classes to take into account for the marshalling +| mainFormatType | | Class | The classes to take into account while unmarshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END diff --git a/components/readme.adoc b/components/readme.adoc index dd13a6b..82a6ec77 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -954,7 +954,7 @@ Number of Data Formats: 46 in 36 JAR artifacts (0 deprecated) | link:camel-xstream/src/main/docs/json-xstream-dataformat.adoc[JSon XStream] (camel-xstream) | 2.0 | JSon data format is used for unmarshal a JSon payload to POJO or to marshal POJO back to JSon payload. -| link:camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc[jsonApi] (camel-jsonapi) | 3.0 | +| link:camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc[jsonApi] (camel-jsonapi) | 3.0 | JsonApi data format is used for marshal and unmarshal Json API object. | link:camel-lzf/src/main/docs/lzf-dataformat.adoc[LZF Deflate Compression] (camel-lzf) | 2.17 | The LZF data format is a message compression and de-compression format (uses the LZF deflate algorithm). diff --git a/docs/components/modules/ROOT/pages/bindy-dataformat.adoc b/docs/components/modules/ROOT/pages/bindy-dataformat.adoc index 7772c9e..4a79052 100644 --- a/docs/components/modules/ROOT/pages/bindy-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/bindy-dataformat.adoc @@ -63,7 +63,7 @@ The Bindy dataformat supports 5 options, which are listed below. [width="100%",cols="2s,1m,1m,6",options="header"] |=== | Name | Default | Java Type | Description -| type | | BindyType | Whether to use csv, fixed or key value pairs mode. The default value is either Csv or KeyValue depending on chosen dataformat. +| type | | BindyType | Whether to use Csv, Fixed, or KeyValue. The default value is either Csv or KeyValue depending on chosen dataformat. | classType | | String | Name of model class to use. | locale | | String | To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default | unwrapSingleInstance | true | Boolean | When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List. @@ -97,19 +97,19 @@ The component supports 18 options, which are listed below. | *camel.dataformat.bindy-csv.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.bindy-csv.enabled* | Enable bindy-csv dataformat | true | Boolean | *camel.dataformat.bindy-csv.locale* | To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default | | String -| *camel.dataformat.bindy-csv.type* | Whether to use csv, fixed or key value pairs mode. | | BindyType +| *camel.dataformat.bindy-csv.type* | Whether to use Csv, Fixed, or KeyValue. | | String | *camel.dataformat.bindy-csv.unwrap-single-instance* | When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List. | true | Boolean | *camel.dataformat.bindy-fixed.class-type* | Name of model class to use. | | String | *camel.dataformat.bindy-fixed.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.bindy-fixed.enabled* | Enable bindy-fixed dataformat | true | Boolean | *camel.dataformat.bindy-fixed.locale* | To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default | | String -| *camel.dataformat.bindy-fixed.type* | Whether to use csv, fixed or key value pairs mode. | | BindyType +| *camel.dataformat.bindy-fixed.type* | Whether to use Csv, Fixed, or KeyValue. | | String | *camel.dataformat.bindy-fixed.unwrap-single-instance* | When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List. | true | Boolean | *camel.dataformat.bindy-kvp.class-type* | Name of model class to use. | | String | *camel.dataformat.bindy-kvp.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.bindy-kvp.enabled* | Enable bindy-kvp dataformat | true | Boolean | *camel.dataformat.bindy-kvp.locale* | To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default | | String -| *camel.dataformat.bindy-kvp.type* | Whether to use csv, fixed or key value pairs mode. | | BindyType +| *camel.dataformat.bindy-kvp.type* | Whether to use Csv, Fixed, or KeyValue. | | String | *camel.dataformat.bindy-kvp.unwrap-single-instance* | When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List. | true | Boolean |=== // spring-boot-auto-configure options: END diff --git a/docs/components/modules/ROOT/pages/json-fastjson-dataformat.adoc b/docs/components/modules/ROOT/pages/json-fastjson-dataformat.adoc index 654f308..663211b 100644 --- a/docs/components/modules/ROOT/pages/json-fastjson-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/json-fastjson-dataformat.adoc @@ -61,7 +61,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 20 options, which are listed below. +The component supports 19 options, which are listed below. @@ -78,7 +78,6 @@ The component supports 20 options, which are listed below. | *camel.dataformat.json-fastjson.enabled* | Whether to enable auto configuration of the json-fastjson data format. 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 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 -| *camel.dataformat.json-fastjson.library* | Which json library to use. | | JsonLibrary | *camel.dataformat.json-fastjson.module-class-names* | To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as a String with FQN class names. Multiple classes can be separated by comma. | | String | *camel.dataformat.json-fastjson.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String | *camel.dataformat.json-fastjson.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String diff --git a/docs/components/modules/ROOT/pages/json-gson-dataformat.adoc b/docs/components/modules/ROOT/pages/json-gson-dataformat.adoc index fc34b4e..9b7b4b6 100644 --- a/docs/components/modules/ROOT/pages/json-gson-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/json-gson-dataformat.adoc @@ -61,7 +61,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 20 options, which are listed below. +The component supports 19 options, which are listed below. @@ -78,7 +78,6 @@ 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 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 -| *camel.dataformat.json-gson.library* | Which json library to use. | | JsonLibrary | *camel.dataformat.json-gson.module-class-names* | To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as a String with FQN class names. Multiple classes can be separated by comma. | | String | *camel.dataformat.json-gson.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String | *camel.dataformat.json-gson.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String diff --git a/docs/components/modules/ROOT/pages/json-jackson-dataformat.adoc b/docs/components/modules/ROOT/pages/json-jackson-dataformat.adoc index 09f9ebe..d3e6fca 100644 --- a/docs/components/modules/ROOT/pages/json-jackson-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/json-jackson-dataformat.adoc @@ -62,7 +62,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 20 options, which are listed below. +The component supports 19 options, which are listed below. @@ -79,7 +79,6 @@ 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 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 -| *camel.dataformat.json-jackson.library* | Which json library to use. | | JsonLibrary | *camel.dataformat.json-jackson.module-class-names* | To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as a String with FQN class names. Multiple classes can be separated by comma. | | String | *camel.dataformat.json-jackson.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String | *camel.dataformat.json-jackson.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String diff --git a/docs/components/modules/ROOT/pages/json-johnzon-dataformat.adoc b/docs/components/modules/ROOT/pages/json-johnzon-dataformat.adoc index 9aa669d..e561efa 100644 --- a/docs/components/modules/ROOT/pages/json-johnzon-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/json-johnzon-dataformat.adoc @@ -62,7 +62,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 20 options, which are listed below. +The component supports 19 options, which are listed below. @@ -79,7 +79,6 @@ 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 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 -| *camel.dataformat.json-johnzon.library* | Which json library to use. | | JsonLibrary | *camel.dataformat.json-johnzon.module-class-names* | To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as a String with FQN class names. Multiple classes can be separated by comma. | | String | *camel.dataformat.json-johnzon.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String | *camel.dataformat.json-johnzon.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String diff --git a/docs/components/modules/ROOT/pages/jsonApi-dataformat.adoc b/docs/components/modules/ROOT/pages/jsonApi-dataformat.adoc index 16a3315..568d1a4 100644 --- a/docs/components/modules/ROOT/pages/jsonApi-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/jsonApi-dataformat.adoc @@ -14,8 +14,8 @@ The jsonApi dataformat supports 3 options, which are listed below. [width="100%",cols="2s,1m,1m,6",options="header"] |=== | Name | Default | Java Type | Description -| dataFormatTypes | | Class[] | -| mainFormatType | | Class | +| dataFormatTypes | | Class[] | The classes to take into account for the marshalling +| mainFormatType | | Class | The classes to take into account while unmarshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END diff --git a/docs/components/modules/ROOT/pages/xstream-dataformat.adoc b/docs/components/modules/ROOT/pages/xstream-dataformat.adoc index 41a4a23..2673753 100644 --- a/docs/components/modules/ROOT/pages/xstream-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/xstream-dataformat.adoc @@ -61,7 +61,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 31 options, which are listed below. +The component supports 30 options, which are listed below. @@ -78,7 +78,6 @@ 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 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 -| *camel.dataformat.json-xstream.library* | Which json library to use. | | JsonLibrary | *camel.dataformat.json-xstream.module-class-names* | To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as a String with FQN class names. Multiple classes can be separated by comma. | | String | *camel.dataformat.json-xstream.module-refs* | To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma. | | String | *camel.dataformat.json-xstream.object-mapper* | Lookup and use the existing ObjectMapper with the given id when using Jackson. | | String diff --git a/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc b/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc index 5c905ac..544d9e1 100644 --- a/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/yaml-snakeyaml-dataformat.adoc @@ -54,7 +54,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 12 options, which are listed below. +The component supports 10 options, which are listed below. @@ -66,11 +66,9 @@ The component supports 12 options, which are listed below. | *camel.dataformat.yaml-snakeyaml.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean | *camel.dataformat.yaml-snakeyaml.dumper-options* | DumperOptions to configure outgoing objects. | | String | *camel.dataformat.yaml-snakeyaml.enabled* | Enable yaml-snakeyaml dataformat | true | Boolean -| *camel.dataformat.yaml-snakeyaml.library* | Which yaml library to use. By default it is SnakeYAML | | YAMLLibrary | *camel.dataformat.yaml-snakeyaml.pretty-flow* | Force the emitter to produce a pretty YAML document when using the flow style. | false | Boolean | *camel.dataformat.yaml-snakeyaml.representer* | Representer to emit outgoing objects. | | String | *camel.dataformat.yaml-snakeyaml.resolver* | Resolver to detect implicit type | | String -| *camel.dataformat.yaml-snakeyaml.type-filter* | Set the types SnakeYAML is allowed to un-marshall | | List | *camel.dataformat.yaml-snakeyaml.unmarshal-type-name* | Class name of the java type to use when unarmshalling | | String | *camel.dataformat.yaml-snakeyaml.use-application-context-class-loader* | Use ApplicationContextClassLoader as custom ClassLoader | true | Boolean |=== diff --git a/platforms/spring-boot/components-starter/camel-jsonapi-starter/src/main/java/org/apache/camel/component/jsonapi/springboot/JsonApiDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-jsonapi-starter/src/main/java/org/apache/camel/component/jsonapi/springboot/JsonApiDataFormatConfiguration.java index dfa1cbc..f3eb5b8 100644 --- a/platforms/spring-boot/components-starter/camel-jsonapi-starter/src/main/java/org/apache/camel/component/jsonapi/springboot/JsonApiDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jsonapi-starter/src/main/java/org/apache/camel/component/jsonapi/springboot/JsonApiDataFormatConfiguration.java @@ -21,6 +21,8 @@ import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon; import org.springframework.boot.context.properties.ConfigurationProperties; /** + * JsonApi data format is used for marshal and unmarshal Json API object. + * * Generated by camel-package-maven-plugin - do not edit this file! */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @@ -34,7 +36,13 @@ public class JsonApiDataFormatConfiguration * enabled by default. */ private Boolean enabled; + /** + * The classes to take into account for the marshalling + */ private Class<?>[] dataFormatTypes; + /** + * The classes to take into account while unmarshalling + */ private Class<?> mainFormatType; /** * Whether the data format should set the Content-Type header with the type