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

RED-5785: Removed restriction for watermarks to contain only ASCII chars

Browse Source
This commit is contained in:
deiflaender 2023-01-25 10:34:08 +01:00
parent 8484434eca
commit 20b2e13abb
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,10 +92,6 @@ public class WatermarkService {
if (StringUtils.isBlank(watermark.getName())) {
throw new BadRequestException("The watermark name must not be empty");
}
if (StringUtils.isNotBlank(watermark.getText()) && !StringUtils.isAsciiPrintable(StringUtils.normalizeSpace(watermark.getText()))) {
throw new BadRequestException("The watermark may only contain ASCII characters");
}
}

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

@ -1,7 +1,6 @@
package com.iqser.red.service.peristence.v1.server.integration.tests;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import org.junit.Test;
import org.springframework.beans.BeanUtils;
@ -200,14 +199,13 @@ public class WatermarkTest extends AbstractPersistenceServerServiceTest {
@Test
public void testWatermarkTextWithWrongText() {
public void testWatermarkTextWithJapaneseText() {
// Arrange
var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
var watermarkText = "This is not an ASCII text äöüÄÖÜéèê... \nand many more...\r May the force with you! ";
var watermarkText = "本資料に記載された情報に係る権利及び内容の責任はシンジェンタジャパン株式会社にある。";
Watermark watermark = new Watermark();
watermark.setName("name");
watermark.setName("japanese");
watermark.setEnabled(true);
watermark.setDossierTemplateId(dossierTemplate.getId());
watermark.setFontSize(12);
@ -217,11 +215,11 @@ public class WatermarkTest extends AbstractPersistenceServerServiceTest {
watermark.setOrientation(WatermarkOrientation.DIAGONAL);
watermark.setText(watermarkText);
// Act
FeignException exception = assertThrows(FeignException.class, () -> watermarkClient.createOrUpdateWatermark(watermark));
var saved = watermarkClient.createOrUpdateWatermark(watermark);
var loadedWatermarked = watermarkClient.getWatermark(saved.getId());
// Assert
assertThat(exception.status()).isEqualTo(400);
assertThat(loadedWatermarked).isEqualTo(saved);
assertThat(loadedWatermarked.getText()).isEqualTo(watermarkText);
}