pdf-as-5 (#82)

- JDK 17
- PDFBox 3
- PDF-AS Web moved to Spring Boot
- MOA Integration tests w/ new error code

---------

Co-authored-by: Gerald Palfinger <gerald.palfinger@a-sit.at>
Co-authored-by: kathrin.resek <kathrin.resek@a-sit.at>

2 files changed, 14 insertions, 19 deletions

diff --git a/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/PDFBoxPlaceholderExtractorTest.java b/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/PDFBoxPlaceholderExtractorTest.java
index 8bd733c3..c110a8d4 100644
--- a/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/PDFBoxPlaceholderExtractorTest.java
+++ b/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/PDFBoxPlaceholderExtractorTest.java
@@ -1,8 +1,6 @@
 package at.gv.egiz.pdfas.lib.testpdfbox;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.List;
@@ -30,7 +28,6 @@ public class PDFBoxPlaceholderExtractorTest {
     List<String> listOfPlaceHolders = getPlaceHolders("/data/platzhalter_en_de_test.pdf");
     assertNotNull(listOfPlaceHolders);
     assertTrue(listOfPlaceHolders.isEmpty());
-
   }
 
   @Test
@@ -51,22 +48,19 @@ public class PDFBoxPlaceholderExtractorTest {
     assertNotNull(listOfPlaceHolders);
 
   }
-  
-  private static List<String> getPlaceHolders(String filePath) throws IOException {
-    final PDDocument doc = PDDocument.load(PDFBoxPlaceholderExtractorTest.class.getResourceAsStream(
-        filePath));
-    final List<String> results = SignatureFieldsAndPlaceHolderExtractor.findEmptySignatureFields(doc);
-    return results;
 
+  private static List<String> getPlaceHolders(String filePath) throws IOException {
+    try (final PDDocument doc = PDDocument.load(PDFBoxPlaceholderExtractorTest.class.getResourceAsStream(
+        filePath))) {
+      return SignatureFieldsAndPlaceHolderExtractor.findEmptySignatureFields(doc);
+    }
   }
 
   private static SignaturePlaceholderData getNextSignaturePlaceHolder(String filePath) throws IOException {
-    final PDDocument doc = PDDocument.load(PDFBoxPlaceholderExtractorTest.class.getResourceAsStream(
-        filePath));
-    final SignaturePlaceholderData result =
-        SignatureFieldsAndPlaceHolderExtractor.getNextUnusedSignaturePlaceHolder(doc);
-    return result;
-
+    try (final PDDocument doc = PDDocument.load(PDFBoxPlaceholderExtractorTest.class.getResourceAsStream(
+        filePath))) {
+      return SignatureFieldsAndPlaceHolderExtractor.getNextUnusedSignaturePlaceHolder(doc);
+    }
   }
 
 }
diff --git a/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/TTFFontTest.java b/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/TTFFontTest.java
index ca45354b..78a89708 100644
--- a/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/TTFFontTest.java
+++ b/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/TTFFontTest.java
@@ -5,6 +5,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSObject;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -21,9 +22,9 @@ public class TTFFontTest {
 			
 			while(cosObjectIt.hasNext()) {
 				COSObject cosObject = cosObjectIt.next();
-				COSBase subType = cosObject.getItem(COSName.SUBTYPE);
-				COSBase baseFont = cosObject.getItem(COSName.BASE_FONT);
-				COSBase aTest = cosObject.getItem(COSName.A);
+				COSBase subType = ((COSDictionary)cosObject.getObject()).getItem(COSName.SUBTYPE);
+				COSBase baseFont = ((COSDictionary)cosObject.getObject()).getItem(COSName.BASE_FONT);
+				COSBase aTest = ((COSDictionary)cosObject.getObject()).getItem(COSName.A);
 				
 				System.out.println(aTest);