This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8682790e6ecd67574ee3a9ab5dcecef79816c236 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Jan 27 08:24:22 2023 +0100 CAMEL-18970 - Camel-Any23: Remove component Signed-off-by: Andrea Cosentino <[email protected]> --- .../apache/camel/catalog/models/dataFormats.json | 2 +- .../org/apache/camel/catalog/models/marshal.json | 2 +- .../org/apache/camel/catalog/models/unmarshal.json | 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 93 --------------------- .../apache/camel/model/dataformat/dataFormats.json | 2 +- .../org/apache/camel/model/dataformat/jaxb.index | 2 - .../resources/org/apache/camel/model/marshal.json | 2 +- .../org/apache/camel/model/unmarshal.json | 2 +- .../dsl/yaml/deserializers/ModelDeserializers.java | 95 ---------------------- .../deserializers/ModelDeserializersResolver.java | 2 - .../generated/resources/schema/camel-yaml-dsl.json | 43 ---------- .../generated/resources/schema/camelYamlDsl.json | 43 ---------- 12 files changed, 6 insertions(+), 284 deletions(-) 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 78ab2a10f56..99f4d81046e 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": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarF [...] + "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "th [...] } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json index 51761863692..bfa2439cdd9 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "t [...] + "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "thrift", " [...] "disabled": { "kind": "attribute", "displayName": "Disabled", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime." }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json index a4e367d41f3..1f9f102b848 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "t [...] + "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "thrift", " [...] "allowNullBody": { "kind": "attribute", "displayName": "Allow Null Body", "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." }, "disabled": { "kind": "attribute", "displayName": "Disabled", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime." }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, 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 89fe8582557..eb1b11b9fae 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 @@ -8,14 +8,6 @@ Aggregates many messages into a single message </xs:annotation> </xs:element> - <xs:element name="any23" type="tns:any23DataFormat"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Extract RDF data from HTML documents. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="apiKey" type="tns:apiKeyDefinition"> <xs:annotation> <xs:documentation xml:lang="en"><![CDATA[ @@ -8123,8 +8115,6 @@ it reaches the end when Camel is shut down. Default value: false <xs:choice minOccurs="0"> - <xs:element ref="tns:any23"/> - <xs:element ref="tns:asn1"/> <xs:element ref="tns:avro"/> @@ -8213,61 +8203,6 @@ it reaches the end when Camel is shut down. Default value: false </xs:complexType> - <xs:complexType name="any23DataFormat"> - - <xs:complexContent> - - <xs:extension base="tns:dataFormat"> - - <xs:sequence> - - <xs:element maxOccurs="unbounded" minOccurs="0" name="configuration" type="tns:propertyDefinition"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Configurations for Apache Any23 as key-value pairs in order to customize the -extraction process. The list of supported parameters can be found here. If not -provided, a default configuration is used. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element maxOccurs="unbounded" minOccurs="0" name="extractors" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -List of Any23 extractors to be used in the unmarshal operation. A list of the -available extractors can be found here here. If not provided, all the available -extractors are used. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - - </xs:sequence> - - <xs:attribute name="outputFormat" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -What RDF syntax to unmarshal as, can be: NTRIPLES, TURTLE, NQUADS, RDFXML, -JSONLD, RDFJSON, RDF4JMODEL. It is by default: RDF4JMODEL. Default value: -RDF4JMODEL - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="baseUri" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -The URI to use as base for building RDF entities if only relative paths are -provided. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - </xs:extension> - - </xs:complexContent> - - </xs:complexType> - <xs:complexType name="asn1DataFormat"> <xs:complexContent> @@ -16704,8 +16639,6 @@ Sets a reference to use for lookup the policy in the registry. <xs:choice minOccurs="0"> - <xs:element ref="tns:any23"/> - <xs:element ref="tns:asn1"/> <xs:element ref="tns:avro"/> @@ -17971,8 +17904,6 @@ Set a reference to a custom Expression to use. <xs:choice maxOccurs="unbounded" minOccurs="0"> - <xs:element ref="tns:any23"/> - <xs:element ref="tns:asn1"/> <xs:element ref="tns:avro"/> @@ -20093,8 +20024,6 @@ To configure a special tag for the operations within this rest definition. <xs:choice minOccurs="0"> - <xs:element ref="tns:any23"/> - <xs:element ref="tns:asn1"/> <xs:element ref="tns:avro"/> @@ -21503,28 +21432,6 @@ multiple certificates. </xs:simpleType> - <xs:simpleType name="any23Type"> - - <xs:restriction base="xs:string"> - - <xs:enumeration value="NTRIPLES"/> - - <xs:enumeration value="TURTLE"/> - - <xs:enumeration value="NQUADS"/> - - <xs:enumeration value="RDFXML"/> - - <xs:enumeration value="JSONLD"/> - - <xs:enumeration value="RDFJSON"/> - - <xs:enumeration value="RDF4JMODEL"/> - - </xs:restriction> - - </xs:simpleType> - <xs:simpleType name="bindyType"> <xs:restriction base="xs:string"> diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json index 78ab2a10f56..99f4d81046e 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json @@ -12,6 +12,6 @@ "output": false }, "properties": { - "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarF [...] + "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "th [...] } } 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 5d628701583..f407397532d 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 @@ -1,7 +1,5 @@ # Generated by camel build tools - do NOT edit this file! ASN1DataFormat -Any23DataFormat -Any23Type AvroDataFormat AvroLibrary BarcodeDataFormat diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json index 51761863692..bfa2439cdd9 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "t [...] + "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "thrift", " [...] "disabled": { "kind": "attribute", "displayName": "Disabled", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime." }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json index a4e367d41f3..1f9f102b848 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "t [...] + "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "thrift", " [...] "allowNullBody": { "kind": "attribute", "displayName": "Allow Null Body", "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." }, "disabled": { "kind": "attribute", "displayName": "Disabled", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime." }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, 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 9c2ba6e22ec..3aa4cb8e5ca 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 @@ -124,7 +124,6 @@ import org.apache.camel.model.cloud.ZooKeeperServiceCallServiceDiscoveryConfigur import org.apache.camel.model.config.BatchResequencerConfig; import org.apache.camel.model.config.StreamResequencerConfig; import org.apache.camel.model.dataformat.ASN1DataFormat; -import org.apache.camel.model.dataformat.Any23DataFormat; import org.apache.camel.model.dataformat.AvroDataFormat; import org.apache.camel.model.dataformat.BarcodeDataFormat; import org.apache.camel.model.dataformat.Base64DataFormat; @@ -517,71 +516,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } } - @YamlType( - nodes = "any23", - inline = true, - types = org.apache.camel.model.dataformat.Any23DataFormat.class, - order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, - properties = { - @YamlProperty(name = "base-uri", type = "string"), - @YamlProperty(name = "configuration", type = "array:org.apache.camel.model.PropertyDefinition"), - @YamlProperty(name = "extractors", type = "array:string"), - @YamlProperty(name = "id", type = "string"), - @YamlProperty(name = "output-format", type = "enum:NTRIPLES,TURTLE,NQUADS,RDFXML,JSONLD,RDFJSON,RDF4JMODEL") - } - ) - public static class Any23DataFormatDeserializer extends YamlDeserializerBase<Any23DataFormat> { - public Any23DataFormatDeserializer() { - super(Any23DataFormat.class); - } - - @Override - protected Any23DataFormat newInstance() { - return new Any23DataFormat(); - } - - @Override - protected Any23DataFormat newInstance(String value) { - return new Any23DataFormat(value); - } - - @Override - protected boolean setProperty(Any23DataFormat target, String propertyKey, - String propertyName, Node node) { - switch(propertyKey) { - case "base-uri": { - String val = asText(node); - target.setBaseUri(val); - break; - } - case "configuration": { - java.util.List<org.apache.camel.model.PropertyDefinition> val = asFlatList(node, org.apache.camel.model.PropertyDefinition.class); - target.setConfiguration(val); - break; - } - case "extractors": { - java.util.List<String> val = asStringList(node); - target.setExtractors(val); - break; - } - case "id": { - String val = asText(node); - target.setId(val); - break; - } - case "output-format": { - String val = asText(node); - target.setOutputFormat(val); - break; - } - default: { - return false; - } - } - return true; - } - } - @YamlType( nodes = { "api-key", @@ -2931,7 +2865,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { types = org.apache.camel.model.transformer.DataFormatTransformerDefinition.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, properties = { - @YamlProperty(name = "any23", type = "object:org.apache.camel.model.dataformat.Any23DataFormat"), @YamlProperty(name = "asn1", type = "object:org.apache.camel.model.dataformat.ASN1DataFormat"), @YamlProperty(name = "avro", type = "object:org.apache.camel.model.dataformat.AvroDataFormat"), @YamlProperty(name = "barcode", type = "object:org.apache.camel.model.dataformat.BarcodeDataFormat"), @@ -2995,11 +2928,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { setProperties(target, val); break; } - case "any23": { - org.apache.camel.model.dataformat.Any23DataFormat val = asType(node, org.apache.camel.model.dataformat.Any23DataFormat.class); - target.setDataFormatType(val); - break; - } case "asn1": { org.apache.camel.model.dataformat.ASN1DataFormat val = asType(node, org.apache.camel.model.dataformat.ASN1DataFormat.class); target.setDataFormatType(val); @@ -3226,7 +3154,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { types = org.apache.camel.model.dataformat.DataFormatsDefinition.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, properties = { - @YamlProperty(name = "any23", type = "object:org.apache.camel.model.dataformat.Any23DataFormat"), @YamlProperty(name = "asn1", type = "object:org.apache.camel.model.dataformat.ASN1DataFormat"), @YamlProperty(name = "avro", type = "object:org.apache.camel.model.dataformat.AvroDataFormat"), @YamlProperty(name = "barcode", type = "object:org.apache.camel.model.dataformat.BarcodeDataFormat"), @@ -3287,16 +3214,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { setProperties(target, val); break; } - case "any23": { - org.apache.camel.model.dataformat.Any23DataFormat val = asType(node, org.apache.camel.model.dataformat.Any23DataFormat.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 "asn1": { org.apache.camel.model.dataformat.ASN1DataFormat val = asType(node, org.apache.camel.model.dataformat.ASN1DataFormat.class); java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats(); @@ -8382,7 +8299,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { types = org.apache.camel.model.MarshalDefinition.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, properties = { - @YamlProperty(name = "any23", type = "object:org.apache.camel.model.dataformat.Any23DataFormat"), @YamlProperty(name = "asn1", type = "object:org.apache.camel.model.dataformat.ASN1DataFormat"), @YamlProperty(name = "avro", type = "object:org.apache.camel.model.dataformat.AvroDataFormat"), @YamlProperty(name = "barcode", type = "object:org.apache.camel.model.dataformat.BarcodeDataFormat"), @@ -8447,11 +8363,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { setProperties(target, val); break; } - case "any23": { - org.apache.camel.model.dataformat.Any23DataFormat val = asType(node, org.apache.camel.model.dataformat.Any23DataFormat.class); - target.setDataFormatType(val); - break; - } case "asn1": { org.apache.camel.model.dataformat.ASN1DataFormat val = asType(node, org.apache.camel.model.dataformat.ASN1DataFormat.class); target.setDataFormatType(val); @@ -17587,7 +17498,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, properties = { @YamlProperty(name = "allow-null-body", type = "boolean"), - @YamlProperty(name = "any23", type = "object:org.apache.camel.model.dataformat.Any23DataFormat"), @YamlProperty(name = "asn1", type = "object:org.apache.camel.model.dataformat.ASN1DataFormat"), @YamlProperty(name = "avro", type = "object:org.apache.camel.model.dataformat.AvroDataFormat"), @YamlProperty(name = "barcode", type = "object:org.apache.camel.model.dataformat.BarcodeDataFormat"), @@ -17657,11 +17567,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { setProperties(target, val); break; } - case "any23": { - org.apache.camel.model.dataformat.Any23DataFormat val = asType(node, org.apache.camel.model.dataformat.Any23DataFormat.class); - target.setDataFormatType(val); - break; - } case "asn1": { org.apache.camel.model.dataformat.ASN1DataFormat val = asType(node, org.apache.camel.model.dataformat.ASN1DataFormat.class); target.setDataFormatType(val); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java index eb9def3e208..5c5ccd43fda 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java @@ -19,8 +19,6 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve case "org.apache.camel.model.dataformat.ASN1DataFormat": return new ModelDeserializers.ASN1DataFormatDeserializer(); case "aggregate": return new ModelDeserializers.AggregateDefinitionDeserializer(); case "org.apache.camel.model.AggregateDefinition": return new ModelDeserializers.AggregateDefinitionDeserializer(); - case "any23": return new ModelDeserializers.Any23DataFormatDeserializer(); - case "org.apache.camel.model.dataformat.Any23DataFormat": return new ModelDeserializers.Any23DataFormatDeserializer(); case "api-key": return new ModelDeserializers.ApiKeyDefinitionDeserializer(); case "apiKey": return new ModelDeserializers.ApiKeyDefinitionDeserializer(); case "org.apache.camel.model.rest.ApiKeyDefinition": return new ModelDeserializers.ApiKeyDefinitionDeserializer(); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json index 2c4cd5adc2a..798cbd30ac7 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json @@ -1462,9 +1462,6 @@ "org.apache.camel.model.MarshalDefinition" : { "type" : "object", "properties" : { - "any23" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat" - }, "asn1" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat" }, @@ -3439,9 +3436,6 @@ "allow-null-body" : { "type" : "boolean" }, - "any23" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat" - }, "asn1" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat" }, @@ -4393,37 +4387,6 @@ } } ] }, - "org.apache.camel.model.dataformat.Any23DataFormat" : { - "oneOf" : [ { - "type" : "string" - }, { - "type" : "object", - "properties" : { - "base-uri" : { - "type" : "string" - }, - "configuration" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "extractors" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "id" : { - "type" : "string" - }, - "output-format" : { - "type" : "string", - "enum" : [ "NTRIPLES", "TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ] - } - } - } ] - }, "org.apache.camel.model.dataformat.AvroDataFormat" : { "oneOf" : [ { "type" : "string" @@ -4755,9 +4718,6 @@ "org.apache.camel.model.dataformat.DataFormatsDefinition" : { "type" : "object", "properties" : { - "any23" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat" - }, "asn1" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat" }, @@ -7948,9 +7908,6 @@ "org.apache.camel.model.transformer.DataFormatTransformerDefinition" : { "type" : "object", "properties" : { - "any23" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat" - }, "asn1" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat" }, 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 3d719fb1605..533dc3b4b7e 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 @@ -1366,9 +1366,6 @@ "org.apache.camel.model.MarshalDefinition" : { "type" : "object", "properties" : { - "any23" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat" - }, "asn1" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat" }, @@ -3343,9 +3340,6 @@ "allowNullBody" : { "type" : "boolean" }, - "any23" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat" - }, "asn1" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat" }, @@ -4297,37 +4291,6 @@ } } ] }, - "org.apache.camel.model.dataformat.Any23DataFormat" : { - "oneOf" : [ { - "type" : "string" - }, { - "type" : "object", - "properties" : { - "baseUri" : { - "type" : "string" - }, - "configuration" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "extractors" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "id" : { - "type" : "string" - }, - "outputFormat" : { - "type" : "string", - "enum" : [ "NTRIPLES", "TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ] - } - } - } ] - }, "org.apache.camel.model.dataformat.AvroDataFormat" : { "oneOf" : [ { "type" : "string" @@ -4659,9 +4622,6 @@ "org.apache.camel.model.dataformat.DataFormatsDefinition" : { "type" : "object", "properties" : { - "any23" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat" - }, "asn1" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat" }, @@ -7849,9 +7809,6 @@ "org.apache.camel.model.transformer.DataFormatTransformerDefinition" : { "type" : "object", "properties" : { - "any23" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat" - }, "asn1" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat" },
