You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2019/08/17 13:53:43 UTC
[camel] branch master updated: cleanups for camel-hdfs2 to
camel-hdfs component renaming
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 5ba4736 cleanups for camel-hdfs2 to camel-hdfs component renaming
5ba4736 is described below
commit 5ba473631f9365e56e7ef3e7a6e7d18f09192ab9
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sat Aug 17 15:53:28 2019 +0200
cleanups for camel-hdfs2 to camel-hdfs component renaming
---
components/camel-hdfs/pom.xml | 2 +-
.../camel-hdfs/src/main/docs/hdfs-component.adoc | 4 +-
.../component/{hdfs2 => hdfs}/HdfsComponent.java | 2 +-
.../{hdfs2 => hdfs}/HdfsCompressionCodec.java | 4 +-
.../{hdfs2 => hdfs}/HdfsConfiguration.java | 2 +-
.../component/{hdfs2 => hdfs}/HdfsConstants.java | 2 +-
.../component/{hdfs2 => hdfs}/HdfsConsumer.java | 4 +-
.../component/{hdfs2 => hdfs}/HdfsEndpoint.java | 2 +-
.../{hdfs2 => hdfs}/HdfsFileSystemType.java | 2 +-
.../component/{hdfs2 => hdfs}/HdfsFileType.java | 10 +--
.../component/{hdfs2 => hdfs}/HdfsHeader.java | 2 +-
.../camel/component/{hdfs2 => hdfs}/HdfsInfo.java | 2 +-
.../component/{hdfs2 => hdfs}/HdfsInfoFactory.java | 2 +-
.../component/{hdfs2 => hdfs}/HdfsInputStream.java | 4 +-
.../component/{hdfs2 => hdfs}/HdfsOsgiHelper.java | 2 +-
.../{hdfs2 => hdfs}/HdfsOutputStream.java | 2 +-
.../component/{hdfs2 => hdfs}/HdfsProducer.java | 2 +-
.../{hdfs2 => hdfs}/HdfsWritableFactories.java | 2 +-
.../camel/component/{hdfs2 => hdfs}/Holder.java | 6 +-
.../component/{hdfs2 => hdfs}/WritableType.java | 2 +-
.../{hdfs2 => hdfs}/osgi/HdfsActivator.java | 2 +-
.../{hdfs2 => hdfs}/FromFileToHdfsTest.java | 2 +-
.../{hdfs2 => hdfs}/HdfsConsumerTest.java | 4 +-
.../{hdfs2 => hdfs}/HdfsProducerConsumerTest.java | 6 +-
.../{hdfs2 => hdfs}/HdfsProducerSplitTest.java | 4 +-
.../{hdfs2 => hdfs}/HdfsProducerTest.java | 2 +-
.../component/{hdfs2 => hdfs}/HdfsTestSupport.java | 2 +-
.../integration/HdfsAppendTest.java | 2 +-
.../HdfsProducerConsumerIntegrationTest.java | 4 +-
.../endpoint/dsl/HdfsEndpointBuilderFactory.java | 74 ++++++++++------------
.../modules/ROOT/pages/hdfs-component.adoc | 4 +-
.../springboot/HdfsComponentAutoConfiguration.java | 4 +-
.../springboot/HdfsComponentConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
34 files changed, 84 insertions(+), 90 deletions(-)
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index dab85d9..b7bbc17e 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -48,7 +48,7 @@
org.apache.hadoop.ipc
</camel.osgi.import.additional>
<camel.osgi.activator>
- org.apache.camel.component.hdfs2.osgi.HdfsActivator
+ org.apache.camel.component.hdfs.osgi.HdfsActivator
</camel.osgi.activator>
</properties>
diff --git a/components/camel-hdfs/src/main/docs/hdfs-component.adoc b/components/camel-hdfs/src/main/docs/hdfs-component.adoc
index a6c3b10..4f534c5 100644
--- a/components/camel-hdfs/src/main/docs/hdfs-component.adoc
+++ b/components/camel-hdfs/src/main/docs/hdfs-component.adoc
@@ -304,7 +304,7 @@ resource with bundle that contains blueprint definition.
[source,java]
------------------------------------------------------------------------------------------------------
-<bean id="hdfsOsgiHelper" class="org.apache.camel.component.hdfs2.HdfsOsgiHelper">
+<bean id="hdfsOsgiHelper" class="org.apache.camel.component.hdfs.HdfsOsgiHelper">
<argument>
<map>
<entry key="file:///" value="org.apache.hadoop.fs.LocalFileSystem" />
@@ -314,7 +314,7 @@ resource with bundle that contains blueprint definition.
</argument>
</bean>
-<bean id="hdfs2" class="org.apache.camel.component.hdfs2.HdfsComponent" depends-on="hdfsOsgiHelper" />
+<bean id="hdfs" class="org.apache.camel.component.hdfs.HdfsComponent" depends-on="hdfsOsgiHelper" />
------------------------------------------------------------------------------------------------------
This way Hadoop 2.x will have correct mapping of URI schemes to
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsComponent.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
similarity index 98%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsComponent.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
index 84af870..1586ce7 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsComponent.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.net.URL;
import java.util.Map;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsCompressionCodec.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsCompressionCodec.java
similarity index 96%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsCompressionCodec.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsCompressionCodec.java
index c6a9250..1dbcef1 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsCompressionCodec.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsCompressionCodec.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import org.apache.hadoop.io.compress.BZip2Codec;
import org.apache.hadoop.io.compress.CompressionCodec;
@@ -45,5 +45,5 @@ public enum HdfsCompressionCodec {
};
public abstract CompressionCodec getCodec();
-
+
}
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConfiguration.java
similarity index 99%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConfiguration.java
index 24a3818..fc9329f 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConstants.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConstants.java
similarity index 97%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConstants.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConstants.java
index 93370dc..ee89a42 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConstants.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import org.apache.hadoop.io.SequenceFile;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
similarity index 99%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
index 4432742..46752f9 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.IOException;
import java.util.concurrent.locks.ReadWriteLock;
@@ -42,7 +42,7 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
private final Processor processor;
private final ReadWriteLock rwlock = new ReentrantReadWriteLock();
private volatile HdfsInputStream istream;
-
+
public HdfsConsumer(HdfsEndpoint endpoint, Processor processor, HdfsConfiguration config) {
super(endpoint, processor);
this.config = config;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsEndpoint.java
similarity index 98%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsEndpoint.java
index 3249c89..69764e9 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsEndpoint.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsFileSystemType.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileSystemType.java
similarity index 97%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsFileSystemType.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileSystemType.java
index ca741df..4661797a 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsFileSystemType.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileSystemType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
public enum HdfsFileSystemType {
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
similarity index 99%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
index 9857902..63f5884 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -141,15 +141,15 @@ public enum HdfsFileType {
String fname = hdfsPath.substring(hdfsPath.lastIndexOf('/'));
// [CAMEL-13711] Files.createTempFile not equivalent to File.createTempFile
-
+
File outputDest;
try {
-
+
// First trying: Files.createTempFile
outputDest = Files.createTempFile(fname, ".hdfs").toFile();
-
+
} catch (Exception ex) {
-
+
// Now trying: File.createTempFile
outputDest = File.createTempFile(fname, ".hdfs");
}
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsHeader.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsHeader.java
similarity index 95%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsHeader.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsHeader.java
index f12e73f..53992ed 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsHeader.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsHeader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
public enum HdfsHeader {
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInfo.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInfo.java
similarity index 97%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInfo.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInfo.java
index 20c1b21..388c936 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInfo.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInfo.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.IOException;
import java.net.URI;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInfoFactory.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInfoFactory.java
similarity index 97%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInfoFactory.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInfoFactory.java
index 5584242..ea07402 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInfoFactory.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInfoFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.IOException;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInputStream.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInputStream.java
similarity index 98%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInputStream.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInputStream.java
index 2f56012..5585c55 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsInputStream.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInputStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.Closeable;
import java.io.IOException;
@@ -111,4 +111,4 @@ public class HdfsInputStream implements Closeable {
return opened;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsOsgiHelper.java
similarity index 98%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsOsgiHelper.java
index 81a57da..9d9a5cc 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsOsgiHelper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.net.URI;
import java.util.Map;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsOutputStream.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsOutputStream.java
similarity index 99%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsOutputStream.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsOutputStream.java
index 0603775..5a64dd1 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsOutputStream.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsOutputStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.Closeable;
import java.io.IOException;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsProducer.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
similarity index 99%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsProducer.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
index 7a0c493..d0c5350 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsProducer.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.IOException;
import java.util.List;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsWritableFactories.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
similarity index 99%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsWritableFactories.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
index 8a7a899..910aa2b 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/HdfsWritableFactories.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/Holder.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/Holder.java
similarity index 96%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/Holder.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/Holder.java
index baacf3c..8a02dcd 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/Holder.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/Holder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
public final class Holder<T> {
@@ -22,7 +22,7 @@ public final class Holder<T> {
* The value contained in the holder.
**/
public T value;
-
+
/**
* Creates a new holder with a <code>null</code> value.
**/
@@ -37,4 +37,4 @@ public final class Holder<T> {
public Holder(T value) {
this.value = value;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/WritableType.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/WritableType.java
similarity index 98%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/WritableType.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/WritableType.java
index 9db05e3..ccd416e 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/WritableType.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/WritableType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.ByteWritable;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/osgi/HdfsActivator.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/osgi/HdfsActivator.java
similarity index 98%
rename from components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/osgi/HdfsActivator.java
rename to components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/osgi/HdfsActivator.java
index 86fe5d0..811afa3 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs2/osgi/HdfsActivator.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/osgi/HdfsActivator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2.osgi;
+package org.apache.camel.component.hdfs.osgi;
import org.apache.hadoop.util.ShutdownHookManager;
import org.osgi.framework.BundleActivator;
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/FromFileToHdfsTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/FromFileToHdfsTest.java
similarity index 98%
rename from components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/FromFileToHdfsTest.java
rename to components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/FromFileToHdfsTest.java
index ec5c5e0..622fc77 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/FromFileToHdfsTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/FromFileToHdfsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.File;
import org.apache.camel.Exchange;
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
similarity index 99%
rename from components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java
rename to components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
index 99c0304..0845fbe 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -81,7 +81,7 @@ public class HdfsConsumerTest extends HdfsTestSupport {
deleteDirectory("target/test");
super.setUp();
}
-
+
@Test
public void testSimpleConsumer() throws Exception {
if (!canTest()) {
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerConsumerTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
similarity index 98%
rename from components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerConsumerTest.java
rename to components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
index d9ed8e0..0f71bdd 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerConsumerTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +39,7 @@ public class HdfsProducerConsumerTest extends HdfsTestSupport {
}
super.setUp();
}
-
+
@Override
public boolean isUseRouteBuilder() {
return false;
@@ -92,4 +92,4 @@ public class HdfsProducerConsumerTest extends HdfsTestSupport {
FileSystem fs = FileSystem.get(dir.toUri(), conf);
fs.delete(dir, true);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerSplitTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
similarity index 99%
rename from components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerSplitTest.java
rename to components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
index af9a338..b3c2e85 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerSplitTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
@@ -40,7 +40,7 @@ public class HdfsProducerSplitTest extends HdfsTestSupport {
}
super.setUp();
}
-
+
@Test
public void testSimpleWriteFileWithMessageSplit() throws Exception {
doTest(1);
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
similarity index 99%
rename from components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerTest.java
rename to components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
index c6814c3..f4cdfc0 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsTestSupport.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
similarity index 97%
rename from components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsTestSupport.java
rename to components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
index 2589482..6399fc0 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/HdfsTestSupport.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2;
+package org.apache.camel.component.hdfs;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsAppendTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
similarity index 98%
rename from components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsAppendTest.java
rename to components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
index 300416a..abfb8f7 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsAppendTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2.integration;
+package org.apache.camel.component.hdfs.integration;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsProducerConsumerIntegrationTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
similarity index 99%
rename from components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsProducerConsumerIntegrationTest.java
rename to components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
index 4356ec3..d1c13aa 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs2/integration/HdfsProducerConsumerIntegrationTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2.integration;
+package org.apache.camel.component.hdfs.integration;
import java.util.HashSet;
import java.util.List;
@@ -136,4 +136,4 @@ public class HdfsProducerConsumerIntegrationTest extends CamelTestSupport {
fs.delete(new Path("hdfs://localhost:9000/tmp/test/multiple-consumers"), true);
}
-}
\ No newline at end of file
+}
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
index 04ebdb0..f2558ce 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
@@ -85,8 +85,7 @@ public interface HdfsEndpointBuilderFactory {
* Set to LOCAL to not use HDFS but local java.io.File instead.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsFileSystemType</code>
- * type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileSystemType</code> type.
*
* Group: common
*/
@@ -99,8 +98,7 @@ public interface HdfsEndpointBuilderFactory {
* Set to LOCAL to not use HDFS but local java.io.File instead.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsFileSystemType</code>
- * type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileSystemType</code> type.
*
* Group: common
*/
@@ -113,7 +111,7 @@ public interface HdfsEndpointBuilderFactory {
* about the various files types.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsFileType</code> type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileType</code> type.
*
* Group: common
*/
@@ -126,7 +124,7 @@ public interface HdfsEndpointBuilderFactory {
* about the various files types.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsFileType</code> type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileType</code> type.
*
* Group: common
*/
@@ -138,7 +136,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -150,7 +148,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -174,7 +172,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -186,7 +184,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -838,7 +836,7 @@ public interface HdfsEndpointBuilderFactory {
* The compression codec to use.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsCompressionCodec</code>
+ * <code>org.apache.camel.component.hdfs.HdfsCompressionCodec</code>
* type.
*
* Group: advanced
@@ -852,7 +850,7 @@ public interface HdfsEndpointBuilderFactory {
* The compression codec to use.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsCompressionCodec</code>
+ * <code>org.apache.camel.component.hdfs.HdfsCompressionCodec</code>
* type.
*
* Group: advanced
@@ -1037,8 +1035,7 @@ public interface HdfsEndpointBuilderFactory {
* Set to LOCAL to not use HDFS but local java.io.File instead.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsFileSystemType</code>
- * type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileSystemType</code> type.
*
* Group: common
*/
@@ -1051,8 +1048,7 @@ public interface HdfsEndpointBuilderFactory {
* Set to LOCAL to not use HDFS but local java.io.File instead.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsFileSystemType</code>
- * type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileSystemType</code> type.
*
* Group: common
*/
@@ -1065,7 +1061,7 @@ public interface HdfsEndpointBuilderFactory {
* about the various files types.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsFileType</code> type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileType</code> type.
*
* Group: common
*/
@@ -1078,7 +1074,7 @@ public interface HdfsEndpointBuilderFactory {
* about the various files types.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsFileType</code> type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileType</code> type.
*
* Group: common
*/
@@ -1090,7 +1086,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -1102,7 +1098,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -1126,7 +1122,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -1138,7 +1134,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -1367,7 +1363,7 @@ public interface HdfsEndpointBuilderFactory {
* The compression codec to use.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsCompressionCodec</code>
+ * <code>org.apache.camel.component.hdfs.HdfsCompressionCodec</code>
* type.
*
* Group: advanced
@@ -1381,7 +1377,7 @@ public interface HdfsEndpointBuilderFactory {
* The compression codec to use.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsCompressionCodec</code>
+ * <code>org.apache.camel.component.hdfs.HdfsCompressionCodec</code>
* type.
*
* Group: advanced
@@ -1564,8 +1560,7 @@ public interface HdfsEndpointBuilderFactory {
* Set to LOCAL to not use HDFS but local java.io.File instead.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsFileSystemType</code>
- * type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileSystemType</code> type.
*
* Group: common
*/
@@ -1578,8 +1573,7 @@ public interface HdfsEndpointBuilderFactory {
* Set to LOCAL to not use HDFS but local java.io.File instead.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsFileSystemType</code>
- * type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileSystemType</code> type.
*
* Group: common
*/
@@ -1592,7 +1586,7 @@ public interface HdfsEndpointBuilderFactory {
* about the various files types.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsFileType</code> type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileType</code> type.
*
* Group: common
*/
@@ -1605,7 +1599,7 @@ public interface HdfsEndpointBuilderFactory {
* about the various files types.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsFileType</code> type.
+ * <code>org.apache.camel.component.hdfs.HdfsFileType</code> type.
*
* Group: common
*/
@@ -1617,7 +1611,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -1629,7 +1623,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -1653,7 +1647,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -1665,7 +1659,7 @@ public interface HdfsEndpointBuilderFactory {
* The type for the key in case of sequence or map files.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.WritableType</code> type.
+ * <code>org.apache.camel.component.hdfs.WritableType</code> type.
*
* Group: common
*/
@@ -1808,7 +1802,7 @@ public interface HdfsEndpointBuilderFactory {
* The compression codec to use.
*
* The option is a:
- * <code>org.apache.camel.component.hdfs2.HdfsCompressionCodec</code>
+ * <code>org.apache.camel.component.hdfs.HdfsCompressionCodec</code>
* type.
*
* Group: advanced
@@ -1822,7 +1816,7 @@ public interface HdfsEndpointBuilderFactory {
* The compression codec to use.
*
* The option will be converted to a
- * <code>org.apache.camel.component.hdfs2.HdfsCompressionCodec</code>
+ * <code>org.apache.camel.component.hdfs.HdfsCompressionCodec</code>
* type.
*
* Group: advanced
@@ -1956,7 +1950,7 @@ public interface HdfsEndpointBuilderFactory {
/**
* Proxy enum for
- * <code>org.apache.camel.component.hdfs2.HdfsFileSystemType</code> enum.
+ * <code>org.apache.camel.component.hdfs.HdfsFileSystemType</code> enum.
*/
enum HdfsFileSystemType {
LOCAL,
@@ -1964,7 +1958,7 @@ public interface HdfsEndpointBuilderFactory {
}
/**
- * Proxy enum for <code>org.apache.camel.component.hdfs2.HdfsFileType</code>
+ * Proxy enum for <code>org.apache.camel.component.hdfs.HdfsFileType</code>
* enum.
*/
enum HdfsFileType {
@@ -1976,7 +1970,7 @@ public interface HdfsEndpointBuilderFactory {
}
/**
- * Proxy enum for <code>org.apache.camel.component.hdfs2.WritableType</code>
+ * Proxy enum for <code>org.apache.camel.component.hdfs.WritableType</code>
* enum.
*/
enum WritableType {
@@ -1993,7 +1987,7 @@ public interface HdfsEndpointBuilderFactory {
/**
* Proxy enum for
- * <code>org.apache.camel.component.hdfs2.HdfsCompressionCodec</code> enum.
+ * <code>org.apache.camel.component.hdfs.HdfsCompressionCodec</code> enum.
*/
enum HdfsCompressionCodec {
DEFAULT,
diff --git a/docs/components/modules/ROOT/pages/hdfs-component.adoc b/docs/components/modules/ROOT/pages/hdfs-component.adoc
index a6c3b10..4f534c5 100644
--- a/docs/components/modules/ROOT/pages/hdfs-component.adoc
+++ b/docs/components/modules/ROOT/pages/hdfs-component.adoc
@@ -304,7 +304,7 @@ resource with bundle that contains blueprint definition.
[source,java]
------------------------------------------------------------------------------------------------------
-<bean id="hdfsOsgiHelper" class="org.apache.camel.component.hdfs2.HdfsOsgiHelper">
+<bean id="hdfsOsgiHelper" class="org.apache.camel.component.hdfs.HdfsOsgiHelper">
<argument>
<map>
<entry key="file:///" value="org.apache.hadoop.fs.LocalFileSystem" />
@@ -314,7 +314,7 @@ resource with bundle that contains blueprint definition.
</argument>
</bean>
-<bean id="hdfs2" class="org.apache.camel.component.hdfs2.HdfsComponent" depends-on="hdfsOsgiHelper" />
+<bean id="hdfs" class="org.apache.camel.component.hdfs.HdfsComponent" depends-on="hdfsOsgiHelper" />
------------------------------------------------------------------------------------------------------
This way Hadoop 2.x will have correct mapping of URI schemes to
diff --git a/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentAutoConfiguration.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentAutoConfiguration.java
index 829973c..0cd6575 100644
--- a/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentAutoConfiguration.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2.springboot;
+package org.apache.camel.component.hdfs.springboot;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.hdfs2.HdfsComponent;
+import org.apache.camel.component.hdfs.HdfsComponent;
import org.apache.camel.spi.ComponentCustomizer;
import org.apache.camel.spi.HasId;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
diff --git a/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentConfiguration.java
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentConfiguration.java
index ed274b4..ea88324 100644
--- a/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.hdfs2.springboot;
+package org.apache.camel.component.hdfs.springboot;
import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
diff --git a/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/resources/META-INF/spring.factories
index 563bd32..f3c7c69 100644
--- a/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.hdfs2.springboot.HdfsComponentAutoConfiguration
+org.apache.camel.component.hdfs.springboot.HdfsComponentAutoConfiguration