move PasswordRequiredException
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/trunk@1654501 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
index 66d9d96..ba8e9a6 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
@@ -27,6 +27,7 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
+import org.apache.commons.compress.exceptions.PasswordRequiredException;
class AES256SHA256Decoder extends CoderBase {
@Override
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/PasswordRequiredException.java b/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java
similarity index 73%
rename from src/main/java/org/apache/commons/compress/archivers/sevenz/PasswordRequiredException.java
rename to src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java
index 6d6a005..8198b0b 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/PasswordRequiredException.java
+++ b/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java
@@ -15,12 +15,12 @@
* limitations under the License.
*
*/
-package org.apache.commons.compress.archivers.sevenz;
+package org.apache.commons.compress.exceptions;
import java.io.IOException;
/**
- * Exception thrown when trying to read an encrypted entry without
+ * Exception thrown when trying to read an encrypted entry or file without
* configuring a password.
* @since 1.10
*/
@@ -29,9 +29,10 @@
/**
* Create a new exception.
*
- * @param archiveName name of the archive containing encrypted streams.
+ * @param name name of the archive containing encrypted streams or
+ * the encrypted file.
*/
- public PasswordRequiredException(String archiveName) {
- super("Cannot read encrypted archive " + archiveName + " without a password.");
+ public PasswordRequiredException(String name) {
+ super("Cannot read encrypted content from " + name + " without a password.");
}
}
diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
index dd50de8..5af1d86 100644
--- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
@@ -23,6 +23,7 @@
import java.util.Arrays;
import javax.crypto.Cipher;
import org.apache.commons.compress.AbstractTestCase;
+import org.apache.commons.compress.exceptions.PasswordRequiredException;
public class SevenZFileTest extends AbstractTestCase {
private static final String TEST2_CONTENT = "<?xml version = '1.0'?>\r\n<!DOCTYPE"
@@ -71,7 +72,7 @@
} catch (PasswordRequiredException ex) {
String msg = ex.getMessage();
assertTrue("Should start with whining about being unable to decrypt",
- msg.startsWith("Cannot read encrypted archive "));
+ msg.startsWith("Cannot read encrypted content from "));
assertTrue("Should finish the sentence properly",
msg.endsWith(" without a password."));
assertTrue("Should contain archive's name",