You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/01/16 14:12:17 UTC
[camel] 06/49: CAMEL-17498: gzip/zip dataformat renamed
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch dataformat-rename
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f6472b72ad12dea007b5d975e49a9488c7e9dcf3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 16 12:22:32 2022 +0100
CAMEL-17498: gzip/zip dataformat renamed
---
.../services/org/apache/camel/model.properties | 2 +-
.../{customDataFormat.json => custom.json} | 2 +-
.../resources/org/apache/camel/model/marshal.json | 2 +-
.../resources/org/apache/camel/model/unmarshal.json | 2 +-
.../org/apache/camel/model/MarshalDefinition.java | 4 ++--
.../org/apache/camel/model/UnmarshalDefinition.java | 4 ++--
.../camel/model/dataformat/CustomDataFormat.java | 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 2 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 21 +++++++++------------
.../deserializers/ModelDeserializersResolver.java | 3 +--
.../src/generated/resources/camel-yaml-dsl.json | 8 ++++----
11 files changed, 24 insertions(+), 28 deletions(-)
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 1bafcec..d816722 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
@@ -27,7 +27,7 @@ convertBodyTo
crypto
csimple
csv
-customDataFormat
+custom
customLoadBalancer
customServiceFilter
dataFormats
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/custom.json
similarity index 96%
rename from core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/custom.json
index 80b3b6a..6708561 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/custom.json
@@ -1,7 +1,7 @@
{
"model": {
"kind": "model",
- "name": "customDataFormat",
+ "name": "custom",
"title": "Custom",
"description": "Delegate to a custom org.apache.camel.spi.DataFormat implementation via Camel registry.",
"deprecated": false,
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 8306abb..f7e108c 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", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflator", "hl7", "ical", "jacksonxml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile [...]
+ "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonxml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile [...]
"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 eec3cec..8e519c2 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", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflator", "hl7", "ical", "jacksonxml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile [...]
+ "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonxml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soapjaxb", "syslog", "tarfile [...]
"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/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 27c377e..e3e3143 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
@@ -89,7 +89,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp
@XmlElement(required = false, name = "fhirXml", type = FhirXmlDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "grok", type = GrokDataFormat.class),
- @XmlElement(required = false, name = "gzipDeflator", type = GzipDeflaterDataFormat.class),
+ @XmlElement(required = false, name = "gzipDeflater", type = GzipDeflaterDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "ical", type = IcalDataFormat.class),
@XmlElement(required = false, name = "jacksonxml", type = JacksonXMLDataFormat.class),
@@ -113,7 +113,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
- @XmlElement(required = false, name = "zip", type = ZipDeflaterDataFormat.class),
+ @XmlElement(required = false, name = "zipDeflater", type = ZipDeflaterDataFormat.class),
@XmlElement(required = false, name = "zipfile", type = ZipFileDataFormat.class) })
private DataFormatDefinition dataFormatType;
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 46dd114..3a8fbd1 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
@@ -89,7 +89,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "fhirXml", type = FhirXmlDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "grok", type = GrokDataFormat.class),
- @XmlElement(required = false, name = "gzipDeflator", type = GzipDeflaterDataFormat.class),
+ @XmlElement(required = false, name = "gzipDeflater", type = GzipDeflaterDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "ical", type = IcalDataFormat.class),
@XmlElement(required = false, name = "jacksonxml", type = JacksonXMLDataFormat.class),
@@ -113,7 +113,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
- @XmlElement(required = false, name = "zip", type = ZipDeflaterDataFormat.class),
+ @XmlElement(required = false, name = "zipDeflater", type = ZipDeflaterDataFormat.class),
@XmlElement(required = false, name = "zipfile", type = ZipFileDataFormat.class) })
private DataFormatDefinition dataFormatType;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
index 6dfbc4d4..e23bbb5 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata;
* Delegate to a custom {@link org.apache.camel.spi.DataFormat} implementation via Camel registry.
*/
@Metadata(label = "dataformat,transformation", title = "Custom")
-@XmlRootElement(name = "customDataFormat")
+@XmlRootElement(name = "custom")
@XmlAccessorType(XmlAccessType.FIELD)
public class CustomDataFormat extends DataFormatDefinition {
@XmlAttribute(required = true)
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 223810e..be19aba 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
@@ -3271,7 +3271,7 @@ public class ModelParser extends BaseParser {
case "cbor": return doParseCBORDataFormat();
case "crypto": return doParseCryptoDataFormat();
case "csv": return doParseCsvDataFormat();
- case "customDataFormat": return doParseCustomDataFormat();
+ case "custom": return doParseCustomDataFormat();
case "fhirJson": return doParseFhirJsonDataFormat();
case "fhirXml": return doParseFhirXmlDataFormat();
case "flatpack": return doParseFlatpackDataFormat();
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 c17b7b7..181f08d 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
@@ -2532,10 +2532,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
inline = true,
types = org.apache.camel.model.dataformat.CustomDataFormat.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- nodes = {
- "custom-data-format",
- "customDataFormat"
- },
+ nodes = "custom",
properties = {
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "ref", type = "string", required = true)
@@ -8129,7 +8126,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "fhir-xml", type = "object:org.apache.camel.model.dataformat.FhirXmlDataFormat"),
@YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat"),
@YamlProperty(name = "grok", type = "object:org.apache.camel.model.dataformat.GrokDataFormat"),
- @YamlProperty(name = "gzip-deflator", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat"),
+ @YamlProperty(name = "gzip-deflater", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat"),
@YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat"),
@YamlProperty(name = "ical", type = "object:org.apache.camel.model.dataformat.IcalDataFormat"),
@YamlProperty(name = "inherit-error-handler", type = "boolean"),
@@ -8154,7 +8151,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "xmlrpc", type = "object:org.apache.camel.model.dataformat.XmlRpcDataFormat"),
@YamlProperty(name = "xstream", type = "object:org.apache.camel.model.dataformat.XStreamDataFormat"),
@YamlProperty(name = "yaml", type = "object:org.apache.camel.model.dataformat.YAMLDataFormat"),
- @YamlProperty(name = "zip", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
+ @YamlProperty(name = "zip-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
@YamlProperty(name = "zipfile", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
}
)
@@ -8252,7 +8249,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setDataFormatType(val);
break;
}
- case "gzip-deflator": {
+ case "gzip-deflater": {
org.apache.camel.model.dataformat.GzipDeflaterDataFormat val = asType(node, org.apache.camel.model.dataformat.GzipDeflaterDataFormat.class);
target.setDataFormatType(val);
break;
@@ -8372,7 +8369,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setDataFormatType(val);
break;
}
- case "zip": {
+ case "zip-deflater": {
org.apache.camel.model.dataformat.ZipDeflaterDataFormat val = asType(node, org.apache.camel.model.dataformat.ZipDeflaterDataFormat.class);
target.setDataFormatType(val);
break;
@@ -16853,7 +16850,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "fhir-xml", type = "object:org.apache.camel.model.dataformat.FhirXmlDataFormat"),
@YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat"),
@YamlProperty(name = "grok", type = "object:org.apache.camel.model.dataformat.GrokDataFormat"),
- @YamlProperty(name = "gzip-deflator", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat"),
+ @YamlProperty(name = "gzip-deflater", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat"),
@YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat"),
@YamlProperty(name = "ical", type = "object:org.apache.camel.model.dataformat.IcalDataFormat"),
@YamlProperty(name = "inherit-error-handler", type = "boolean"),
@@ -16878,7 +16875,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "xmlrpc", type = "object:org.apache.camel.model.dataformat.XmlRpcDataFormat"),
@YamlProperty(name = "xstream", type = "object:org.apache.camel.model.dataformat.XStreamDataFormat"),
@YamlProperty(name = "yaml", type = "object:org.apache.camel.model.dataformat.YAMLDataFormat"),
- @YamlProperty(name = "zip", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
+ @YamlProperty(name = "zip-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
@YamlProperty(name = "zipfile", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
}
)
@@ -16976,7 +16973,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setDataFormatType(val);
break;
}
- case "gzip-deflator": {
+ case "gzip-deflater": {
org.apache.camel.model.dataformat.GzipDeflaterDataFormat val = asType(node, org.apache.camel.model.dataformat.GzipDeflaterDataFormat.class);
target.setDataFormatType(val);
break;
@@ -17096,7 +17093,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setDataFormatType(val);
break;
}
- case "zip": {
+ case "zip-deflater": {
org.apache.camel.model.dataformat.ZipDeflaterDataFormat val = asType(node, org.apache.camel.model.dataformat.ZipDeflaterDataFormat.class);
target.setDataFormatType(val);
break;
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 72e8a48..f0f9aa5 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
@@ -77,8 +77,7 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "org.apache.camel.model.dataformat.CryptoDataFormat": return new ModelDeserializers.CryptoDataFormatDeserializer();
case "csv": return new ModelDeserializers.CsvDataFormatDeserializer();
case "org.apache.camel.model.dataformat.CsvDataFormat": return new ModelDeserializers.CsvDataFormatDeserializer();
- case "custom-data-format": return new ModelDeserializers.CustomDataFormatDeserializer();
- case "customDataFormat": return new ModelDeserializers.CustomDataFormatDeserializer();
+ case "custom": return new ModelDeserializers.CustomDataFormatDeserializer();
case "org.apache.camel.model.dataformat.CustomDataFormat": return new ModelDeserializers.CustomDataFormatDeserializer();
case "custom-load-balancer": return new ModelDeserializers.CustomLoadBalancerDefinitionDeserializer();
case "customLoadBalancer": return new ModelDeserializers.CustomLoadBalancerDefinitionDeserializer();
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index 7b96b7b..367d67b 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -1402,7 +1402,7 @@
"grok" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GrokDataFormat"
},
- "gzip-deflator" : {
+ "gzip-deflater" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
},
"hl7" : {
@@ -1477,7 +1477,7 @@
"yaml" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat"
},
- "zip" : {
+ "zip-deflater" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
},
"zipfile" : {
@@ -2867,7 +2867,7 @@
"grok" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GrokDataFormat"
},
- "gzip-deflator" : {
+ "gzip-deflater" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
},
"hl7" : {
@@ -2942,7 +2942,7 @@
"yaml" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat"
},
- "zip" : {
+ "zip-deflater" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
},
"zipfile" : {