This is an automated email from the ASF dual-hosted git repository.
ffang 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 bdc1d53 Revert
"[CAMEL-15738]camel-fastjson|camel-fhir|camel-gson|camel-jackson|camel-jacksonxml|camel-jaxb|camel-xstream
doc mismatch the value in src code"
bdc1d53 is described below
commit bdc1d5346ee6fabe351fcca485287286f756aaa6
Author: Freeman Fang <[email protected]>
AuthorDate: Thu Oct 22 11:59:28 2020 -0400
Revert
"[CAMEL-15738]camel-fastjson|camel-fhir|camel-gson|camel-jackson|camel-jacksonxml|camel-jaxb|camel-xstream
doc mismatch the value in src code"
This reverts commit cbfc4c6809b0ae183ad7027c785bde29c300341e.
---
components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc | 2 +-
.../camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc | 2 +-
components/camel-gson/src/main/docs/json-gson-dataformat.adoc | 2 +-
components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc | 2 +-
components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc | 2 +-
components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc | 2 +-
components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc | 2 +-
7 files changed, 7 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 31f6759..d6587d2 100644
--- a/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
+++ b/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
@@ -31,7 +31,7 @@ The JSON Fastjson dataformat supports 2 options, which are
listed below.
|===
| Name | Default | Java Type | Description
| unmarshalTypeName | | String | Class name of the java type to use when
unmarshalling
-| contentTypeHeader | true | 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.
+| 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/camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc
b/components/camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc
index eeb79ea..5000efa 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc
+++
b/components/camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc
@@ -35,6 +35,6 @@ The FHIR XML dataformat supports 13 options, which are listed
below.
| summaryMode | false | Boolean | If set to true (default is false) only
elements marked by the FHIR specification as being summary elements will be
included.
| suppressNarratives | false | Boolean | If set to true (default is false),
narratives will not be included in the encoded values.
| dontStripVersionsFromReferencesAtPaths | | List | If supplied value(s), any
resource references at the specified paths will have their resource versions
encoded instead of being automatically stripped during the encoding process.
This setting has no effect on the parsing process. This method provides a
finer-grained level of control than setStripVersionsFromReferences(String) and
any paths specified by this method will be encoded even if
setStripVersionsFromReferences(String) has been [...]
-| contentTypeHeader | true | 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.
+| 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/camel-gson/src/main/docs/json-gson-dataformat.adoc
b/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
index f69ee0d..d23112f 100644
--- a/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
+++ b/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
@@ -32,7 +32,7 @@ The JSON Gson dataformat supports 3 options, which are listed
below.
| Name | Default | Java Type | Description
| prettyPrint | false | Boolean | To enable pretty printing output nicely
formatted. Is by default false.
| unmarshalTypeName | | String | Class name of the java type to use when
unmarshalling
-| contentTypeHeader | true | 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.
+| 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/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
b/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
index 3f7a902..7c75c47 100644
--- a/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
+++ b/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
@@ -47,7 +47,7 @@ The JSON Jackson dataformat supports 17 options, which are
listed below.
| 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.
| timezone | | String | If set then Jackson will use the Timezone when
marshalling/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson, fastjson and xstream.
| autoDiscoverObjectMapper | false | Boolean | If set to true then Jackson
will lookup for an objectMapper into the registry
-| contentTypeHeader | true | 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.
+| 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/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
b/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
index 14ee25a..d10f4ef 100644
--- a/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
+++ b/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
@@ -63,7 +63,7 @@ The JacksonXML dataformat supports 15 options, which are
listed below.
| enableFeatures | | String | Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeature, or
com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
by comma
| disableFeatures | | String | Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeature, or
com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
by comma
| 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.
-| contentTypeHeader | true | 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.
+| 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/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
index dbea998..c6e7f6c 100644
--- a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
+++ b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
@@ -42,7 +42,7 @@ The JAXB dataformat supports 19 options, which are listed
below.
| schemaLocation | | String | To define the location of the schema
| noNamespaceSchemaLocation | | String | To define the location of the
namespaceless schema
| jaxbProviderProperties | | String | Refers to a custom java.util.Map to
lookup in the registry containing custom JAXB provider properties to be used
with the JAXB marshaller.
-| contentTypeHeader | true | 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.
+| 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/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
index 08371ef..1c3e527 100644
--- a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
@@ -43,7 +43,7 @@ The JSON XStream dataformat supports 3 options, which are
listed below.
| Name | Default | Java Type | Description
| prettyPrint | false | Boolean | To enable pretty printing output nicely
formatted. Is by default false.
| dropRootNode | false | Boolean | Whether XStream will drop the root node in
the generated JSon. You may want to enable this when using POJOs; as then the
written object will include the class name as root node, which is often not
intended to be written in the JSON output.
-| contentTypeHeader | true | 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.
+| 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
