fix breaking changes in org.apache.pdfbox:pdfbox

Author: jxfzzzt

src/main/java/com/mindee/input/InputSourceUtils.java

@@ -1,11 +1,14 @@
 package com.mindee.input;
 
 import com.mindee.MindeeException;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URL;
 import javax.imageio.ImageIO;
+
 import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 
@@ -71,7 +74,7 @@ public static String[] splitNameStrict(String filename) throws MindeeException {
    * Returns true if the file is a PDF.
    */
   public static boolean isPdf(byte[] fileBytes) {
-    try (PDDocument document = Loader.loadPDF(new ByteArrayInputStream(fileBytes))) {
+    try (PDDocument document = Loader.loadPDF(new RandomAccessReadBuffer(new ByteArrayInputStream(fileBytes)))) {
       return true;
     } catch (IOException e) {
       return false;
@@ -96,7 +99,7 @@ public static void validateUrl(URL inputUrl) {
    */
   public static boolean hasSourceText(byte[] fileBytes) {
     try {
-      PDDocument document = Loader.loadPDF(new ByteArrayInputStream(fileBytes));
+      PDDocument document = Loader.loadPDF(new RandomAccessReadBuffer(new ByteArrayInputStream(fileBytes)));
       PDFTextStripper stripper = new PDFTextStripper();
 
       for (int i = 0; i < document.getNumberOfPages(); i++) {

src/main/java/com/mindee/pdf/PDFUtils.java

@@ -17,6 +17,7 @@
 import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.ImageType;
@@ -243,7 +244,7 @@ protected void writeString(String text, List<TextPosition> textPositions) throws
         try {
           contentStream.showText(text);
         } catch (IllegalArgumentException | UnsupportedOperationException e) {
-          contentStream.setFont(PDType1Font.HELVETICA, fontSize);
+          contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), fontSize);
           contentStream.showText(text);
         }
         contentStream.endText();

src/test/java/com/mindee/input/LocalInputSourceTest.java

@@ -14,6 +14,7 @@
 import java.util.stream.Collectors;
 import javax.imageio.ImageIO;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.junit.jupiter.api.Assertions;
@@ -338,8 +339,8 @@ public void testPdfResizeWithTextKeepsText() throws IOException {
     byte[] compressedWithText =
         PdfCompressor.compressPdf(initialWithText.getFile(), 100, true, false);
 
-    PDDocument originalDoc = PDDocument.load(initialWithText.getFile());
-    PDDocument compressedDoc = PDDocument.load(compressedWithText);
+    PDDocument originalDoc = Loader.loadPDF(initialWithText.getFile());
+    PDDocument compressedDoc = Loader.loadPDF(compressedWithText);
 
     Assertions.assertEquals(originalDoc.getNumberOfPages(), compressedDoc.getNumberOfPages());
     Assertions.assertNotEquals(originalDoc.hashCode(), compressedDoc.hashCode());

src/test/java/com/mindee/pdf/PDFUtilsTest.java

@@ -10,6 +10,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
+
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.junit.jupiter.api.Assertions;
@@ -43,7 +45,7 @@ public void givenADocumentAndListOfPages_whenMerged_thenReturnsCorrectDocument()
     File file = new File("src/test/resources/output/fileToTest.pdf");
     List<Integer> pageList = Arrays.asList(0, 2, 3, 1, 10, 2, 1);
     byte[] newPdf = PDFUtils.mergePdfPages(file, pageList);
-    PDDocument document = PDDocument.load(newPdf);
+    PDDocument document = Loader.loadPDF(newPdf);
 
     Assertions.assertEquals(7, document.getNumberOfPages());
     document.close();