This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch df2 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3c0a0f49a73f46226e0ed6ee06e86ad59e364e59 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 17:34:00 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../apache/camel/catalog/dataformats/swiftMt.json | 2 +- .../apache/camel/catalog/dataformats/swiftMx.json | 8 +- .../org/apache/camel/catalog/models.properties | 1 - .../catalog/models/dataFormatTransformer.json | 2 +- .../apache/camel/catalog/models/dataFormats.json | 2 +- .../org/apache/camel/catalog/models/marshal.json | 2 +- .../org/apache/camel/catalog/models/swiftMt.json | 2 +- .../org/apache/camel/catalog/models/swiftMx.json | 8 +- .../org/apache/camel/catalog/models/unmarshal.json | 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 57 +++---------- .../apache/camel/catalog/schemas/camel-xml-io.xsd | 57 +++---------- .../org/apache/camel/builder/DataFormatClause.java | 2 - .../camel/model/dataformat/BarcodeDataFormat.java | 3 +- .../camel/model/dataformat/CsvDataFormat.java | 6 +- .../camel/model/dataformat/JaxbDataFormat.java | 4 +- .../reifier/dataformat/CsvDataFormatReifier.java | 1 - .../ROOT/pages/camel-4x-upgrade-guide-4_15.adoc | 2 + .../dsl/yaml/deserializers/ModelDeserializers.java | 93 ++-------------------- .../deserializers/ModelDeserializersResolver.java | 2 - .../generated/resources/schema/camelYamlDsl.json | 69 +--------------- 20 files changed, 50 insertions(+), 275 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMt.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMt.json index b55c6517394..c70d79a69bb 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMt.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMt.json @@ -17,6 +17,6 @@ }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, - "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In Json", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "The flag indicating that messages must be marshalled in a JSON format." } + "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In Json", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "The flag indicating that messages must be marshalled in a JSON format." } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMx.json index 21a13a66a1d..5ee723cf151 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMx.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMx.json @@ -17,9 +17,9 @@ }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, - "writeConfigRef": { "index": 1, "kind": "attribute", "displayName": "Write Config Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a specific configuration to use when marshalling a message to lookup from the registry." }, - "writeInJson": { "index": 2, "kind": "attribute", "displayName": "Write In Json", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "The flag indicating that messages must be marshalled in a JSON format." }, - "readMessageId": { "index": 3, "kind": "attribute", "displayName": "Read Message Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from the namespace used." }, - "readConfigRef": { "index": 4, "kind": "attribute", "displayName": "Read Config Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry." } + "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In Json", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "The flag indicating that messages must be marshalled in a JSON format." }, + "readMessageId": { "index": 2, "kind": "attribute", "displayName": "Read Message Id", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.prowidesoftware.swift.model.MxId", "deprecated": false, "autowired": false, "secret": false, "description": "The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from the namespace used." }, + "readConfig": { "index": 3, "kind": "attribute", "displayName": "Read Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.prowidesoftware.swift.model.mx.MxReadConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry." }, + "writeConfig": { "index": 4, "kind": "attribute", "displayName": "Write Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.prowidesoftware.swift.model.mx.MxWriteConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a specific configuration to use when marshalling a message to lookup from the registry." } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties index a824299d6f3..64faa3287cf 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties @@ -218,7 +218,6 @@ threads thrift throttle throwException -tidyMarkup to toD tokenize diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json index 5ed0d9342c5..7ea6dd34e25 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "index": 0, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "proto [...] + "dataFormatType": { "index": 0, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "proto [...] "scheme": { "index": 1, "kind": "attribute", "displayName": "Scheme", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set a scheme name supported by the transformer. If you specify 'csv', the transformer will be picked up for all of 'csv' from\/to Java transformation. Note that the scheme matching is performed only when no exactly matched transformer exists." }, "name": { "index": 2, "kind": "attribute", "displayName": "Name", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set the transformer name under which the transformer gets referenced when specifying the input\/output data type on routes. If you specify a transformer name that matches a data type scheme like 'csv' the transformer will be picked up for all of 'csv:' from\/t [...] "fromType": { "index": 3, "kind": "attribute", "displayName": "From Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set the 'from' data type name. If you specify 'xml:XYZ', the transformer will be picked up if source type is 'xml:XYZ'. If you specify just 'xml', the transformer matches with all of 'xml' source type like 'xml:ABC' or 'xml:DEF'." }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json index 0958ba7eb64..570e9f25104 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json @@ -12,6 +12,6 @@ "output": false }, "properties": { - "dataFormats": { "index": 0, "kind": "element", "displayName": "Data Formats", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp" [...] + "dataFormats": { "index": 0, "kind": "element", "displayName": "Data Formats", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp" [...] } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json index 6312faebf84..196af61b1df 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json @@ -15,7 +15,7 @@ "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "index": 1, "kind": "attribute", "displayName": "Description", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }, "disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Disables this EIP from the route." }, - "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp" [...] + "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp" [...] "variableSend": { "index": 4, "kind": "attribute", "displayName": "Variable Send", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is tak [...] "variableReceive": { "index": 5, "kind": "attribute", "displayName": "Variable Receive", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable th [...] } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/swiftMt.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/swiftMt.json index 039a14a2c32..3c238696476 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/swiftMt.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/swiftMt.json @@ -14,6 +14,6 @@ }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, - "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In Json", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "The flag indicating that messages must be marshalled in a JSON format." } + "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In Json", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "The flag indicating that messages must be marshalled in a JSON format." } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/swiftMx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/swiftMx.json index e54c670fa7e..2d8ce8fa8d9 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/swiftMx.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/swiftMx.json @@ -14,9 +14,9 @@ }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, - "writeConfigRef": { "index": 1, "kind": "attribute", "displayName": "Write Config Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a specific configuration to use when marshalling a message to lookup from the registry." }, - "writeInJson": { "index": 2, "kind": "attribute", "displayName": "Write In Json", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "The flag indicating that messages must be marshalled in a JSON format." }, - "readMessageId": { "index": 3, "kind": "attribute", "displayName": "Read Message Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from the namespace used." }, - "readConfigRef": { "index": 4, "kind": "attribute", "displayName": "Read Config Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry." } + "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In Json", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "The flag indicating that messages must be marshalled in a JSON format." }, + "readMessageId": { "index": 2, "kind": "attribute", "displayName": "Read Message Id", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.prowidesoftware.swift.model.MxId", "deprecated": false, "autowired": false, "secret": false, "description": "The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from the namespace used." }, + "readConfig": { "index": 3, "kind": "attribute", "displayName": "Read Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.prowidesoftware.swift.model.mx.MxReadConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry." }, + "writeConfig": { "index": 4, "kind": "attribute", "displayName": "Write Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.prowidesoftware.swift.model.mx.MxWriteConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a specific configuration to use when marshalling a message to lookup from the registry." } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json index 58accb3ae2d..6d0ca05b044 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json @@ -15,7 +15,7 @@ "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "index": 1, "kind": "attribute", "displayName": "Description", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }, "disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Disables this EIP from the route." }, - "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp" [...] + "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp" [...] "variableSend": { "index": 4, "kind": "attribute", "displayName": "Variable Send", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is tak [...] "variableReceive": { "index": 5, "kind": "attribute", "displayName": "Variable Receive", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable th [...] "allowNullBody": { "index": 6, "kind": "attribute", "displayName": "Allow Null Body", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Indicates whether null is allowed as value of a body to unmarshall." } 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 7289acfc4b2..2f7ce04730d 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 @@ -2202,15 +2202,6 @@ Controls the rate at which messages are passed to the next node in the route <xs:documentation xml:lang="en"> <![CDATA[ Throws an exception -]]> - </xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="tidyMarkup" type="tns:tidyMarkupDataFormat"> - <xs:annotation> - <xs:documentation xml:lang="en"> -<![CDATA[ -Parse (potentially invalid) HTML into valid HTML or DOM. ]]> </xs:documentation> </xs:annotation> @@ -7578,7 +7569,6 @@ messages, or any custom logic needed before the looping executes. <xs:element ref="tns:syslog"/> <xs:element ref="tns:tarFile"/> <xs:element ref="tns:thrift"/> - <xs:element ref="tns:tidyMarkup"/> <xs:element ref="tns:univocityCsv"/> <xs:element ref="tns:univocityFixed"/> <xs:element ref="tns:univocityTsv"/> @@ -10121,39 +10111,39 @@ The flag indicating that messages must be marshalled in a JSON format. Default v <xs:complexContent> <xs:extension base="tns:dataFormat"> <xs:sequence/> - <xs:attribute name="writeConfigRef" type="xs:string"> + <xs:attribute name="writeInJson" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Refers to a specific configuration to use when marshalling a message to lookup from the registry. +The flag indicating that messages must be marshalled in a JSON format. Default value: false ]]> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="writeInJson" type="xs:string"> + <xs:attribute name="readMessageId" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -The flag indicating that messages must be marshalled in a JSON format. Default value: false +The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from +the namespace used. ]]> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="readMessageId" type="xs:string"> + <xs:attribute name="readConfig" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from -the namespace used. +Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry. ]]> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="readConfigRef" type="xs:string"> + <xs:attribute name="writeConfig" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry. +Refers to a specific configuration to use when marshalling a message to lookup from the registry. ]]> </xs:documentation> </xs:annotation> @@ -10247,32 +10237,6 @@ value is binary. Default value: binary 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. Default value: true -]]> - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="tidyMarkupDataFormat"> - <xs:complexContent> - <xs:extension base="tns:dataFormat"> - <xs:sequence/> - <xs:attribute name="dataObjectType" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"> -<![CDATA[ -What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node. -Default value: org.w3c.dom.Node -]]> - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="omitXmlDeclaration" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"> -<![CDATA[ -When returning a String, do we omit the XML declaration in the top. Default value: false ]]> </xs:documentation> </xs:annotation> @@ -14901,7 +14865,6 @@ To type used as a target data type in the transformation. <xs:element ref="tns:syslog"/> <xs:element ref="tns:tarFile"/> <xs:element ref="tns:thrift"/> - <xs:element ref="tns:tidyMarkup"/> <xs:element ref="tns:univocityCsv"/> <xs:element ref="tns:univocityFixed"/> <xs:element ref="tns:univocityTsv"/> @@ -17176,7 +17139,6 @@ Set a reference to a custom Expression to use. <xs:element ref="tns:syslog"/> <xs:element ref="tns:tarFile"/> <xs:element ref="tns:thrift"/> - <xs:element ref="tns:tidyMarkup"/> <xs:element ref="tns:univocityCsv"/> <xs:element ref="tns:univocityFixed"/> <xs:element ref="tns:univocityTsv"/> @@ -18026,7 +17988,6 @@ Set the 'to' data type name. If you specify 'json:XYZ', the transformer will be <xs:element ref="tns:syslog"/> <xs:element ref="tns:tarFile"/> <xs:element ref="tns:thrift"/> - <xs:element ref="tns:tidyMarkup"/> <xs:element ref="tns:univocityCsv"/> <xs:element ref="tns:univocityFixed"/> <xs:element ref="tns:univocityTsv"/> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd index 1ef1689aef3..8f4209fd79c 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd @@ -2013,15 +2013,6 @@ Controls the rate at which messages are passed to the next node in the route <xs:documentation xml:lang="en"> <![CDATA[ Throws an exception -]]> - </xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="tidyMarkup" type="tns:tidyMarkupDataFormat"> - <xs:annotation> - <xs:documentation xml:lang="en"> -<![CDATA[ -Parse (potentially invalid) HTML into valid HTML or DOM. ]]> </xs:documentation> </xs:annotation> @@ -6251,7 +6242,6 @@ messages, or any custom logic needed before the looping executes. <xs:element ref="tns:syslog"/> <xs:element ref="tns:tarFile"/> <xs:element ref="tns:thrift"/> - <xs:element ref="tns:tidyMarkup"/> <xs:element ref="tns:univocityCsv"/> <xs:element ref="tns:univocityFixed"/> <xs:element ref="tns:univocityTsv"/> @@ -8794,39 +8784,39 @@ The flag indicating that messages must be marshalled in a JSON format. Default v <xs:complexContent> <xs:extension base="tns:dataFormat"> <xs:sequence/> - <xs:attribute name="writeConfigRef" type="xs:string"> + <xs:attribute name="writeInJson" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Refers to a specific configuration to use when marshalling a message to lookup from the registry. +The flag indicating that messages must be marshalled in a JSON format. Default value: false ]]> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="writeInJson" type="xs:string"> + <xs:attribute name="readMessageId" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -The flag indicating that messages must be marshalled in a JSON format. Default value: false +The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from +the namespace used. ]]> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="readMessageId" type="xs:string"> + <xs:attribute name="readConfig" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from -the namespace used. +Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry. ]]> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="readConfigRef" type="xs:string"> + <xs:attribute name="writeConfig" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry. +Refers to a specific configuration to use when marshalling a message to lookup from the registry. ]]> </xs:documentation> </xs:annotation> @@ -8920,32 +8910,6 @@ value is binary. Default value: binary 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. Default value: true -]]> - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="tidyMarkupDataFormat"> - <xs:complexContent> - <xs:extension base="tns:dataFormat"> - <xs:sequence/> - <xs:attribute name="dataObjectType" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"> -<![CDATA[ -What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node. -Default value: org.w3c.dom.Node -]]> - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="omitXmlDeclaration" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"> -<![CDATA[ -When returning a String, do we omit the XML declaration in the top. Default value: false ]]> </xs:documentation> </xs:annotation> @@ -13595,7 +13559,6 @@ To type used as a target data type in the transformation. <xs:element ref="tns:syslog"/> <xs:element ref="tns:tarFile"/> <xs:element ref="tns:thrift"/> - <xs:element ref="tns:tidyMarkup"/> <xs:element ref="tns:univocityCsv"/> <xs:element ref="tns:univocityFixed"/> <xs:element ref="tns:univocityTsv"/> @@ -15870,7 +15833,6 @@ Set a reference to a custom Expression to use. <xs:element ref="tns:syslog"/> <xs:element ref="tns:tarFile"/> <xs:element ref="tns:thrift"/> - <xs:element ref="tns:tidyMarkup"/> <xs:element ref="tns:univocityCsv"/> <xs:element ref="tns:univocityFixed"/> <xs:element ref="tns:univocityTsv"/> @@ -16720,7 +16682,6 @@ Set the 'to' data type name. If you specify 'json:XYZ', the transformer will be <xs:element ref="tns:syslog"/> <xs:element ref="tns:tarFile"/> <xs:element ref="tns:thrift"/> - <xs:element ref="tns:tidyMarkup"/> <xs:element ref="tns:univocityCsv"/> <xs:element ref="tns:univocityFixed"/> <xs:element ref="tns:univocityTsv"/> diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java index 5c56278da53..0ebc7910894 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java @@ -18,8 +18,6 @@ package org.apache.camel.builder; import java.util.Map; -import org.w3c.dom.Node; - import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.model.MarshalDefinition; import org.apache.camel.model.ProcessorDefinition; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java index 77202577548..e05fa2672e0 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java @@ -35,7 +35,8 @@ import org.apache.camel.spi.Metadata; public class BarcodeDataFormat extends DataFormatDefinition { @XmlAttribute - @Metadata(enums = "AZTEC,CODABAR,CODE_39,CODE_93,CODE_128,DATA_MATRIX,EAN_8,EAN_13,ITF,MAXICODE,PDF_417,QR_CODE,RSS_14,RSS_EXPANDED,UPC_A,UPC_E,UPC_EAN_EXTENSION", defaultValue = "QR_CODE") + @Metadata(enums = "AZTEC,CODABAR,CODE_39,CODE_93,CODE_128,DATA_MATRIX,EAN_8,EAN_13,ITF,MAXICODE,PDF_417,QR_CODE,RSS_14,RSS_EXPANDED,UPC_A,UPC_E,UPC_EAN_EXTENSION", + defaultValue = "QR_CODE") private String barcodeFormat; @XmlAttribute @Metadata(enums = "JPG,GIF,PNG", defaultValue = "PNG") diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java index 8b3c7baf911..269ca076269 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java @@ -16,12 +16,9 @@ */ package org.apache.camel.model.dataformat; -import java.util.List; - import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlTransient; @@ -39,7 +36,8 @@ public class CsvDataFormat extends DataFormatDefinition { // Format options @XmlAttribute - @Metadata(enums = "DEFAULT,EXCEL,INFORMIX_UNLOAD,INFORMIX_UNLOAD_CSV,MONGODB_CSV,MONGODB_TSV,MYSQL,ORACLE,POSTGRESQL_CSV,POSTGRESQL_TEXT,RFC4180", defaultValue = "DEFAULT") + @Metadata(enums = "DEFAULT,EXCEL,INFORMIX_UNLOAD,INFORMIX_UNLOAD_CSV,MONGODB_CSV,MONGODB_TSV,MYSQL,ORACLE,POSTGRESQL_CSV,POSTGRESQL_TEXT,RFC4180", + defaultValue = "DEFAULT") private String format; @XmlAttribute @Metadata(label = "advanced", javaType = "java.lang.Boolean") 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 949be4ffcad..ae2f9b68e25 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 @@ -319,8 +319,8 @@ public class JaxbDataFormat extends DataFormatDefinition implements ContentTypeH } /** - * When marshalling using JAXB or SOAP then the JAXB implementation will automatically 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 + * When marshalling using JAXB or SOAP then the JAXB implementation will automatically 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. */ public void setNamespacePrefix(String namespacePrefix) { diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java index 21fa8852482..477a6e70aae 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java @@ -17,7 +17,6 @@ package org.apache.camel.reifier.dataformat; import java.util.Map; -import java.util.StringJoiner; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_15.adoc index c19f4f84800..29d14b2d852 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_15.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_15.adoc @@ -47,3 +47,5 @@ Should be changed to: <csv format="EXCEL" delimiter="|" skipHeaderRecord="true" header="orderId,amount"/> ---- +Removed the `tidyMarkup` DataFormat in the DSL as the implementation has been removed in earlier version, +but we forgot to remove it from the DSL model. 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 38a8406793a..4e383fb921c 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 @@ -173,7 +173,6 @@ import org.apache.camel.model.dataformat.SwiftMxDataFormat; import org.apache.camel.model.dataformat.SyslogDataFormat; import org.apache.camel.model.dataformat.TarFileDataFormat; import org.apache.camel.model.dataformat.ThriftDataFormat; -import org.apache.camel.model.dataformat.TidyMarkupDataFormat; import org.apache.camel.model.dataformat.UniVocityCsvDataFormat; import org.apache.camel.model.dataformat.UniVocityFixedDataFormat; import org.apache.camel.model.dataformat.UniVocityHeader; @@ -3523,7 +3522,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "syslog", type = "object:org.apache.camel.model.dataformat.SyslogDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "tarFile", type = "object:org.apache.camel.model.dataformat.TarFileDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "thrift", type = "object:org.apache.camel.model.dataformat.ThriftDataFormat", oneOf = "dataFormatType"), - @YamlProperty(name = "tidyMarkup", type = "object:org.apache.camel.model.dataformat.TidyMarkupDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "toType", type = "string", description = "Set the 'to' data type name. If you specify 'json:XYZ', the transformer will be picked up if destination type is 'json:XYZ'. If you specify just 'json', the transformer matches with all of 'json' destination type like 'json:ABC' or 'json:DEF'.", displayName = "To Type"), @YamlProperty(name = "univocityCsv", type = "object:org.apache.camel.model.dataformat.UniVocityCsvDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "univocityFixed", type = "object:org.apache.camel.model.dataformat.UniVocityFixedDataFormat", oneOf = "dataFormatType"), @@ -3729,11 +3727,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "tidyMarkup": { - org.apache.camel.model.dataformat.TidyMarkupDataFormat val = asType(node, org.apache.camel.model.dataformat.TidyMarkupDataFormat.class); - target.setDataFormatType(val); - break; - } case "univocityCsv": { org.apache.camel.model.dataformat.UniVocityCsvDataFormat val = asType(node, org.apache.camel.model.dataformat.UniVocityCsvDataFormat.class); target.setDataFormatType(val); @@ -3846,7 +3839,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "syslog", type = "object:org.apache.camel.model.dataformat.SyslogDataFormat"), @YamlProperty(name = "tarFile", type = "object:org.apache.camel.model.dataformat.TarFileDataFormat"), @YamlProperty(name = "thrift", type = "object:org.apache.camel.model.dataformat.ThriftDataFormat"), - @YamlProperty(name = "tidyMarkup", type = "object:org.apache.camel.model.dataformat.TidyMarkupDataFormat"), @YamlProperty(name = "univocityCsv", type = "object:org.apache.camel.model.dataformat.UniVocityCsvDataFormat"), @YamlProperty(name = "univocityFixed", type = "object:org.apache.camel.model.dataformat.UniVocityFixedDataFormat"), @YamlProperty(name = "univocityTsv", type = "object:org.apache.camel.model.dataformat.UniVocityTsvDataFormat"), @@ -4236,16 +4228,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormats(existing); break; } - case "tidyMarkup": { - org.apache.camel.model.dataformat.TidyMarkupDataFormat val = asType(node, org.apache.camel.model.dataformat.TidyMarkupDataFormat.class); - java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats(); - if (existing == null) { - existing = new java.util.ArrayList<>(); - } - existing.add(val); - target.setDataFormats(existing); - break; - } case "univocityCsv": { org.apache.camel.model.dataformat.UniVocityCsvDataFormat val = asType(node, org.apache.camel.model.dataformat.UniVocityCsvDataFormat.class); java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats(); @@ -9752,7 +9734,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "syslog", type = "object:org.apache.camel.model.dataformat.SyslogDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "tarFile", type = "object:org.apache.camel.model.dataformat.TarFileDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "thrift", type = "object:org.apache.camel.model.dataformat.ThriftDataFormat", oneOf = "dataFormatType"), - @YamlProperty(name = "tidyMarkup", type = "object:org.apache.camel.model.dataformat.TidyMarkupDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "univocityCsv", type = "object:org.apache.camel.model.dataformat.UniVocityCsvDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "univocityFixed", type = "object:org.apache.camel.model.dataformat.UniVocityFixedDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "univocityTsv", type = "object:org.apache.camel.model.dataformat.UniVocityTsvDataFormat", oneOf = "dataFormatType"), @@ -9964,11 +9945,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "tidyMarkup": { - org.apache.camel.model.dataformat.TidyMarkupDataFormat val = asType(node, org.apache.camel.model.dataformat.TidyMarkupDataFormat.class); - target.setDataFormatType(val); - break; - } case "univocityCsv": { org.apache.camel.model.dataformat.UniVocityCsvDataFormat val = asType(node, org.apache.camel.model.dataformat.UniVocityCsvDataFormat.class); target.setDataFormatType(val); @@ -18002,9 +17978,9 @@ public final class ModelDeserializers extends YamlDeserializerSupport { deprecated = false, properties = { @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id"), - @YamlProperty(name = "readConfigRef", type = "string", description = "Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry.", displayName = "Read Config Ref"), + @YamlProperty(name = "readConfig", type = "string", description = "Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry.", displayName = "Read Config"), @YamlProperty(name = "readMessageId", type = "string", description = "The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from the namespace used.", displayName = "Read Message Id"), - @YamlProperty(name = "writeConfigRef", type = "string", description = "Refers to a specific configuration to use when marshalling a message to lookup from the registry.", displayName = "Write Config Ref"), + @YamlProperty(name = "writeConfig", type = "string", description = "Refers to a specific configuration to use when marshalling a message to lookup from the registry.", displayName = "Write Config"), @YamlProperty(name = "writeInJson", type = "boolean", description = "The flag indicating that messages must be marshalled in a JSON format.", displayName = "Write In Json") } ) @@ -18028,9 +18004,9 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setId(val); break; } - case "readConfigRef": { + case "readConfig": { String val = asText(node); - target.setReadConfigRef(val); + target.setReadConfig(val); break; } case "readMessageId": { @@ -18038,9 +18014,9 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setReadMessageId(val); break; } - case "writeConfigRef": { + case "writeConfig": { String val = asText(node); - target.setWriteConfigRef(val); + target.setWriteConfig(val); break; } case "writeInJson": { @@ -18646,57 +18622,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } } - @YamlType( - nodes = "tidyMarkup", - types = org.apache.camel.model.dataformat.TidyMarkupDataFormat.class, - order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, - displayName = "TidyMarkup", - description = "Parse (potentially invalid) HTML into valid HTML or DOM.", - deprecated = false, - properties = { - @YamlProperty(name = "dataObjectType", type = "enum:org.w3c.dom.Node,java.lang.String", defaultValue = "org.w3c.dom.Node", description = "What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node", displayName = "Data Object Type"), - @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id"), - @YamlProperty(name = "omitXmlDeclaration", type = "boolean", description = "When returning a String, do we omit the XML declaration in the top.", displayName = "Omit Xml Declaration") - } - ) - public static class TidyMarkupDataFormatDeserializer extends YamlDeserializerBase<TidyMarkupDataFormat> { - public TidyMarkupDataFormatDeserializer() { - super(TidyMarkupDataFormat.class); - } - - @Override - protected TidyMarkupDataFormat newInstance() { - return new TidyMarkupDataFormat(); - } - - @Override - protected boolean setProperty(TidyMarkupDataFormat target, String propertyKey, - String propertyName, Node node) { - propertyKey = org.apache.camel.util.StringHelper.dashToCamelCase(propertyKey); - switch(propertyKey) { - case "dataObjectType": { - String val = asText(node); - target.setDataObjectTypeName(val); - break; - } - case "id": { - String val = asText(node); - target.setId(val); - break; - } - case "omitXmlDeclaration": { - String val = asText(node); - target.setOmitXmlDeclaration(val); - break; - } - default: { - return false; - } - } - return true; - } - } - @YamlType( nodes = "to", inline = true, @@ -19981,7 +19906,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "syslog", type = "object:org.apache.camel.model.dataformat.SyslogDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "tarFile", type = "object:org.apache.camel.model.dataformat.TarFileDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "thrift", type = "object:org.apache.camel.model.dataformat.ThriftDataFormat", oneOf = "dataFormatType"), - @YamlProperty(name = "tidyMarkup", type = "object:org.apache.camel.model.dataformat.TidyMarkupDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "univocityCsv", type = "object:org.apache.camel.model.dataformat.UniVocityCsvDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "univocityFixed", type = "object:org.apache.camel.model.dataformat.UniVocityFixedDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "univocityTsv", type = "object:org.apache.camel.model.dataformat.UniVocityTsvDataFormat", oneOf = "dataFormatType"), @@ -20198,11 +20122,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "tidyMarkup": { - org.apache.camel.model.dataformat.TidyMarkupDataFormat val = asType(node, org.apache.camel.model.dataformat.TidyMarkupDataFormat.class); - target.setDataFormatType(val); - break; - } case "univocityCsv": { org.apache.camel.model.dataformat.UniVocityCsvDataFormat val = asType(node, org.apache.camel.model.dataformat.UniVocityCsvDataFormat.class); target.setDataFormatType(val); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java index 74eaf91be9c..2c673eb5724 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java @@ -440,8 +440,6 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve case "org.apache.camel.model.ThrottleDefinition": return new ModelDeserializers.ThrottleDefinitionDeserializer(); case "throwException": return new ModelDeserializers.ThrowExceptionDefinitionDeserializer(); case "org.apache.camel.model.ThrowExceptionDefinition": return new ModelDeserializers.ThrowExceptionDefinitionDeserializer(); - case "tidyMarkup": return new ModelDeserializers.TidyMarkupDataFormatDeserializer(); - case "org.apache.camel.model.dataformat.TidyMarkupDataFormat": return new ModelDeserializers.TidyMarkupDataFormatDeserializer(); case "to": return new ModelDeserializers.ToDefinitionDeserializer(); case "org.apache.camel.model.ToDefinition": return new ModelDeserializers.ToDefinitionDeserializer(); case "toD": return new ModelDeserializers.ToDynamicDefinitionDeserializer(); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json index bf7b7ea084f..8bc1b4987d0 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json @@ -2905,8 +2905,6 @@ "required" : [ "tarFile" ] }, { "required" : [ "thrift" ] - }, { - "required" : [ "tidyMarkup" ] }, { "required" : [ "univocityCsv" ] }, { @@ -3211,14 +3209,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ThriftDataFormat" } } - }, { - "type" : "object", - "required" : [ "tidyMarkup" ], - "properties" : { - "tidyMarkup" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.TidyMarkupDataFormat" - } - } }, { "type" : "object", "required" : [ "univocityCsv" ], @@ -3340,7 +3330,6 @@ "syslog" : { }, "tarFile" : { }, "thrift" : { }, - "tidyMarkup" : { }, "univocityCsv" : { }, "univocityFixed" : { }, "univocityTsv" : { }, @@ -7820,7 +7809,6 @@ "syslog" : { }, "tarFile" : { }, "thrift" : { }, - "tidyMarkup" : { }, "univocityCsv" : { }, "univocityFixed" : { }, "univocityTsv" : { }, @@ -7914,8 +7902,6 @@ "required" : [ "tarFile" ] }, { "required" : [ "thrift" ] - }, { - "required" : [ "tidyMarkup" ] }, { "required" : [ "univocityCsv" ] }, { @@ -8220,14 +8206,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ThriftDataFormat" } } - }, { - "type" : "object", - "required" : [ "tidyMarkup" ], - "properties" : { - "tidyMarkup" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.TidyMarkupDataFormat" - } - } }, { "type" : "object", "required" : [ "univocityCsv" ], @@ -10723,9 +10701,6 @@ "thrift" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ThriftDataFormat" }, - "tidyMarkup" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.TidyMarkupDataFormat" - }, "univocityCsv" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.UniVocityCsvDataFormat" }, @@ -11984,9 +11959,9 @@ "title" : "Id", "description" : "The id of this node" }, - "readConfigRef" : { + "readConfig" : { "type" : "string", - "title" : "Read Config Ref", + "title" : "Read Config", "description" : "Refers to a specific configuration to use when unmarshalling an input stream to lookup from the registry." }, "readMessageId" : { @@ -11994,9 +11969,9 @@ "title" : "Read Message Id", "description" : "The type of MX message to produce when unmarshalling an input stream. If not set, it will be automatically detected from the namespace used." }, - "writeConfigRef" : { + "writeConfig" : { "type" : "string", - "title" : "Write Config Ref", + "title" : "Write Config", "description" : "Refers to a specific configuration to use when marshalling a message to lookup from the registry." }, "writeInJson" : { @@ -12087,31 +12062,6 @@ } } ] }, - "org.apache.camel.model.dataformat.TidyMarkupDataFormat" : { - "title" : "TidyMarkup", - "description" : "Parse (potentially invalid) HTML into valid HTML or DOM.", - "type" : "object", - "additionalProperties" : false, - "properties" : { - "dataObjectType" : { - "type" : "string", - "title" : "Data Object Type", - "description" : "What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node", - "default" : "org.w3c.dom.Node", - "enum" : [ "org.w3c.dom.Node", "java.lang.String" ] - }, - "id" : { - "type" : "string", - "title" : "Id", - "description" : "The id of this node" - }, - "omitXmlDeclaration" : { - "type" : "boolean", - "title" : "Omit Xml Declaration", - "description" : "When returning a String, do we omit the XML declaration in the top." - } - } - }, "org.apache.camel.model.dataformat.UniVocityCsvDataFormat" : { "title" : "uniVocity CSV", "description" : "Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.", @@ -16500,8 +16450,6 @@ "required" : [ "tarFile" ] }, { "required" : [ "thrift" ] - }, { - "required" : [ "tidyMarkup" ] }, { "required" : [ "univocityCsv" ] }, { @@ -16798,14 +16746,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ThriftDataFormat" } } - }, { - "type" : "object", - "required" : [ "tidyMarkup" ], - "properties" : { - "tidyMarkup" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.TidyMarkupDataFormat" - } - } }, { "type" : "object", "required" : [ "univocityCsv" ], @@ -16921,7 +16861,6 @@ "syslog" : { }, "tarFile" : { }, "thrift" : { }, - "tidyMarkup" : { }, "univocityCsv" : { }, "univocityFixed" : { }, "univocityTsv" : { },
