Revert "Bump org.apache.pdfbox:preflight from 2.0.26 to 3.0.0"

This reverts commit d41cba1.

Author: gtcno

buildSrc/src/main/kotlin/common-kotlin.gradle.kts

@@ -1,3 +1,4 @@
+import com.diffplug.spotless.LineEnding
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import java.net.URI
@@ -34,6 +35,7 @@ tasks.withType<Test> {
     }
 }
 
+
 group = "no.nav.dagpenger"
 
 val sourcesJar by tasks.registering(Jar::class) {
@@ -62,6 +64,9 @@ publishing {
     }
 }
 
+
+
+
 configure<com.diffplug.gradle.spotless.SpotlessExtension> {
     kotlin {
         ktlint()
@@ -72,3 +77,4 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
         ktlint()
     }
 }
+

image-utils/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation("org.apache.pdfbox:preflight:3.0.0")
+    implementation("org.apache.pdfbox:preflight:2.0.26")
     implementation("org.apache.pdfbox:pdfbox:2.0.26")
     implementation("org.apache.tika:tika-core:2.9.1")
     implementation("org.imgscalr:imgscalr-lib:4.2")

image-utils/src/main/kotlin/no/nav/dagpenger/pdf/Pdf.kt

@@ -1,14 +1,13 @@
 package no.nav.dagpenger.pdf
 
 import no.nav.dagpenger.io.Detect.isPdf
-import org.apache.pdfbox.Loader
-import org.apache.pdfbox.io.IOUtils
-import org.apache.pdfbox.io.RandomAccessReadBuffer
+import org.apache.pdfbox.io.MemoryUsageSetting
 import org.apache.pdfbox.multipdf.PDFMergerUtility
 import org.apache.pdfbox.multipdf.Splitter
 import org.apache.pdfbox.pdmodel.PDDocument
 import org.apache.pdfbox.rendering.PDFRenderer
 import java.awt.image.BufferedImage
+import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.Closeable
 import java.io.InputStream
@@ -19,7 +18,7 @@ sealed class PDFDocument constructor(val document: PDDocument) : Closeable {
     companion object {
         fun load(bytes: ByteArray): PDFDocument {
             return try {
-                ValidPDFDocument(Loader.loadPDF(bytes))
+                ValidPDFDocument(PDDocument.load(bytes))
             } catch (e: Exception) {
                 InvalidPDFDocument(e)
             }
@@ -28,7 +27,7 @@ sealed class PDFDocument constructor(val document: PDDocument) : Closeable {
         fun load(inputStream: InputStream): PDFDocument {
             return try {
                 inputStream.buffered().use { buffered ->
-                    ValidPDFDocument(Loader.loadPDF(RandomAccessReadBuffer(buffered)))
+                    ValidPDFDocument(PDDocument.load(buffered))
                 }
             } catch (e: Exception) {
                 InvalidPDFDocument(e)
@@ -41,8 +40,8 @@ sealed class PDFDocument constructor(val document: PDDocument) : Closeable {
             return ByteArrayOutputStream().use { os ->
                 PDFMergerUtility().also {
                     it.destinationStream = os
-                    it.addSources(pages.map { page -> RandomAccessReadBuffer(page) })
-                    it.mergeDocuments(IOUtils.createMemoryOnlyStreamCache())
+                    it.addSources(pages.map { page -> ByteArrayInputStream(page) })
+                    it.mergeDocuments(MemoryUsageSetting.setupMainMemoryOnly())
                 }
                 load(os.toByteArray())
             }

image-utils/src/main/kotlin/no/nav/dagpenger/pdf/PdfWatermarker.kt

@@ -1,7 +1,6 @@
 package no.nav.dagpenger.pdf
 
 import no.nav.dagpenger.io.Detect.isPdf
-import org.apache.pdfbox.Loader
 import org.apache.pdfbox.cos.COSDictionary
 import org.apache.pdfbox.cos.COSName
 import org.apache.pdfbox.pdmodel.PDDocument
@@ -11,9 +10,9 @@ import org.apache.pdfbox.pdmodel.PDResources
 import org.apache.pdfbox.pdmodel.common.PDRectangle
 import org.apache.pdfbox.pdmodel.font.PDFont
 import org.apache.pdfbox.pdmodel.font.PDType1Font
-import org.apache.pdfbox.pdmodel.font.Standard14Fonts
 import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState
 import java.awt.Color
+import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.time.LocalDateTime
@@ -38,7 +37,7 @@ object PdfWatermarker {
     private const val DEFAULT_BACKGROUND_OPACITY = 1.0f
     private const val BORDER_WIDTH = 1f
     private const val HEIGHT = 22f
-    private val FONT: PDFont = PDType1Font(Standard14Fonts.FontName.HELVETICA)
+    private val FONT: PDFont = PDType1Font.HELVETICA
     private const val FONT_SIZE = 6
 
     private fun removePermissions(pdfDocument: PDDocument) {
@@ -170,7 +169,7 @@ object PdfWatermarker {
     ): ByteArray {
         require(bytes.isPdf()) { "Kan kun vannmerke PDF-filer." }
 
-        return Loader.loadPDF(bytes).use { pdfDocument ->
+        return PDDocument.load(ByteArrayInputStream(bytes)).use { pdfDocument ->
             applyOn(pdfDocument, ident, includeDate)
         }
     }

image-utils/src/test/kotlin/no/nav/dagpenger/test/IOUtils.kt

@@ -1,6 +1,6 @@
 package no.nav.dagpenger.pdf
 
-import org.apache.pdfbox.Loader
+import org.apache.pdfbox.pdmodel.PDDocument
 import org.apache.pdfbox.text.PDFTextStripper
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
@@ -18,7 +18,7 @@ internal fun String.fileAsBufferedInputStream(): BufferedInputStream = this.file
 internal fun String.fileAsByteArray(): ByteArray = this.fileAsInputStream().use { it.readAllBytes() }
 
 internal fun ByteArray.extractText(): String {
-    return Loader.loadPDF(this).use {
+    return PDDocument.load(this).use {
         PDFTextStripper().getText(it)
     }
 }

settings.gradle.kts

@@ -10,6 +10,7 @@ include("pdl-klient")
 include("image-utils")
 include("oauth2-klient")
 
+
 dependencyResolutionManagement {
     repositories {
         maven("https://github-package-registry-mirror.gc.nav.no/cached/maven-release")
@@ -20,3 +21,4 @@ dependencyResolutionManagement {
         }
     }
 }
+