This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 7dfb4936a9 NIFI-13157 Replaced deprecated getNextTarEntry() and
getNextZipEntry() with getNextEntry(). This closes #8813
7dfb4936a9 is described below
commit 7dfb4936a9cbe0ee1e1f9d206916562d8feb9b88
Author: dan-s1 <[email protected]>
AuthorDate: Fri May 10 17:01:20 2024 +0000
NIFI-13157 Replaced deprecated getNextTarEntry() and getNextZipEntry() with
getNextEntry().
This closes #8813
Signed-off-by: Joseph Witt <[email protected]>
---
.../client/service/operation/TransferDebugOperationHandlerTest.java | 2 +-
.../src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java | 4 ++--
.../apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java | 2 +-
.../main/java/org/apache/nifi/processors/standard/UnpackContent.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/c2/c2-client-bundle/c2-client-service/src/test/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandlerTest.java
b/c2/c2-client-bundle/c2-client-service/src/test/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandlerTest.java
index 798928bce0..78a0fc4426 100644
---
a/c2/c2-client-bundle/c2-client-service/src/test/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandlerTest.java
+++
b/c2/c2-client-bundle/c2-client-service/src/test/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandlerTest.java
@@ -238,7 +238,7 @@ public class TransferDebugOperationHandlerTest {
Map<String, String> fileNamesWithContents = new HashMap<>();
try (TarArchiveInputStream tarInputStream = new
TarArchiveInputStream(new GzipCompressorInputStream(new
ByteArrayInputStream(bundle)))) {
TarArchiveEntry currentEntry;
- while ((currentEntry = tarInputStream.getNextTarEntry()) != null) {
+ while ((currentEntry = tarInputStream.getNextEntry()) != null) {
fileNamesWithContents.put(
currentEntry.getName(),
new BufferedReader(new
InputStreamReader(tarInputStream)).lines().collect(joining(NEW_LINE)));
diff --git
a/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java
b/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java
index b96534a6b2..bea8167703 100644
---
a/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java
+++
b/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java
@@ -34,7 +34,7 @@ public class FlowFileUnpackagerV1 implements
FlowFileUnpackager {
public Map<String, String> unpackageFlowFile(final InputStream in, final
OutputStream out) throws IOException {
flowFilesRead++;
final TarArchiveInputStream tarIn = new TarArchiveInputStream(in);
- final TarArchiveEntry attribEntry = tarIn.getNextTarEntry();
+ final TarArchiveEntry attribEntry = tarIn.getNextEntry();
if (attribEntry == null) {
return null;
}
@@ -48,7 +48,7 @@ public class FlowFileUnpackagerV1 implements
FlowFileUnpackager {
+ FlowFilePackagerV1.FILENAME_ATTRIBUTES);
}
- final TarArchiveEntry contentEntry = tarIn.getNextTarEntry();
+ final TarArchiveEntry contentEntry = tarIn.getNextEntry();
if (contentEntry != null &&
contentEntry.getName().equals(FlowFilePackagerV1.FILENAME_CONTENT)) {
final byte[] buffer = new byte[512 << 10];//512KB
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java
index 39bac2b96f..6d77f1d426 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/TarUnpackerSequenceFileWriter.java
@@ -37,7 +37,7 @@ public class TarUnpackerSequenceFileWriter extends
SequenceFileWriterImpl {
protected void processInputStream(final InputStream stream, final FlowFile
tarArchivedFlowFile, final Writer writer) throws IOException {
try (final TarArchiveInputStream tarIn = new TarArchiveInputStream(new
BufferedInputStream(stream))) {
TarArchiveEntry tarEntry;
- while ((tarEntry = tarIn.getNextTarEntry()) != null) {
+ while ((tarEntry = tarIn.getNextEntry()) != null) {
if (tarEntry.isDirectory()) {
continue;
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
index 34b8573389..aa5bbedc58 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
@@ -379,7 +379,7 @@ public class UnpackContent extends AbstractProcessor {
int fragmentCount = 0;
try (final TarArchiveInputStream tarIn = new
TarArchiveInputStream(new BufferedInputStream(inputStream))) {
TarArchiveEntry tarEntry;
- while ((tarEntry = tarIn.getNextTarEntry()) != null) {
+ while ((tarEntry = tarIn.getNextEntry()) != null) {
if (tarEntry.isDirectory() || !fileMatches(tarEntry)) {
continue;
}
@@ -521,7 +521,7 @@ public class UnpackContent extends AbstractProcessor {
try (final ZipArchiveInputStream zipInputStream = new
ZipArchiveInputStream(new BufferedInputStream(inputStream),
filenameEncoding.toString(), true,
allowStoredEntriesWithDataDescriptor)) {
ZipArchiveEntry zipEntry;
- while ((zipEntry = zipInputStream.getNextZipEntry()) !=
null) {
+ while ((zipEntry = zipInputStream.getNextEntry()) != null)
{
processEntry(zipInputStream, zipEntry.isDirectory(),
zipEntry.getName(), EncryptionMethod.NONE);
}
}
