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

RED-4249-As an admin of a dossier template I want to customize the highlighting color of a skipped redaction of an entity

Browse Source 
- rework after review
This commit is contained in:
devplant 2022-06-23 10:43:21 +03:00
parent 93d54c0886
commit d9060e39d8
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,11 +79,8 @@ public class WatermarkService {
private void validateWatermark(Watermark watermark) { private void validateWatermark(Watermark watermark) {
// if (watermark == null) {
// throw new BadRequestException("The watermark may not be null");
// }
if (StringUtils.isBlank(watermark.getName())) { if (StringUtils.isBlank(watermark.getName())) {
throw new BadRequestException("The watermaek name must not be null"); throw new BadRequestException("The watermark name must not be null");
} }
if (StringUtils.isNotBlank(watermark.getText()) && !StringUtils.isAsciiPrintable(StringUtils.normalizeSpace(watermark.getText()))) { if (StringUtils.isNotBlank(watermark.getText()) && !StringUtils.isAsciiPrintable(StringUtils.normalizeSpace(watermark.getText()))) {
throw new BadRequestException("The watermark may only contain ASCII characters"); throw new BadRequestException("The watermark may only contain ASCII characters");

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

@ -35,7 +35,6 @@ public class WatermarkTest extends AbstractPersistenceServerServiceTest {
Watermark watermark = new Watermark(); Watermark watermark = new Watermark();
watermark.setName("watermark name"); watermark.setName("watermark name");
// watermark.setEnabled(true);
watermark.setText("Minions ipsum chasy para tu la bodaaa bananaaaa hana dul sae. Chasy hana dul sae pepete hana dul sae belloo! Tatata bala tu ti aamoo! Jeje."); watermark.setText("Minions ipsum chasy para tu la bodaaa bananaaaa hana dul sae. Chasy hana dul sae pepete hana dul sae belloo! Tatata bala tu ti aamoo! Jeje.");
watermark.setFontSize(12); watermark.setFontSize(12);
watermark.setFontType("font"); watermark.setFontType("font");
@ -63,11 +62,10 @@ public class WatermarkTest extends AbstractPersistenceServerServiceTest {
watermark2.setDossierTemplateId(dossierTemplate.getId()); watermark2.setDossierTemplateId(dossierTemplate.getId());
try { try {
var saved2 = watermarkClient.createOrUpdateWatermark(watermark2); watermarkClient.createOrUpdateWatermark(watermark2);
} catch (FeignException.FeignClientException e) { } catch (FeignException.FeignClientException e) {
assertThat(e.status()).isEqualTo(409); assertThat(e.status()).isEqualTo(409);
} }
// loadedWatermark = watermarkClient.getWatermark(saved.getId());
// Delete first time // Delete first time
watermarkClient.deleteWatermark(saved.getId()); watermarkClient.deleteWatermark(saved.getId());

2
persistence-service-v1/pom.xml
View File

@ -27,7 +27,7 @@
<properties> <properties>
<redaction-service.version>3.114.0</redaction-service.version> <redaction-service.version>3.114.0</redaction-service.version>
<search-service.version>2.36.0</search-service.version> <search-service.version>2.36.0</search-service.version>
<pdftron-redaction-service.version>3.105.0</pdftron-redaction-service.version> <pdftron-redaction-service.version>3.111.0</pdftron-redaction-service.version>
<redaction-report-service.version>3.47.0</redaction-report-service.version> <redaction-report-service.version>3.47.0</redaction-report-service.version>
</properties> </properties>