This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch backport/22491-to-camel-4.18.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit e490f0ed691fe4731029a6a205455b1400ab0239 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Apr 8 14:43:32 2026 +0200 CAMEL-23298: Add missing PQC and OCSF dataformats in model and fix A..Z ordering Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> Signed-off-by: Andrea Cosentino <[email protected]> --- .../META-INF/org/apache/camel/model/dataformat/dataFormats.json | 2 +- .../org/apache/camel/model/transformer/dataFormatTransformer.json | 2 +- .../java/org/apache/camel/builder/DataFormatBuilderFactory.java | 8 ++++++++ .../src/main/java/org/apache/camel/builder/DataFormatClause.java | 8 ++++++++ .../src/main/java/org/apache/camel/model/MarshalDefinition.java | 4 ++-- .../src/main/java/org/apache/camel/model/UnmarshalDefinition.java | 4 ++-- .../org/apache/camel/model/dataformat/DataFormatsDefinition.java | 2 ++ .../camel/model/transformer/DataFormatTransformerDefinition.java | 6 +++++- 8 files changed, 29 insertions(+), 7 deletions(-) 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 ad5bb7bbe94b..5c7539afee16 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", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "groovyXml", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", [...] + "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", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "groovyXml", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", [...] } } 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 7d8367e89550..815ec640f005 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", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "groovyXml", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parque [...] + "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", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "groovyXml", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "ocsf", [...] "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/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java index 5442232f5493..96958bdf55a2 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 @@ -45,6 +45,7 @@ import org.apache.camel.model.dataformat.LZFDataFormat; import org.apache.camel.model.dataformat.MimeMultipartDataFormat; import org.apache.camel.model.dataformat.OcsfDataFormat; import org.apache.camel.model.dataformat.PGPDataFormat; +import org.apache.camel.model.dataformat.PQCDataFormat; import org.apache.camel.model.dataformat.ParquetAvroDataFormat; import org.apache.camel.model.dataformat.ProtobufDataFormat; import org.apache.camel.model.dataformat.RssDataFormat; @@ -278,6 +279,13 @@ public final class DataFormatBuilderFactory { return new PGPDataFormat.Builder(); } + /** + * Uses the PQC (Post-Quantum Cryptography) data format + */ + public PQCDataFormat.Builder pqc() { + return new PQCDataFormat.Builder(); + } + /** * Uses the protobuf 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 72f5102c9a2b..843796295b66 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 @@ -51,6 +51,7 @@ import org.apache.camel.model.dataformat.LZFDataFormat; import org.apache.camel.model.dataformat.MimeMultipartDataFormat; import org.apache.camel.model.dataformat.OcsfDataFormat; import org.apache.camel.model.dataformat.PGPDataFormat; +import org.apache.camel.model.dataformat.PQCDataFormat; import org.apache.camel.model.dataformat.ParquetAvroDataFormat; import org.apache.camel.model.dataformat.ProtobufDataFormat; import org.apache.camel.model.dataformat.ProtobufLibrary; @@ -551,6 +552,13 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> { return dataFormat(pgp); } + /** + * Uses the PQC (Post-Quantum Cryptography) data format + */ + public T pqc() { + return dataFormat(new PQCDataFormat()); + } + /** * Uses the Jackson XML 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 41ae107fec40..87c05302f3fd 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 @@ -110,6 +110,8 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp @XmlElement(name = "mimeMultipart", type = MimeMultipartDataFormat.class), @XmlElement(name = "ocsf", type = OcsfDataFormat.class), @XmlElement(name = "parquetAvro", type = ParquetAvroDataFormat.class), + @XmlElement(name = "pgp", type = PGPDataFormat.class), + @XmlElement(name = "pqc", type = PQCDataFormat.class), @XmlElement(name = "protobuf", type = ProtobufDataFormat.class), @XmlElement(name = "rss", type = RssDataFormat.class), @XmlElement(name = "smooks", type = SmooksDataFormat.class), @@ -123,8 +125,6 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp @XmlElement(name = "univocityFixed", type = UniVocityFixedDataFormat.class), @XmlElement(name = "univocityTsv", type = UniVocityTsvDataFormat.class), @XmlElement(name = "xmlSecurity", type = XMLSecurityDataFormat.class), - @XmlElement(name = "pgp", type = PGPDataFormat.class), - @XmlElement(name = "pqc", type = PQCDataFormat.class), @XmlElement(name = "yaml", type = YAMLDataFormat.class), @XmlElement(name = "zipDeflater", type = ZipDeflaterDataFormat.class), @XmlElement(name = "zipFile", type = ZipFileDataFormat.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 f40c8fafcd32..f4077d35f087 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 @@ -110,6 +110,8 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> @XmlElement(name = "mimeMultipart", type = MimeMultipartDataFormat.class), @XmlElement(name = "ocsf", type = OcsfDataFormat.class), @XmlElement(name = "parquetAvro", type = ParquetAvroDataFormat.class), + @XmlElement(name = "pgp", type = PGPDataFormat.class), + @XmlElement(name = "pqc", type = PQCDataFormat.class), @XmlElement(name = "protobuf", type = ProtobufDataFormat.class), @XmlElement(name = "rss", type = RssDataFormat.class), @XmlElement(name = "smooks", type = SmooksDataFormat.class), @@ -123,8 +125,6 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> @XmlElement(name = "univocityFixed", type = UniVocityFixedDataFormat.class), @XmlElement(name = "univocityTsv", type = UniVocityTsvDataFormat.class), @XmlElement(name = "xmlSecurity", type = XMLSecurityDataFormat.class), - @XmlElement(name = "pgp", type = PGPDataFormat.class), - @XmlElement(name = "pqc", type = PQCDataFormat.class), @XmlElement(name = "yaml", type = YAMLDataFormat.class), @XmlElement(name = "zipDeflater", type = ZipDeflaterDataFormat.class), @XmlElement(name = "zipFile", type = ZipFileDataFormat.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 57581cf8e896..0d9b6288e210 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 @@ -71,8 +71,10 @@ public class DataFormatsDefinition implements CopyableDefinition<DataFormatsDefi @XmlElement(name = "jsonApi", type = JsonApiDataFormat.class), @XmlElement(name = "lzf", type = LZFDataFormat.class), @XmlElement(name = "mimeMultipart", type = MimeMultipartDataFormat.class), + @XmlElement(name = "ocsf", type = OcsfDataFormat.class), @XmlElement(name = "parquetAvro", type = ParquetAvroDataFormat.class), @XmlElement(name = "pgp", type = PGPDataFormat.class), + @XmlElement(name = "pqc", type = PQCDataFormat.class), @XmlElement(name = "protobuf", type = ProtobufDataFormat.class), @XmlElement(name = "rss", type = RssDataFormat.class), @XmlElement(name = "smooks", type = SmooksDataFormat.class), 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 7e794428b1ec..31abd9fae6a2 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 @@ -50,7 +50,9 @@ import org.apache.camel.model.dataformat.JsonApiDataFormat; import org.apache.camel.model.dataformat.JsonDataFormat; import org.apache.camel.model.dataformat.LZFDataFormat; import org.apache.camel.model.dataformat.MimeMultipartDataFormat; +import org.apache.camel.model.dataformat.OcsfDataFormat; import org.apache.camel.model.dataformat.PGPDataFormat; +import org.apache.camel.model.dataformat.PQCDataFormat; import org.apache.camel.model.dataformat.ParquetAvroDataFormat; import org.apache.camel.model.dataformat.ProtobufDataFormat; import org.apache.camel.model.dataformat.RssDataFormat; @@ -108,7 +110,10 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElement(name = "jsonApi", type = JsonApiDataFormat.class), @XmlElement(name = "lzf", type = LZFDataFormat.class), @XmlElement(name = "mimeMultipart", type = MimeMultipartDataFormat.class), + @XmlElement(name = "ocsf", type = OcsfDataFormat.class), @XmlElement(name = "parquetAvro", type = ParquetAvroDataFormat.class), + @XmlElement(name = "pgp", type = PGPDataFormat.class), + @XmlElement(name = "pqc", type = PQCDataFormat.class), @XmlElement(name = "protobuf", type = ProtobufDataFormat.class), @XmlElement(name = "rss", type = RssDataFormat.class), @XmlElement(name = "smooks", type = SmooksDataFormat.class), @@ -122,7 +127,6 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElement(name = "univocityFixed", type = UniVocityFixedDataFormat.class), @XmlElement(name = "univocityTsv", type = UniVocityTsvDataFormat.class), @XmlElement(name = "xmlSecurity", type = XMLSecurityDataFormat.class), - @XmlElement(name = "pgp", type = PGPDataFormat.class), @XmlElement(name = "yaml", type = YAMLDataFormat.class), @XmlElement(name = "zipDeflater", type = ZipDeflaterDataFormat.class), @XmlElement(name = "zipFile", type = ZipFileDataFormat.class) })
