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
The following commit(s) were added to refs/heads/master by this push:
new 8e34ee4 Make the private static final instance public under the name
"DEFAULT" since it uses the platform default encoding.
8e34ee4 is described below
commit 8e34ee48898ea1cd0547d1df263f44a14e68678c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Aug 8 11:23:18 2020 -0400
Make the private static final instance public under the name "DEFAULT"
since it uses the platform default encoding.
Reuse this constant instead of creating new factories all over with the
exception of some tests that check for deprecated behavior.
---
.../commons/compress/archivers/ArchiveStreamFactory.java | 10 +++++++---
.../org/apache/commons/compress/archivers/Lister.java | 9 +++++----
.../commons/compress/archivers/examples/Archiver.java | 2 +-
.../commons/compress/archivers/examples/Expander.java | 6 +++---
.../org/apache/commons/compress/AbstractTestCase.java | 2 +-
.../apache/commons/compress/archivers/ArTestCase.java | 6 +++---
.../compress/archivers/ArchiveServiceLoaderTest.java | 4 ++--
.../compress/archivers/ArchiveStreamFactoryTest.java | 16 ++++++++--------
.../apache/commons/compress/archivers/CpioTestCase.java | 6 +++---
.../apache/commons/compress/archivers/DumpTestCase.java | 4 ++--
.../commons/compress/archivers/ExceptionMessageTest.java | 8 ++++----
.../apache/commons/compress/archivers/JarTestCase.java | 6 +++---
.../apache/commons/compress/archivers/TarTestCase.java | 10 +++++-----
.../apache/commons/compress/archivers/ZipTestCase.java | 14 +++++++-------
.../compress/archivers/examples/ExpanderTest.java | 4 ++--
.../archivers/examples/ParameterizedArchiverTest.java | 4 ++--
.../archivers/examples/ParameterizedExpanderTest.java | 4 ++--
.../archivers/tar/TarArchiveInputStreamTest.java | 2 +-
.../archivers/tar/TarArchiveOutputStreamTest.java | 2 +-
.../compress/archivers/tar/TarMemoryFileSystemTest.java | 6 +++---
.../archivers/zip/ZipArchiveInputStreamTest.java | 2 +-
.../commons/compress/compressors/Pack200TestCase.java | 6 +++---
.../bzip2/BZip2CompressorInputStreamTest.java | 2 +-
.../deflate64/Deflate64CompressorInputStreamTest.java | 2 +-
.../compress/compressors/pack200/Pack200UtilsTest.java | 4 ++--
25 files changed, 73 insertions(+), 68 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
index 0a1e223..84283c7 100644
---
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
+++
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
@@ -94,7 +94,11 @@ public class ArchiveStreamFactory implements
ArchiveStreamProvider {
private static final int SIGNATURE_SIZE = 12;
- private static final ArchiveStreamFactory SINGLETON = new
ArchiveStreamFactory();
+ /**
+ * The singleton instance using the platform default encoding.
+ * @since 1.21
+ */
+ public static final ArchiveStreamFactory DEFAULT = new
ArchiveStreamFactory();
/**
* Constant (value {@value}) used to identify the AR archive format.
@@ -211,7 +215,7 @@ public class ArchiveStreamFactory implements
ArchiveStreamProvider {
@Override
public SortedMap<String, ArchiveStreamProvider> run() {
TreeMap<String, ArchiveStreamProvider> map = new TreeMap<>();
- putAll(SINGLETON.getInputStreamArchiveNames(), SINGLETON, map);
+ putAll(DEFAULT.getInputStreamArchiveNames(), DEFAULT, map);
for (ArchiveStreamProvider provider :
findArchiveStreamProviders()) {
putAll(provider.getInputStreamArchiveNames(), provider,
map);
}
@@ -252,7 +256,7 @@ public class ArchiveStreamFactory implements
ArchiveStreamProvider {
@Override
public SortedMap<String, ArchiveStreamProvider> run() {
TreeMap<String, ArchiveStreamProvider> map = new TreeMap<>();
- putAll(SINGLETON.getOutputStreamArchiveNames(), SINGLETON,
map);
+ putAll(DEFAULT.getOutputStreamArchiveNames(), DEFAULT, map);
for (ArchiveStreamProvider provider :
findArchiveStreamProviders()) {
putAll(provider.getOutputStreamArchiveNames(), provider,
map);
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/Lister.java
b/src/main/java/org/apache/commons/compress/archivers/Lister.java
index dd404a5..330d089 100644
--- a/src/main/java/org/apache/commons/compress/archivers/Lister.java
+++ b/src/main/java/org/apache/commons/compress/archivers/Lister.java
@@ -37,7 +37,8 @@ import org.apache.commons.compress.archivers.zip.ZipFile;
* @since 1.1
*/
public final class Lister {
- private static final ArchiveStreamFactory factory = new
ArchiveStreamFactory();
+
+ private static final ArchiveStreamFactory FACTORY =
ArchiveStreamFactory.DEFAULT;
public static void main(final String[] args) throws Exception {
if (args.length == 0) {
@@ -73,14 +74,14 @@ public final class Lister {
private static ArchiveInputStream createArchiveInputStream(final String[]
args, final InputStream fis)
throws ArchiveException {
if (args.length > 1) {
- return factory.createArchiveInputStream(args[1], fis);
+ return FACTORY.createArchiveInputStream(args[1], fis);
}
- return factory.createArchiveInputStream(fis);
+ return FACTORY.createArchiveInputStream(fis);
}
private static String detectFormat(File f) throws ArchiveException,
IOException {
try (final InputStream fis = new
BufferedInputStream(Files.newInputStream(f.toPath()))) {
- return factory.detect(fis);
+ return FACTORY.detect(fis);
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/examples/Archiver.java
b/src/main/java/org/apache/commons/compress/archivers/examples/Archiver.java
index 4632752..b35ecc2 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/Archiver.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/Archiver.java
@@ -127,7 +127,7 @@ public class Archiver {
public void create(String format, OutputStream target, File directory,
CloseableConsumer closeableConsumer) throws IOException,
ArchiveException {
try (CloseableConsumerAdapter c = new
CloseableConsumerAdapter(closeableConsumer)) {
- create(c.track(new
ArchiveStreamFactory().createArchiveOutputStream(format, target)),
+
create(c.track(ArchiveStreamFactory.DEFAULT.createArchiveOutputStream(format,
target)),
directory);
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
index 54ad228..5d07533 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
@@ -66,7 +66,7 @@ public class Expander {
public void expand(File archive, File targetDirectory) throws IOException,
ArchiveException {
String format = null;
try (InputStream i = new
BufferedInputStream(Files.newInputStream(archive.toPath()))) {
- format = new ArchiveStreamFactory().detect(i);
+ format = ArchiveStreamFactory.DEFAULT.detect(i);
}
expand(format, archive, targetDirectory);
}
@@ -136,7 +136,7 @@ public class Expander {
public void expand(InputStream archive, File targetDirectory,
CloseableConsumer closeableConsumer)
throws IOException, ArchiveException {
try (CloseableConsumerAdapter c = new
CloseableConsumerAdapter(closeableConsumer)) {
- expand(c.track(new
ArchiveStreamFactory().createArchiveInputStream(archive)),
+
expand(c.track(ArchiveStreamFactory.DEFAULT.createArchiveInputStream(archive)),
targetDirectory);
}
}
@@ -185,7 +185,7 @@ public class Expander {
public void expand(String format, InputStream archive, File
targetDirectory, CloseableConsumer closeableConsumer)
throws IOException, ArchiveException {
try (CloseableConsumerAdapter c = new
CloseableConsumerAdapter(closeableConsumer)) {
- expand(c.track(new
ArchiveStreamFactory().createArchiveInputStream(format, archive)),
+
expand(c.track(ArchiveStreamFactory.DEFAULT.createArchiveInputStream(format,
archive)),
targetDirectory);
}
}
diff --git a/src/test/java/org/apache/commons/compress/AbstractTestCase.java
b/src/test/java/org/apache/commons/compress/AbstractTestCase.java
index 892566c..4e241c8 100644
--- a/src/test/java/org/apache/commons/compress/AbstractTestCase.java
+++ b/src/test/java/org/apache/commons/compress/AbstractTestCase.java
@@ -53,7 +53,7 @@ public abstract class AbstractTestCase {
private File archive; // used to delete the archive in tearDown
protected List<String> archiveList; // Lists the content of the archive as
originally created
- protected ArchiveStreamFactory factory = new ArchiveStreamFactory();
+ protected ArchiveStreamFactory factory = ArchiveStreamFactory.DEFAULT;
@Before
public void setUp() throws Exception {
diff --git
a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
index fadb7c3..7174ca5 100644
--- a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
@@ -46,7 +46,7 @@ public final class ArTestCase extends AbstractTestCase {
final File file2 = getFile("test2.xml");
final OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("ar", out);
+ final ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("ar", out);
os.putArchiveEntry(new ArArchiveEntry("test1.xml", file1.length()));
IOUtils.copy(new FileInputStream(file1), os);
os.closeArchiveEntry();
@@ -66,7 +66,7 @@ public final class ArTestCase extends AbstractTestCase {
final File file2 = getFile("test2.xml");
final OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("ar", out);
+ final ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("ar", out);
os.putArchiveEntry(new ArArchiveEntry("test1.xml",
file1.length()));
IOUtils.copy(new FileInputStream(file1), os);
os.closeArchiveEntry();
@@ -102,7 +102,7 @@ public final class ArTestCase extends AbstractTestCase {
// create
final OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("ar", out);
+ final ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("ar", out);
os.putArchiveEntry(new ArArchiveEntry("test1.xml",
file1.length()));
IOUtils.copy(new FileInputStream(file1), os);
os.closeArchiveEntry();
diff --git
a/src/test/java/org/apache/commons/compress/archivers/ArchiveServiceLoaderTest.java
b/src/test/java/org/apache/commons/compress/archivers/ArchiveServiceLoaderTest.java
index 910797d..5c418ad 100644
---
a/src/test/java/org/apache/commons/compress/archivers/ArchiveServiceLoaderTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/ArchiveServiceLoaderTest.java
@@ -29,12 +29,12 @@ public class ArchiveServiceLoaderTest {
@Test(expected = ArchiveInvocationConfirmationException.class)
public void testInputStream() throws ArchiveException {
- new
ArchiveStreamFactory().createArchiveInputStream("ArchiveTestInput1", new
ByteArrayInputStream(new byte[] {}));
+
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("ArchiveTestInput1", new
ByteArrayInputStream(new byte[] {}));
}
@Test(expected = ArchiveInvocationConfirmationException.class)
public void testOutputStream() throws ArchiveException {
- new
ArchiveStreamFactory().createArchiveOutputStream("ArchiveTestOutput1", new
ByteArrayOutputStream());
+
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("ArchiveTestOutput1",
new ByteArrayOutputStream());
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
index f7113ac..713656a 100644
---
a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
@@ -51,7 +51,7 @@ public class ArchiveStreamFactoryTest {
@Test
public void shortTextFilesAreNoTARs() throws Exception {
try {
- new ArchiveStreamFactory()
+ ArchiveStreamFactory.DEFAULT
.createArchiveInputStream(new ByteArrayInputStream("This
certainly is not a tar archive, really, no kidding".getBytes()));
fail("created an input stream for a non-archive");
} catch (final ArchiveException ae) {
@@ -66,7 +66,7 @@ public class ArchiveStreamFactoryTest {
public void aiffFilesAreNoTARs() throws Exception {
try (FileInputStream fis = new
FileInputStream("src/test/resources/testAIFF.aif")) {
try (InputStream is = new BufferedInputStream(fis)) {
- new ArchiveStreamFactory().createArchiveInputStream(is);
+ ArchiveStreamFactory.DEFAULT.createArchiveInputStream(is);
fail("created an input stream for a non-archive");
} catch (final ArchiveException ae) {
assertTrue(ae.getMessage().startsWith("No Archiver found"));
@@ -78,7 +78,7 @@ public class ArchiveStreamFactoryTest {
public void testCOMPRESS209() throws Exception {
try (FileInputStream fis = new
FileInputStream("src/test/resources/testCompress209.doc")) {
try (InputStream bis = new BufferedInputStream(fis)) {
- new ArchiveStreamFactory().createArchiveInputStream(bis);
+ ArchiveStreamFactory.DEFAULT.createArchiveInputStream(bis);
fail("created an input stream for a non-archive");
} catch (final ArchiveException ae) {
assertTrue(ae.getMessage().startsWith("No Archiver found"));
@@ -88,14 +88,14 @@ public class ArchiveStreamFactoryTest {
@Test(expected = StreamingNotSupportedException.class)
public void cantRead7zFromStream() throws Exception {
- new ArchiveStreamFactory()
+ ArchiveStreamFactory.DEFAULT
.createArchiveInputStream(ArchiveStreamFactory.SEVEN_Z,
new ByteArrayInputStream(new byte[0]));
}
@Test(expected = StreamingNotSupportedException.class)
public void cantWrite7zToStream() throws Exception {
- new ArchiveStreamFactory()
+ ArchiveStreamFactory.DEFAULT
.createArchiveOutputStream(ArchiveStreamFactory.SEVEN_Z,
new ByteArrayOutputStream());
}
@@ -109,7 +109,7 @@ public class ArchiveStreamFactoryTest {
public void detectsAndThrowsFor7z() throws Exception {
try (FileInputStream fis = new
FileInputStream("src/test/resources/bla.7z")) {
try (InputStream bis = new BufferedInputStream(fis)) {
- new ArchiveStreamFactory().createArchiveInputStream(bis);
+ ArchiveStreamFactory.DEFAULT.createArchiveInputStream(bis);
fail("Expected a StreamingNotSupportedException");
} catch (final StreamingNotSupportedException ex) {
assertEquals(ArchiveStreamFactory.SEVEN_Z, ex.getFormat());
@@ -126,7 +126,7 @@ public class ArchiveStreamFactoryTest {
public void skipsPK00Prefix() throws Exception {
try (FileInputStream fis = new
FileInputStream("src/test/resources/COMPRESS-208.zip")) {
try (InputStream bis = new BufferedInputStream(fis)) {
- try (ArchiveInputStream ais = new
ArchiveStreamFactory().createArchiveInputStream(bis)) {
+ try (ArchiveInputStream ais =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream(bis)) {
assertTrue(ais instanceof ZipArchiveInputStream);
}
}
@@ -193,7 +193,7 @@ public class ArchiveStreamFactoryTest {
return fac;
}
// The different factory types
- private static final ArchiveStreamFactory FACTORY = new
ArchiveStreamFactory();
+ private static final ArchiveStreamFactory FACTORY =
ArchiveStreamFactory.DEFAULT;
private static final ArchiveStreamFactory FACTORY_UTF8 = new
ArchiveStreamFactory("UTF-8");
private static final ArchiveStreamFactory FACTORY_ASCII = new
ArchiveStreamFactory("ASCII");
private static final ArchiveStreamFactory FACTORY_SET_UTF8 =
getFactory("UTF-8");
diff --git
a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
index bad0161..c65d8eb 100644
--- a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
@@ -46,7 +46,7 @@ public final class CpioTestCase extends AbstractTestCase {
final File file2 = getFile("test2.xml");
final OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("cpio", out);
+ final ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("cpio", out);
os.putArchiveEntry(new CpioArchiveEntry("test1.xml", file1.length()));
IOUtils.copy(new FileInputStream(file1), os);
os.closeArchiveEntry();
@@ -69,7 +69,7 @@ public final class CpioTestCase extends AbstractTestCase {
{
final OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("cpio", out);
+ final ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("cpio", out);
CpioArchiveEntry entry = new CpioArchiveEntry("test1.xml",
file1Length);
entry.setMode(CpioConstants.C_ISREG);
os.putArchiveEntry(entry);
@@ -89,7 +89,7 @@ public final class CpioTestCase extends AbstractTestCase {
// Unarchive Operation
final File input = output;
final InputStream is = new FileInputStream(input);
- final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("cpio", is);
+ final ArchiveInputStream in =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("cpio", is);
final Map<String, File> result = new HashMap<>();
diff --git
a/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java
index 8675902..cc36563 100644
--- a/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java
@@ -50,7 +50,7 @@ public final class DumpTestCase extends AbstractTestCase {
ArchiveInputStream in = null;
OutputStream out = null;
try {
- in = new ArchiveStreamFactory()
+ in = ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("dump", is);
ArchiveEntry entry = in.getNextEntry();
@@ -92,7 +92,7 @@ public final class DumpTestCase extends AbstractTestCase {
private void archiveDetection(final File f) throws Exception {
try (InputStream is = new FileInputStream(f)) {
assertEquals(DumpArchiveInputStream.class,
- new ArchiveStreamFactory()
+ ArchiveStreamFactory.DEFAULT
.createArchiveInputStream(new
BufferedInputStream(is))
.getClass());
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
b/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
index e64d792..2ff60c4 100644
---
a/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
@@ -33,7 +33,7 @@ public class ExceptionMessageTest {
@Test
public void testMessageWhenArchiverNameIsNull_1(){
try{
- new ArchiveStreamFactory().createArchiveInputStream(null,
System.in);
+ ArchiveStreamFactory.DEFAULT.createArchiveInputStream(null,
System.in);
fail("Should raise an IllegalArgumentException.");
}catch (final IllegalArgumentException e) {
assertEquals(ARCHIVER_NULL_MESSAGE, e.getMessage());
@@ -45,7 +45,7 @@ public class ExceptionMessageTest {
@Test
public void testMessageWhenInputStreamIsNull(){
try{
- new ArchiveStreamFactory().createArchiveInputStream("zip", null);
+ ArchiveStreamFactory.DEFAULT.createArchiveInputStream("zip", null);
fail("Should raise an IllegalArgumentException.");
}catch (final IllegalArgumentException e) {
assertEquals(INPUTSTREAM_NULL_MESSAGE, e.getMessage());
@@ -57,7 +57,7 @@ public class ExceptionMessageTest {
@Test
public void testMessageWhenArchiverNameIsNull_2(){
try{
- new ArchiveStreamFactory().createArchiveOutputStream(null,
System.out);
+ ArchiveStreamFactory.DEFAULT.createArchiveOutputStream(null,
System.out);
fail("Should raise an IllegalArgumentException.");
} catch (final IllegalArgumentException e) {
assertEquals(ARCHIVER_NULL_MESSAGE, e.getMessage());
@@ -69,7 +69,7 @@ public class ExceptionMessageTest {
@Test
public void testMessageWhenOutputStreamIsNull(){
try{
- new ArchiveStreamFactory().createArchiveOutputStream("zip", null);
+ ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("zip",
null);
fail("Should raise an IllegalArgumentException.");
} catch (final IllegalArgumentException e) {
assertEquals(OUTPUTSTREAM_NULL_MESSAGE, e.getMessage());
diff --git
a/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
index 3717e7a..6847977 100644
--- a/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
@@ -40,7 +40,7 @@ public final class JarTestCase extends AbstractTestCase {
final OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("jar", out);
+ final ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("jar", out);
os.putArchiveEntry(new ZipArchiveEntry("testdata/test1.xml"));
IOUtils.copy(new FileInputStream(file1), os);
@@ -58,7 +58,7 @@ public final class JarTestCase extends AbstractTestCase {
public void testJarUnarchive() throws Exception {
final File input = getFile("bla.jar");
final InputStream is = new FileInputStream(input);
- final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("jar", is);
+ final ArchiveInputStream in =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("jar", is);
ZipArchiveEntry entry = (ZipArchiveEntry)in.getNextEntry();
File o = new File(dir, entry.getName());
@@ -89,7 +89,7 @@ public final class JarTestCase extends AbstractTestCase {
public void testJarUnarchiveAll() throws Exception {
final File input = getFile("bla.jar");
final InputStream is = new FileInputStream(input);
- final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("jar", is);
+ final ArchiveInputStream in =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("jar", is);
ArchiveEntry entry = in.getNextEntry();
while (entry != null) {
diff --git
a/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
index 048beb4..2363f80 100644
--- a/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
@@ -47,7 +47,7 @@ public final class TarTestCase extends AbstractTestCase {
final File output = new File(dir, "bla.tar");
final File file1 = getFile("test1.xml");
final OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("tar", out);
+ final ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("tar", out);
final TarArchiveEntry entry = new
TarArchiveEntry("testdata/test1.xml");
entry.setModTime(0);
entry.setSize(file1.length());
@@ -71,7 +71,7 @@ public final class TarTestCase extends AbstractTestCase {
final File output = new File(dir, "bla.tar");
final File file1 = getFile("test1.xml");
final OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("tar", out);
+ final ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("tar", out);
final TarArchiveEntry entry = new TarArchiveEntry(name);
entry.setModTime(0);
entry.setSize(file1.length());
@@ -94,7 +94,7 @@ public final class TarTestCase extends AbstractTestCase {
final String toLongName =
"testdata/123456789012345678901234567890123456789012345678901234567890123456789012345678901234567.xml";
final File output2 = new File(dir, "bla.tar");
final OutputStream out2 = new FileOutputStream(output2);
- os2 = new ArchiveStreamFactory().createArchiveOutputStream("tar",
out2);
+ os2 =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("tar", out2);
final TarArchiveEntry entry2 = new TarArchiveEntry(toLongName);
entry2.setModTime(0);
entry2.setSize(file1.length());
@@ -119,7 +119,7 @@ public final class TarTestCase extends AbstractTestCase {
public void testTarUnarchive() throws Exception {
final File input = getFile("bla.tar");
final InputStream is = new FileInputStream(input);
- final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("tar", is);
+ final ArchiveInputStream in =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("tar", is);
final TarArchiveEntry entry = (TarArchiveEntry)in.getNextEntry();
final OutputStream out = new FileOutputStream(new File(dir,
entry.getName()));
IOUtils.copy(in, out);
@@ -324,7 +324,7 @@ public final class TarTestCase extends AbstractTestCase {
public void testCOMPRESS178() throws Exception {
final File input = getFile("COMPRESS-178.tar");
final InputStream is = new FileInputStream(input);
- final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("tar", is);
+ final ArchiveInputStream in =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("tar", is);
try {
in.getNextEntry();
fail("Expected IOException");
diff --git
a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
index a324524..e66a30a 100644
--- a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
@@ -69,7 +69,7 @@ public final class ZipTestCase extends AbstractTestCase {
final File file2 = getFile("test2.xml");
try (final OutputStream out = new FileOutputStream(output)) {
- try (ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("zip", out)) {
+ try (ArchiveOutputStream os =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("zip", out)) {
os.putArchiveEntry(new ZipArchiveEntry("testdata/test1.xml"));
try (final FileInputStream input = new FileInputStream(file1))
{
IOUtils.copy(input, os);
@@ -88,7 +88,7 @@ public final class ZipTestCase extends AbstractTestCase {
final List<File> results = new ArrayList<>();
try (final InputStream fileInputStream = new FileInputStream(output)) {
- try (ArchiveInputStream archiveInputStream = new
ArchiveStreamFactory().createArchiveInputStream("zip",
+ try (ArchiveInputStream archiveInputStream =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("zip",
fileInputStream)) {
ZipArchiveEntry entry = null;
while ((entry = (ZipArchiveEntry)
archiveInputStream.getNextEntry()) != null) {
@@ -136,7 +136,7 @@ public final class ZipTestCase extends AbstractTestCase {
}
// Unarchive the same
- try (ArchiveInputStream inputStream = new
ArchiveStreamFactory().createArchiveInputStream("zip",
+ try (ArchiveInputStream inputStream =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("zip",
new ByteArrayInputStream(channel.array()))) {
ZipArchiveEntry entry;
@@ -159,7 +159,7 @@ public final class ZipTestCase extends AbstractTestCase {
public void testZipUnarchive() throws Exception {
final File input = getFile("bla.zip");
try (final InputStream is = new FileInputStream(input);
- final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("zip", is)) {
+ final ArchiveInputStream in =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("zip", is)) {
final ZipArchiveEntry entry = (ZipArchiveEntry) in.getNextEntry();
try (final OutputStream out = new FileOutputStream(new File(dir,
entry.getName()))) {
IOUtils.copy(in, out);
@@ -239,13 +239,13 @@ public final class ZipTestCase extends AbstractTestCase {
final List<ZipException> expectedExceptions = new ArrayList<>();
try (final InputStream fis = new FileInputStream(input);
- ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("zip", fis)) {
+ ArchiveInputStream in =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("zip", fis)) {
ZipArchiveEntry entry = null;
while ((entry = (ZipArchiveEntry) in.getNextEntry()) != null) {
results.add(entry.getName());
- final ArchiveInputStream nestedIn = new
ArchiveStreamFactory().createArchiveInputStream("zip", in);
+ final ArchiveInputStream nestedIn =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("zip", in);
try {
ZipArchiveEntry nestedEntry = null;
while ((nestedEntry = (ZipArchiveEntry)
nestedIn.getNextEntry()) != null) {
@@ -698,7 +698,7 @@ public final class ZipTestCase extends AbstractTestCase {
// stream access
try (final FileInputStream fis = new FileInputStream(input);
- final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("zip", fis)) {
+ final ArchiveInputStream in =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream("zip", fis)) {
for (ArchiveEntry entry; (entry = in.getNextEntry()) != null; ) {
readStream(in, entry, actualStatistics);
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java
b/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java
index 304777c..69f1031 100644
---
a/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java
@@ -176,7 +176,7 @@ public class ExpanderTest extends AbstractTestCase {
try (OutputStream o = Files.newOutputStream(dummy.toPath())) {
o.write(new byte[14]);
}
- try (ArchiveOutputStream aos = new ArchiveStreamFactory()
+ try (ArchiveOutputStream aos = ArchiveStreamFactory.DEFAULT
.createArchiveOutputStream("zip",
Files.newOutputStream(archive.toPath()))) {
aos.putArchiveEntry(aos.createArchiveEntry(dir, "a"));
aos.closeArchiveEntry();
@@ -200,7 +200,7 @@ public class ExpanderTest extends AbstractTestCase {
try (OutputStream o = Files.newOutputStream(dummy.toPath())) {
o.write(new byte[14]);
}
- try (ArchiveOutputStream aos = new ArchiveStreamFactory()
+ try (ArchiveOutputStream aos = ArchiveStreamFactory.DEFAULT
.createArchiveOutputStream("zip",
Files.newOutputStream(archive.toPath()))) {
aos.putArchiveEntry(aos.createArchiveEntry(dummy, entry));
aos.write("Hello, world 1".getBytes(StandardCharsets.UTF_8));
diff --git
a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedArchiverTest.java
b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedArchiverTest.java
index 2267610..5eb457e 100644
---
a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedArchiverTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedArchiverTest.java
@@ -108,7 +108,7 @@ public class ParameterizedArchiverTest extends
AbstractTestCase {
@Test
public void archiveStreamVersion() throws IOException, ArchiveException {
try (OutputStream os = Files.newOutputStream(target.toPath());
- ArchiveOutputStream aos = new
ArchiveStreamFactory().createArchiveOutputStream(format, os)) {
+ ArchiveOutputStream aos =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream(format, os)) {
new Archiver().create(aos, dir);
}
verifyContent();
@@ -117,7 +117,7 @@ public class ParameterizedArchiverTest extends
AbstractTestCase {
private void verifyContent() throws IOException, ArchiveException {
try (InputStream is = Files.newInputStream(target.toPath());
BufferedInputStream bis = new BufferedInputStream(is);
- ArchiveInputStream ais = new
ArchiveStreamFactory().createArchiveInputStream(format, bis)) {
+ ArchiveInputStream ais =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream(format, bis)) {
assertDir("a", ais.getNextEntry());
assertDir("a/b", ais.getNextEntry());
ArchiveEntry n = ais.getNextEntry();
diff --git
a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java
b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java
index 88f2924..305b5de 100644
---
a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java
@@ -73,7 +73,7 @@ public class ParameterizedExpanderTest extends
AbstractTestCase {
try (OutputStream o = Files.newOutputStream(dummy.toPath())) {
o.write(new byte[14]);
}
- try (ArchiveOutputStream aos = new ArchiveStreamFactory()
+ try (ArchiveOutputStream aos = ArchiveStreamFactory.DEFAULT
.createArchiveOutputStream(format,
Files.newOutputStream(archive.toPath()))) {
aos.putArchiveEntry(aos.createArchiveEntry(dir, "a"));
aos.closeArchiveEntry();
@@ -130,7 +130,7 @@ public class ParameterizedExpanderTest extends
AbstractTestCase {
@Test
public void archiveInputStreamVersion() throws IOException,
ArchiveException {
try (InputStream i = new
BufferedInputStream(Files.newInputStream(archive.toPath()));
- ArchiveInputStream ais = new
ArchiveStreamFactory().createArchiveInputStream(format, i)) {
+ ArchiveInputStream ais =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream(format, i)) {
new Expander().expand(ais, resultDir);
}
verifyTargetDir();
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
index 56a665f..9a99691 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
@@ -415,7 +415,7 @@ public class TarArchiveInputStreamTest extends
AbstractTestCase {
// untar these tars
// -----------------------
InputStream is = new FileInputStream(tarF);
- TarArchiveInputStream debInputStream = (TarArchiveInputStream) new
ArchiveStreamFactory()
+ TarArchiveInputStream debInputStream = (TarArchiveInputStream)
ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("tar", is);
TarArchiveEntry outEntry;
while ((outEntry = (TarArchiveEntry)
debInputStream.getNextEntry()) != null) {
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
index 2635b25..f50c6de 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
@@ -57,7 +57,7 @@ public class TarArchiveOutputStreamTest extends
AbstractTestCase {
f.deleteOnExit();
final FileOutputStream fos = new FileOutputStream(f);
- final ArchiveOutputStream tarOut = new ArchiveStreamFactory()
+ final ArchiveOutputStream tarOut = ArchiveStreamFactory.DEFAULT
.createArchiveOutputStream(ArchiveStreamFactory.TAR, fos);
final File file1 = getFile("test1.xml");
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
index 86b625d..6cc64ac 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
@@ -48,7 +48,7 @@ public class TarMemoryFileSystemTest {
final File f = File.createTempFile("commons-compress-memoryfs",
".tar");
try (final OutputStream out = Files.newOutputStream(f.toPath());
- final ArchiveOutputStream tarOut = new
ArchiveStreamFactory().createArchiveOutputStream(ArchiveStreamFactory.TAR,
out)) {
+ final ArchiveOutputStream tarOut =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream(ArchiveStreamFactory.TAR,
out)) {
final TarArchiveEntry entry = new TarArchiveEntry(p);
tarOut.putArchiveEntry(entry);
@@ -65,7 +65,7 @@ public class TarMemoryFileSystemTest {
Path p = fileSystem.getPath("target.tar");
try (final OutputStream out = Files.newOutputStream(p);
- final ArchiveOutputStream tarOut = new
ArchiveStreamFactory().createArchiveOutputStream(ArchiveStreamFactory.TAR,
out)) {
+ final ArchiveOutputStream tarOut =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream(ArchiveStreamFactory.TAR,
out)) {
final String content = "Test";
final TarArchiveEntry entry = new TarArchiveEntry("test.txt");
entry.setSize(content.length());
@@ -102,7 +102,7 @@ public class TarMemoryFileSystemTest {
final Path target = fileSystem.getPath("original-file.tar");
try (final OutputStream out = Files.newOutputStream(target);
- final ArchiveOutputStream tarOut = new
ArchiveStreamFactory().createArchiveOutputStream(ArchiveStreamFactory.TAR,
out)) {
+ final ArchiveOutputStream tarOut =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream(ArchiveStreamFactory.TAR,
out)) {
final TarArchiveEntry entry = new TarArchiveEntry(source);
tarOut.putArchiveEntry(entry);
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
index 65c0ccf..4f10afb 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
@@ -740,7 +740,7 @@ public class ZipArchiveInputStreamTest {
for (int i = 0; i < len; i++) {
input[i] = (byte) bytes[i];
}
- try (ArchiveInputStream ais = new ArchiveStreamFactory()
+ try (ArchiveInputStream ais = ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("zip", new
ByteArrayInputStream(input))) {
ais.getNextEntry();
IOUtils.toByteArray(ais);
diff --git
a/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java
b/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java
index d346185..c622548 100644
--- a/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java
@@ -71,7 +71,7 @@ public final class Pack200TestCase extends AbstractTestCase {
? new Pack200CompressorInputStream(input, mode)
: new Pack200CompressorInputStream(new FileInputStream(input),
mode)) {
- final ArchiveInputStream in = new ArchiveStreamFactory()
+ final ArchiveInputStream in = ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("jar", is);
ArchiveEntry entry = in.getNextEntry();
@@ -111,7 +111,7 @@ public final class Pack200TestCase extends AbstractTestCase
{
try (OutputStream out = new Pack200CompressorOutputStream(new
FileOutputStream(output),
mode)) {
- final ArchiveOutputStream os = new ArchiveStreamFactory()
+ final ArchiveOutputStream os = ArchiveStreamFactory.DEFAULT
.createArchiveOutputStream("jar", out);
os.putArchiveEntry(new ZipArchiveEntry("testdata/test1.xml"));
@@ -126,7 +126,7 @@ public final class Pack200TestCase extends AbstractTestCase
{
}
try (InputStream is = new Pack200CompressorInputStream(output)) {
- final ArchiveInputStream in = new ArchiveStreamFactory()
+ final ArchiveInputStream in = ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("jar", is);
final List<String> files = new ArrayList<>();
files.add("testdata/test1.xml");
diff --git
a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java
index 8dde0ed..f9ae9cc 100644
---
a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java
@@ -151,7 +151,7 @@ public class BZip2CompressorInputStreamTest {
for (int i = 0; i < len; i++) {
input[i] = (byte) bytes[i];
}
- try (ArchiveInputStream ais = new ArchiveStreamFactory()
+ try (ArchiveInputStream ais = ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("zip", new
ByteArrayInputStream(input))) {
ais.getNextEntry();
IOUtils.toByteArray(ais);
diff --git
a/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStreamTest.java
index 6dfc694..5676738 100644
---
a/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStreamTest.java
@@ -284,7 +284,7 @@ public class Deflate64CompressorInputStreamTest {
for (int i = 0; i < len; i++) {
input[i] = (byte) bytes[i];
}
- try (ArchiveInputStream ais = new ArchiveStreamFactory()
+ try (ArchiveInputStream ais = ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("zip", new
ByteArrayInputStream(input))) {
ais.getNextEntry();
IOUtils.toByteArray(ais);
diff --git
a/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java
b/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java
index 3874f75..0b2eebe 100644
---
a/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java
@@ -41,7 +41,7 @@ public final class Pack200UtilsTest extends AbstractTestCase {
Pack200Utils.normalize(input, output[1],
new HashMap<String, String>());
try (FileInputStream is = new FileInputStream(output[1])) {
- final ArchiveInputStream in = new ArchiveStreamFactory()
+ final ArchiveInputStream in = ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("jar", is);
ArchiveEntry entry = in.getNextEntry();
@@ -87,7 +87,7 @@ public final class Pack200UtilsTest extends AbstractTestCase {
Pack200Utils.normalize(output[1]);
is = new FileInputStream(output[1]);
try {
- final ArchiveInputStream in = new ArchiveStreamFactory()
+ final ArchiveInputStream in = ArchiveStreamFactory.DEFAULT
.createArchiveInputStream("jar", is);
ArchiveEntry entry = in.getNextEntry();
