This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.14.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit ed65316c70c3df065a6f1d1f54a025d4d0807f4d Author: Claus Ibsen <[email protected]> AuthorDate: Fri Oct 10 14:19:51 2025 +0200 CAMEL-22526: camel-core - The dfdl dataformat is missing in model and catalog --- .../camel/catalog/models/dataFormatTransformer.json | 2 +- .../org/apache/camel/catalog/models/dataFormats.json | 2 +- .../org/apache/camel/catalog/schemas/camel-spring.xsd | 2 ++ .../org/apache/camel/catalog/schemas/camel-xml-io.xsd | 2 ++ .../apache/camel/dataformat/dfdl/DfdlDataFormat.java | 4 ++-- .../org/apache/camel/model/dataformat/dataFormats.json | 2 +- .../camel/model/transformer/dataFormatTransformer.json | 2 +- .../camel/model/dataformat/DataFormatsDefinition.java | 1 + .../apache/camel/model/dataformat/DfdlDataFormat.java | 10 ++++------ .../transformer/DataFormatTransformerDefinition.java | 2 ++ .../apache/camel/main/MainConfigurationDevConsole.java | 1 - .../org/apache/camel/support/CamelContextHelper.java | 4 ++-- .../java/org/apache/camel/xml/out/ModelWriter.java | 2 ++ .../java/org/apache/camel/yaml/out/ModelWriter.java | 2 ++ .../dsl/yaml/deserializers/ModelDeserializers.java | 17 +++++++++++++++++ .../src/generated/resources/schema/camelYamlDsl.json | 14 ++++++++++++++ 16 files changed, 54 insertions(+), 15 deletions(-) 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 5ed0d9342c5f..abdbc446e282 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", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp" [...] "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 0958ba7eb64a..2f8b712d0182 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", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro [...] } } 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 3d2c208a4e2c..2afc586ff084 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 @@ -17155,6 +17155,7 @@ Set a reference to a custom Expression to use. <xs:element ref="tns:crypto"/> <xs:element ref="tns:csv"/> <xs:element ref="tns:custom"/> + <xs:element ref="tns:dfdl"/> <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> @@ -18006,6 +18007,7 @@ Set the 'to' data type name. If you specify 'json:XYZ', the transformer will be <xs:element ref="tns:crypto"/> <xs:element ref="tns:csv"/> <xs:element ref="tns:custom"/> + <xs:element ref="tns:dfdl"/> <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> 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 28f7894acec0..ccca7b71c794 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 @@ -15849,6 +15849,7 @@ Set a reference to a custom Expression to use. <xs:element ref="tns:crypto"/> <xs:element ref="tns:csv"/> <xs:element ref="tns:custom"/> + <xs:element ref="tns:dfdl"/> <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> @@ -16700,6 +16701,7 @@ Set the 'to' data type name. If you specify 'json:XYZ', the transformer will be <xs:element ref="tns:crypto"/> <xs:element ref="tns:csv"/> <xs:element ref="tns:custom"/> + <xs:element ref="tns:dfdl"/> <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> diff --git a/components/camel-dfdl/src/main/java/org/apache/camel/dataformat/dfdl/DfdlDataFormat.java b/components/camel-dfdl/src/main/java/org/apache/camel/dataformat/dfdl/DfdlDataFormat.java index b8f0c9070fff..0938d47fbed7 100644 --- a/components/camel-dfdl/src/main/java/org/apache/camel/dataformat/dfdl/DfdlDataFormat.java +++ b/components/camel-dfdl/src/main/java/org/apache/camel/dataformat/dfdl/DfdlDataFormat.java @@ -47,8 +47,8 @@ import org.apache.daffodil.japi.io.InputSourceDataInputStream; public class DfdlDataFormat extends ServiceSupport implements DataFormat, CamelContextAware { private CamelContext camelContext; private String schemaUri; - private String rootElement = ""; - private String rootNamespace = ""; + private String rootElement; + private String rootNamespace; private DataProcessor daffodilProcessor; @Override 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 0958ba7eb64a..2f8b712d0182 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", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro [...] } } 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 5ed0d9342c5f..abdbc446e282 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", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "iso8583", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp" [...] "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/model/dataformat/DataFormatsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java index 467d08352575..11a541e31a84 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 @@ -54,6 +54,7 @@ public class DataFormatsDefinition implements CopyableDefinition<DataFormatsDefi @XmlElement(name = "crypto", type = CryptoDataFormat.class), @XmlElement(name = "csv", type = CsvDataFormat.class), @XmlElement(name = "custom", type = CustomDataFormat.class), + @XmlElement(name = "dfdl", type = DfdlDataFormat.class), @XmlElement(name = "fhirJson", type = FhirJsonDataFormat.class), @XmlElement(name = "fhirXml", type = FhirXmlDataFormat.class), @XmlElement(name = "flatpack", type = FlatpackDataFormat.class), diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DfdlDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DfdlDataFormat.java index 8f025acd1883..87eb4fcc2b08 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DfdlDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DfdlDataFormat.java @@ -38,15 +38,13 @@ public class DfdlDataFormat extends DataFormatDefinition { @XmlAttribute @Metadata(required = true, description = "The path to the DFDL schema file.") private String schemaUri; - @XmlAttribute @Metadata(description = "The root element name of the schema to use. If not specified, the first root element in the schema will be used.", - label = "advanced", defaultValue = "") - private String rootElement = ""; - + label = "advanced") + private String rootElement; @XmlAttribute - @Metadata(description = "The root namespace of the schema to use.", label = "advanced", defaultValue = "") - private String rootNamespace = ""; + @Metadata(description = "The root namespace of the schema to use.", label = "advanced") + private String rootNamespace; public DfdlDataFormat() { super("dfdl"); 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 65b8e67c5fef..e4a3816b14ef 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 @@ -33,6 +33,7 @@ import org.apache.camel.model.dataformat.CBORDataFormat; import org.apache.camel.model.dataformat.CryptoDataFormat; import org.apache.camel.model.dataformat.CsvDataFormat; import org.apache.camel.model.dataformat.CustomDataFormat; +import org.apache.camel.model.dataformat.DfdlDataFormat; import org.apache.camel.model.dataformat.FhirJsonDataFormat; import org.apache.camel.model.dataformat.FhirXmlDataFormat; import org.apache.camel.model.dataformat.FlatpackDataFormat; @@ -90,6 +91,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElement(name = "crypto", type = CryptoDataFormat.class), @XmlElement(name = "csv", type = CsvDataFormat.class), @XmlElement(name = "custom", type = CustomDataFormat.class), + @XmlElement(name = "dfdl", type = DfdlDataFormat.class), @XmlElement(name = "fhirJson", type = FhirJsonDataFormat.class), @XmlElement(name = "fhirXml", type = FhirXmlDataFormat.class), @XmlElement(name = "flatpack", type = FlatpackDataFormat.class), diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationDevConsole.java b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationDevConsole.java index e6266c48d718..9afab366e9cb 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationDevConsole.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationDevConsole.java @@ -22,7 +22,6 @@ import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.annotations.DevConsole; import org.apache.camel.support.console.AbstractDevConsole; import org.apache.camel.util.OrderedLocationProperties; -import org.apache.camel.util.SensitiveUtils; import org.apache.camel.util.json.JsonArray; import org.apache.camel.util.json.JsonObject; diff --git a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java index 9d1d0534c79b..1b331bfb98db 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java @@ -61,8 +61,8 @@ public final class CamelContextHelper { /** * Whether the given configuration property contains a sensitive key (such as password, accesstoken, etc.) * - * @param text the configuration property - * @return true if sensitive, false otherwise + * @param text the configuration property + * @return true if sensitive, false otherwise */ public static boolean containsSensitive(String text) { return SensitiveUtils.containsSensitive(text); 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 1ce7c77f9e3b..0bc53f09c3e5 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 @@ -2539,6 +2539,7 @@ public class ModelWriter extends BaseWriter { case "CryptoDataFormat" -> doWriteCryptoDataFormat("crypto", (CryptoDataFormat) v); case "CsvDataFormat" -> doWriteCsvDataFormat("csv", (CsvDataFormat) v); case "CustomDataFormat" -> doWriteCustomDataFormat("custom", (CustomDataFormat) v); + case "DfdlDataFormat" -> doWriteDfdlDataFormat("dfdl", (DfdlDataFormat) v); case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); @@ -3683,6 +3684,7 @@ public class ModelWriter extends BaseWriter { case "CryptoDataFormat" -> doWriteCryptoDataFormat("crypto", (CryptoDataFormat) v); case "CsvDataFormat" -> doWriteCsvDataFormat("csv", (CsvDataFormat) v); case "CustomDataFormat" -> doWriteCustomDataFormat("custom", (CustomDataFormat) v); + case "DfdlDataFormat" -> doWriteDfdlDataFormat("dfdl", (DfdlDataFormat) v); case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) 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 b6e49bdab161..49e09de68c0d 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 @@ -2539,6 +2539,7 @@ public class ModelWriter extends BaseWriter { case "CryptoDataFormat" -> doWriteCryptoDataFormat("crypto", (CryptoDataFormat) v); case "CsvDataFormat" -> doWriteCsvDataFormat("csv", (CsvDataFormat) v); case "CustomDataFormat" -> doWriteCustomDataFormat("custom", (CustomDataFormat) v); + case "DfdlDataFormat" -> doWriteDfdlDataFormat("dfdl", (DfdlDataFormat) v); case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); @@ -3683,6 +3684,7 @@ public class ModelWriter extends BaseWriter { case "CryptoDataFormat" -> doWriteCryptoDataFormat("crypto", (CryptoDataFormat) v); case "CsvDataFormat" -> doWriteCsvDataFormat("csv", (CsvDataFormat) v); case "CustomDataFormat" -> doWriteCustomDataFormat("custom", (CustomDataFormat) v); + case "DfdlDataFormat" -> doWriteDfdlDataFormat("dfdl", (DfdlDataFormat) v); case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); 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 2dc5dbc20e31..c328bf7a7aa5 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 @@ -3500,6 +3500,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "crypto", type = "object:org.apache.camel.model.dataformat.CryptoDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "csv", type = "object:org.apache.camel.model.dataformat.CsvDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "custom", type = "object:org.apache.camel.model.dataformat.CustomDataFormat", oneOf = "dataFormatType"), + @YamlProperty(name = "dfdl", type = "object:org.apache.camel.model.dataformat.DfdlDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "fhirJson", type = "object:org.apache.camel.model.dataformat.FhirJsonDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "fhirXml", type = "object:org.apache.camel.model.dataformat.FhirXmlDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat", oneOf = "dataFormatType"), @@ -3610,6 +3611,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } + case "dfdl": { + org.apache.camel.model.dataformat.DfdlDataFormat val = asType(node, org.apache.camel.model.dataformat.DfdlDataFormat.class); + target.setDataFormatType(val); + break; + } case "fhirJson": { org.apache.camel.model.dataformat.FhirJsonDataFormat val = asType(node, org.apache.camel.model.dataformat.FhirJsonDataFormat.class); target.setDataFormatType(val); @@ -3826,6 +3832,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "crypto", type = "object:org.apache.camel.model.dataformat.CryptoDataFormat"), @YamlProperty(name = "csv", type = "object:org.apache.camel.model.dataformat.CsvDataFormat"), @YamlProperty(name = "custom", type = "object:org.apache.camel.model.dataformat.CustomDataFormat"), + @YamlProperty(name = "dfdl", type = "object:org.apache.camel.model.dataformat.DfdlDataFormat"), @YamlProperty(name = "fhirJson", type = "object:org.apache.camel.model.dataformat.FhirJsonDataFormat"), @YamlProperty(name = "fhirXml", type = "object:org.apache.camel.model.dataformat.FhirXmlDataFormat"), @YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat"), @@ -3982,6 +3989,16 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormats(existing); break; } + case "dfdl": { + org.apache.camel.model.dataformat.DfdlDataFormat val = asType(node, org.apache.camel.model.dataformat.DfdlDataFormat.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 "fhirJson": { org.apache.camel.model.dataformat.FhirJsonDataFormat val = asType(node, org.apache.camel.model.dataformat.FhirJsonDataFormat.class); java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats(); 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 a83b1f89d5e6..1d0cdd8eb528 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 @@ -10872,6 +10872,9 @@ "custom" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CustomDataFormat" }, + "dfdl" : { + "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.DfdlDataFormat" + }, "fhirJson" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirJsonDataFormat" }, @@ -16910,6 +16913,8 @@ "required" : [ "csv" ] }, { "required" : [ "custom" ] + }, { + "required" : [ "dfdl" ] }, { "required" : [ "fhirJson" ] }, { @@ -17052,6 +17057,14 @@ "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CustomDataFormat" } } + }, { + "type" : "object", + "required" : [ "dfdl" ], + "properties" : { + "dfdl" : { + "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.DfdlDataFormat" + } + } }, { "type" : "object", "required" : [ "fhirJson" ], @@ -17357,6 +17370,7 @@ "crypto" : { }, "csv" : { }, "custom" : { }, + "dfdl" : { }, "fhirJson" : { }, "fhirXml" : { }, "flatpack" : { },
