camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [camel] branch master updated: CAMEL-10324 - Regen
Date Wed, 29 May 2019 10:10:56 GMT
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 03c2ca7  CAMEL-10324 - Regen
03c2ca7 is described below

commit 03c2ca713ce896dc64ea637de60cbb176424f320
Author: Andrea Cosentino <ancosen@gmail.com>
AuthorDate: Wed May 29 12:10:37 2019 +0200

    CAMEL-10324 - Regen
---
 components/camel-cbor/src/main/docs/cbor-dataformat.adoc            | 4 ++--
 docs/components/modules/ROOT/pages/cbor-dataformat.adoc             | 4 ++--
 .../component/cbor/springboot/CBORDataFormatConfiguration.java      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/camel-cbor/src/main/docs/cbor-dataformat.adoc b/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
index aa2a57a..60a03d6 100644
--- a/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
+++ b/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
@@ -31,7 +31,7 @@ The CBOR dataformat supports 7 options, which are listed below.
 | unmarshalTypeName |  | String | Class name of the java type to use when unarmshalling
 | 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.
-| allowUnmarshallType | false | Boolean | If enabled then Jackson is allowed to attempt to
use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled
when desired to be used.
+| allowUnmarshallType | false | Boolean | If enabled then Jackson CBOR is allowed to attempt
to use the CamelCBORUnmarshalType header during the unmarshalling. This should only be enabled
when desired to be used.
 | 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
@@ -58,7 +58,7 @@ The component supports 8 options, which are listed below.
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *camel.dataformat.cbor.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt
to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be
enabled when desired to be used. | false | Boolean
+| *camel.dataformat.cbor.allow-unmarshall-type* | If enabled then Jackson CBOR is allowed
to attempt to use the CamelCBORUnmarshalType header during the unmarshalling. This should
only be enabled when desired to be used. | false | Boolean
 | *camel.dataformat.cbor.collection-type-name* | 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. |  | String
 | *camel.dataformat.cbor.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.cbor.enabled* | Whether to enable auto configuration of the cbor data
format. This is enabled by default. |  | Boolean
diff --git a/docs/components/modules/ROOT/pages/cbor-dataformat.adoc b/docs/components/modules/ROOT/pages/cbor-dataformat.adoc
index aa2a57a..60a03d6 100644
--- a/docs/components/modules/ROOT/pages/cbor-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/cbor-dataformat.adoc
@@ -31,7 +31,7 @@ The CBOR dataformat supports 7 options, which are listed below.
 | unmarshalTypeName |  | String | Class name of the java type to use when unarmshalling
 | 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.
-| allowUnmarshallType | false | Boolean | If enabled then Jackson is allowed to attempt to
use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled
when desired to be used.
+| allowUnmarshallType | false | Boolean | If enabled then Jackson CBOR is allowed to attempt
to use the CamelCBORUnmarshalType header during the unmarshalling. This should only be enabled
when desired to be used.
 | 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
@@ -58,7 +58,7 @@ The component supports 8 options, which are listed below.
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *camel.dataformat.cbor.allow-unmarshall-type* | If enabled then Jackson is allowed to attempt
to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be
enabled when desired to be used. | false | Boolean
+| *camel.dataformat.cbor.allow-unmarshall-type* | If enabled then Jackson CBOR is allowed
to attempt to use the CamelCBORUnmarshalType header during the unmarshalling. This should
only be enabled when desired to be used. | false | Boolean
 | *camel.dataformat.cbor.collection-type-name* | 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. |  | String
 | *camel.dataformat.cbor.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.cbor.enabled* | Whether to enable auto configuration of the cbor data
format. This is enabled by default. |  | Boolean
diff --git a/platforms/spring-boot/components-starter/camel-cbor-starter/src/main/java/org/apache/camel/component/cbor/springboot/CBORDataFormatConfiguration.java
b/platforms/spring-boot/components-starter/camel-cbor-starter/src/main/java/org/apache/camel/component/cbor/springboot/CBORDataFormatConfiguration.java
index 9434ebc..851bf7e 100644
--- a/platforms/spring-boot/components-starter/camel-cbor-starter/src/main/java/org/apache/camel/component/cbor/springboot/CBORDataFormatConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-cbor-starter/src/main/java/org/apache/camel/component/cbor/springboot/CBORDataFormatConfiguration.java
@@ -62,9 +62,9 @@ public class CBORDataFormatConfiguration
      */
     private Boolean useList = false;
     /**
-     * If enabled then Jackson is allowed to attempt to use the
-     * CamelJacksonUnmarshalType header during the unmarshalling. This should
-     * only be enabled when desired to be used.
+     * If enabled then Jackson CBOR is allowed to attempt to use the
+     * CamelCBORUnmarshalType header during the unmarshalling. This should only
+     * be enabled when desired to be used.
      */
     private Boolean allowUnmarshallType = false;
     /**


Mime
View raw message