This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
The following commit(s) were added to refs/heads/master by this push:
new 9634e5600 Deprecate FlushShieldFilterOutputStream
9634e5600 is described below
commit 9634e5600c3ffc546ddbe74522930a526e88b373
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Aug 9 09:42:48 2026 -0400
Deprecate FlushShieldFilterOutputStream
---
src/changes/changes.xml | 1 +
.../java/org/apache/commons/compress/archivers/sevenz/Coders.java | 5 ++---
.../org/apache/commons/compress/archivers/sevenz/LZMADecoder.java | 4 ++--
.../apache/commons/compress/utils/FlushShieldFilterOutputStream.java | 3 ++-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0d0b7b045..1e1c52ab6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -205,6 +205,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-io:commons-io from 2.21.0 to 2.22.0.</action>
<!-- REMOVE -->
<action type="remove" dev="pkarwasz" due-to="Piotr P. Karwasz">Deprecate
IOUtils.readFully and IOUtils.skip.</action>
+ <action type="remove" dev="ggregory" due-to="Piotr P. Karwasz">Deprecate
FlushShieldFilterOutputStream.</action>
</release>
<release version="1.28.0" date="2025-07-26" description="This is a feature
and maintenance release. Java 8 or later is required.">
<!-- FIX -->
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
index a30012a06..92e20d2dc 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
@@ -36,7 +36,7 @@
import
org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import
org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
import
org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream;
-import org.apache.commons.compress.utils.FlushShieldFilterOutputStream;
+import org.apache.commons.io.output.FlushShieldOutputStream;
import org.tukaani.xz.ARMOptions;
import org.tukaani.xz.ARMThumbOptions;
import org.tukaani.xz.FilterOptions;
@@ -66,10 +66,9 @@ InputStream decode(final String archiveName, final
InputStream in, final long un
}
}
- @SuppressWarnings("resource")
@Override
OutputStream encode(final OutputStream out, final Object options) {
- return new FlushShieldFilterOutputStream(opts.getOutputStream(new
FinishableWrapperOutputStream(out)));
+ return new FlushShieldOutputStream(opts.getOutputStream(new
FinishableWrapperOutputStream(out)));
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java
index 2a384ee9b..e2d41715c 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java
@@ -25,7 +25,7 @@
import org.apache.commons.compress.MemoryLimitException;
import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.utils.ByteUtils;
-import org.apache.commons.compress.utils.FlushShieldFilterOutputStream;
+import org.apache.commons.io.output.FlushShieldOutputStream;
import org.tukaani.xz.LZMA2Options;
import org.tukaani.xz.LZMAInputStream;
import org.tukaani.xz.LZMAOutputStream;
@@ -59,7 +59,7 @@ InputStream decode(final String archiveName, final
InputStream in, final long un
@Override
OutputStream encode(final OutputStream out, final Object opts) throws
IOException {
// NOOP as LZMAOutputStream throws an exception in flush
- return new FlushShieldFilterOutputStream(new LZMAOutputStream(out,
getOptions(opts), false));
+ return new FlushShieldOutputStream(new LZMAOutputStream(out,
getOptions(opts), false));
}
private int getDictionarySize(final Coder coder) throws ArchiveException {
diff --git
a/src/main/java/org/apache/commons/compress/utils/FlushShieldFilterOutputStream.java
b/src/main/java/org/apache/commons/compress/utils/FlushShieldFilterOutputStream.java
index b95ab3998..0b1a123b5 100644
---
a/src/main/java/org/apache/commons/compress/utils/FlushShieldFilterOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/utils/FlushShieldFilterOutputStream.java
@@ -26,8 +26,9 @@
/**
* Re-implements {@link FilterOutputStream#flush()} to do nothing.
*
- * TODO Deprecate.
+ * @deprecated Use FlushShieldOutputStream from Apache Commons IO instead.
This class will be removed in a future release.
*/
+@Deprecated
public class FlushShieldFilterOutputStream extends FilterOutputStream {
/**
