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 89cadee7db7997cccc08a9912af6139de51802e9 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Jan 27 07:57:02 2023 +0100 CAMEL-18970 - Camel-Any23: Remove component Signed-off-by: Andrea Cosentino <[email protected]> --- .../camel/builder/DataFormatBuilderFactory.java | 8 -------- .../org/apache/camel/builder/DataFormatClause.java | 21 --------------------- .../org/apache/camel/model/MarshalDefinition.java | 2 -- .../org/apache/camel/model/UnmarshalDefinition.java | 2 -- .../model/dataformat/DataFormatsDefinition.java | 1 - .../DataFormatTransformerDefinition.java | 2 -- 6 files changed, 36 deletions(-) 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 c113d84ac9f..737ef0dab9d 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 @@ -17,7 +17,6 @@ package org.apache.camel.builder; 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; @@ -62,13 +61,6 @@ import org.apache.camel.model.dataformat.ZipFileDataFormat; */ public final class DataFormatBuilderFactory { - /** - * Uses the Any23 data format - */ - public Any23DataFormat.Builder any23() { - return new Any23DataFormat.Builder(); - } - /** * Uses the ASN.1 file 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 4961952cce4..820c25d7954 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 @@ -24,8 +24,6 @@ import org.w3c.dom.Node; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.model.dataformat.ASN1DataFormat; -import org.apache.camel.model.dataformat.Any23DataFormat; -import org.apache.camel.model.dataformat.Any23Type; import org.apache.camel.model.dataformat.AvroDataFormat; import org.apache.camel.model.dataformat.AvroLibrary; import org.apache.camel.model.dataformat.Base64DataFormat; @@ -86,25 +84,6 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> { this.operation = operation; } - /** - * Uses the Any23 data format - */ - public T any23(String baseuri) { - return dataFormat(new Any23DataFormat(baseuri)); - } - - public T any23(String baseuri, Any23Type outputformat) { - return dataFormat(new Any23DataFormat(baseuri, outputformat)); - } - - public T any23(String baseuri, Any23Type outputformat, Map<String, String> configurations) { - return dataFormat(new Any23DataFormat(baseuri, outputformat, configurations)); - } - - public T any23(String baseuri, Any23Type outputformat, Map<String, String> configurations, List<String> extractors) { - return dataFormat(new Any23DataFormat(baseuri, outputformat, configurations, extractors)); - } - /** * Uses the Avro 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 2e10b378967..f7a57469fef 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 @@ -23,7 +23,6 @@ import jakarta.xml.bind.annotation.XmlElements; import jakarta.xml.bind.annotation.XmlRootElement; 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; @@ -73,7 +72,6 @@ import org.apache.camel.spi.Metadata; public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> implements DataFormatDefinitionAware { @XmlElements({ - @XmlElement(name = "any23", type = Any23DataFormat.class), @XmlElement(name = "asn1", type = ASN1DataFormat.class), @XmlElement(name = "avro", type = AvroDataFormat.class), @XmlElement(name = "barcode", type = BarcodeDataFormat.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 72b578d5b23..0c36e6f026a 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 @@ -24,7 +24,6 @@ import jakarta.xml.bind.annotation.XmlElements; import jakarta.xml.bind.annotation.XmlRootElement; 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; @@ -74,7 +73,6 @@ import org.apache.camel.spi.Metadata; public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> implements DataFormatDefinitionAware { @XmlElements({ - @XmlElement(name = "any23", type = Any23DataFormat.class), @XmlElement(name = "asn1", type = ASN1DataFormat.class), @XmlElement(name = "avro", type = AvroDataFormat.class), @XmlElement(name = "barcode", type = BarcodeDataFormat.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 848e70636c8..e82b73ec068 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 @@ -39,7 +39,6 @@ public class DataFormatsDefinition { // cannot use @XmlElementRef as it doesn't allow optional properties @XmlElements({ - @XmlElement(name = "any23", type = Any23DataFormat.class), @XmlElement(name = "asn1", type = ASN1DataFormat.class), @XmlElement(name = "avro", type = AvroDataFormat.class), @XmlElement(name = "barcode", type = BarcodeDataFormat.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 cc3a95998f7..c6fc23c13fb 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 @@ -24,7 +24,6 @@ import jakarta.xml.bind.annotation.XmlType; import org.apache.camel.model.DataFormatDefinition; 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; @@ -76,7 +75,6 @@ import org.apache.camel.spi.Metadata; public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElements({ - @XmlElement(name = "any23", type = Any23DataFormat.class), @XmlElement(name = "asn1", type = ASN1DataFormat.class), @XmlElement(name = "avro", type = AvroDataFormat.class), @XmlElement(name = "barcode", type = BarcodeDataFormat.class),
