|
 |
85a9e4 |
From 575df9b9a3519186ac801a10eb632e0e2b4ddbdd Mon Sep 17 00:00:00 2001
|
|
|
85a9e4 |
From: Michael Simacek <msimacek@redhat.com>
|
|
|
85a9e4 |
Date: Mon, 12 Feb 2018 10:59:55 +0100
|
|
|
85a9e4 |
Subject: [PATCH 2/3] Remove ZSTD compressor
|
|
|
85a9e4 |
|
|
|
85a9e4 |
---
|
|
|
85a9e4 |
.../compressors/CompressorStreamFactory.java | 14 ++------------
|
|
|
85a9e4 |
1 file changed, 2 insertions(+), 12 deletions(-)
|
|
|
85a9e4 |
|
|
|
85a9e4 |
diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
|
|
85a9e4 |
index ab178a9..3817704 100644
|
|
|
85a9e4 |
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
|
|
85a9e4 |
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
|
|
85a9e4 |
@@ -54,9 +54,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
|
|
|
85a9e4 |
import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
|
|
|
85a9e4 |
import org.apache.commons.compress.compressors.xz.XZUtils;
|
|
|
85a9e4 |
import org.apache.commons.compress.compressors.z.ZCompressorInputStream;
|
|
|
85a9e4 |
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
|
|
|
85a9e4 |
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
|
|
|
85a9e4 |
-import org.apache.commons.compress.compressors.zstandard.ZstdUtils;
|
|
|
85a9e4 |
import org.apache.commons.compress.utils.IOUtils;
|
|
|
85a9e4 |
import org.apache.commons.compress.utils.Lists;
|
|
|
85a9e4 |
import org.apache.commons.compress.utils.ServiceLoaderIterator;
|
|
|
85a9e4 |
@@ -516,10 +513,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
|
|
|
85a9e4 |
return LZ4_FRAMED;
|
|
|
85a9e4 |
}
|
|
|
85a9e4 |
|
|
|
85a9e4 |
- if (ZstdUtils.matches(signature, signatureLength)) {
|
|
|
85a9e4 |
- return ZSTANDARD;
|
|
|
85a9e4 |
- }
|
|
|
85a9e4 |
-
|
|
|
85a9e4 |
throw new CompressorException("No Compressor found for the stream signature.");
|
|
|
85a9e4 |
}
|
|
|
85a9e4 |
/**
|
|
|
85a9e4 |
@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
|
|
|
85a9e4 |
}
|
|
|
85a9e4 |
|
|
|
85a9e4 |
if (ZSTANDARD.equalsIgnoreCase(name)) {
|
|
|
85a9e4 |
- if (!ZstdUtils.isZstdCompressionAvailable()) {
|
|
|
85a9e4 |
- throw new CompressorException("Zstandard compression is not available." + YOU_NEED_ZSTD_JNI);
|
|
|
85a9e4 |
- }
|
|
|
85a9e4 |
- return new ZstdCompressorInputStream(in);
|
|
|
85a9e4 |
+ throw new CompressorException("Zstandard compression is not available in this build.");
|
|
|
85a9e4 |
}
|
|
|
85a9e4 |
|
|
|
85a9e4 |
if (LZMA.equalsIgnoreCase(name)) {
|
|
|
85a9e4 |
@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
|
|
|
85a9e4 |
}
|
|
|
85a9e4 |
|
|
|
85a9e4 |
if (ZSTANDARD.equalsIgnoreCase(name)) {
|
|
|
85a9e4 |
- return new ZstdCompressorOutputStream(out);
|
|
|
85a9e4 |
+ throw new CompressorException("Zstandard compression is not available in this build.");
|
|
|
85a9e4 |
}
|
|
|
85a9e4 |
} catch (final IOException e) {
|
|
|
85a9e4 |
throw new CompressorException("Could not create CompressorOutputStream", e);
|
|
|
85a9e4 |
--
|
|
|
85a9e4 |
2.20.1
|
|
|
85a9e4 |
|