Skip to content

Commit a30821d

Browse files
committed
updates SwissQRBill dependency
1 parent a873ae2 commit a30821d

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ val buildSettings = Seq(
103103
// transitive dependencies of legacy de.zalando.beard
104104
"org.antlr" % "antlr4" % "4.8-1",
105105
"io.monix" %% "monix" % "3.4.1", // ### Scala 3
106-
"net.codecrete.qrbill" % "qrbill-generator" % "3.2.0",
106+
"net.codecrete.qrbill" % "qrbill-generator" % "3.3.0",
107107
"io.nayuki" % "qrcodegen" % "1.8.0",
108108
"org.apache.pdfbox" % "pdfbox" % "2.0.34",
109109
"org.apache.pdfbox" % "pdfbox-parent" % "2.0.34" pomOnly(),

src/main/scala/ch/openolitor/core/BaseRouteService.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import ch.openolitor.stammdaten.models.ProjektVorlageId
4747
import ch.openolitor.util.ZipBuilderWithFile
4848
import com.tegonal.CFEnvConfigLoader.ConfigLoader
4949
import com.typesafe.scalalogging.LazyLogging
50+
import org.apache.pdfbox.Loader
5051
import org.apache.pdfbox.multipdf.PDFMergerUtility
5152
import org.apache.pdfbox.pdmodel.PDDocument
5253
import org.odftoolkit.simple.SpreadsheetDocument
@@ -320,7 +321,8 @@ trait BaseRouteService extends ExecutionContextAware with SprayJsonSupport with
320321
case Right(file) =>
321322
val name = if (file.metaData.name.isEmpty) ref.id.id else file.metaData.name
322323
logger.debug(s"merge pdf file:${ref.id.id} => $name")
323-
PDFmerged.appendDocument(mergedFile, PDDocument.load(file.file))
324+
val loadedFile = Loader.loadPDF(file.file.readAllBytes());
325+
PDFmerged.appendDocument(mergedFile, loadedFile)
324326
}
325327
})) {
326328
case Success(result) =>

src/main/scala/ch/openolitor/core/reporting/PDFReportResultCollector.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import ch.openolitor.buchhaltung.models.RechnungId
2828
import ch.openolitor.core.DateFormats
2929
import ch.openolitor.core.jobs.JobQueueService.FileResultPayload
3030
import ch.openolitor.core.reporting.ReportSystem._
31+
import org.apache.pdfbox.Loader
3132
import org.apache.pdfbox.multipdf.PDFMergerUtility
3233
import org.apache.pdfbox.pdmodel.PDDocument
3334

@@ -63,7 +64,8 @@ class PDFReportResultCollector(reportSystem: ActorRef, override val jobQueueServ
6364
notifyProgress(stats)
6465
case SingleReportResult(id: RechnungId, stats, Right(result: ReportResultWithDocument)) =>
6566
log.debug(s"Add Pdf Entry:${result.name}")
66-
pdfFiles = pdfFiles :+ (id, PDDocument.load(result.document))
67+
val loadedFile = Loader.loadPDF(result.document);
68+
pdfFiles = pdfFiles :+ (id, loadedFile)
6769
notifyProgress(stats)
6870
case result: GenerateReportsStats if result.numberOfReportsInProgress == 0 =>
6971
pdfFiles.sortBy(_._1) foreach { file =>

0 commit comments

Comments
 (0)