From 71e7dcd1a1ff16d5a5b39eead688d17fe92a837d Mon Sep 17 00:00:00 2001
From: Philipp Schramm <Philipp.Schramm@iqser.com>
Date: Wed, 15 Dec 2021 09:06:24 +0100
Subject: [PATCH] RED-3042 Bugfix: Made deleting watermark idempotent

---
 .../management/v1/processor/service/WatermarkService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java
index b92928f1a..470752def 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java
@@ -4,6 +4,7 @@ import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.WatermarkEntity;
@@ -23,8 +24,11 @@ public class WatermarkService {
 
 
     public void deleteWatermark(String dossierTemplateId) {
-
-        watermarkRepository.deleteById(dossierTemplateId);
+        try {
+            watermarkRepository.deleteById(dossierTemplateId);
+        } catch (EmptyResultDataAccessException e) {
+            log.info("Watermark for dossierTemplateId '{}' was already deleted.", dossierTemplateId);
+        }
     }