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 a2530ade06eae081883755e08581b3be947261df Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 17:26:30 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../apache/camel/catalog/models/tidyMarkup.json | 20 --- .../thrift/ThriftDataFormatConfigurer.java | 7 + .../camel/dataformat/thrift/ThriftDataFormat.java | 23 +-- .../apache/camel/model/dataformat/dataFormats.json | 2 +- .../apache/camel/model/dataformat/tidyMarkup.json | 20 --- .../META-INF/org/apache/camel/model/marshal.json | 2 +- .../model/transformer/dataFormatTransformer.json | 2 +- .../META-INF/org/apache/camel/model/unmarshal.json | 2 +- .../services/org/apache/camel/model.properties | 1 - .../org/apache/camel/model/dataformat/jaxb.index | 1 - .../camel/builder/DataFormatBuilderFactory.java | 8 - .../org/apache/camel/builder/DataFormatClause.java | 15 -- .../org/apache/camel/model/MarshalDefinition.java | 2 - .../apache/camel/model/UnmarshalDefinition.java | 2 - .../model/dataformat/DataFormatsDefinition.java | 1 - .../model/dataformat/TidyMarkupDataFormat.java | 170 --------------------- .../DataFormatTransformerDefinition.java | 2 - .../reifier/dataformat/DataFormatReifier.java | 2 - .../dataformat/TarFileDataFormatReifier.java | 1 + .../dataformat/TidyMarkupDataFormatReifier.java | 37 ----- .../java/org/apache/camel/xml/in/ModelParser.java | 8 - .../java/org/apache/camel/xml/out/ModelWriter.java | 14 -- .../org/apache/camel/yaml/out/ModelWriter.java | 14 -- 23 files changed, 20 insertions(+), 336 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tidyMarkup.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tidyMarkup.json deleted file mode 100644 index a4fb0c9be83..00000000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tidyMarkup.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "tidyMarkup", - "title": "TidyMarkup", - "description": "Parse (potentially invalid) HTML into valid HTML or DOM.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.TidyMarkupDataFormat", - "abstract": false, - "input": false, - "output": false - }, - "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" }, - "dataObjectType": { "index": 1, "kind": "attribute", "displayName": "Data Object Type", "group": "common", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "org.w3c.dom.Node", "java.lang.String" ], "deprecated": false, "autowired": false, "secret": false, "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" }, - "omitXmlDeclaration": { "index": 2, "kind": "attribute", "displayName": "Omit Xml Declaration", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "When returning a String, do we omit the XML declaration in the top." } - } -} diff --git a/components/camel-thrift/src/generated/java/org/apache/camel/dataformat/thrift/ThriftDataFormatConfigurer.java b/components/camel-thrift/src/generated/java/org/apache/camel/dataformat/thrift/ThriftDataFormatConfigurer.java index 61c1e291860..7fa6414c2a4 100644 --- a/components/camel-thrift/src/generated/java/org/apache/camel/dataformat/thrift/ThriftDataFormatConfigurer.java +++ b/components/camel-thrift/src/generated/java/org/apache/camel/dataformat/thrift/ThriftDataFormatConfigurer.java @@ -24,6 +24,7 @@ public class ThriftDataFormatConfigurer extends org.apache.camel.support.compone Map<String, Object> map = new CaseInsensitiveMap(); map.put("ContentTypeFormat", java.lang.String.class); map.put("ContentTypeHeader", boolean.class); + map.put("InstanceClass", java.lang.String.class); ALL_OPTIONS = map; } @@ -35,6 +36,8 @@ public class ThriftDataFormatConfigurer extends org.apache.camel.support.compone case "contentTypeFormat": target.setContentTypeFormat(property(camelContext, java.lang.String.class, value)); return true; case "contenttypeheader": case "contentTypeHeader": target.setContentTypeHeader(property(camelContext, boolean.class, value)); return true; + case "instanceclass": + case "instanceClass": target.setInstanceClass(property(camelContext, java.lang.String.class, value)); return true; default: return false; } } @@ -51,6 +54,8 @@ public class ThriftDataFormatConfigurer extends org.apache.camel.support.compone case "contentTypeFormat": return java.lang.String.class; case "contenttypeheader": case "contentTypeHeader": return boolean.class; + case "instanceclass": + case "instanceClass": return java.lang.String.class; default: return null; } } @@ -63,6 +68,8 @@ public class ThriftDataFormatConfigurer extends org.apache.camel.support.compone case "contentTypeFormat": return target.getContentTypeFormat(); case "contenttypeheader": case "contentTypeHeader": return target.isContentTypeHeader(); + case "instanceclass": + case "instanceClass": return target.getInstanceClass(); default: return null; } } diff --git a/components/camel-thrift/src/main/java/org/apache/camel/dataformat/thrift/ThriftDataFormat.java b/components/camel-thrift/src/main/java/org/apache/camel/dataformat/thrift/ThriftDataFormat.java index 4413c693085..3ab4a716be2 100644 --- a/components/camel-thrift/src/main/java/org/apache/camel/dataformat/thrift/ThriftDataFormat.java +++ b/components/camel-thrift/src/main/java/org/apache/camel/dataformat/thrift/ThriftDataFormat.java @@ -53,7 +53,7 @@ public class ThriftDataFormat extends ServiceSupport private CamelContext camelContext; @SuppressWarnings("rawtypes") private TBase defaultInstance; - private String instanceClassName; + private String instanceClass; private boolean contentTypeHeader = true; private String contentTypeFormat = CONTENT_TYPE_FORMAT_BINARY; @@ -101,9 +101,12 @@ public class ThriftDataFormat extends ServiceSupport } } + public String getInstanceClass() { + return instanceClass; + } + public void setInstanceClass(String className) { - ObjectHelper.notNull(className, "ThriftDataFormat instaceClass"); - instanceClassName = className; + instanceClass = className; } public void setContentTypeHeader(boolean contentTypeHeader) { @@ -128,11 +131,6 @@ public class ThriftDataFormat extends ServiceSupport this.contentTypeFormat = contentTypeFormat; } - /* - * (non-Javadoc) - * @see org.apache.camel.spi.DataFormat#marshal(org.apache.camel.Exchange, - * java.lang.Object, java.io.OutputStream) - */ @Override @SuppressWarnings("rawtypes") public void marshal(final Exchange exchange, final Object graph, final OutputStream outputStream) throws Exception { @@ -159,11 +157,6 @@ public class ThriftDataFormat extends ServiceSupport } } - /* - * (non-Javadoc) - * @see org.apache.camel.spi.DataFormat#unmarshal(org.apache.camel.Exchange, - * java.io.InputStream) - */ @Override public Object unmarshal(final Exchange exchange, final InputStream inputStream) throws Exception { TDeserializer deserializer; @@ -204,8 +197,8 @@ public class ThriftDataFormat extends ServiceSupport @Override protected void doStart() throws Exception { - if (defaultInstance == null && instanceClassName != null) { - defaultInstance = loadDefaultInstance(instanceClassName, getCamelContext()); + if (defaultInstance == null && instanceClass != null) { + defaultInstance = loadDefaultInstance(instanceClass, getCamelContext()); } } diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/dataFormats.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/dataFormats.json index 0958ba7eb64..570e9f25104 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/dataFormats.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/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/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/tidyMarkup.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/tidyMarkup.json deleted file mode 100644 index a4fb0c9be83..00000000000 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/tidyMarkup.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "tidyMarkup", - "title": "TidyMarkup", - "description": "Parse (potentially invalid) HTML into valid HTML or DOM.", - "deprecated": false, - "firstVersion": "2.0.0", - "label": "dataformat,transformation", - "javaType": "org.apache.camel.model.dataformat.TidyMarkupDataFormat", - "abstract": false, - "input": false, - "output": false - }, - "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" }, - "dataObjectType": { "index": 1, "kind": "attribute", "displayName": "Data Object Type", "group": "common", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "org.w3c.dom.Node", "java.lang.String" ], "deprecated": false, "autowired": false, "secret": false, "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" }, - "omitXmlDeclaration": { "index": 2, "kind": "attribute", "displayName": "Omit Xml Declaration", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "When returning a String, do we omit the XML declaration in the top." } - } -} diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json index 6312faebf84..196af61b1df 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/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/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/dataFormatTransformer.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/dataFormatTransformer.json index 5ed0d9342c5..7ea6dd34e25 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/dataFormatTransformer.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/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/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json index 58accb3ae2d..6d0ca05b044 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/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/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties index 65b9d6eaa5b..71705b90c4d 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties +++ b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties @@ -219,7 +219,6 @@ threads thrift throttle throwException -tidyMarkup to toD tokenize diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index index 1b272d86bbe..81734a979c8 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index @@ -41,7 +41,6 @@ SwiftMxDataFormat SyslogDataFormat TarFileDataFormat ThriftDataFormat -TidyMarkupDataFormat UniVocityCsvDataFormat UniVocityFixedDataFormat UniVocityHeader diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java index c732650b56e..646ef44e1c7 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java @@ -53,7 +53,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.UniVocityTsvDataFormat; @@ -326,13 +325,6 @@ public final class DataFormatBuilderFactory { return new ThriftDataFormat.Builder(); } - /** - * Return TidyMarkup in the default format as {@link org.w3c.dom.Node} - */ - public TidyMarkupDataFormat.Builder tidyMarkup() { - return new TidyMarkupDataFormat.Builder(); - } - /** * Uses the UniVosity CSV data format */ 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 cebeed45c00..5c56278da53 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 @@ -62,7 +62,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.XMLSecurityDataFormat; import org.apache.camel.model.dataformat.YAMLDataFormat; import org.apache.camel.model.dataformat.YAMLLibrary; @@ -1021,20 +1020,6 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> { return dataFormat(new ThriftDataFormat(instanceClassName, contentTypeFormat)); } - /** - * Return WellFormed HTML (an XML Document) either {@link java.lang.String} or {@link org.w3c.dom.Node} - */ - public T tidyMarkup(Class<?> dataObjectType) { - return dataFormat(new TidyMarkupDataFormat(dataObjectType)); - } - - /** - * Return TidyMarkup in the default format as {@link org.w3c.dom.Node} - */ - public T tidyMarkup() { - return dataFormat(new TidyMarkupDataFormat(Node.class)); - } - /** * Uses the YAML data format * diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java index e7df749f2e9..808cab8583c 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java @@ -60,7 +60,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.UniVocityTsvDataFormat; @@ -115,7 +114,6 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp @XmlElement(name = "syslog", type = SyslogDataFormat.class), @XmlElement(name = "tarFile", type = TarFileDataFormat.class), @XmlElement(name = "thrift", type = ThriftDataFormat.class), - @XmlElement(name = "tidyMarkup", type = TidyMarkupDataFormat.class), @XmlElement(name = "univocityCsv", type = UniVocityCsvDataFormat.class), @XmlElement(name = "univocityFixed", type = UniVocityFixedDataFormat.class), @XmlElement(name = "univocityTsv", type = UniVocityTsvDataFormat.class), diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java index 0b0b4fcaa9c..f1a8822d4b2 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java @@ -60,7 +60,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.UniVocityTsvDataFormat; @@ -115,7 +114,6 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> @XmlElement(name = "syslog", type = SyslogDataFormat.class), @XmlElement(name = "tarFile", type = TarFileDataFormat.class), @XmlElement(name = "thrift", type = ThriftDataFormat.class), - @XmlElement(name = "tidyMarkup", type = TidyMarkupDataFormat.class), @XmlElement(name = "univocityCsv", type = UniVocityCsvDataFormat.class), @XmlElement(name = "univocityFixed", type = UniVocityFixedDataFormat.class), @XmlElement(name = "univocityTsv", type = UniVocityTsvDataFormat.class), diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java index 467d0835257..35e761a348c 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java @@ -80,7 +80,6 @@ public class DataFormatsDefinition implements CopyableDefinition<DataFormatsDefi @XmlElement(name = "syslog", type = SyslogDataFormat.class), @XmlElement(name = "tarFile", type = TarFileDataFormat.class), @XmlElement(name = "thrift", type = ThriftDataFormat.class), - @XmlElement(name = "tidyMarkup", type = TidyMarkupDataFormat.class), @XmlElement(name = "univocityCsv", type = UniVocityCsvDataFormat.class), @XmlElement(name = "univocityFixed", type = UniVocityFixedDataFormat.class), @XmlElement(name = "univocityTsv", type = UniVocityTsvDataFormat.class), diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java deleted file mode 100644 index 6afeb78d198..00000000000 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.model.dataformat; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlTransient; - -import org.w3c.dom.Node; - -import org.apache.camel.builder.DataFormatBuilder; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.spi.Metadata; - -/** - * Parse (potentially invalid) HTML into valid HTML or DOM. - */ -@Metadata(firstVersion = "2.0.0", label = "dataformat,transformation", title = "TidyMarkup") -@XmlRootElement(name = "tidyMarkup") -@XmlAccessorType(XmlAccessType.FIELD) -public class TidyMarkupDataFormat extends DataFormatDefinition { - - @XmlTransient - private Class<?> dataObjectType; - - @XmlAttribute(name = "dataObjectType") - @Metadata(defaultValue = "org.w3c.dom.Node", enums = "org.w3c.dom.Node,java.lang.String") - private String dataObjectTypeName; - @XmlAttribute - @Metadata(javaType = "java.lang.Boolean") - private String omitXmlDeclaration; - - public TidyMarkupDataFormat() { - super("tidyMarkup"); - this.setDataObjectType(Node.class); - } - - protected TidyMarkupDataFormat(TidyMarkupDataFormat source) { - super(source); - this.dataObjectType = source.dataObjectType; - this.dataObjectTypeName = source.dataObjectTypeName; - this.omitXmlDeclaration = source.omitXmlDeclaration; - } - - @Override - public TidyMarkupDataFormat copyDefinition() { - return new TidyMarkupDataFormat(this); - } - - public TidyMarkupDataFormat(Class<?> dataObjectType) { - this(); - if (!dataObjectType.isAssignableFrom(String.class) && !dataObjectType.isAssignableFrom(Node.class)) { - throw new IllegalArgumentException( - "TidyMarkupDataFormat only supports returning a String or a org.w3c.dom.Node object"); - } - this.setDataObjectType(dataObjectType); - } - - private TidyMarkupDataFormat(Builder builder) { - this(); - this.dataObjectType = builder.dataObjectType; - this.dataObjectTypeName = builder.dataObjectTypeName; - this.omitXmlDeclaration = builder.omitXmlDeclaration; - } - - /** - * What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. - * <p/> - * Is by default org.w3c.dom.Node - */ - public void setDataObjectType(Class<?> dataObjectType) { - this.dataObjectType = dataObjectType; - } - - public Class<?> getDataObjectType() { - return dataObjectType; - } - - public String getDataObjectTypeName() { - return dataObjectTypeName; - } - - /** - * What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. - * <p/> - * Is by default org.w3c.dom.Node - */ - public void setDataObjectTypeName(String dataObjectTypeName) { - this.dataObjectTypeName = dataObjectTypeName; - } - - public String getOmitXmlDeclaration() { - return omitXmlDeclaration; - } - - /** - * When returning a String, do we omit the XML declaration in the top. - */ - public void setOmitXmlDeclaration(String omitXmlDeclaration) { - this.omitXmlDeclaration = omitXmlDeclaration; - } - - /** - * {@code Builder} is a specific builder for {@link TidyMarkupDataFormat}. - */ - @XmlTransient - public static class Builder implements DataFormatBuilder<TidyMarkupDataFormat> { - - private Class<?> dataObjectType; - private String dataObjectTypeName; - private String omitXmlDeclaration; - - /** - * What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. - * <p/> - * Is by default org.w3c.dom.Node - */ - public Builder dataObjectType(Class<?> dataObjectType) { - this.dataObjectType = dataObjectType; - return this; - } - - /** - * What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. - * <p/> - * Is by default org.w3c.dom.Node - */ - public Builder dataObjectTypeName(String dataObjectTypeName) { - this.dataObjectTypeName = dataObjectTypeName; - return this; - } - - /** - * When returning a String, do we omit the XML declaration in the top. - */ - public Builder omitXmlDeclaration(String omitXmlDeclaration) { - this.omitXmlDeclaration = omitXmlDeclaration; - return this; - } - - /** - * When returning a String, do we omit the XML declaration in the top. - */ - public Builder omitXmlDeclaration(boolean omitXmlDeclaration) { - this.omitXmlDeclaration = Boolean.toString(omitXmlDeclaration); - return this; - } - - @Override - public TidyMarkupDataFormat end() { - return new TidyMarkupDataFormat(this); - } - } -} diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java index 65b8e67c5fe..c4b9508ae0a 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java @@ -59,7 +59,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.UniVocityTsvDataFormat; @@ -115,7 +114,6 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElement(name = "syslog", type = SyslogDataFormat.class), @XmlElement(name = "tarFile", type = TarFileDataFormat.class), @XmlElement(name = "thrift", type = ThriftDataFormat.class), - @XmlElement(name = "tidyMarkup", type = TidyMarkupDataFormat.class), @XmlElement(name = "univocityCsv", type = UniVocityCsvDataFormat.class), @XmlElement(name = "univocityFixed", type = UniVocityFixedDataFormat.class), @XmlElement(name = "univocityTsv", type = UniVocityTsvDataFormat.class), diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java index 416c8b962d7..746fb2efc30 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java @@ -212,8 +212,6 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends return new TarFileDataFormatReifier(camelContext, definition); } else if (definition instanceof ThriftDataFormat) { return new ThriftDataFormatReifier(camelContext, definition); - } else if (definition instanceof TidyMarkupDataFormat) { - return new TidyMarkupDataFormatReifier(camelContext, definition); } else if (definition instanceof UniVocityCsvDataFormat) { return new UniVocityCsvDataFormatReifier(camelContext, definition); } else if (definition instanceof UniVocityFixedDataFormat) { diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java index 889db9982f5..1b05aebb5d5 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java @@ -31,6 +31,7 @@ public class TarFileDataFormatReifier extends DataFormatReifier<TarFileDataForma @Override protected void prepareDataFormatConfig(Map<String, Object> properties) { properties.put("usingIterator", definition.getUsingIterator()); + properties.put("allowEmptyDirectory", definition.getAllowEmptyDirectory()); properties.put("preservePathElements", definition.getPreservePathElements()); properties.put("maxDecompressedSize", definition.getMaxDecompressedSize()); } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java deleted file mode 100644 index 2c466812f6e..00000000000 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.reifier.dataformat; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.TidyMarkupDataFormat; - -public class TidyMarkupDataFormatReifier extends DataFormatReifier<TidyMarkupDataFormat> { - - public TidyMarkupDataFormatReifier(CamelContext camelContext, DataFormatDefinition definition) { - super(camelContext, (TidyMarkupDataFormat) definition); - } - - @Override - protected void prepareDataFormatConfig(Map<String, Object> properties) { - properties.put("dataObjectType", or(definition.getDataObjectType(), definition.getDataObjectTypeName())); - properties.put("omitXmlDeclaration", definition.getOmitXmlDeclaration()); - } - -} 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 fef66d5f9a7..ef5d044c3fc 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 @@ -2181,13 +2181,6 @@ public class ModelParser extends BaseParser { default: yield identifiedTypeAttributeHandler().accept(def, key, val); }, noElementHandler(), noValueHandler()); } - protected TidyMarkupDataFormat doParseTidyMarkupDataFormat() throws IOException, XmlPullParserException { - return doParse(new TidyMarkupDataFormat(), (def, key, val) -> switch (key) { - case "dataObjectType": def.setDataObjectTypeName(val); yield true; - case "omitXmlDeclaration": def.setOmitXmlDeclaration(val); yield true; - default: yield identifiedTypeAttributeHandler().accept(def, key, val); - }, noElementHandler(), noValueHandler()); - } protected UniVocityCsvDataFormat doParseUniVocityCsvDataFormat() throws IOException, XmlPullParserException { return doParse(new UniVocityCsvDataFormat(), (def, key, val) -> switch (key) { case "delimiter": def.setDelimiter(val); yield true; @@ -2982,7 +2975,6 @@ public class ModelParser extends BaseParser { case "syslog": return doParseSyslogDataFormat(); case "tarFile": return doParseTarFileDataFormat(); case "thrift": return doParseThriftDataFormat(); - case "tidyMarkup": return doParseTidyMarkupDataFormat(); case "univocityCsv": return doParseUniVocityCsvDataFormat(); case "univocityFixed": return doParseUniVocityFixedDataFormat(); case "univocityTsv": return doParseUniVocityTsvDataFormat(); diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java index 825aba50822..56359eab2ea 100644 --- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java +++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java @@ -553,9 +553,6 @@ public class ModelWriter extends BaseWriter { public void writeThriftDataFormat(ThriftDataFormat def) throws IOException { doWriteThriftDataFormat("thrift", def); } - public void writeTidyMarkupDataFormat(TidyMarkupDataFormat def) throws IOException { - doWriteTidyMarkupDataFormat("tidyMarkup", def); - } public void writeUniVocityCsvDataFormat(UniVocityCsvDataFormat def) throws IOException { doWriteUniVocityCsvDataFormat("univocityCsv", def); } @@ -1240,7 +1237,6 @@ public class ModelWriter extends BaseWriter { case "SyslogDataFormat" -> doWriteSyslogDataFormat("syslog", (SyslogDataFormat) v); case "TarFileDataFormat" -> doWriteTarFileDataFormat("tarFile", (TarFileDataFormat) v); case "ThriftDataFormat" -> doWriteThriftDataFormat("thrift", (ThriftDataFormat) v); - case "TidyMarkupDataFormat" -> doWriteTidyMarkupDataFormat("tidyMarkup", (TidyMarkupDataFormat) v); case "UniVocityCsvDataFormat" -> doWriteUniVocityCsvDataFormat("univocityCsv", (UniVocityCsvDataFormat) v); case "UniVocityFixedDataFormat" -> doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v); case "UniVocityTsvDataFormat" -> doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v); @@ -2001,7 +1997,6 @@ public class ModelWriter extends BaseWriter { case "SyslogDataFormat" -> doWriteSyslogDataFormat("syslog", (SyslogDataFormat) v); case "TarFileDataFormat" -> doWriteTarFileDataFormat("tarFile", (TarFileDataFormat) v); case "ThriftDataFormat" -> doWriteThriftDataFormat("thrift", (ThriftDataFormat) v); - case "TidyMarkupDataFormat" -> doWriteTidyMarkupDataFormat("tidyMarkup", (TidyMarkupDataFormat) v); case "UniVocityCsvDataFormat" -> doWriteUniVocityCsvDataFormat("univocityCsv", (UniVocityCsvDataFormat) v); case "UniVocityFixedDataFormat" -> doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v); case "UniVocityTsvDataFormat" -> doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v); @@ -2564,7 +2559,6 @@ public class ModelWriter extends BaseWriter { case "SyslogDataFormat" -> doWriteSyslogDataFormat("syslog", (SyslogDataFormat) v); case "TarFileDataFormat" -> doWriteTarFileDataFormat("tarFile", (TarFileDataFormat) v); case "ThriftDataFormat" -> doWriteThriftDataFormat("thrift", (ThriftDataFormat) v); - case "TidyMarkupDataFormat" -> doWriteTidyMarkupDataFormat("tidyMarkup", (TidyMarkupDataFormat) v); case "UniVocityCsvDataFormat" -> doWriteUniVocityCsvDataFormat("univocityCsv", (UniVocityCsvDataFormat) v); case "UniVocityFixedDataFormat" -> doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v); case "UniVocityTsvDataFormat" -> doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v); @@ -2888,13 +2882,6 @@ public class ModelWriter extends BaseWriter { doWriteAttribute("instanceClass", def.getInstanceClass(), null); endElement(name); } - protected void doWriteTidyMarkupDataFormat(String name, TidyMarkupDataFormat def) throws IOException { - startElement(name); - doWriteIdentifiedTypeAttributes(def); - doWriteAttribute("omitXmlDeclaration", def.getOmitXmlDeclaration(), null); - doWriteAttribute("dataObjectType", def.getDataObjectTypeName(), "org.w3c.dom.Node"); - endElement(name); - } protected void doWriteUniVocityAbstractDataFormatAttributes(UniVocityAbstractDataFormat def) throws IOException { doWriteIdentifiedTypeAttributes(def); doWriteAttribute("headerExtractionEnabled", def.getHeaderExtractionEnabled(), null); @@ -3708,7 +3695,6 @@ public class ModelWriter extends BaseWriter { case "SyslogDataFormat" -> doWriteSyslogDataFormat("syslog", (SyslogDataFormat) v); case "TarFileDataFormat" -> doWriteTarFileDataFormat("tarFile", (TarFileDataFormat) v); case "ThriftDataFormat" -> doWriteThriftDataFormat("thrift", (ThriftDataFormat) v); - case "TidyMarkupDataFormat" -> doWriteTidyMarkupDataFormat("tidyMarkup", (TidyMarkupDataFormat) v); case "UniVocityCsvDataFormat" -> doWriteUniVocityCsvDataFormat("univocityCsv", (UniVocityCsvDataFormat) v); case "UniVocityFixedDataFormat" -> doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v); case "UniVocityTsvDataFormat" -> doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v); diff --git a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java index 5e465ef7215..ca3fa1ecfc3 100644 --- a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java +++ b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java @@ -553,9 +553,6 @@ public class ModelWriter extends BaseWriter { public void writeThriftDataFormat(ThriftDataFormat def) throws IOException { doWriteThriftDataFormat("thrift", def); } - public void writeTidyMarkupDataFormat(TidyMarkupDataFormat def) throws IOException { - doWriteTidyMarkupDataFormat("tidyMarkup", def); - } public void writeUniVocityCsvDataFormat(UniVocityCsvDataFormat def) throws IOException { doWriteUniVocityCsvDataFormat("univocityCsv", def); } @@ -1240,7 +1237,6 @@ public class ModelWriter extends BaseWriter { case "SyslogDataFormat" -> doWriteSyslogDataFormat("syslog", (SyslogDataFormat) v); case "TarFileDataFormat" -> doWriteTarFileDataFormat("tarFile", (TarFileDataFormat) v); case "ThriftDataFormat" -> doWriteThriftDataFormat("thrift", (ThriftDataFormat) v); - case "TidyMarkupDataFormat" -> doWriteTidyMarkupDataFormat("tidyMarkup", (TidyMarkupDataFormat) v); case "UniVocityCsvDataFormat" -> doWriteUniVocityCsvDataFormat("univocityCsv", (UniVocityCsvDataFormat) v); case "UniVocityFixedDataFormat" -> doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v); case "UniVocityTsvDataFormat" -> doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v); @@ -2001,7 +1997,6 @@ public class ModelWriter extends BaseWriter { case "SyslogDataFormat" -> doWriteSyslogDataFormat("syslog", (SyslogDataFormat) v); case "TarFileDataFormat" -> doWriteTarFileDataFormat("tarFile", (TarFileDataFormat) v); case "ThriftDataFormat" -> doWriteThriftDataFormat("thrift", (ThriftDataFormat) v); - case "TidyMarkupDataFormat" -> doWriteTidyMarkupDataFormat("tidyMarkup", (TidyMarkupDataFormat) v); case "UniVocityCsvDataFormat" -> doWriteUniVocityCsvDataFormat("univocityCsv", (UniVocityCsvDataFormat) v); case "UniVocityFixedDataFormat" -> doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v); case "UniVocityTsvDataFormat" -> doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v); @@ -2564,7 +2559,6 @@ public class ModelWriter extends BaseWriter { case "SyslogDataFormat" -> doWriteSyslogDataFormat("syslog", (SyslogDataFormat) v); case "TarFileDataFormat" -> doWriteTarFileDataFormat("tarFile", (TarFileDataFormat) v); case "ThriftDataFormat" -> doWriteThriftDataFormat("thrift", (ThriftDataFormat) v); - case "TidyMarkupDataFormat" -> doWriteTidyMarkupDataFormat("tidyMarkup", (TidyMarkupDataFormat) v); case "UniVocityCsvDataFormat" -> doWriteUniVocityCsvDataFormat("univocityCsv", (UniVocityCsvDataFormat) v); case "UniVocityFixedDataFormat" -> doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v); case "UniVocityTsvDataFormat" -> doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v); @@ -2888,13 +2882,6 @@ public class ModelWriter extends BaseWriter { doWriteAttribute("instanceClass", def.getInstanceClass(), null); endElement(name); } - protected void doWriteTidyMarkupDataFormat(String name, TidyMarkupDataFormat def) throws IOException { - startElement(name); - doWriteIdentifiedTypeAttributes(def); - doWriteAttribute("omitXmlDeclaration", def.getOmitXmlDeclaration(), null); - doWriteAttribute("dataObjectType", def.getDataObjectTypeName(), "org.w3c.dom.Node"); - endElement(name); - } protected void doWriteUniVocityAbstractDataFormatAttributes(UniVocityAbstractDataFormat def) throws IOException { doWriteIdentifiedTypeAttributes(def); doWriteAttribute("headerExtractionEnabled", def.getHeaderExtractionEnabled(), null); @@ -3708,7 +3695,6 @@ public class ModelWriter extends BaseWriter { case "SyslogDataFormat" -> doWriteSyslogDataFormat("syslog", (SyslogDataFormat) v); case "TarFileDataFormat" -> doWriteTarFileDataFormat("tarFile", (TarFileDataFormat) v); case "ThriftDataFormat" -> doWriteThriftDataFormat("thrift", (ThriftDataFormat) v); - case "TidyMarkupDataFormat" -> doWriteTidyMarkupDataFormat("tidyMarkup", (TidyMarkupDataFormat) v); case "UniVocityCsvDataFormat" -> doWriteUniVocityCsvDataFormat("univocityCsv", (UniVocityCsvDataFormat) v); case "UniVocityFixedDataFormat" -> doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v); case "UniVocityTsvDataFormat" -> doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v);
