Bump org.apache.pdfbox.pdfbox from 2.0.27 to 3.0.0

codeborne · Nov 6, 2023 · 65260cc · 65260cc
1 parent da7aee4
commit 65260cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,5 +1,5 @@
 dependencies {
-  implementation group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.27', transitive: true
+  implementation group: 'org.apache.pdfbox', name: 'pdfbox', version: '3.0.0', transitive: true
   implementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2', transitive: false
   implementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1', transitive: false
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'

diff --git a/src/main/java/com/codeborne/pdftest/PDF.java b/src/main/java/com/codeborne/pdftest/PDF.java
@@ -6,6 +6,9 @@
 import com.codeborne.pdftest.matchers.DoesNotContainExactText;
 import com.codeborne.pdftest.matchers.DoesNotContainText;
 import com.codeborne.pdftest.matchers.MatchesText;
+import org.apache.pdfbox.io.RandomAccessRead;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
+import org.apache.pdfbox.pdfparser.PDFParser;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
 import org.apache.pdfbox.text.PDFTextStripper;
@@ -22,7 +25,6 @@
 
 public class PDF {
   public final byte[] content;
-
   public final String text;
   public final int numberOfPages;
   public final String author;
@@ -44,8 +46,8 @@ private PDF(String name, byte[] content) {
   private PDF(String name, byte[] content, int startPage, int endPage) {
     this.content = content;
 
-    try (InputStream inputStream = new ByteArrayInputStream(content)) {
-      try (PDDocument pdf = PDDocument.load(inputStream)) {
+    try (RandomAccessRead buffer = new RandomAccessReadBuffer(content)) {
+      try (PDDocument pdf = new PDFParser(buffer).parse()) {
         PDFTextStripper pdfTextStripper = new PDFTextStripper();
         pdfTextStripper.setStartPage(startPage);
         pdfTextStripper.setEndPage(endPage);
@@ -74,15 +76,15 @@ private PDF(String name, byte[] content, int startPage, int endPage) {
   public PDF(File pdfFile) throws IOException {
     this(pdfFile.getAbsolutePath(), readAllBytes(Paths.get(pdfFile.getAbsolutePath())));
   }
-  
+
   public PDF(URL url) throws IOException {
     this(url.toString(), readBytes(url));
   }
 
   public PDF(URI uri) throws IOException {
     this(uri.toURL());
   }
-  
+
   public PDF(byte[] content) {
     this("", content);
   }
@@ -151,5 +153,4 @@ public static Matcher<PDF> matchesText(String regex) {
   public static Matcher<PDF> matchesText(Pattern regex) {
     return new MatchesText(regex);
   }
-
 }