|
| 1 | +From 9a061729b0976ded5a739765fcdfc0c56bd0e46c Mon Sep 17 00:00:00 2001 |
| 2 | +From: Michael Simacek <msimacek@redhat.com> |
| 3 | +Date: Mon, 12 Feb 2018 10:59:55 +0100 |
| 4 | +Subject: [PATCH 2/3] Remove ZSTD compressor |
| 5 | + |
| 6 | +Forwarded: not-needed |
| 7 | +--- |
| 8 | + .../archivers/zip/ZipArchiveInputStream.java | 3 +-- |
| 9 | + .../commons/compress/archivers/zip/ZipFile.java | 7 ++++--- |
| 10 | + .../compressors/CompressorStreamFactory.java | 13 ++----------- |
| 11 | + 3 files changed, 7 insertions(+), 16 deletions(-) |
| 12 | + |
| 13 | +diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java |
| 14 | +index b6d0abc..81ddb57 100644 |
| 15 | +--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java |
| 16 | ++++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java |
| 17 | +@@ -45,7 +45,6 @@ import org.apache.commons.compress.archivers.ArchiveEntry; |
| 18 | + import org.apache.commons.compress.archivers.ArchiveInputStream; |
| 19 | + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; |
| 20 | + import org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream; |
| 21 | +-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream; |
| 22 | + import org.apache.commons.compress.utils.ArchiveUtils; |
| 23 | + import org.apache.commons.compress.utils.IOUtils; |
| 24 | + import org.apache.commons.compress.utils.InputStreamStatistics; |
| 25 | +@@ -522,7 +521,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream<ZipArchiveEntry> i |
| 26 | + * @since 1.28.0 |
| 27 | + */ |
| 28 | + protected InputStream createZstdInputStream(final InputStream in) throws IOException { |
| 29 | +- return new ZstdCompressorInputStream(in); |
| 30 | ++ throw new IOException("Zstandard compression is not available in this build."); |
| 31 | + } |
| 32 | + |
| 33 | + /** |
| 34 | +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 |
| 35 | +index 264ac33..5535a57 100644 |
| 36 | +--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java |
| 37 | ++++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java |
| 38 | +@@ -55,7 +55,6 @@ import org.apache.commons.compress.archivers.EntryStreamOffsets; |
| 39 | + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; |
| 40 | + import org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream; |
| 41 | + import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; |
| 42 | +-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream; |
| 43 | + import org.apache.commons.compress.utils.BoundedArchiveInputStream; |
| 44 | + import org.apache.commons.compress.utils.BoundedSeekableByteChannelInputStream; |
| 45 | + import org.apache.commons.compress.utils.IOUtils; |
| 46 | +@@ -1083,8 +1082,10 @@ public class ZipFile implements Closeable { |
| 47 | + */ |
| 48 | + @SuppressWarnings("resource") |
| 49 | + InputStream createZstdInputStream(final InputStream in) throws IOException { |
| 50 | +- // This method is the only location that references ZstdCompressorInputStream directly to avoid requiring the JAR for all use cases. |
| 51 | +- return zstdInputStreamFactory != null ? zstdInputStreamFactory.apply(in) : new ZstdCompressorInputStream(in); |
| 52 | ++ if (zstdInputStreamFactory == null) { |
| 53 | ++ throw new IOException("Zstandard compression is not available in this build."); |
| 54 | ++ } |
| 55 | ++ return zstdInputStreamFactory.apply(in); |
| 56 | + } |
| 57 | + |
| 58 | + private void fillNameMap() { |
| 59 | +diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java |
| 60 | +index 9a65ba4..a7432c4 100644 |
| 61 | +--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java |
| 62 | ++++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java |
| 63 | +@@ -52,9 +52,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; |
| 64 | + import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; |
| 65 | + import org.apache.commons.compress.compressors.xz.XZUtils; |
| 66 | + import org.apache.commons.compress.compressors.z.ZCompressorInputStream; |
| 67 | +-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream; |
| 68 | +-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream; |
| 69 | +-import org.apache.commons.compress.compressors.zstandard.ZstdUtils; |
| 70 | + import org.apache.commons.compress.utils.IOUtils; |
| 71 | + import org.apache.commons.compress.utils.Sets; |
| 72 | + import org.apache.commons.lang3.StringUtils; |
| 73 | +@@ -266,9 +263,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { |
| 74 | + if (compressorNames.contains(LZ4_FRAMED) && FramedLZ4CompressorInputStream.matches(signature, signatureLength)) { |
| 75 | + return LZ4_FRAMED; |
| 76 | + } |
| 77 | +- if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) { |
| 78 | +- return ZSTANDARD; |
| 79 | +- } |
| 80 | + throw new CompressorException("No Compressor found for the stream signature."); |
| 81 | + } |
| 82 | + |
| 83 | +@@ -616,10 +610,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { |
| 84 | + // @formatter:on |
| 85 | + } |
| 86 | + if (ZSTANDARD.equalsIgnoreCase(name)) { |
| 87 | +- if (!ZstdUtils.isZstdCompressionAvailable()) { |
| 88 | +- throw new CompressorException("Zstandard compression is not available." + YOU_NEED_ZSTD_JNI); |
| 89 | +- } |
| 90 | +- return new ZstdCompressorInputStream(in); |
| 91 | ++ throw new CompressorException("Zstandard compression is not available in this build."); |
| 92 | + } |
| 93 | + if (LZMA.equalsIgnoreCase(name)) { |
| 94 | + if (!LZMAUtils.isLZMACompressionAvailable()) { |
| 95 | +@@ -707,7 +698,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { |
| 96 | + return new FramedLZ4CompressorOutputStream(out); |
| 97 | + } |
| 98 | + if (ZSTANDARD.equalsIgnoreCase(name)) { |
| 99 | +- return new ZstdCompressorOutputStream(out); |
| 100 | ++ throw new CompressorException("Zstandard compression is not available in this build."); |
| 101 | + } |
| 102 | + } catch (final IOException e) { |
| 103 | + throw new CompressorException("Could not create CompressorOutputStream.", e); |
| 104 | +-- |
| 105 | +2.51.0 |
| 106 | + |
0 commit comments