Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java?rev=1576203&r1=1576202&r2=1576203&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java Tue Mar 11 07:17:34 2014 @@ -21,14 +21,15 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.security.KeyStore; +import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.pdfbox.exceptions.COSVisitorException; import org.apache.pdfbox.exceptions.CryptographyException; +import org.apache.pdfbox.exceptions.SignatureException; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.encryption.AccessPermission; import org.apache.pdfbox.pdmodel.encryption.PublicKeyDecryptionMaterial; @@ -241,22 +242,12 @@ public class TestPublicKeyEncryption ext * @return reloaded document * @throws Exception if */ - private PDDocument reload(PDDocument doc) + private PDDocument reload(PDDocument doc) + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { - try - { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - doc.save(buffer); - return PDDocument.load(new ByteArrayInputStream(buffer.toByteArray())); - } - catch (IOException e) - { - throw new IllegalStateException("Unexpected failure"); - } - catch (COSVisitorException e) - { - throw new IllegalStateException("Unexpected failure"); - } + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + doc.save(buffer); + return PDDocument.load(new ByteArrayInputStream(buffer.toByteArray())); } /**
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java?rev=1576203&r1=1576202&r2=1576203&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java Tue Mar 11 07:17:34 2014 @@ -22,9 +22,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import org.apache.pdfbox.exceptions.COSVisitorException; +import org.apache.pdfbox.exceptions.CryptographyException; +import org.apache.pdfbox.exceptions.SignatureException; import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.io.RandomAccessBuffer; @@ -47,10 +49,9 @@ public class TestPDDocument extends Test /** * Test document save/load using a stream. - * @throws IOException if something went wrong - * @throws COSVisitorException if something went wrong */ - public void testSaveLoadStream() throws IOException, COSVisitorException + public void testSaveLoadStream() + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { // Create PDF with one blank page PDDocument document = new PDDocument(); @@ -75,10 +76,9 @@ public class TestPDDocument extends Test /** * Test document save/load using a file. - * @throws IOException if something went wrong - * @throws COSVisitorException if something went wrong */ - public void testSaveLoadFile() throws IOException, COSVisitorException + public void testSaveLoadFile() + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { // Create PDF with one blank page PDDocument document = new PDDocument(); @@ -106,10 +106,9 @@ public class TestPDDocument extends Test /** * Test document save/loadNonSeq using a stream. - * @throws IOException if something went wrong - * @throws COSVisitorException if something went wrong */ -public void testSaveLoadNonSeqStream() throws IOException, COSVisitorException + public void testSaveLoadNonSeqStream() + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { // Create PDF with one blank page PDDocument document = new PDDocument(); @@ -134,10 +133,9 @@ public void testSaveLoadNonSeqStream() t /** * Test document save/loadNonSeq using a file. - * @throws IOException if something went wrong - * @throws COSVisitorException if something went wrong */ - public void testSaveLoadNonSeqFile() throws IOException, COSVisitorException + public void testSaveLoadNonSeqFile() + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { // Create PDF with one blank page PDDocument document = new PDDocument(); Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java?rev=1576203&r1=1576202&r2=1576203&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java Tue Mar 11 07:17:34 2014 @@ -19,7 +19,6 @@ package org.apache.pdfbox.pdmodel.edit; import junit.framework.TestCase; import org.apache.pdfbox.cos.COSFloat; import org.apache.pdfbox.cos.COSStream; -import org.apache.pdfbox.exceptions.COSVisitorException; import org.apache.pdfbox.pdfparser.PDFStreamParser; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -30,9 +29,10 @@ import java.io.IOException; /** * @author Yegor Kozlov */ -public class TestPDPageContentStream extends TestCase { - - public void testSetCmykColors() throws IOException, COSVisitorException { +public class TestPDPageContentStream extends TestCase +{ + public void testSetCmykColors() throws IOException + { PDDocument doc = new PDDocument(); PDPage page = new PDPage(); Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java?rev=1576203&r1=1576202&r2=1576203&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java Tue Mar 11 07:17:34 2014 @@ -20,11 +20,13 @@ import java.awt.Color; import java.awt.geom.AffineTransform; import java.io.File; import java.io.IOException; +import java.security.NoSuchAlgorithmException; import junit.framework.TestCase; import org.apache.pdfbox.cos.COSName; -import org.apache.pdfbox.exceptions.COSVisitorException; +import org.apache.pdfbox.exceptions.CryptographyException; +import org.apache.pdfbox.exceptions.SignatureException; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentCatalog; import org.apache.pdfbox.pdmodel.PDPage; @@ -117,7 +119,8 @@ public class TestLayerUtility extends Te } } - private File createMainPDF() throws IOException, COSVisitorException + private File createMainPDF() + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { File targetFile = new File(testResultsDir, "text-doc.pdf"); PDDocument doc = new PDDocument(); @@ -172,7 +175,8 @@ public class TestLayerUtility extends Te return targetFile; } - private File createOverlay1() throws IOException, COSVisitorException + private File createOverlay1() + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { File targetFile = new File(testResultsDir, "overlay1.pdf"); PDDocument doc = new PDDocument(); Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java?rev=1576203&r1=1576202&r2=1576203&view=diff ============================================================================== --- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java (original) +++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java Tue Mar 11 07:17:34 2014 @@ -20,6 +20,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -34,7 +35,8 @@ import org.apache.pdfbox.cos.COSInteger; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.cos.COSObject; import org.apache.pdfbox.cos.COSStream; -import org.apache.pdfbox.exceptions.COSVisitorException; +import org.apache.pdfbox.exceptions.CryptographyException; +import org.apache.pdfbox.exceptions.SignatureException; import org.apache.pdfbox.io.RandomAccessBuffer; import org.apache.pdfbox.pdfparser.BaseParser; import org.apache.pdfbox.pdmodel.PDDocument; @@ -210,10 +212,9 @@ public class OverlayPDF * This will add overlays to a documents. * * @param specificPageOverlayFile map of overlay files for specific pages - * @throws IOException exception - * @throws COSVisitorException exception */ - public void overlay(Map<Integer, String> specificPageOverlayFile) throws IOException, COSVisitorException + public void overlay(Map<Integer, String> specificPageOverlayFile) + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { PDDocument sourcePDFDocument = null; PDDocument defaultOverlay = null; Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java?rev=1576203&r1=1576202&r2=1576203&view=diff ============================================================================== --- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java (original) +++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java Tue Mar 11 07:17:34 2014 @@ -20,11 +20,13 @@ import java.io.File; import java.io.IOException; import java.io.FileOutputStream; +import java.security.NoSuchAlgorithmException; import java.util.List; +import org.apache.pdfbox.exceptions.CryptographyException; import org.apache.pdfbox.exceptions.InvalidPasswordException; -import org.apache.pdfbox.exceptions.COSVisitorException; +import org.apache.pdfbox.exceptions.SignatureException; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdfwriter.COSWriter; @@ -219,7 +221,8 @@ public class PDFSplit } } - private static final void writeDocument( PDDocument doc, String fileName ) throws IOException, COSVisitorException + private static final void writeDocument( PDDocument doc, String fileName ) + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { FileOutputStream output = null; COSWriter writer = null; Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java?rev=1576203&r1=1576202&r2=1576203&view=diff ============================================================================== --- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java (original) +++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java Tue Mar 11 07:17:34 2014 @@ -19,15 +19,17 @@ package org.apache.pdfbox.tools; import java.io.File; import java.io.IOException; +import java.security.NoSuchAlgorithmException; import java.util.Iterator; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSObject; import org.apache.pdfbox.cos.COSStream; +import org.apache.pdfbox.exceptions.CryptographyException; +import org.apache.pdfbox.exceptions.SignatureException; import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.exceptions.COSVisitorException; import org.apache.pdfbox.exceptions.InvalidPasswordException; /** @@ -56,12 +58,15 @@ public class WriteDecodedDoc * @param in The filename used for input. * @param out The filename used for output. * - * @throws IOException If there is an error parsing the document. - * @throws COSVisitorException If there is an error while copying the document. + * @throws IOException if the output could not be written + * @throws CryptographyException if something went wrong during a cryptography operation + * @throws SignatureException if signing failed + * @throws NoSuchAlgorithmException if the cryptographic algorithm is not available * - * @deprecated use {@link WriteDecodedDoc#doIt(String, String, String)} instead. + * @deprecated use {@link WriteDecodedDoc#doIt(String, String, String, boolean)} instead. */ - public void doIt(String in, String out) throws IOException, COSVisitorException + public void doIt(String in, String out) + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { doIt(in, out, "", false); } @@ -74,11 +79,13 @@ public class WriteDecodedDoc * @param password The password to open the document. * @param useNonSeqParser use the non sequential parser * - * @throws IOException If there is an error parsing the document. - * @throws COSVisitorException If there is an error while copying the document. + * @throws IOException if the output could not be written + * @throws CryptographyException if something went wrong during a cryptography operation + * @throws SignatureException if signing failed + * @throws NoSuchAlgorithmException if the cryptographic algorithm is not available */ - public void doIt(String in, String out, String password, boolean useNonSeqParser) - throws IOException, COSVisitorException + public void doIt(String in, String out, String password, boolean useNonSeqParser) + throws IOException, CryptographyException, SignatureException, NoSuchAlgorithmException { PDDocument doc = null; try
