(camel) branch main updated: chore: remove usage of deprecated methods in tarfile component

[apupier]

This is an automated email from the ASF dual-hosted git repository.

apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new f737805b933 chore: remove usage of deprecated methods in tarfile 
component
f737805b933 is described below

commit f737805b933fbc1ed57e08356c29d1ffdc99e1ca
Author: Aurélien Pupier <apup...@redhat.com>
AuthorDate: Fri Jun 14 13:34:56 2024 +0200

    chore: remove usage of deprecated methods in tarfile component
    
    Signed-off-by: Aurélien Pupier <apup...@redhat.com>
---
 .../java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java | 4 ++--
 .../main/java/org/apache/camel/dataformat/tarfile/TarIterator.java  | 2 +-
 .../camel/processor/aggregate/tarfile/TarAggregationStrategy.java   | 2 +-
 .../org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java  | 6 ------
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java
 
b/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java
index 59a199a190c..397996c2951 100644
--- 
a/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java
+++ 
b/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarFileDataFormat.java
@@ -110,7 +110,7 @@ public class TarFileDataFormat extends ServiceSupport 
implements DataFormat, Dat
             OutputStreamBuilder osb = 
OutputStreamBuilder.withExchange(exchange);
 
             try {
-                TarArchiveEntry entry = tis.getNextTarEntry();
+                TarArchiveEntry entry = tis.getNextEntry();
                 if (entry != null) {
                     exchange.getMessage().setHeader(FILE_NAME, 
entry.getName());
                     IOHelper.copy(tis, osb, IOHelper.DEFAULT_BUFFER_SIZE, 
false, maxDecompressedSize);
@@ -118,7 +118,7 @@ public class TarFileDataFormat extends ServiceSupport 
implements DataFormat, Dat
                     throw new IllegalStateException("Unable to untar the file, 
it may be corrupted.");
                 }
 
-                entry = tis.getNextTarEntry();
+                entry = tis.getNextEntry();
                 if (entry != null) {
                     throw new IllegalStateException("Tar file has more than 1 
entry.");
                 }
diff --git 
a/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarIterator.java
 
b/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarIterator.java
index 3015842c80f..032a3eacaca 100644
--- 
a/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarIterator.java
+++ 
b/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/TarIterator.java
@@ -157,7 +157,7 @@ public class TarIterator implements Iterator<Message>, 
Closeable {
     private TarArchiveEntry getNextEntry() throws IOException {
         TarArchiveEntry entry;
 
-        while ((entry = tarInputStream.getNextTarEntry()) != null) {
+        while ((entry = tarInputStream.getNextEntry()) != null) {
             if (!entry.isDirectory()) {
                 return entry;
             } else {
diff --git 
a/components/camel-tarfile/src/main/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategy.java
 
b/components/camel-tarfile/src/main/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategy.java
index 2b671b04b69..67ba2968dfb 100644
--- 
a/components/camel-tarfile/src/main/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategy.java
+++ 
b/components/camel-tarfile/src/main/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategy.java
@@ -40,7 +40,7 @@ import 
org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git 
a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
 
b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
index 958509a756b..50db4a01bf3 100644
--- 
a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
+++ 
b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
@@ -321,12 +321,6 @@ public class TarFileDataFormatTest extends 
CamelTestSupport {
         }
     }
 
-    private static void copy(File file, OutputStream out) throws IOException {
-        try (InputStream in = new FileInputStream(file)) {
-            copy(in, out);
-        }
-    }
-
     private static void copy(InputStream in, File file) throws IOException {
         try (OutputStream out = new FileOutputStream(file)) {
             copy(in, out);