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 6afdc3f6e Extend IOException (#605)
6afdc3f6e is described below
commit 6afdc3f6eb5f6c1417086e77ef3cbfeab2831e04
Author: Gary Gregory <garydgreg...@users.noreply.github.com>
AuthorDate: Sat Nov 16 08:58:18 2024 -0500
Extend IOException (#605)
* CompressorException now extends IOException instead of Exception
ArchiveException now extends IOException instead of Exception
* Update ArchiveStreamFactoryTest.java
---
.../java/org/apache/commons/compress/archivers/ArchiveException.java | 4 +++-
.../org/apache/commons/compress/archivers/ArchiveStreamFactory.java | 2 +-
.../org/apache/commons/compress/compressors/CompressorException.java | 4 +++-
.../apache/commons/compress/compressors/CompressorStreamFactory.java | 4 ++--
.../apache/commons/compress/archivers/ArchiveStreamFactoryTest.java | 2 +-
.../org/apache/commons/compress/compressors/DetectCompressorTest.java | 2 +-
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
b/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
index 5be299dc4..bafbac924 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
@@ -18,10 +18,12 @@
*/
package org.apache.commons.compress.archivers;
+import java.io.IOException;
+
/**
* Signals that an Archive exception of some sort has occurred.
*/
-public class ArchiveException extends Exception {
+public class ArchiveException extends IOException {
/** Serial. */
private static final long serialVersionUID = 2772690708123267100L;
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 1ee518a9c..12745a8df 100644
---
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
+++
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
@@ -224,7 +224,7 @@ public class ArchiveStreamFactory implements
ArchiveStreamProvider {
signatureLength = IOUtils.readFully(in, signature);
in.reset();
} catch (final IOException e) {
- throw new ArchiveException("IOException while reading signature.",
e);
+ throw new ArchiveException("Failure reading signature.", e);
}
// For now JAR files are detected as ZIP files.
diff --git
a/src/main/java/org/apache/commons/compress/compressors/CompressorException.java
b/src/main/java/org/apache/commons/compress/compressors/CompressorException.java
index 7b79107a1..eb41bbfc3 100644
---
a/src/main/java/org/apache/commons/compress/compressors/CompressorException.java
+++
b/src/main/java/org/apache/commons/compress/compressors/CompressorException.java
@@ -18,10 +18,12 @@
*/
package org.apache.commons.compress.compressors;
+import java.io.IOException;
+
/**
* Signals that an Compressor exception of some sort has occurred.
*/
-public class CompressorException extends Exception {
+public class CompressorException extends IOException {
/** Serial. */
private static final long serialVersionUID = -2932901310255908814L;
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 8d94b63de..b5b84e737 100644
---
a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
+++
b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
@@ -240,7 +240,7 @@ public class CompressorStreamFactory implements
CompressorStreamProvider {
signatureLength = IOUtils.readFully(inputStream, signature);
inputStream.reset();
} catch (final IOException e) {
- throw new CompressorException("IOException while reading
signature.", e);
+ throw new CompressorException("Failed to read signature.", e);
}
if (compressorNames.contains(BZIP2) &&
BZip2CompressorInputStream.matches(signature, signatureLength)) {
return BZIP2;
@@ -632,7 +632,7 @@ public class CompressorStreamFactory implements
CompressorStreamProvider {
return new ZstdCompressorOutputStream(out);
}
} catch (final IOException e) {
- throw new CompressorException("Could not create
CompressorOutputStream", e);
+ throw new CompressorException("Could not create
CompressorOutputStream.", e);
}
final CompressorStreamProvider compressorStreamProvider =
getCompressorOutputStreamProviders().get(toKey(name));
if (compressorStreamProvider != null) {
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 70d353706..5622851f6 100644
---
a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
@@ -281,7 +281,7 @@ public class ArchiveStreamFactoryTest extends AbstractTest {
final ArchiveException e3 = assertThrows(ArchiveException.class, () ->
ArchiveStreamFactory.detect(new BufferedInputStream(new BrokenInputStream())),
"Expected ArchiveException");
- assertEquals("IOException while reading signature.", e3.getMessage());
+ assertEquals("Failure reading signature.", e3.getMessage());
}
/**
diff --git
a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java
b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java
index bfc04f82f..7f8f50bcf 100644
---
a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java
@@ -269,7 +269,7 @@ public final class DetectCompressorTest {
final CompressorException ce = assertThrows(CompressorException.class,
() -> CompressorStreamFactory.detect(new
BufferedInputStream(new BrokenInputStream())), "Expected IOException");
- assertEquals("IOException while reading signature.", ce.getMessage());
+ assertEquals("Failed to read signature.", ce.getMessage());
}
@ParameterizedTest
