This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit e122bff2aad0c86e10fd5b9593b4d122003198af
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jul 5 11:51:24 2024 -0400
Migrate from deprecated API
---
.../commons/compress/archivers/zip/ExplodingInputStream.java | 12 ++++++------
.../org/apache/commons/compress/archivers/zip/ZipFile.java | 6 +++---
.../compressors/deflate/DeflateCompressorInputStream.java | 8 ++++----
.../compress/compressors/gzip/GzipCompressorInputStream.java | 8 ++++----
.../compressors/lz4/FramedLZ4CompressorInputStream.java | 7 +++----
.../lz77support/AbstractLZ77CompressorInputStream.java | 8 ++++----
.../compress/compressors/lzma/LZMACompressorInputStream.java | 10 +++++-----
.../snappy/FramedSnappyCompressorInputStream.java | 7 +++----
.../compress/compressors/xz/XZCompressorInputStream.java | 8 ++++----
.../compressors/zstandard/ZstdCompressorInputStream.java | 10 +++++-----
.../org/apache/commons/compress/utils/BitInputStream.java | 6 +++---
11 files changed, 44 insertions(+), 46 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
index 8ccd71bd8..4eb124f48 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
@@ -24,8 +24,8 @@ import java.io.InputStream;
import org.apache.commons.compress.utils.ExactMath;
import org.apache.commons.compress.utils.InputStreamStatistics;
+import org.apache.commons.io.input.BoundedInputStream;
import org.apache.commons.io.input.CloseShieldInputStream;
-import org.apache.commons.io.input.CountingInputStream;
/**
* The implode compression method was added to PKZIP 1.01 released in 1989. It
was then dropped from PKZIP 2.0 released in 1993 in favor of the deflate method.
@@ -175,14 +175,14 @@ final class ExplodingInputStream extends InputStream
implements InputStreamStati
private void init() throws IOException {
if (bits == null) {
// we do not want to close in
- try (CountingInputStream i = new
CountingInputStream(CloseShieldInputStream.wrap(in))) {
+ try (BoundedInputStream cis =
BoundedInputStream.builder().setInputStream(CloseShieldInputStream.wrap(in)).get())
{
if (numberOfTrees == 3) {
- literalTree = BinaryTree.decode(i, 256);
+ literalTree = BinaryTree.decode(cis, 256);
}
- lengthTree = BinaryTree.decode(i, 64);
- distanceTree = BinaryTree.decode(i, 64);
- treeSizes += i.getByteCount();
+ lengthTree = BinaryTree.decode(cis, 64);
+ distanceTree = BinaryTree.decode(cis, 64);
+ treeSizes += cis.getCount();
}
bits = new BitStream(in);
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index 8b48fe0f2..e5df37d38 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -61,7 +61,7 @@ import org.apache.commons.io.Charsets;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.build.AbstractOrigin.ByteArrayOrigin;
import org.apache.commons.io.build.AbstractStreamBuilder;
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
/**
* Replacement for {@link java.util.zip.ZipFile}.
@@ -242,14 +242,14 @@ public class ZipFile implements Closeable {
}
}
- private static final class StoredStatisticsStream extends
CountingInputStream implements InputStreamStatistics {
+ private static final class StoredStatisticsStream extends
BoundedInputStream implements InputStreamStatistics {
StoredStatisticsStream(final InputStream in) {
super(in);
}
@Override
public long getCompressedCount() {
- return super.getByteCount();
+ return super.getCount();
}
@Override
diff --git
a/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java
index 9e904820a..09ec9076a 100644
---
a/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java
@@ -25,7 +25,7 @@ import java.util.zip.InflaterInputStream;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
/**
* Deflate decompressor.
@@ -54,7 +54,7 @@ public class DeflateCompressorInputStream extends
CompressorInputStream implemen
&& (signature[1] == (byte) MAGIC_2a || signature[1] == (byte)
MAGIC_2b || signature[1] == (byte) MAGIC_2c || signature[1] == (byte) MAGIC_2d);
}
- private final CountingInputStream countingStream;
+ private final BoundedInputStream countingStream;
private final InputStream in;
private final Inflater inflater;
@@ -76,7 +76,7 @@ public class DeflateCompressorInputStream extends
CompressorInputStream implemen
*/
public DeflateCompressorInputStream(final InputStream inputStream, final
DeflateParameters parameters) {
inflater = new Inflater(!parameters.withZlibHeader());
- in = new InflaterInputStream(countingStream = new
CountingInputStream(inputStream), inflater);
+ in = new InflaterInputStream(countingStream =
BoundedInputStream.builder().setInputStream(inputStream).asSupplier().get(),
inflater);
}
/** {@inheritDoc} */
@@ -100,7 +100,7 @@ public class DeflateCompressorInputStream extends
CompressorInputStream implemen
*/
@Override
public long getCompressedCount() {
- return countingStream.getByteCount();
+ return countingStream.getCount();
}
/** {@inheritDoc} */
diff --git
a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
index e05dd1f8c..930f6e0d9 100644
---
a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
@@ -33,7 +33,7 @@ import java.util.zip.Inflater;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.ByteUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
/**
* Input stream that decompresses .gz files.
@@ -100,7 +100,7 @@ public class GzipCompressorInputStream extends
CompressorInputStream implements
}
}
- private final CountingInputStream countingStream;
+ private final BoundedInputStream countingStream;
// Compressed input stream, possibly wrapped in a
// BufferedInputStream, always wrapped in countingStream above
@@ -155,7 +155,7 @@ public class GzipCompressorInputStream extends
CompressorInputStream implements
* @throws IOException if the stream could not be created
*/
public GzipCompressorInputStream(final InputStream inputStream, final
boolean decompressConcatenated) throws IOException {
- countingStream = new CountingInputStream(inputStream);
+ countingStream =
BoundedInputStream.builder().setInputStream(inputStream).get();
// Mark support is strictly needed for concatenated files only,
// but it's simpler if it is always available.
if (countingStream.markSupported()) {
@@ -190,7 +190,7 @@ public class GzipCompressorInputStream extends
CompressorInputStream implements
*/
@Override
public long getCompressedCount() {
- return countingStream.getByteCount();
+ return countingStream.getCount();
}
/**
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
index a05c48ac9..7708b53fd 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
@@ -28,7 +28,6 @@ import org.apache.commons.compress.utils.ByteUtils;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.commons.io.input.CountingInputStream;
/**
* CompressorInputStream for the LZ4 frame format.
@@ -97,7 +96,7 @@ public class FramedLZ4CompressorInputStream extends
CompressorInputStream implem
private final byte[] oneByte = new byte[1];
private final ByteUtils.ByteSupplier supplier = this::readOneByte;
- private final CountingInputStream inputStream;
+ private final BoundedInputStream inputStream;
private final boolean decompressConcatenated;
private boolean expectBlockChecksum;
private boolean expectBlockDependency;
@@ -136,7 +135,7 @@ public class FramedLZ4CompressorInputStream extends
CompressorInputStream implem
* @throws IOException if reading fails
*/
public FramedLZ4CompressorInputStream(final InputStream in, final boolean
decompressConcatenated) throws IOException {
- this.inputStream = new CountingInputStream(in);
+ this.inputStream =
BoundedInputStream.builder().setInputStream(in).get();
this.decompressConcatenated = decompressConcatenated;
init(true);
}
@@ -172,7 +171,7 @@ public class FramedLZ4CompressorInputStream extends
CompressorInputStream implem
*/
@Override
public long getCompressedCount() {
- return inputStream.getByteCount();
+ return inputStream.getCount();
}
private void init(final boolean firstFrame) throws IOException {
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
index 1a083ece1..ada7d721c 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
@@ -26,7 +26,7 @@ import
org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.ByteUtils;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
/**
* Encapsulates code common to LZ77 decompressors.
@@ -90,7 +90,7 @@ public abstract class AbstractLZ77CompressorInputStream
extends CompressorInputS
private int readIndex;
/** The underlying stream to read compressed data from */
- private final CountingInputStream in;
+ private final BoundedInputStream in;
/** Number of bytes still to be read from the current literal or
back-reference. */
private long bytesRemaining;
@@ -118,7 +118,7 @@ public abstract class AbstractLZ77CompressorInputStream
extends CompressorInputS
* @throws IllegalArgumentException if windowSize is not bigger than 0
*/
public AbstractLZ77CompressorInputStream(final InputStream is, final int
windowSize) {
- this.in = new CountingInputStream(is);
+ this.in =
BoundedInputStream.builder().setInputStream(is).asSupplier().get();
if (windowSize <= 0) {
throw new IllegalArgumentException("windowSize must be bigger than
0");
}
@@ -145,7 +145,7 @@ public abstract class AbstractLZ77CompressorInputStream
extends CompressorInputS
*/
@Override
public long getCompressedCount() {
- return in.getByteCount();
+ return in.getCount();
}
/**
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
index 5625db925..ff0695a93 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
import org.apache.commons.compress.MemoryLimitException;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
import org.tukaani.xz.LZMAInputStream;
/**
@@ -47,7 +47,7 @@ public class LZMACompressorInputStream extends
CompressorInputStream implements
return signature != null && length >= 3 && signature[0] == 0x5d &&
signature[1] == 0 && signature[2] == 0;
}
- private final CountingInputStream countingStream;
+ private final BoundedInputStream countingStream;
private final InputStream in;
@@ -60,7 +60,7 @@ public class LZMACompressorInputStream extends
CompressorInputStream implements
* this implementation, or the underlying {@code
inputStream} throws an exception
*/
public LZMACompressorInputStream(final InputStream inputStream) throws
IOException {
- in = new LZMAInputStream(countingStream = new
CountingInputStream(inputStream), -1);
+ in = new LZMAInputStream(countingStream =
BoundedInputStream.builder().setInputStream(inputStream).get(), -1);
}
/**
@@ -77,7 +77,7 @@ public class LZMACompressorInputStream extends
CompressorInputStream implements
*/
public LZMACompressorInputStream(final InputStream inputStream, final int
memoryLimitInKb) throws IOException {
try {
- in = new LZMAInputStream(countingStream = new
CountingInputStream(inputStream), memoryLimitInKb);
+ in = new LZMAInputStream(countingStream =
BoundedInputStream.builder().setInputStream(inputStream).get(),
memoryLimitInKb);
} catch (final org.tukaani.xz.MemoryLimitException e) {
// convert to commons-compress exception
throw new MemoryLimitException(e.getMemoryNeeded(),
e.getMemoryLimit(), e);
@@ -101,7 +101,7 @@ public class LZMACompressorInputStream extends
CompressorInputStream implements
*/
@Override
public long getCompressedCount() {
- return countingStream.getByteCount();
+ return countingStream.getCount();
}
/** {@inheritDoc} */
diff --git
a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
index 3aaaba681..204a997eb 100644
---
a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
@@ -29,7 +29,6 @@ import org.apache.commons.compress.utils.ByteUtils;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.commons.io.input.CountingInputStream;
/**
* CompressorInputStream for the framing Snappy format.
@@ -97,7 +96,7 @@ public class FramedSnappyCompressorInputStream extends
CompressorInputStream imp
private long unreadBytes;
- private final CountingInputStream countingStream;
+ private final BoundedInputStream countingStream;
/** The underlying stream to read compressed data from */
private final PushbackInputStream inputStream;
@@ -155,7 +154,7 @@ public class FramedSnappyCompressorInputStream extends
CompressorInputStream imp
if (blockSize <= 0) {
throw new IllegalArgumentException("blockSize must be bigger than
0");
}
- countingStream = new CountingInputStream(in);
+ countingStream = BoundedInputStream.builder().setInputStream(in).get();
this.inputStream = new PushbackInputStream(countingStream, 1);
this.blockSize = blockSize;
this.dialect = dialect;
@@ -194,7 +193,7 @@ public class FramedSnappyCompressorInputStream extends
CompressorInputStream imp
*/
@Override
public long getCompressedCount() {
- return countingStream.getByteCount() - unreadBytes;
+ return countingStream.getCount() - unreadBytes;
}
/** {@inheritDoc} */
diff --git
a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java
index 56d6767fc..9bfdff849 100644
---
a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
import org.apache.commons.compress.MemoryLimitException;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
import org.tukaani.xz.SingleXZInputStream;
import org.tukaani.xz.XZ;
import org.tukaani.xz.XZInputStream;
@@ -57,7 +57,7 @@ public class XZCompressorInputStream extends
CompressorInputStream implements In
return true;
}
- private final CountingInputStream countingStream;
+ private final BoundedInputStream countingStream;
private final InputStream in;
@@ -102,7 +102,7 @@ public class XZCompressorInputStream extends
CompressorInputStream implements In
* @since 1.14
*/
public XZCompressorInputStream(final InputStream inputStream, final
boolean decompressConcatenated, final int memoryLimitInKb) throws IOException {
- countingStream = new CountingInputStream(inputStream);
+ countingStream =
BoundedInputStream.builder().setInputStream(inputStream).get();
if (decompressConcatenated) {
in = new XZInputStream(countingStream, memoryLimitInKb);
} else {
@@ -125,7 +125,7 @@ public class XZCompressorInputStream extends
CompressorInputStream implements In
*/
@Override
public long getCompressedCount() {
- return countingStream.getByteCount();
+ return countingStream.getCount();
}
@Override
diff --git
a/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
index 105198d82..5b93e1bd5 100644
---
a/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
import com.github.luben.zstd.BufferPool;
import com.github.luben.zstd.ZstdInputStream;
@@ -35,11 +35,11 @@ import com.github.luben.zstd.ZstdInputStream;
*/
public class ZstdCompressorInputStream extends CompressorInputStream
implements InputStreamStatistics {
- private final CountingInputStream countingStream;
+ private final BoundedInputStream countingStream;
private final ZstdInputStream decIS;
public ZstdCompressorInputStream(final InputStream in) throws IOException {
- this.decIS = new ZstdInputStream(countingStream = new
CountingInputStream(in));
+ this.decIS = new ZstdInputStream(countingStream =
BoundedInputStream.builder().setInputStream(in).get());
}
/**
@@ -51,7 +51,7 @@ public class ZstdCompressorInputStream extends
CompressorInputStream implements
* @throws IOException if an IO error occurs.
*/
public ZstdCompressorInputStream(final InputStream in, final BufferPool
bufferPool) throws IOException {
- this.decIS = new ZstdInputStream(countingStream = new
CountingInputStream(in), bufferPool);
+ this.decIS = new ZstdInputStream(countingStream =
BoundedInputStream.builder().setInputStream(in).get(), bufferPool);
}
@Override
@@ -69,7 +69,7 @@ public class ZstdCompressorInputStream extends
CompressorInputStream implements
*/
@Override
public long getCompressedCount() {
- return countingStream.getByteCount();
+ return countingStream.getCount();
}
@Override
diff --git
a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
index 18947e941..8fb678652 100644
--- a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
+++ b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
@@ -39,7 +39,7 @@ public class BitInputStream implements Closeable {
}
}
- private final org.apache.commons.io.input.CountingInputStream in;
+ private final org.apache.commons.io.input.BoundedInputStream in;
private final ByteOrder byteOrder;
private long bitsCached;
private int bitsCachedSize;
@@ -51,7 +51,7 @@ public class BitInputStream implements Closeable {
* @param byteOrder the bit arrangement across byte boundaries, either
BIG_ENDIAN (aaaaabbb bb000000) or LITTLE_ENDIAN (bbbaaaaa 000000bb)
*/
public BitInputStream(final InputStream in, final ByteOrder byteOrder) {
- this.in = new org.apache.commons.io.input.CountingInputStream(in);
+ this.in =
org.apache.commons.io.input.BoundedInputStream.builder().setInputStream(in).asSupplier().get();
this.byteOrder = byteOrder;
}
@@ -136,7 +136,7 @@ public class BitInputStream implements Closeable {
* @since 1.17
*/
public long getBytesRead() {
- return in.getByteCount();
+ return in.getCount();
}
private long processBitsGreater57(final int count) throws IOException {
