diff --git a/persistence-service-v1/persistence-service-api-v1/src/test/java/com/iqser/red/service/persistence/service/v1/api/model/IdentityTest.java b/persistence-service-v1/persistence-service-api-v1/src/test/java/com/iqser/red/service/persistence/service/v1/api/model/IdentityTest.java index 588933c14..fa201e412 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/test/java/com/iqser/red/service/persistence/service/v1/api/model/IdentityTest.java +++ b/persistence-service-v1/persistence-service-api-v1/src/test/java/com/iqser/red/service/persistence/service/v1/api/model/IdentityTest.java @@ -2,7 +2,7 @@ package com.iqser.red.service.persistence.service.v1.api.model; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IdentityTest { diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/model/reducetext/SectionText.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/model/reducetext/SectionText.java index 4fe09530a..05b008e6f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/model/reducetext/SectionText.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/model/reducetext/SectionText.java @@ -28,11 +28,16 @@ public class SectionText { private boolean isTable; private String headline; + @Builder.Default private List sectionAreas = new ArrayList<>(); + @Builder.Default private Set images = new HashSet<>(); + @Builder.Default private List textBlocks = new ArrayList<>(); + @Builder.Default private Map tabularData = new HashMap<>(); + @Builder.Default private List cellStarts = new ArrayList<>(); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/model/reducetext/TextPositionSequence.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/model/reducetext/TextPositionSequence.java index f5c22cd10..9197b59cc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/model/reducetext/TextPositionSequence.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/migrations/model/reducetext/TextPositionSequence.java @@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j; public class TextPositionSequence { private int page; + @Builder.Default private List textPositions = new ArrayList<>(); // Removed diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateImportService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateImportService.java index d860c33ef..a4c4bae97 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateImportService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateImportService.java @@ -567,7 +567,7 @@ public class DossierTemplateImportService { totalSizeArchive += nBytes; double compressionRatio = (float) totalSizeEntry / ze.getCompressedSize(); - if (compressionRatio > settings.getCompressionTresholdRatio()) { + if (compressionRatio > settings.getCompressionThresholdRatio()) { log.debug("zip entry: " + ze.getName() + " - totalSizeEntry: " + totalSizeEntry + " ze.getCompressedSize(): " + ze.getCompressedSize() + " compressionRatio: " + compressionRatio); // ratio between compressed and uncompressed data is highly suspicious, looks like a Zip Bomb Attack throw new BadRequestException("ZIP-Bomb detected (compressionRatio)."); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java index 66eb72b39..ccdf43cd5 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java @@ -38,6 +38,6 @@ public class FileManagementServiceSettings { private boolean ocrByDefault; - private double compressionTresholdRatio = 10; + private double compressionThresholdRatio = 10; } diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index 12fcca797..0bbe4f946 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -6,7 +6,7 @@ com.iqser.red platform-dependency - 1.13.0 + 1.16.0