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
commit 728b128c588ce046514677382ea8c1bbef96fc31
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jul 5 09:07:59 2024 -0400
Generics
---
.../apache/commons/compress/compressors/CompressorStreamFactory.java | 2 +-
src/test/java/org/apache/commons/compress/compressors/BZip2Test.java | 2 +-
.../compress/compressors/CompressorStreamFactoryRoundtripTest.java | 2 +-
.../java/org/apache/commons/compress/compressors/DeflateTest.java | 2 +-
.../org/apache/commons/compress/compressors/FramedSnappyTest.java | 4 ++--
src/test/java/org/apache/commons/compress/compressors/GZipTest.java | 2 +-
src/test/java/org/apache/commons/compress/compressors/LZMATest.java | 2 +-
src/test/java/org/apache/commons/compress/compressors/XZTest.java | 2 +-
.../commons/compress/compressors/zstandard/ZstdRoundtripTest.java | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
index 8453b6704..376253cf2 100644
---
a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
+++
b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
@@ -626,7 +626,7 @@ public class CompressorStreamFactory implements
CompressorStreamProvider {
* @throws IllegalArgumentException if the archiver name or stream is null
*/
@Override
- public CompressorOutputStream createCompressorOutputStream(final String
name, final OutputStream out) throws CompressorException {
+ public CompressorOutputStream<?> createCompressorOutputStream(final String
name, final OutputStream out) throws CompressorException {
if (name == null || out == null) {
throw new IllegalArgumentException("Compressor name and stream
must not be null.");
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java
b/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java
index fa94dec2b..67dc2a475 100644
--- a/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java
+++ b/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java
@@ -48,7 +48,7 @@ public final class BZip2Test extends AbstractTest {
{
output = newTempFile("test.txt.bz2");
try (OutputStream out = Files.newOutputStream(output.toPath());
- CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("bzip2", out)) {
+ CompressorOutputStream<?> cos = new
CompressorStreamFactory().createCompressorOutputStream("bzip2", out)) {
Files.copy(input.toPath(), cos);
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/CompressorStreamFactoryRoundtripTest.java
b/src/test/java/org/apache/commons/compress/compressors/CompressorStreamFactoryRoundtripTest.java
index ac6bd572e..c8cfe6fc2 100644
---
a/src/test/java/org/apache/commons/compress/compressors/CompressorStreamFactoryRoundtripTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/CompressorStreamFactoryRoundtripTest.java
@@ -54,7 +54,7 @@ public class CompressorStreamFactoryRoundtripTest {
final CompressorStreamProvider factory = new CompressorStreamFactory();
final ByteArrayOutputStream compressedOs = new ByteArrayOutputStream();
final String fixture = "The quick brown fox jumps over the lazy dog";
- try (CompressorOutputStream compressorOutputStream =
factory.createCompressorOutputStream(compressorName, compressedOs)) {
+ try (CompressorOutputStream<?> compressorOutputStream =
factory.createCompressorOutputStream(compressorName, compressedOs)) {
compressorOutputStream.write(fixture.getBytes(StandardCharsets.UTF_8.name()));
compressorOutputStream.flush();
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java
b/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java
index fe771d89f..0eb1c727d 100644
--- a/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java
@@ -41,7 +41,7 @@ public final class DeflateTest extends AbstractTest {
final File input = getFile("test1.xml");
final File output = newTempFile("test1.xml.deflatez");
try (OutputStream out = Files.newOutputStream(output.toPath())) {
- try (CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("deflate", out)) {
+ try (CompressorOutputStream<?> cos = new
CompressorStreamFactory().createCompressorOutputStream("deflate", out)) {
Files.copy(input.toPath(), cos);
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java
b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java
index edb896a6e..a2dbc90e9 100644
---
a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java
@@ -60,7 +60,7 @@ public final class FramedSnappyTest extends AbstractTest {
private void testRoundtrip(final File input) throws Exception {
final File outputSz = newTempFile(input.getName() + ".sz");
try (OutputStream os = Files.newOutputStream(outputSz.toPath());
- CompressorOutputStream sos = new
CompressorStreamFactory().createCompressorOutputStream("snappy-framed", os)) {
+ CompressorOutputStream<?> sos = new
CompressorStreamFactory().createCompressorOutputStream("snappy-framed", os)) {
Files.copy(input.toPath(), sos);
}
try (InputStream is = Files.newInputStream(input.toPath());
@@ -84,7 +84,7 @@ public final class FramedSnappyTest extends AbstractTest {
final File outputSz = newTempFile(input.getName() + ".sz");
try (InputStream is = Files.newInputStream(input.toPath());
OutputStream os = Files.newOutputStream(outputSz.toPath());
- CompressorOutputStream sos = new
CompressorStreamFactory().createCompressorOutputStream("snappy-framed", os)) {
+ CompressorOutputStream<?> sos = new
CompressorStreamFactory().createCompressorOutputStream("snappy-framed", os)) {
final byte[] b = IOUtils.toByteArray(is);
sos.write(b[0]);
sos.write(b, 1, b.length - 1); // must be split into multiple
compressed chunks
diff --git
a/src/test/java/org/apache/commons/compress/compressors/GZipTest.java
b/src/test/java/org/apache/commons/compress/compressors/GZipTest.java
index 075298aa5..7212b5635 100644
--- a/src/test/java/org/apache/commons/compress/compressors/GZipTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/GZipTest.java
@@ -187,7 +187,7 @@ public final class GZipTest extends AbstractTest {
final File input = getFile("test1.xml");
final File output = newTempFile("test1.xml.gz");
try (OutputStream out = Files.newOutputStream(output.toPath())) {
- try (CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("gz", out)) {
+ try (CompressorOutputStream<?> cos = new
CompressorStreamFactory().createCompressorOutputStream("gz", out)) {
Files.copy(input.toPath(), cos);
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/LZMATest.java
b/src/test/java/org/apache/commons/compress/compressors/LZMATest.java
index e6b158d28..281e7dc16 100644
--- a/src/test/java/org/apache/commons/compress/compressors/LZMATest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/LZMATest.java
@@ -41,7 +41,7 @@ public final class LZMATest extends AbstractTest {
final Path input = getPath("test1.xml");
final File compressed = newTempFile("test1.xml.xz");
try (OutputStream out = Files.newOutputStream(compressed.toPath())) {
- try (CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("lzma", out)) {
+ try (CompressorOutputStream<?> cos = new
CompressorStreamFactory().createCompressorOutputStream("lzma", out)) {
Files.copy(input, cos);
}
}
diff --git a/src/test/java/org/apache/commons/compress/compressors/XZTest.java
b/src/test/java/org/apache/commons/compress/compressors/XZTest.java
index 2eba626bf..af9033956 100644
--- a/src/test/java/org/apache/commons/compress/compressors/XZTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/XZTest.java
@@ -63,7 +63,7 @@ public final class XZTest extends AbstractTest {
final File input = getFile("test1.xml");
final File output = newTempFile("test1.xml.xz");
try (OutputStream out = Files.newOutputStream(output.toPath())) {
- try (CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("xz", out)) {
+ try (CompressorOutputStream<?> cos = new
CompressorStreamFactory().createCompressorOutputStream("xz", out)) {
Files.copy(input.toPath(), cos);
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdRoundtripTest.java
b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdRoundtripTest.java
index 06d0a22ba..59bc6be6f 100644
---
a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdRoundtripTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdRoundtripTest.java
@@ -64,7 +64,7 @@ public class ZstdRoundtripTest extends AbstractTest {
final Path input = getPath("bla.tar");
final File output = newTempFile(input.getFileName() + ".zstd");
try (OutputStream os = Files.newOutputStream(output.toPath());
- CompressorOutputStream zos = new
CompressorStreamFactory().createCompressorOutputStream("zstd", os)) {
+ CompressorOutputStream<?> zos = new
CompressorStreamFactory().createCompressorOutputStream("zstd", os)) {
Files.copy(input, zos);
}
try (InputStream inputStream = Files.newInputStream(output.toPath());
