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:51 UTC
[camel] 40/49: CAMEL-17499: zipfile 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 942cbe49d90f94176b3fdd1bb33d6df055515daf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 16 13:47:41 2022 +0100
CAMEL-17499: zipfile dataformat renamed
---
.../zipfile/ZipFileDataFormatConfigurer.java | 34 ----------------------
.../org/apache/camel/configurer/zipfile-dataformat | 2 --
.../org/apache/camel/dataformat.properties | 7 -----
.../services/org/apache/camel/dataformat/zipfile | 2 --
.../apache/camel/dataformat/zipfile/zipfile.json | 25 ----------------
.../dataformat/zipfile/ZipFileDataFormat.java | 4 +--
.../java/org/apache/camel/xml/in/ModelParser.java | 2 +-
.../test/resources/routeWithZipFileDataFormat.xml | 2 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 21 +++++++------
.../deserializers/ModelDeserializersResolver.java | 3 +-
.../src/generated/resources/camel-yaml-dsl.json | 8 ++---
11 files changed, 22 insertions(+), 88 deletions(-)
diff --git a/components/camel-zipfile/src/generated/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatConfigurer.java b/components/camel-zipfile/src/generated/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatConfigurer.java
deleted file mode 100644
index 8f68fc1..0000000
--- a/components/camel-zipfile/src/generated/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatConfigurer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.dataformat.zipfile;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class ZipFileDataFormatConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
-
- @Override
- public boolean configure(CamelContext camelContext, Object target, String name, Object value, boolean ignoreCase) {
- ZipFileDataFormat dataformat = (ZipFileDataFormat) target;
- switch (ignoreCase ? name.toLowerCase() : name) {
- case "usingiterator":
- case "usingIterator": dataformat.setUsingIterator(property(camelContext, boolean.class, value)); return true;
- case "allowemptydirectory":
- case "allowEmptyDirectory": dataformat.setAllowEmptyDirectory(property(camelContext, boolean.class, value)); return true;
- case "preservepathelements":
- case "preservePathElements": dataformat.setPreservePathElements(property(camelContext, boolean.class, value)); return true;
- case "maxdecompressedsize":
- case "maxDecompressedSize": dataformat.setMaxDecompressedSize(property(camelContext, long.class, value)); return true;
- default: return false;
- }
- }
-
-}
-
diff --git a/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/configurer/zipfile-dataformat b/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/configurer/zipfile-dataformat
deleted file mode 100644
index f391b96..0000000
--- a/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/configurer/zipfile-dataformat
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.dataformat.zipfile.ZipFileDataFormatConfigurer
diff --git a/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
deleted file mode 100644
index 69d1836..0000000
--- a/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-dataFormats=zipfile
-groupId=org.apache.camel
-artifactId=camel-zipfile
-version=3.15.0-SNAPSHOT
-projectName=Camel :: Zip File
-projectDescription=Camel Zip file support
diff --git a/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/dataformat/zipfile b/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/dataformat/zipfile
deleted file mode 100644
index cb0c8df..0000000
--- a/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/dataformat/zipfile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.dataformat.zipfile.ZipFileDataFormat
diff --git a/components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipfile.json b/components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipfile.json
deleted file mode 100644
index cb4cc16..0000000
--- a/components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipfile.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "dataformat": {
- "kind": "dataformat",
- "name": "zipfile",
- "title": "Zip File",
- "description": "Compression and decompress streams using java.util.zip.ZipStream.",
- "deprecated": false,
- "firstVersion": "2.11.0",
- "label": "dataformat,transformation,file",
- "javaType": "org.apache.camel.dataformat.zipfile.ZipFileDataFormat",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel",
- "artifactId": "camel-zipfile",
- "version": "3.15.0-SNAPSHOT",
- "modelName": "zipfile",
- "modelJavaType": "org.apache.camel.model.dataformat.ZipFileDataFormat"
- },
- "properties": {
- "usingIterator": { "kind": "attribute", "displayName": "Using Iterator", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the zip file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode." },
- "allowEmptyDirectory": { "kind": "attribute", "displayName": "Allow Empty Directory", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the zip file has more then one entry, setting this option to true, allows to get the iterator even if the directory is empty" },
- "preservePathElements": { "kind": "attribute", "displayName": "Preserve Path Elements", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the file name contains path elements, setting this option to true, allows the path to be maintained in the zip file." },
- "maxDecompressedSize": { "kind": "attribute", "displayName": "Max Decompressed Size", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1073741824", "description": "Set the maximum decompressed size of a zip file (in bytes). The default value if not specified corresponds to 1 gigabyte. An IOException will be thrown if the decompressed size exceeds this amount. Set to -1 to disable setting a m [...]
- "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
- }
-}
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
index a2a3cde..a062404 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
@@ -40,7 +40,7 @@ import static org.apache.camel.Exchange.FILE_NAME;
/**
* Zip file data format. See {@link org.apache.camel.model.dataformat.ZipDataFormat} for "deflate" compression.
*/
-@Dataformat("zipfile")
+@Dataformat("zipFile")
public class ZipFileDataFormat extends ServiceSupport implements DataFormat, DataFormatName {
/**
* The default maximum decompressed size (in bytes), which corresponds to 1G.
@@ -53,7 +53,7 @@ public class ZipFileDataFormat extends ServiceSupport implements DataFormat, Dat
@Override
public String getDataFormatName() {
- return "zipfile";
+ return "zipFile";
}
@Override
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 457288e..dd451a3 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
@@ -3291,7 +3291,7 @@ public class ModelParser extends BaseParser {
case "xstream": return doParseXStreamDataFormat();
case "yaml": return doParseYAMLDataFormat();
case "zipDeflater": return doParseZipDeflaterDataFormat();
- case "zipfile": return doParseZipFileDataFormat();
+ case "zipFile": return doParseZipFileDataFormat();
default: return null;
}
}
diff --git a/core/camel-xml-io/src/test/resources/routeWithZipFileDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithZipFileDataFormat.xml
index 3d50962..c9ac390 100644
--- a/core/camel-xml-io/src/test/resources/routeWithZipFileDataFormat.xml
+++ b/core/camel-xml-io/src/test/resources/routeWithZipFileDataFormat.xml
@@ -22,7 +22,7 @@
<from uri="seda:a"/>
<pipeline>
<marshal>
- <zipfile/>
+ <zipFile/>
</marshal>
<to uri="seda:b"/>
</pipeline>
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 bbf45c1..2438540 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
@@ -2857,7 +2857,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@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-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
- @YamlProperty(name = "zipfile", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
+ @YamlProperty(name = "zip-file", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
}
)
public static class DataFormatTransformerDefinitionDeserializer extends YamlDeserializerBase<DataFormatTransformerDefinition> {
@@ -3074,7 +3074,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setDataFormatType(val);
break;
}
- case "zipfile": {
+ case "zip-file": {
org.apache.camel.model.dataformat.ZipFileDataFormat val = asType(node, org.apache.camel.model.dataformat.ZipFileDataFormat.class);
target.setDataFormatType(val);
break;
@@ -3154,7 +3154,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@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-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
- @YamlProperty(name = "zipfile", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
+ @YamlProperty(name = "zip-file", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
}
)
public static class DataFormatsDefinitionDeserializer extends YamlDeserializerBase<DataFormatsDefinition> {
@@ -3566,7 +3566,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setDataFormats(existing);
break;
}
- case "zipfile": {
+ case "zip-file": {
org.apache.camel.model.dataformat.ZipFileDataFormat val = asType(node, org.apache.camel.model.dataformat.ZipFileDataFormat.class);
java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats();
if (existing == null) {
@@ -8136,7 +8136,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@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-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
- @YamlProperty(name = "zipfile", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
+ @YamlProperty(name = "zip-file", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
}
)
public static class MarshalDefinitionDeserializer extends YamlDeserializerBase<MarshalDefinition> {
@@ -8353,7 +8353,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setDataFormatType(val);
break;
}
- case "zipfile": {
+ case "zip-file": {
org.apache.camel.model.dataformat.ZipFileDataFormat val = asType(node, org.apache.camel.model.dataformat.ZipFileDataFormat.class);
target.setDataFormatType(val);
break;
@@ -16872,7 +16872,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@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-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"),
- @YamlProperty(name = "zipfile", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
+ @YamlProperty(name = "zip-file", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat")
}
)
public static class UnmarshalDefinitionDeserializer extends YamlDeserializerBase<UnmarshalDefinition> {
@@ -17089,7 +17089,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
target.setDataFormatType(val);
break;
}
- case "zipfile": {
+ case "zip-file": {
org.apache.camel.model.dataformat.ZipFileDataFormat val = asType(node, org.apache.camel.model.dataformat.ZipFileDataFormat.class);
target.setDataFormatType(val);
break;
@@ -18420,7 +18420,10 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlType(
types = org.apache.camel.model.dataformat.ZipFileDataFormat.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- nodes = "zipfile",
+ nodes = {
+ "zip-file",
+ "zipFile"
+ },
properties = {
@YamlProperty(name = "allow-empty-directory", type = "boolean"),
@YamlProperty(name = "id", type = "string"),
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 bf08333..e1919ba 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
@@ -536,7 +536,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve
case "zip-deflater": return new ModelDeserializers.ZipDeflaterDataFormatDeserializer();
case "zipDeflater": return new ModelDeserializers.ZipDeflaterDataFormatDeserializer();
case "org.apache.camel.model.dataformat.ZipDeflaterDataFormat": return new ModelDeserializers.ZipDeflaterDataFormatDeserializer();
- case "zipfile": return new ModelDeserializers.ZipFileDataFormatDeserializer();
+ case "zip-file": return new ModelDeserializers.ZipFileDataFormatDeserializer();
+ case "zipFile": return new ModelDeserializers.ZipFileDataFormatDeserializer();
case "org.apache.camel.model.dataformat.ZipFileDataFormat": return new ModelDeserializers.ZipFileDataFormatDeserializer();
case "zookeeper-service-discovery": return new ModelDeserializers.ZooKeeperServiceCallServiceDiscoveryConfigurationDeserializer();
case "zookeeperServiceDiscovery": return new ModelDeserializers.ZooKeeperServiceCallServiceDiscoveryConfigurationDeserializer();
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 eafe094..1270926 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
@@ -1477,7 +1477,7 @@
"zip-deflater" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
},
- "zipfile" : {
+ "zip-file" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipFileDataFormat"
}
}
@@ -2939,7 +2939,7 @@
"zip-deflater" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
},
- "zipfile" : {
+ "zip-file" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipFileDataFormat"
}
}
@@ -4295,7 +4295,7 @@
"zip-deflater" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
},
- "zipfile" : {
+ "zip-file" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipFileDataFormat"
}
}
@@ -7215,7 +7215,7 @@
"zip-deflater" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
},
- "zipfile" : {
+ "zip-file" : {
"$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ZipFileDataFormat"
}
}