From c9ba32f6b2250448477de6abc24444cd35464e3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Aug 2023 07:04:40 +0000
Subject: [PATCH 1/2] Bump org.apache.pdfbox:pdfbox from 2.0.29 to 3.0.0

Bumps org.apache.pdfbox:pdfbox from 2.0.29 to 3.0.0.

---
updated-dependencies:
- dependency-name: org.apache.pdfbox:pdfbox
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 975e2b9..695fdf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
-            <version>2.0.29</version>
+            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->

From 3505b78e0017cf37959b5f9c2335b28ddc76446e Mon Sep 17 00:00:00 2001
From: oliver1 <Oliver.Warz@pdv.de>
Date: Sat, 19 Aug 2023 12:31:31 +0200
Subject: [PATCH 2/2] Change pddocument

---
 pom.xml                                       | 20 ++-----------------
 .../java/de/pdv/apex/ExampleFO2PDFTest.java   | 11 ++++++++--
 .../java/de/pdv/apex/ExampleXML2PDFTest.java  | 18 +++++++++--------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 695fdf6..ce474eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <junit.version>5.10.0</junit.version>
         <batik.version>1.16</batik.version>
+        <pdfbox.version>3.0.0</pdfbox.version>
         <sonar.organization>omaster395464gh</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
@@ -44,7 +45,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
-            <version>3.0.0</version>
+            <version>${pdfbox.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
@@ -94,23 +95,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <!-- Start: Security fixes -->
-        <!-- https://mvnrepository.com/artifact/org.apache.pdfbox/fontbox -->
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>fontbox</artifactId>
-            <version>2.0.29</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- End: Security fixes -->
     </dependencies>
 
     <build>
diff --git a/src/test/java/de/pdv/apex/ExampleFO2PDFTest.java b/src/test/java/de/pdv/apex/ExampleFO2PDFTest.java
index b588c08..172a0c5 100644
--- a/src/test/java/de/pdv/apex/ExampleFO2PDFTest.java
+++ b/src/test/java/de/pdv/apex/ExampleFO2PDFTest.java
@@ -1,6 +1,7 @@
 package de.pdv.apex;
 
 import org.apache.fop.apps.*;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.PDFTextStripperByArea;
@@ -17,6 +18,7 @@ import javax.xml.transform.stream.StreamSource;
 import java.io.*;
 import java.nio.file.Files;
 import java.util.List;
+import org.apache.pdfbox.Loader;
 
 class ExampleFO2PDFTest {
 
@@ -110,8 +112,8 @@ class ExampleFO2PDFTest {
         if (!pdfFile.exists())
             throw new Exception("result file missing");
 
-        try (PDDocument document = PDDocument.load(pdfFile)) {
-            //document.getClass();
+        try (PDDocument document = Loader.loadPDF(new RandomAccessReadBufferedFile(pdfFile)))
+        {
             if (!document.isEncrypted()) {
                 PDFTextStripperByArea stripper = new PDFTextStripperByArea();
                 stripper.setSortByPosition(true);
@@ -124,6 +126,11 @@ class ExampleFO2PDFTest {
                 System.out.println("Pages: " + document.getNumberOfPages());
                 Assertions.assertEquals(Integer.valueOf(1).intValue(), document.getNumberOfPages());
             }
+            /*
+            for (PDPage page : document.getPages())
+            {
+            ....
+            }*/
         }
         System.out.println("Filesize (Bytes): " + Files.size(pdfFile.toPath()));
         System.out.println("Success!");
diff --git a/src/test/java/de/pdv/apex/ExampleXML2PDFTest.java b/src/test/java/de/pdv/apex/ExampleXML2PDFTest.java
index 30d8e49..20003eb 100644
--- a/src/test/java/de/pdv/apex/ExampleXML2PDFTest.java
+++ b/src/test/java/de/pdv/apex/ExampleXML2PDFTest.java
@@ -4,6 +4,8 @@ import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.MimeConstants;
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -19,6 +21,7 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 
 class ExampleXML2PDFTest {
 
@@ -53,8 +56,7 @@ class ExampleXML2PDFTest {
         // configure foUserAgent as desired
 
         // Setup output
-        OutputStream out = new java.io.FileOutputStream(pdfFile);
-        out = new java.io.BufferedOutputStream(out);
+        OutputStream out = Files.newOutputStream(Paths.get(pdfFile.toURI()));
 
         // Construct fop with desired output format
         Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, foUserAgent, out);
@@ -84,11 +86,11 @@ class ExampleXML2PDFTest {
 
         if (!pdfFile.exists())
             throw new Exception("result file missing");
-
-        PDDocument document = PDDocument.load(pdfFile);
-        System.out.println("Pages: " + document.getNumberOfPages());
-        System.out.println("Filesize (Bytes): " + Files.size(pdfFile.toPath()));
-        Assertions.assertEquals(Integer.valueOf(1).intValue(), document.getNumberOfPages());
-        System.out.println("Success!");
+        try (PDDocument document = Loader.loadPDF(new RandomAccessReadBufferedFile(pdfFile))) {
+            System.out.println("Pages: " + document.getNumberOfPages());
+            System.out.println("Filesize (Bytes): " + Files.size(pdfFile.toPath()));
+            Assertions.assertEquals(Integer.valueOf(1).intValue(), document.getNumberOfPages());
+            System.out.println("Success!");
+        }
     }
 }
\ No newline at end of file