From f320ac46cc4428a6eca071efb4948ff56cf278df Mon Sep 17 00:00:00 2001 From: Philipp Schramm Date: Tue, 2 Nov 2021 16:23:26 +0100 Subject: [PATCH] RED-2562 Added watermark flag for previews to DownloadPreparationService.java --- .../server/service/download/DownloadPreparationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java index 32db56f7a..417ef19c1 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java @@ -92,7 +92,7 @@ public class DownloadPreparationService { fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Annotated", addSuffix(fileStatus.getFilename(), "annotated"), getAnnotated(dossier.getDossierTemplateId(), fileStatus.getDossierId(), fileId))); } if (downloadFileType.name().equals(DownloadFileType.PREVIEW.name())) { - fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", addSuffix(fileStatus.getFilename(), "highlighted"), getPreview(original, redactionLog, dossier.getDossierTemplateId()))); + fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", addSuffix(fileStatus.getFilename(), "highlighted"), getPreview(original, redactionLog, dossier.getDossierTemplateId(), watermarkEnabled))); } if (downloadFileType.name().equals(DownloadFileType.REDACTED.name())) { fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Redacted", addSuffix(fileStatus.getFilename(), "redacted"), getRedacted(original, redactionLog, dossier.getDossierTemplateId(), watermarkEnabled))); @@ -194,12 +194,13 @@ public class DownloadPreparationService { } - private byte[] getPreview(byte[] original, RedactionLog redactionLog, String dossierTemplateId) { + private byte[] getPreview(byte[] original, RedactionLog redactionLog, String dossierTemplateId, boolean watermarkEnabled) { return pdfTronRedactionClient.redactionPreview(PdfTronRedactionRequest.builder() .document(original) .dossierTemplateId(dossierTemplateId) .redactionLog(redactionLog) + .applyWatermark(watermarkEnabled) .build()).getDocument(); }