1- From d80b7b190c789c33a15f56613a21c44827a63c75 Mon Sep 17 00:00:00 2001
1+ From bab91e014f73296a8ac9a3aef2aaa324a85e9b96 Mon Sep 17 00:00:00 2001
22From: Michael Simacek <
[email protected] >
33Date: Mon, 12 Feb 2018 10:59:55 +0100
4- Subject: [PATCH 2/3 ] Remove ZSTD compressor
4+ Subject: [PATCH 2/2 ] Remove ZSTD compressor
55
66---
7- .../compressors/CompressorStreamFactory.java | 22 ++++--- ------------
8- 1 file changed, 4 insertions(+), 18 deletions(-)
7+ .../compress/ compressors/CompressorStreamFactory.java | 14 ++------------
8+ 1 file changed, 2 insertions(+), 12 deletions(-)
99
1010diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
11- index 2406d5a44..9ed40a3d7 100644
11+ index ab178a9..3817704 100644
1212--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
1313+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
14- @@ -53 ,9 +53 ,6 @@
14+ @@ -54 ,9 +54 ,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
1515 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
1616 import org.apache.commons.compress.compressors.xz.XZUtils;
1717 import org.apache.commons.compress.compressors.z.ZCompressorInputStream;
1818- import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
1919- import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
2020- import org.apache.commons.compress.compressors.zstandard.ZstdUtils;
2121 import org.apache.commons.compress.utils.IOUtils;
22- import org.apache.commons.compress.utils.Sets ;
23-
24- @@ -280 ,10 +277 ,6 @@ static String detect(final InputStream inputStream, final Set<String> compressor
22+ import org.apache.commons.compress.utils.Lists ;
23+ import org.apache.commons.compress.utils.ServiceLoaderIterator;
24+ @@ -516 ,10 +513 ,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
2525 return LZ4_FRAMED;
2626 }
2727
28- - if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) {
28+ - if (ZstdUtils.matches(signature, signatureLength)) {
2929- return ZSTANDARD;
3030- }
3131-
3232 throw new CompressorException("No Compressor found for the stream signature.");
3333 }
34-
35- @@ -405,10 +398,6 @@ public static String getZ() {
36- return Z;
37- }
38-
39- - public static String getZstandard() {
40- - return ZSTANDARD;
41- - }
42- -
43- static void putAll(final Set<String> names, final CompressorStreamProvider provider, final TreeMap<String, CompressorStreamProvider> map) {
44- names.forEach(name -> map.put(toKey(name), provider));
45- }
46- @@ -513,7 +502,7 @@ public CompressorInputStream createCompressorInputStream(final InputStream in, f
47- * Creates a compressor input stream from a compressor name and an input stream.
48- *
49- * @param name of the compressor, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #LZMA}, {@value #PACK200}, {@value #SNAPPY_RAW},
50- - * {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #ZSTANDARD}, {@value #DEFLATE64} or
51- + * {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #DEFLATE64} or
52- * {@value #DEFLATE}
53- * @param in the input stream
54- * @return compressor input stream
55- @@ -554,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
34+ /**
35+ @@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
5636 }
5737
5838 if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -64,16 +44,7 @@ index 2406d5a44..9ed40a3d7 100644
6444 }
6545
6646 if (LZMA.equalsIgnoreCase(name)) {
67- @@ -614,7 +600,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
68- * Creates a compressor output stream from a compressor name and an output stream.
69- *
70- * @param name the compressor name, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #PACK200}, {@value #SNAPPY_FRAMED}, {@value #LZ4_BLOCK},
71- - * {@value #LZ4_FRAMED}, {@value #ZSTANDARD} or {@value #DEFLATE}
72- + * {@value #LZ4_FRAMED} or {@value #DEFLATE}
73- * @param out the output stream
74- * @return the compressor output stream
75- * @throws CompressorException if the archiver name is not known
76- @@ -665,7 +651,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, fi
47+ @@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
7748 }
7849
7950 if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -83,5 +54,5 @@ index 2406d5a44..9ed40a3d7 100644
8354 } catch (final IOException e) {
8455 throw new CompressorException("Could not create CompressorOutputStream", e);
8556- -
86- 2.43.0
57+ 2.14.3
8758
0 commit comments