You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/03/01 11:33:18 UTC
[camel] branch main updated: CAMEL-17701: camel-core-model - Add labels to EIP options
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fadc73a CAMEL-17701: camel-core-model - Add labels to EIP options
fadc73a is described below
commit fadc73a6fe6d29a58e11b6682e2d7e8b80ea48e4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 1 12:31:45 2022 +0100
CAMEL-17701: camel-core-model - Add labels to EIP options
---
.../apache/camel/catalog/dataformats/flatpack.json | 4 +-
.../org/apache/camel/catalog/dataformats/ical.json | 2 +-
.../camel/catalog/dataformats/jacksonXml.json | 2 +-
.../org/apache/camel/catalog/models/avro.json | 2 +-
.../apache/camel/catalog/models/jacksonXml.json | 15 +++----
.../org/apache/camel/catalog/models/jaxb.json | 20 +++++-----
.../org/apache/camel/catalog/models/json.json | 2 +-
.../org/apache/camel/catalog/others.properties | 1 +
.../org/apache/camel/catalog/others/console.json | 15 +++++++
.../apache/camel/catalog/schemas/camel-spring.xsd | 27 ++++++++-----
.../org/apache/camel/model/dataformat/avro.json | 2 +-
.../apache/camel/model/dataformat/jacksonXml.json | 15 +++----
.../org/apache/camel/model/dataformat/jaxb.json | 20 +++++-----
.../org/apache/camel/model/dataformat/json.json | 2 +-
.../camel/model/dataformat/AvroDataFormat.java | 2 +-
.../model/dataformat/JacksonXMLDataFormat.java | 46 ++++++++++++++++------
.../camel/model/dataformat/JaxbDataFormat.java | 17 +++++---
.../camel/model/dataformat/JsonApiDataFormat.java | 1 -
.../camel/model/dataformat/JsonDataFormat.java | 1 +
.../camel/model/dataformat/LZFDataFormat.java | 1 +
.../model/dataformat/MimeMultipartDataFormat.java | 8 ++--
.../dataformat/JacksonXMLDataFormatReifier.java | 1 +
.../reifier/dataformat/JsonDataFormatReifier.java | 1 +
.../java/org/apache/camel/xml/in/ModelParser.java | 1 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 6 +++
.../src/generated/resources/camel-yaml-dsl.json | 3 ++
.../src/generated/resources/camelYamlDsl.json | 3 ++
27 files changed, 143 insertions(+), 77 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json
index a95cb2f..38694a0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json
@@ -18,11 +18,11 @@
"properties": {
"definition": { "kind": "attribute", "displayName": "Definition", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The flatpack pzmap configuration file. Can be omitted in simpler situations, but its preferred to use the pzmap." },
"fixed": { "kind": "attribute", "displayName": "Fixed", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Delimited or fixed. Is by default false = delimited" },
- "delimiter": { "kind": "attribute", "displayName": "Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": ",", "description": "The delimiter char (could be ; , or similar)" },
"ignoreFirstRecord": { "kind": "attribute", "displayName": "Ignore First Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the first line is ignored for delimited files (for the column headers). Is by default true." },
+ "textQualifier": { "kind": "attribute", "displayName": "Text Qualifier", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If the text is qualified with a character. Uses quote character by default." },
+ "delimiter": { "kind": "attribute", "displayName": "Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": ",", "description": "The delimiter char (could be ; , or similar)" },
"allowShortLines": { "kind": "attribute", "displayName": "Allow Short Lines", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be shorter than expected and ignores the extra characters" },
"ignoreExtraColumns": { "kind": "attribute", "displayName": "Ignore Extra Columns", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be longer than expected and ignores the extra characters." },
- "textQualifier": { "kind": "attribute", "displayName": "Text Qualifier", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If the text is qualified with a character. Uses quote character by default." },
"parserFactoryRef": { "kind": "attribute", "displayName": "Parser Factory Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/ical.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/ical.json
index 638edf5..24c033b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/ical.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/ical.json
@@ -3,7 +3,7 @@
"kind": "dataformat",
"name": "ical",
"title": "iCal",
- "description": "Marshal and unmarshal iCal (.ics) documents to\/from model objects.",
+ "description": "Marshal and unmarshal iCal (.ics) documents to\/from model objects provided by the iCal4j library.",
"deprecated": false,
"firstVersion": "2.12.0",
"label": "dataformat,transformation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonXml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonXml.json
index 35dd3ec..245b8f6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonXml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonXml.json
@@ -3,7 +3,7 @@
"kind": "dataformat",
"name": "jacksonXml",
"title": "Jackson XML",
- "description": "Unmarshal an XML payloads to POJOs and back using XMLMapper extension of Jackson.",
+ "description": "Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.",
"deprecated": false,
"firstVersion": "2.16.0",
"label": "dataformat,transformation,xml",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/avro.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/avro.json
index db58101..08d4a9f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/avro.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/avro.json
@@ -29,7 +29,7 @@
"disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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.j [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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": { "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling." },
- "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
+ "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
"schemaResolver": { "kind": "attribute", "displayName": "Schema Resolver", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Optional schema resolver used to lookup schemas for the data in transit." },
"autoDiscoverSchemaResolver": { "kind": "attribute", "displayName": "Auto Discover Schema Resolver", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When not disabled, the SchemaResolver will be looked up into the registry" },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json
index 90fc017..95a72c7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json
@@ -13,20 +13,21 @@
"output": false
},
"properties": {
- "xmlMapper": { "kind": "attribute", "displayName": "Xml Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Lookup and use the existing XmlMapper with the given id." },
+ "xmlMapper": { "kind": "attribute", "displayName": "Xml Mapper", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Lookup and use the existing XmlMapper with the given id." },
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
"unmarshalType": { "kind": "attribute", "displayName": "Unmarshal Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" },
+ "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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." },
"jsonView": { "kind": "attribute", "displayName": "Json View", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Include", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to." },
- "collectionType": { "kind": "attribute", "displayName": "Collection Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+ "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to." },
+ "collectionType": { "kind": "attribute", "displayName": "Collection Type", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." },
- "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
- "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
- "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
+ "timezone": { "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling." },
+ "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
+ "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+ "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
"enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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.jack [...]
"disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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.j [...]
- "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
index 2bf5f58f..8452f63 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
@@ -15,21 +15,21 @@
"properties": {
"contextPath": { "kind": "attribute", "displayName": "Context Path", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Package name where your JAXB classes are located." },
"contextPathIsClassName": { "kind": "attribute", "displayName": "Context Path Is Class Name", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This can be set to true to mark that the contextPath is referring to a classname and not a package name." },
- "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character." },
+ "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should be resolved. You can separate multiple schema files by using the ',' character." },
"schemaSeverityLevel": { "kind": "attribute", "displayName": "Schema Severity Level", "required": false, "type": "enum", "javaType": "java.lang.Integer", "enum": [ "0", "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0", "description": "Sets the schema severity level to use when validating against a schema. This level determines the minimum severity error that triggers JAXB to stop continue parsing. The default value of 0 (warning) means that an [...]
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
- "objectFactory": { "kind": "attribute", "displayName": "Object Factory", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow using ObjectFactory classes to create the POJO classes during marshalling. This only applies to POJO classes that has not been annotated with JAXB and providing jaxb.index descriptor files." },
- "ignoreJAXBElement": { "kind": "attribute", "displayName": "Ignore JAXBElement", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases." },
- "mustBeJAXBElement": { "kind": "attribute", "displayName": "Must Be JAXBElement", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether marhsalling must be java objects with JAXB annotations. And if not then it fails. This option can be set to false to relax that, such as when the data is already in XML format." },
- "filterNonXmlChars": { "kind": "attribute", "displayName": "Filter Non Xml Chars", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To ignore non xml characheters and replace them with an empty space." },
+ "objectFactory": { "kind": "attribute", "displayName": "Object Factory", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow using ObjectFactory classes to create the POJO classes during marshalling. This only applies to POJO classes that has not been annotated with JAXB and providing jaxb.index descriptor files." },
+ "ignoreJAXBElement": { "kind": "attribute", "displayName": "Ignore JAXBElement", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases." },
+ "mustBeJAXBElement": { "kind": "attribute", "displayName": "Must Be JAXBElement", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether marhsalling must be java objects with JAXB annotations. And if not then it fails. This option can be set to false to relax that, such as when the data is already in XML format." },
+ "filterNonXmlChars": { "kind": "attribute", "displayName": "Filter Non Xml Chars", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To ignore non xml characheters and replace them with an empty space." },
"encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To overrule and use a specific encoding" },
- "fragment": { "kind": "attribute", "displayName": "Fragment", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To turn on marshalling XML fragment trees. By default JAXB looks for XmlRootElement annotation on given class to operate on whole XML tree. This is useful but not always - sometimes generated code does not have XmlRootElement annotation, sometimes you need u [...]
- "partClass": { "kind": "attribute", "displayName": "Part Class", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class used for fragment parsing. See more details at the fragment option." },
- "partNamespace": { "kind": "attribute", "displayName": "Part Namespace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "XML namespace to use for fragment parsing. See more details at the fragment option." },
- "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." },
+ "fragment": { "kind": "attribute", "displayName": "Fragment", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To turn on marshalling XML fragment trees. By default JAXB looks for XmlRootElement annotation on given class to operate on whole XML tree. This is useful but not always - sometimes generated code does not have XmlRootElement annotation, [...]
+ "partClass": { "kind": "attribute", "displayName": "Part Class", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class used for fragment parsing. See more details at the fragment option." },
+ "partNamespace": { "kind": "attribute", "displayName": "Part Namespace", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "XML namespace to use for fragment parsing. See more details at the fragment option." },
+ "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." },
"xmlStreamWriterWrapper": { "kind": "attribute", "displayName": "Xml Stream Writer Wrapper", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom xml stream writer." },
"schemaLocation": { "kind": "attribute", "displayName": "Schema Location", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the schema" },
- "noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No Namespace Schema Location", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the namespaceless schema" },
+ "noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No Namespace Schema Location", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the namespaceless schema" },
"jaxbProviderProperties": { "kind": "attribute", "displayName": "Jaxb Provider Properties", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
index 8ebf76c..ad249b5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
@@ -28,7 +28,7 @@
"disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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.j [...]
"permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+ "timezone": { "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
"dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 2ecc8b0..5f99325 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -8,6 +8,7 @@ cloud
cloudevents
cluster
componentdsl
+console
csimple-joor
cxf-transport
debug
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
new file mode 100644
index 0000000..b1048bd
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "console",
+ "title": "Console",
+ "description": "Camel Developer Console",
+ "deprecated": false,
+ "firstVersion": "3.15.0",
+ "label": "core",
+ "supportLevel": "Preview",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-console",
+ "version": "3.16.0-SNAPSHOT"
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index f3cb070..3046edb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -7134,6 +7134,15 @@ Class name of the java type to use when unmarshalling.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="allowUnmarshallType" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+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. Default value: false
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="jsonView" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
@@ -7176,6 +7185,13 @@ To unmarshal to a List of Map or a List of Pojo. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="timezone" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+If set then Jackson will use the Timezone when marshalling/unmarshalling.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="enableJaxbAnnotationModule" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
@@ -7224,15 +7240,6 @@ by comma.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="allowUnmarshallType" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-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. Default value: false
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="contentTypeHeader" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
@@ -7270,7 +7277,7 @@ and not a package name. Default value: false
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
To validate against an existing schema. Your can use the prefix classpath:,
-file: or http: to specify how the resource should by resolved. You can separate
+file: or http: to specify how the resource should be resolved. You can separate
multiple schema files by using the ',' character.
]]></xs:documentation>
</xs:annotation>
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/avro.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/avro.json
index db58101..08d4a9f 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/avro.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/avro.json
@@ -29,7 +29,7 @@
"disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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.j [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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": { "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling." },
- "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
+ "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
"contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
"schemaResolver": { "kind": "attribute", "displayName": "Schema Resolver", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Optional schema resolver used to lookup schemas for the data in transit." },
"autoDiscoverSchemaResolver": { "kind": "attribute", "displayName": "Auto Discover Schema Resolver", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When not disabled, the SchemaResolver will be looked up into the registry" },
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json
index 90fc017..95a72c7 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json
@@ -13,20 +13,21 @@
"output": false
},
"properties": {
- "xmlMapper": { "kind": "attribute", "displayName": "Xml Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Lookup and use the existing XmlMapper with the given id." },
+ "xmlMapper": { "kind": "attribute", "displayName": "Xml Mapper", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Lookup and use the existing XmlMapper with the given id." },
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
"unmarshalType": { "kind": "attribute", "displayName": "Unmarshal Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" },
+ "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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." },
"jsonView": { "kind": "attribute", "displayName": "Json View", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Include", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to." },
- "collectionType": { "kind": "attribute", "displayName": "Collection Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+ "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to." },
+ "collectionType": { "kind": "attribute", "displayName": "Collection Type", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Use List", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To unmarshal to a List of Map or a List of Pojo." },
- "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
- "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
- "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
+ "timezone": { "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling." },
+ "enableJaxbAnnotationModule": { "kind": "attribute", "displayName": "Enable Jaxb Annotation Module", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable the JAXB annotations module when using jackson. When enabled then JAXB annotations can be used by Jackson." },
+ "moduleClassNames": { "kind": "attribute", "displayName": "Module Class Names", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+ "moduleRefs": { "kind": "attribute", "displayName": "Module Refs", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma." },
"enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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.jack [...]
"disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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.j [...]
- "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json
index 2bf5f58f..8452f63 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.json
@@ -15,21 +15,21 @@
"properties": {
"contextPath": { "kind": "attribute", "displayName": "Context Path", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Package name where your JAXB classes are located." },
"contextPathIsClassName": { "kind": "attribute", "displayName": "Context Path Is Class Name", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This can be set to true to mark that the contextPath is referring to a classname and not a package name." },
- "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character." },
+ "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should be resolved. You can separate multiple schema files by using the ',' character." },
"schemaSeverityLevel": { "kind": "attribute", "displayName": "Schema Severity Level", "required": false, "type": "enum", "javaType": "java.lang.Integer", "enum": [ "0", "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0", "description": "Sets the schema severity level to use when validating against a schema. This level determines the minimum severity error that triggers JAXB to stop continue parsing. The default value of 0 (warning) means that an [...]
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
- "objectFactory": { "kind": "attribute", "displayName": "Object Factory", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow using ObjectFactory classes to create the POJO classes during marshalling. This only applies to POJO classes that has not been annotated with JAXB and providing jaxb.index descriptor files." },
- "ignoreJAXBElement": { "kind": "attribute", "displayName": "Ignore JAXBElement", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases." },
- "mustBeJAXBElement": { "kind": "attribute", "displayName": "Must Be JAXBElement", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether marhsalling must be java objects with JAXB annotations. And if not then it fails. This option can be set to false to relax that, such as when the data is already in XML format." },
- "filterNonXmlChars": { "kind": "attribute", "displayName": "Filter Non Xml Chars", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To ignore non xml characheters and replace them with an empty space." },
+ "objectFactory": { "kind": "attribute", "displayName": "Object Factory", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow using ObjectFactory classes to create the POJO classes during marshalling. This only applies to POJO classes that has not been annotated with JAXB and providing jaxb.index descriptor files." },
+ "ignoreJAXBElement": { "kind": "attribute", "displayName": "Ignore JAXBElement", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore JAXBElement elements - only needed to be set to false in very special use-cases." },
+ "mustBeJAXBElement": { "kind": "attribute", "displayName": "Must Be JAXBElement", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether marhsalling must be java objects with JAXB annotations. And if not then it fails. This option can be set to false to relax that, such as when the data is already in XML format." },
+ "filterNonXmlChars": { "kind": "attribute", "displayName": "Filter Non Xml Chars", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To ignore non xml characheters and replace them with an empty space." },
"encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To overrule and use a specific encoding" },
- "fragment": { "kind": "attribute", "displayName": "Fragment", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To turn on marshalling XML fragment trees. By default JAXB looks for XmlRootElement annotation on given class to operate on whole XML tree. This is useful but not always - sometimes generated code does not have XmlRootElement annotation, sometimes you need u [...]
- "partClass": { "kind": "attribute", "displayName": "Part Class", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class used for fragment parsing. See more details at the fragment option." },
- "partNamespace": { "kind": "attribute", "displayName": "Part Namespace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "XML namespace to use for fragment parsing. See more details at the fragment option." },
- "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." },
+ "fragment": { "kind": "attribute", "displayName": "Fragment", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To turn on marshalling XML fragment trees. By default JAXB looks for XmlRootElement annotation on given class to operate on whole XML tree. This is useful but not always - sometimes generated code does not have XmlRootElement annotation, [...]
+ "partClass": { "kind": "attribute", "displayName": "Part Class", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class used for fragment parsing. See more details at the fragment option." },
+ "partNamespace": { "kind": "attribute", "displayName": "Part Namespace", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "XML namespace to use for fragment parsing. See more details at the fragment option." },
+ "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." },
"xmlStreamWriterWrapper": { "kind": "attribute", "displayName": "Xml Stream Writer Wrapper", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom xml stream writer." },
"schemaLocation": { "kind": "attribute", "displayName": "Schema Location", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the schema" },
- "noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No Namespace Schema Location", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the namespaceless schema" },
+ "noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No Namespace Schema Location", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the location of the namespaceless schema" },
"jaxbProviderProperties": { "kind": "attribute", "displayName": "Jaxb Provider Properties", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
index 8ebf76c..ad249b5 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
@@ -28,7 +28,7 @@
"disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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.j [...]
"permissions": { "kind": "attribute", "displayName": "Permissions", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Adds permissions that controls which Java packages and classes XStream is allowed to use during unmarshal from xml\/json to Java beans. A permission must be configured either here or globally using a JVM system property. The permission can be specified in a syntax where a plus [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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." },
+ "timezone": { "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "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": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
"dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "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": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" },
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
index 04f2ce8..ea505f5 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
@@ -85,7 +85,7 @@ public class AvroDataFormat extends DataFormatDefinition {
@Metadata(label = "advanced")
private String timezone;
@XmlAttribute
- @Metadata(javaType = "java.lang.Boolean", defaultValue = "false")
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String autoDiscoverObjectMapper;
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean", defaultValue = "true",
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
index bb715e6..888d3a7 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
@@ -32,46 +32,55 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "jacksonXml")
@XmlAccessorType(XmlAccessType.FIELD)
public class JacksonXMLDataFormat extends DataFormatDefinition implements ContentTypeHeaderAware {
+
+ @XmlTransient
+ private Class<?> unmarshalType;
+ @XmlTransient
+ private Class<?> jsonView;
+ @XmlTransient
+ private Class<?> collectionType;
+
@XmlAttribute
+ @Metadata(label = "advanced")
private String xmlMapper;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
+ @Metadata(javaType = "java.lang.Boolean")
private String prettyPrint;
@XmlAttribute(name = "unmarshalType")
private String unmarshalTypeName;
- @XmlTransient
- private Class<?> unmarshalType;
+ @XmlAttribute
+ @Metadata(javaType = "java.lang.Boolean")
+ private String allowUnmarshallType;
@XmlAttribute(name = "jsonView")
private String jsonViewTypeName;
- @XmlTransient
- private Class<?> jsonView;
@XmlAttribute
private String include;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String allowJmsType;
@XmlAttribute(name = "collectionType")
+ @Metadata(label = "advanced")
private String collectionTypeName;
- @XmlTransient
- private Class<?> collectionType;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
+ @Metadata(javaType = "java.lang.Boolean")
private String useList;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
+ @Metadata(label = "advanced")
+ private String timezone;
+ @XmlAttribute
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String enableJaxbAnnotationModule;
@XmlAttribute
+ @Metadata(label = "advanced")
private String moduleClassNames;
@XmlAttribute
+ @Metadata(label = "advanced")
private String moduleRefs;
@XmlAttribute
private String enableFeatures;
@XmlAttribute
private String disableFeatures;
@XmlAttribute
- @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
- private String allowUnmarshallType;
- @XmlAttribute
@Metadata(javaType = "java.lang.Boolean", defaultValue = "true",
description = "Whether the data format should set the Content-Type header with the type from the data format."
+ " For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON")
@@ -299,4 +308,15 @@ public class JacksonXMLDataFormat extends DataFormatDefinition implements Conten
this.contentTypeHeader = contentTypeHeader;
}
+ public String getTimezone() {
+ return timezone;
+ }
+
+ /**
+ * If set then Jackson will use the Timezone when marshalling/unmarshalling.
+ */
+ public void setTimezone(String timezone) {
+ this.timezone = timezone;
+ }
+
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
index dab6064..d113010 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "jaxb")
@XmlAccessorType(XmlAccessType.FIELD)
public class JaxbDataFormat extends DataFormatDefinition implements ContentTypeHeaderAware {
+
@XmlAttribute(required = true)
private String contextPath;
@XmlAttribute
@@ -45,28 +46,31 @@ public class JaxbDataFormat extends DataFormatDefinition implements ContentTypeH
@Metadata(javaType = "java.lang.Boolean")
private String prettyPrint;
@XmlAttribute
- @Metadata(javaType = "java.lang.Boolean")
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String objectFactory;
@XmlAttribute
- @Metadata(javaType = "java.lang.Boolean")
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String ignoreJAXBElement;
@XmlAttribute
- @Metadata(javaType = "java.lang.Boolean")
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String mustBeJAXBElement;
@XmlAttribute
- @Metadata(javaType = "java.lang.Boolean")
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String filterNonXmlChars;
@XmlAttribute
private String encoding;
@XmlAttribute
- @Metadata(javaType = "java.lang.Boolean")
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String fragment;
// Partial encoding
@XmlAttribute
+ @Metadata(label = "advanced")
private String partClass;
@XmlAttribute
+ @Metadata(label = "advanced")
private String partNamespace;
@XmlAttribute
+ @Metadata(label = "advanced")
private String namespacePrefixRef;
@XmlAttribute
@Metadata(label = "advanced")
@@ -74,6 +78,7 @@ public class JaxbDataFormat extends DataFormatDefinition implements ContentTypeH
@XmlAttribute
private String schemaLocation;
@XmlAttribute
+ @Metadata(label = "advanced")
private String noNamespaceSchemaLocation;
@XmlAttribute
@Metadata(label = "advanced")
@@ -121,7 +126,7 @@ public class JaxbDataFormat extends DataFormatDefinition implements ContentTypeH
/**
* To validate against an existing schema. Your can use the prefix classpath:, file:* or *http: to specify how the
- * resource should by resolved. You can separate multiple schema files by using the ',' character.
+ * resource should be resolved. You can separate multiple schema files by using the ',' character.
*/
public void setSchema(String schema) {
this.schema = schema;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
index b73b5b7..faf85c4 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
@@ -35,7 +35,6 @@ public class JsonApiDataFormat extends DataFormatDefinition {
@XmlAttribute
private Class<?>[] dataFormatTypes;
-
@XmlAttribute
private Class<?> mainFormatType;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index 45f0059..f973cc8 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -79,6 +79,7 @@ public class JsonDataFormat extends DataFormatDefinition implements ContentTypeH
@Metadata(javaType = "java.lang.Boolean")
private String allowUnmarshallType;
@XmlAttribute
+ @Metadata(label = "advanced")
private String timezone;
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean", defaultValue = "false")
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
index db9ac12..50a31da 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "lzf")
@XmlAccessorType(XmlAccessType.FIELD)
public class LZFDataFormat extends DataFormatDefinition {
+
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean")
private String usingParallelCompression;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
index 764545c..892be96 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
@@ -58,7 +58,7 @@ public class MimeMultipartDataFormat extends DataFormatDefinition {
/**
* Specify the subtype of the MIME Multipart.
* <p>
- * Default is "mixed".
+ * Default is mixed.
*/
public void setMultipartSubType(String multipartSubType) {
this.multipartSubType = multipartSubType;
@@ -71,7 +71,7 @@ public class MimeMultipartDataFormat extends DataFormatDefinition {
/**
* Defines whether a message without attachment is also marshaled into a MIME Multipart (with only one body part).
* <p>
- * Default is "false".
+ * Default is false.
*/
public void setMultipartWithoutAttachment(String multipartWithoutAttachment) {
this.multipartWithoutAttachment = multipartWithoutAttachment;
@@ -85,7 +85,7 @@ public class MimeMultipartDataFormat extends DataFormatDefinition {
* Defines whether the MIME-Multipart headers are part of the message body (true) or are set as Camel headers
* (false).
* <p>
- * Default is "false".
+ * Default is false.
*/
public void setHeadersInline(String headersInline) {
this.headersInline = headersInline;
@@ -112,7 +112,7 @@ public class MimeMultipartDataFormat extends DataFormatDefinition {
/**
* Defines whether the content of binary parts in the MIME multipart is binary (true) or Base-64 encoded (false)
* <p>
- * Default is "false".
+ * Default is false.
*/
public void setBinaryContent(String binaryContent) {
this.binaryContent = binaryContent;
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
index a7a9fb2..6241e65 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java
@@ -44,6 +44,7 @@ public class JacksonXMLDataFormatReifier extends DataFormatReifier<JacksonXMLDat
properties.put("enableFeatures", definition.getEnableFeatures());
properties.put("disableFeatures", definition.getDisableFeatures());
properties.put("allowUnmarshallType", definition.getAllowUnmarshallType());
+ properties.put("timezone", definition.getTimezone());
}
}
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
index 848c49e..ed584fb 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
@@ -76,6 +76,7 @@ public class JsonDataFormatReifier extends DataFormatReifier<JsonDataFormat> {
properties.put("schemaResolver", asRef(definition.getSchemaResolver()));
properties.put("autoDiscoverSchemaResolver", definition.getAutoDiscoverSchemaResolver());
properties.put("namingStrategy", definition.getNamingStrategy());
+ properties.put("timezone", definition.getTimezone());
}
}
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 4c1f318..54b116f 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -2186,6 +2186,7 @@ public class ModelParser extends BaseParser {
case "moduleClassNames": def.setModuleClassNames(val); break;
case "moduleRefs": def.setModuleRefs(val); break;
case "prettyPrint": def.setPrettyPrint(val); break;
+ case "timezone": def.setTimezone(val); break;
case "unmarshalType": def.setUnmarshalTypeName(val); break;
case "useList": def.setUseList(val); break;
case "xmlMapper": def.setXmlMapper(val); break;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 2ba0a15..2e7fe03 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -6966,6 +6966,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "module-class-names", type = "string"),
@YamlProperty(name = "module-refs", type = "string"),
@YamlProperty(name = "pretty-print", type = "boolean"),
+ @YamlProperty(name = "timezone", type = "string"),
@YamlProperty(name = "unmarshal-type", type = "string"),
@YamlProperty(name = "use-list", type = "boolean"),
@YamlProperty(name = "xml-mapper", type = "string")
@@ -7050,6 +7051,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setPrettyPrint(val);
break;
}
+ case "timezone": {
+ String val = asText(node);
+ target.setTimezone(val);
+ break;
+ }
case "unmarshal-type": {
String val = asText(node);
target.setUnmarshalTypeName(val);
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index 6248bb9..754f3d4 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -5043,6 +5043,9 @@
"pretty-print" : {
"type" : "boolean"
},
+ "timezone" : {
+ "type" : "string"
+ },
"unmarshal-type" : {
"type" : "string"
},
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index 292824a..105dced 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -4944,6 +4944,9 @@
"prettyPrint" : {
"type" : "boolean"
},
+ "timezone" : {
+ "type" : "string"
+ },
"unmarshalType" : {
"type" : "string"
},