You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2022/08/02 05:34:11 UTC
svn commit: r1903184 - in /pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form: PDAcroFormFromAnnotsTest.java PDAcroFormGenerateAppearancesTest.java PDAcroFormTest.java PDFieldTreeTest.java TestRadioButtons.java
Author: lehmi
Date: Tue Aug 2 05:34:11 2022
New Revision: 1903184
URL: http://svn.apache.org/viewvc?rev=1903184&view=rev
Log:
PDFBOX-5483: replace InputStream with RandomAccessRead
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormGenerateAppearancesTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java?rev=1903184&r1=1903183&r2=1903184&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java Tue Aug 2 05:34:11 2022
@@ -29,6 +29,7 @@ import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.PDResources;
@@ -60,14 +61,15 @@ class PDAcroFormFromAnnotsTest
int numFormFieldsByAcrobat = 0;
- try (PDDocument testPdf = Loader.loadPDF(new URL(acrobatSourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(RandomAccessReadBuffer
+ .createBufferFromStream(new URL(acrobatSourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
PDAcroForm acroForm = catalog.getAcroForm(null);
numFormFieldsByAcrobat = acroForm.getFields().size();
}
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
// need to do a low level cos access as the PDModel access will build the AcroForm
@@ -95,14 +97,16 @@ class PDAcroFormFromAnnotsTest
int numFormFieldsByAcrobat = 0;
- try (PDDocument testPdf = Loader.loadPDF(new URL(acrobatSourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(RandomAccessReadBuffer
+ .createBufferFromStream(new URL(acrobatSourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
PDAcroForm acroForm = catalog.getAcroForm(null);
numFormFieldsByAcrobat = acroForm.getFields().size();
}
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
// need to do a low level cos access as the PDModel access will build the AcroForm
@@ -129,7 +133,8 @@ class PDAcroFormFromAnnotsTest
int numCosFormFields = 0;
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
// need to do a low level cos access as the PDModel access will build the AcroForm
@@ -155,7 +160,8 @@ class PDAcroFormFromAnnotsTest
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12881055/merge-test.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
// need to do a low level cos access as the PDModel access will build the AcroForm
@@ -186,7 +192,8 @@ class PDAcroFormFromAnnotsTest
// will build the expected fields using the acrobat source document
Map<String, PDField> fieldsByName = new HashMap<>();
- try (PDDocument testPdf = Loader.loadPDF(new URL(acrobatSourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(RandomAccessReadBuffer
+ .createBufferFromStream(new URL(acrobatSourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
PDAcroForm acroForm = catalog.getAcroForm(null);
@@ -197,7 +204,8 @@ class PDAcroFormFromAnnotsTest
}
}
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
// need to do a low level cos access as the PDModel access will build the AcroForm
@@ -236,7 +244,8 @@ class PDAcroFormFromAnnotsTest
// will build the expected font respurce names and font decriptor names using the acrobat source document
Map<String, String> fontNames = new HashMap<>();
- try (PDDocument testPdf = Loader.loadPDF(new URL(acrobatSourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(RandomAccessReadBuffer
+ .createBufferFromStream(new URL(acrobatSourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
PDAcroForm acroForm = catalog.getAcroForm(null);
@@ -258,7 +267,8 @@ class PDAcroFormFromAnnotsTest
}
}
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
PDAcroForm acroForm = catalog.getAcroForm(new CreateFieldsFixup(testPdf));
@@ -291,7 +301,8 @@ class PDAcroFormFromAnnotsTest
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/13016993/poppler-14433-0.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
assertDoesNotThrow(() -> catalog.getAcroForm(new CreateFieldsFixup(testPdf)), "Getting the AcroForm shall not throw an exception");
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormGenerateAppearancesTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormGenerateAppearancesTest.java?rev=1903184&r1=1903183&r2=1903184&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormGenerateAppearancesTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormGenerateAppearancesTest.java Tue Aug 2 05:34:11 2022
@@ -20,10 +20,10 @@ package org.apache.pdfbox.pdmodel.intera
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.junit.jupiter.api.parallel.Execution;
@@ -48,8 +48,8 @@ class PDAcroFormGenerateAppearancesTest
})
void testGetAcroForm(String sourceUrl) throws IOException
{
- try (InputStream is = new URL(sourceUrl).openStream();
- PDDocument testPdf = Loader.loadPDF(is))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java?rev=1903184&r1=1903183&r2=1903184&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java Tue Aug 2 05:34:11 2022
@@ -32,6 +32,7 @@ import java.util.List;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -357,7 +358,8 @@ class PDAcroFormTest
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12866226/D1790B.PDF";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = testPdf.getDocumentCatalog();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeTest.java?rev=1903184&r1=1903183&r2=1903184&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeTest.java Tue Aug 2 05:34:11 2022
@@ -17,10 +17,10 @@
package org.apache.pdfbox.pdmodel.interactive.form;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
@@ -44,8 +44,8 @@ class PDFieldTreeTest
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/13016994/PDFBOX-4131-0.pdf";
- try (InputStream is = new URL(sourceUrl).openStream();
- PDDocument doc = Loader.loadPDF(is))
+ try (PDDocument doc = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDDocumentCatalog catalog = doc.getDocumentCatalog();
PDAcroForm acroForm = catalog.getAcroForm();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java?rev=1903184&r1=1903183&r2=1903184&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java Tue Aug 2 05:34:11 2022
@@ -32,6 +32,7 @@ import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
@@ -140,7 +141,8 @@ class TestRadioButtons
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDAcroForm acroForm = testPdf.getDocumentCatalog().getAcroForm();
PDRadioButton field = (PDRadioButton) acroForm.getField("Checking/Savings");
@@ -162,7 +164,8 @@ class TestRadioButtons
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDAcroForm acroForm = testPdf.getDocumentCatalog().getAcroForm();
PDRadioButton field = (PDRadioButton) acroForm.getField("Checking/Savings");
@@ -187,7 +190,8 @@ class TestRadioButtons
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDAcroForm acroForm = testPdf.getDocumentCatalog().getAcroForm();
PDRadioButton field = (PDRadioButton) acroForm.getField("Checking/Savings");
@@ -225,7 +229,8 @@ class TestRadioButtons
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDAcroForm acroForm = testPdf.getDocumentCatalog().getAcroForm();
PDRadioButton field = (PDRadioButton) acroForm.getField("Checking/Savings");
@@ -254,7 +259,8 @@ class TestRadioButtons
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDAcroForm acroForm = testPdf.getDocumentCatalog().getAcroForm();
PDRadioButton field = (PDRadioButton) acroForm.getField("Checking/Savings");
@@ -289,7 +295,8 @@ class TestRadioButtons
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDAcroForm acroForm = testPdf.getDocumentCatalog().getAcroForm();
PDRadioButton field = (PDRadioButton) acroForm.getField("Checking/Savings");
@@ -308,7 +315,8 @@ class TestRadioButtons
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDAcroForm acroForm = testPdf.getDocumentCatalog().getAcroForm();
PDRadioButton field = (PDRadioButton) acroForm.getField("Checking/Savings");
@@ -328,7 +336,8 @@ class TestRadioButtons
{
String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf";
- try (PDDocument testPdf = Loader.loadPDF(new URL(sourceUrl).openStream()))
+ try (PDDocument testPdf = Loader.loadPDF(
+ RandomAccessReadBuffer.createBufferFromStream(new URL(sourceUrl).openStream())))
{
PDAcroForm acroForm = testPdf.getDocumentCatalog().getAcroForm();
PDRadioButton field = (PDRadioButton) acroForm.getField("Checking/Savings");