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 2019/02/06 10:05:21 UTC
[camel] branch master updated: camel3 - Rename zipFile to zipfile
dataformat. Fixed TODO
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 969c253 camel3 - Rename zipFile to zipfile dataformat. Fixed TODO
969c253 is described below
commit 969c25368741a719d90c2b6cd0ebbbb80bfb95a0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Feb 6 11:04:33 2019 +0100
camel3 - Rename zipFile to zipfile dataformat. Fixed TODO
---
MIGRATION.md | 4 +++-
.../java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java | 2 +-
.../src/main/java/org/apache/camel/model/MarshalDefinition.java | 2 +-
.../src/main/java/org/apache/camel/model/UnmarshalDefinition.java | 2 +-
.../java/org/apache/camel/model/dataformat/DataFormatsDefinition.java | 2 +-
.../java/org/apache/camel/model/dataformat/ZipFileDataFormat.java | 3 +--
.../camel/model/transformer/DataFormatTransformerDefinition.java | 2 +-
.../resources/org/apache/camel/model/routeWithZipFileDataFormat.xml | 2 +-
.../java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java | 3 ---
9 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index d2ad98c..239d44b 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -124,4 +124,6 @@ The XML DSL has been changed slightly.
The custom load balancer EIP has changed from `<custom>` to `<customLoadBalancer>`
-The XMLSecurity data format has renamed the attribute `keyOrTrustStoreParametersId` to `keyOrTrustStoreParametersRef` in the `<secureXML>` tag.
\ No newline at end of file
+The XMLSecurity data format has renamed the attribute `keyOrTrustStoreParametersId` to `keyOrTrustStoreParametersRef` in the `<secureXML>` tag.
+
+The `<zipFile>` data format has been renamed to `<zipfile>`.
\ No newline at end of file
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 840b8f7..a9a427e 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
@@ -49,7 +49,7 @@ public class ZipFileDataFormat extends ServiceSupport implements DataFormat, Dat
@Override
public String getDataFormatName() {
- return "zipFile";
+ return "zipfile";
}
@Override
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
index f462459..490e2a5 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -108,7 +108,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
- @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
+ @XmlElement(required = false, name = "zipfile", type = ZipFileDataFormat.class)}
)
private DataFormatDefinition dataFormatType;
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 5a4f706..bbdeead 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -108,7 +108,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
- @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
+ @XmlElement(required = false, name = "zipfile", type = ZipFileDataFormat.class)}
)
private DataFormatDefinition dataFormatType;
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index b467b76..e1fb150 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -79,7 +79,7 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
- @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
+ @XmlElement(required = false, name = "zipfile", type = ZipFileDataFormat.class)}
)
private List<DataFormatDefinition> dataFormats;
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
index 4d98796..4b773d2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
@@ -30,8 +30,7 @@ import org.apache.camel.spi.Metadata;
* The Zip File data format is a message compression and de-compression format of zip files.
*/
@Metadata(firstVersion = "2.11.0", label = "dataformat,transformation,file", title = "Zip File")
-// TODO: use zipfile as name in Camel 3.0
-@XmlRootElement(name = "zipFile")
+@XmlRootElement(name = "zipfile")
@XmlAccessorType(XmlAccessType.FIELD)
public class ZipFileDataFormat extends DataFormatDefinition {
@XmlAttribute
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
index 5aa77d0..207b4a5 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
@@ -121,7 +121,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
- @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
+ @XmlElement(required = false, name = "zipfile", type = ZipFileDataFormat.class)}
)
private DataFormatDefinition dataFormatType;
diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml
index c9ac390..3d50962 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithZipFileDataFormat.xml
@@ -22,7 +22,7 @@
<from uri="seda:a"/>
<pipeline>
<marshal>
- <zipFile/>
+ <zipfile/>
</marshal>
<to uri="seda:b"/>
</pipeline>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index dd5f62e..632b16c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -381,9 +381,6 @@ public class PackageDataFormatMojo extends AbstractMojo {
return "json";
} else if ("bindy-csv".equals(name) || "bindy-fixed".equals(name) || "bindy-kvp".equals(name)) {
return "bindy";
- } else if ("zipfile".equals(name)) {
- // darn should have been lower case
- return "zipFile";
} else if ("yaml-snakeyaml".equals(name)) {
return "yaml";
}