Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #161: RED-3042 Bugfix: Made deleting watermark idempotent

Browse Source 
Merge in RED/persistence-service from bugfix/RED-3042 to master

* commit '71e7dcd1a1ff16d5a5b39eead688d17fe92a837d':
  RED-3042 Bugfix: Made deleting watermark idempotent
  RED-3042 Bugfix: Made deleting watermark idempotent
This commit is contained in:
Philipp Schramm 2021-12-15 09:11:40 +01:00
commit e1d4c02b92
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/WatermarkService.java
View File

@ -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);
}
}

4
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/WatermarkTest.java
View File

@ -48,6 +48,7 @@ public class WatermarkTest extends AbstractPersistenceServerServiceTest {
saved = watermarkClient.saveWatermark(dossierTemplate.getId(), watermark);
assertThat(watermarkClient.getWatermark(dossierTemplate.getId())).isEqualTo(saved);
// Delete first time
watermarkClient.deleteWatermark(dossierTemplate.getId());
try {
@ -55,6 +56,9 @@ public class WatermarkTest extends AbstractPersistenceServerServiceTest {
} catch (FeignException.FeignClientException e) {
assertThat(e.status()).isEqualTo(404);
}
// Delete second time
watermarkClient.deleteWatermark(dossierTemplate.getId());
}