test 1

Added some logs
RED-2224: Fixed missing values in engines
2021-10-19 14:52:55 +02:00 · 2021-10-19 14:38:03 +02:00 · 2021-10-19 10:55:51 +02:00 · 2021-10-15 15:35:28 +02:00 · 2021-10-15 15:27:15 +02:00 · 2021-10-15 10:45:10 +02:00
42 changed files with 369 additions and 481 deletions
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.iqser.red</groupId>
        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -13,6 +13,6 @@ RUN apt-get update \
    wget cabextract xfonts-utils fonts-liberation \
 && rm -rf /var/lib/apt/lists/*

-RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+RUN curl http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \
 && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \
 && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.1.3</version>
+        <version>1.1.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -22,7 +22,7 @@
    </modules>

    <properties>
-        <pdfbox.version>2.0.21</pdfbox.version>
+        <pdfbox.version>2.0.24</pdfbox.version>
    </properties>


@@ -32,7 +32,7 @@
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.3.6</version>
+                <version>1.7.0</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>persistence-service-api-v1</artifactId>
-            <version>0.4.0</version>
+            <version>0.44.0</version>
        </dependency>
    </dependencies>
 </project>
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.model;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,6 +12,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+
@Data
@Builder
@NoArgsConstructor
@@ -1,21 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class Comment {
-
-    private String id;
-    private OffsetDateTime date;
-    private String text;
-    private String user;
-
-}
@@ -1,25 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class IdRemoval {
-
-    private String id;
-    private String user;
-    private Status status;
-    private boolean removeFromDictionary;
-
-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
@@ -1,25 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualForceRedact {
-
-    private String id;
-    private String user;
-    private Status status;
-    private String legalBasis;
-
-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
@@ -1,25 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualImageRecategorization {
-
-    private String id;
-    private String user;
-    private Status status;
-    private String type;
-
-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
@@ -1,25 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualLegalBasisChange {
-
-    private String id;
-    private String user;
-    private Status status;
-    private String legalBasis;
-
-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
@@ -1,34 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualRedactionEntry {
-
-    private String id;
-    private String user;
-    private String type;
-    private String value;
-    private String reason;
-    private String legalBasis;
-    private List<Rectangle> positions = new ArrayList<>();
-    private Status status;
-
-    private boolean addToDictionary;
-    private boolean addToDossierDictionary;
-
-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
@@ -1,38 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualRedactions {
-
-    @Builder.Default
-    private Set<IdRemoval> idsToRemove = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualForceRedact> forceRedacts = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualImageRecategorization> imageRecategorizations = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualLegalBasisChange> manualLegalBasisChanges = new HashSet<>();
-
-    @Builder.Default
-    private Map<String, List<Comment>> comments = new HashMap<>();
-
-}
@@ -1,11 +1,11 @@
 package com.iqser.red.service.redaction.v1.model;

+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
 import lombok.AllArgsConstructor;
 import lombok.Data;

 import java.util.List;

-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.LegalBasis;

@Data
@AllArgsConstructor
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,6 +13,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+
@Data
@Builder
@NoArgsConstructor
@@ -34,7 +37,7 @@ public class RedactionLogEntry {
    private List<Rectangle> positions = new ArrayList<>();
    private int sectionNumber;
    private boolean manual;
-    private Status status;
+    private AnnotationStatus status;
    private ManualRedactionType manualRedactionType;
    private String manualRedactionUserId;
    private boolean isDictionaryEntry;
@@ -3,6 +3,8 @@ package com.iqser.red.service.redaction.v1.model;
 import java.util.HashSet;
 import java.util.Set;

+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum Status {
-    REQUESTED, APPROVED, DECLINED
-}
@@ -24,12 +24,12 @@
        <dependency>
            <groupId>org.drools</groupId>
            <artifactId>drools-core</artifactId>
-            <version>7.37.0.Final</version>
+            <version>7.59.0.Final</version>
        </dependency>
        <dependency>
            <groupId>org.kie</groupId>
            <artifactId>kie-spring</artifactId>
-            <version>7.37.0.Final</version>
+            <version>7.59.0.Final</version>
        </dependency>
        <dependency>
            <groupId>org.locationtech.jts</groupId>
@@ -39,7 +39,6 @@
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
        </dependency>

        <dependency>
@@ -72,10 +71,6 @@
            <artifactId>metric-commons</artifactId>
        </dependency>
        <!-- other external -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox</artifactId>
@@ -93,7 +88,6 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-amqp</artifactId>
-            <version>2.3.1.RELEASE</version>
        </dependency>

        <!-- test dependencies -->
@@ -107,12 +101,6 @@
            <artifactId>test-commons</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit-test</artifactId>
-            <version>2.3.1</version>
-            <scope>test</scope>
-        </dependency>
    </dependencies>

    <build>
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import com.iqser.red.service.persistence.service.v1.api.model.FileType;
+import com.amazonaws.services.kms.model.NotFoundException;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
@@ -152,6 +153,10 @@ public class RedactionController implements RedactionResource {

        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());

+        if (redactionLog == null) {
+            throw new NotFoundException("RedactionLog not present");
+        }
+
        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
        if (redactionLog.getAnalysisVersion() == 0) {
            // old redaction logs are returned directly
@@ -21,6 +21,7 @@ public class RedTextPosition {
    private float YDirAdj;
    private float width;
    private float heightDir;
+    private float widthDirAdj;

    // not used in reanalysis
    @JsonIgnore
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

+import static java.util.stream.Collectors.toSet;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.iqser.red.service.redaction.v1.model.Point;
@@ -244,7 +246,15 @@ public class TextPositionSequence implements CharSequence {
            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
                    .getYDirAdj() + height;
-        } else {
+        } else if(textPositions.get(0).getRotation() == 0 && textPositions.stream().map(t -> t.getY()).collect(toSet()).size() > 1) {
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+        }
+        else {
            posXEnd = textPositions.get(textPositions.size() - 1)
                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
@@ -35,12 +35,11 @@ public class RedactionMessageReceiver {
    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {

        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
-        log.info("Processing analyze request: {}", analyzeRequest);
+        log.info("Processing analyze request for file: {}", analyzeRequest.getFileId());
        AnalyzeResult result;
        if (analyzeRequest.isReanalyseOnlyIfPossible()) {
            result = analyzeService.reanalyze(analyzeRequest);
-            log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest
-                    .getFileId(), result.getDuration());
+            log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
        } else {
            // TODO Seperate stucture analysis by other queue
            analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
@@ -1,5 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import static java.util.stream.Collectors.toSet;
+
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import lombok.Data;
 import lombok.Getter;

@@ -8,6 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

+
@Data
 public class Dictionary {

@@ -61,13 +65,13 @@ public class Dictionary {
    public boolean containsValue(String type, String value) {

        return localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getEntries()
+                .getValues(false)
                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getLocalEntries()
+                .getValues(true)
                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getEntries()
+                .getValues(false)
                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getLocalEntries()
+                .getValues(true)
                .contains(value);
    }

@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;


+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import lombok.AllArgsConstructor;
 import lombok.Data;

@@ -8,7 +9,6 @@ import java.io.Serializable;
 import java.util.Set;
 import java.util.stream.Collectors;

-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DictionaryEntry;

@Data
@AllArgsConstructor
@@ -8,18 +8,14 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;

-import com.iqser.red.service.persistence.service.v1.api.model.FileType;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
 import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.IdRemoval;
-import com.iqser.red.service.redaction.v1.model.ManualForceRedact;
-import com.iqser.red.service.redaction.v1.model.ManualImageRecategorization;
-import com.iqser.red.service.redaction.v1.model.ManualLegalBasisChange;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
@@ -110,7 +106,7 @@ public class AnalyzeService {

        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, text.getSectionTexts(), kieContainer, analyzeRequest, nerEntities);

-        dictionaryService.updateExternalDictionary(dictionary, analyzeRequest.getDossierTemplateId());
+        dictionaryService.updateExternalDictionary(dictionary, analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());

        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest
                .getDossierTemplateId());
@@ -186,7 +182,7 @@ public class AnalyzeService {
            if (entry.isManual() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
                sectionsToReanalyse.add(entry.getSectionNumber());
            }
-            if (entry.isImage() || entry.getType().equals("image")) {
+            if (entry.isImage()) {
                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
            }
        }
@@ -242,13 +238,13 @@ public class AnalyzeService {
            return new HashSet<>();
        }

-        return Stream.concat(manualRedactions.getManualLegalBasisChanges()
+        return Stream.concat(manualRedactions.getLegalBasisChanges()
                .stream()
-                .map(ManualLegalBasisChange::getId), Stream.concat(manualRedactions.getImageRecategorizations()
+                .map(ManualLegalBasisChange::getAnnotationId), Stream.concat(manualRedactions.getImageRecategorization()
                .stream()
-                .map(ManualImageRecategorization::getId), Stream.concat(manualRedactions.getIdsToRemove()
+                .map(ManualImageRecategorization::getAnnotationId), Stream.concat(manualRedactions.getIdsToRemove()
                .stream()
-                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))))
+                .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId))))
                .collect(Collectors.toSet());
    }

@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
 import com.iqser.red.service.redaction.v1.model.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -27,8 +28,6 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
 public class AnnotationService {

-    private final DictionaryService dictionaryService;
-

    public void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException {

@@ -91,7 +90,7 @@ public class AnnotationService {
        if (redactionLogEntry.getComments() != null) {
            for (Comment comment : redactionLogEntry.getComments()) {
                PDAnnotationText txtAnnot = new PDAnnotationText();
-                txtAnnot.setAnnotationName(comment.getId());
+                txtAnnot.setAnnotationName(String.valueOf(comment.getId()));
                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
                txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
                txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));
@@ -1,10 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DictionaryEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+
 import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -82,7 +84,7 @@ public class DictionaryService {
            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();

            var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId) : dictionaryClient.getAllTypesForDossier(dossierId);
-            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse)) {
+            if (CollectionUtils.isNotEmpty(typeResponse)) {

                List<DictionaryModel> dictionary = typeResponse
                        .stream()
@@ -116,11 +118,11 @@ public class DictionaryService {
    }


-    public void updateExternalDictionary(Dictionary dictionary, String dossierTemplateId) {
+    public void updateExternalDictionary(Dictionary dictionary, String dossierTemplateId, String dossierId) {

        dictionary.getDictionaryModels().forEach(dm -> {
            if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
-                dictionaryClient.addEntries(dm.getType(), new ArrayList<>(dm.getLocalEntries()), false);
+                dictionaryClient.addEntries(IdBuilder.getTypeId(dm.getType(), dossierTemplateId, dm.isDossierDictionary() ? dossierId : null), new ArrayList<>(dm.getLocalEntries()), false);
                long externalVersion = dictionaryClient.getVersion(dossierTemplateId);
                if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
                    dictionary.getVersion().setDossierTemplateVersion(externalVersion);
@@ -9,6 +9,8 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualImageRecategorization;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.KieContainer;
@@ -16,8 +18,6 @@ import org.springframework.stereotype.Service;

 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
 import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.model.ManualImageRecategorization;
-import com.iqser.red.service.redaction.v1.model.Status;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
@@ -84,12 +84,12 @@ public class EntityRedactionService {

            if (!local && reanalysisSection.getImages() != null && !reanalysisSection.getImages()
                    .isEmpty() && analyzeRequest.getManualRedactions() != null && analyzeRequest.getManualRedactions()
-                    .getImageRecategorizations() != null) {
+                    .getImageRecategorization() != null) {
                for (Image image : reanalysisSection.getImages()) {
                    String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
                    for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
-                            .getImageRecategorizations()) {
-                        if (imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId()
+                            .getImageRecategorization()) {
+                        if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED) && imageRecategorization.getAnnotationId()
                                .equals(imageId)) {
                            image.setType(imageRecategorization.getType());
                        }
@@ -209,10 +209,10 @@ public class EntityRedactionService {
        for (DictionaryModel model : dictionary.getDictionaryModels()) {
            if (model.isCaseInsensitive()) {
                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), Engine.DICTIONARY));
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY));
            } else {
                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), Engine.DICTIONARY));
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY));
            }
        }

@@ -1,19 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import java.util.stream.Collectors;
-
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.persistence.service.v1.api.model.FileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.server.client.EntityRecognitionClient;
 import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionRequest;
 import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionSection;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.stereotype.Service;
+
+import java.util.stream.Collectors;

@Slf4j
@Service
@@ -31,20 +29,24 @@ public class NerAnalyserService {

            long start = System.currentTimeMillis();

-            var nerRequest = EntityRecognitionRequest.builder()
-                    .data(text.getSectionTexts()
-                            .stream()
-                            .map(sectionText -> new EntityRecognitionSection(sectionText.getSectionNumber(), new String(Base64
-                                    .encodeBase64(sectionText
-                                    .getText().getBytes()))))
-                            .collect(Collectors.toList()))
-                    .build();
+            if (text != null) {
+                var nerRequest = EntityRecognitionRequest.builder()
+                        .data(text.getSectionTexts()
+                                .stream()
+                                .map(sectionText -> new EntityRecognitionSection(sectionText.getSectionNumber(), new String(Base64
+                                        .encodeBase64(sectionText
+                                                .getText().getBytes()))))
+                                .collect(Collectors.toList()))
+                        .build();

-            var nerResponse = entityRecognitionClient.findAuthors(nerRequest);
+                var nerResponse = entityRecognitionClient.findAuthors(nerRequest);

-            log.info("Computing NER entities took: {} ms for dossierId {} and fileId {}", System.currentTimeMillis() - start, dossierId, fileId);
+                log.info("Computing NER entities took: {} ms for dossierId {} and fileId {}", System.currentTimeMillis() - start, dossierId, fileId);

-            redactionStorageService.storeObject(dossierId, fileId, FileType.NER_ENTITIES, nerResponse);
+                redactionStorageService.storeObject(dossierId, fileId, FileType.NER_ENTITIES, nerResponse);
+            } else {
+                log.warn("Warning, text for file: {} in dossier: {} is null", fileId, dossierId);
+            }
        }
    }

@@ -1,15 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
@@ -20,8 +10,12 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionS
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
@@ -30,8 +24,7 @@ public class RedactionLogCreatorService {
    private final DictionaryService dictionaryService;


-    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages,
-                                                      String dossierTemplateId) {
+    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages, String dossierTemplateId) {

        List<RedactionLogEntry> entries = new ArrayList<>();

@@ -206,4 +199,5 @@ public class RedactionLogCreatorService {
        return dictionaryService.isRecommendation(type, dossierTemplateId);
    }

+
 }
@@ -8,19 +8,15 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
 import org.springframework.stereotype.Service;

-import com.iqser.red.service.redaction.v1.model.Comment;
-import com.iqser.red.service.redaction.v1.model.IdRemoval;
-import com.iqser.red.service.redaction.v1.model.ManualForceRedact;
-import com.iqser.red.service.redaction.v1.model.ManualImageRecategorization;
-import com.iqser.red.service.redaction.v1.model.ManualLegalBasisChange;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.Status;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -38,7 +34,7 @@ public class RedactionLogMergeService {
    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId,
                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {

-        log.info("Merging Redaction log with manual redactions {}", manualRedactions);
+        log.info("Merging Redaction log with manual redactions");
        if (manualRedactions != null) {

            var manualRedactionLogEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
@@ -74,27 +70,27 @@ public class RedactionLogMergeService {

        List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();

-        manualRedactions.getImageRecategorizations().forEach(item -> {
+        manualRedactions.getImageRecategorization().forEach(item -> {
            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
            }
        });

        manualRedactions.getIdsToRemove().forEach(item -> {
            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
            }
        });

-        manualRedactions.getForceRedacts().forEach(item -> {
+        manualRedactions.getForceRedactions().forEach(item -> {
            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
            }
        });

-        manualRedactions.getManualLegalBasisChanges().forEach(item -> {
+        manualRedactions.getLegalBasisChanges().forEach(item -> {
            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
            }
        });

@@ -112,18 +108,18 @@ public class RedactionLogMergeService {
            if (mrw.getItem() instanceof ManualImageRecategorization) {
                var imageRecategorization = (ManualImageRecategorization) mrw.getItem();
                String manualOverrideReason = null;
-                if (imageRecategorization.getStatus().equals(Status.APPROVED)) {
-                    redactionLogEntry.setStatus(Status.APPROVED);
+                if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                    redactionLogEntry.setType(imageRecategorization.getType());
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
-                } else if (imageRecategorization.getStatus().equals(Status.REQUESTED)) {
+                } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
-                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
                            .isRedacted(), false));
                    redactionLogEntry.setRecategorizationType(imageRecategorization.getType());
                } else {
-                    redactionLogEntry.setStatus(Status.DECLINED);
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                }

                redactionLogEntry.setManualRedactionUserId(imageRecategorization.getUser());
@@ -135,19 +131,19 @@ public class RedactionLogMergeService {
            if (mrw.getItem() instanceof IdRemoval) {
                var manualRemoval = (IdRemoval) mrw.getItem();
                String manualOverrideReason = null;
-                if (manualRemoval.getStatus().equals(Status.APPROVED)) {
+                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
                    redactionLogEntry.setRedacted(false);
-                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
                            .isRedacted(), true));
-                } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
                            .isRedacted(), false));
                } else {
-                    redactionLogEntry.setStatus(Status.DECLINED);
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                }

                redactionLogEntry.setReason(manualOverrideReason);
@@ -158,24 +154,24 @@ public class RedactionLogMergeService {
                redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
            }

-            if (mrw.getItem() instanceof ManualForceRedact) {
-                var manualForceRedact = (ManualForceRedact) mrw.getItem();
+            if (mrw.getItem() instanceof ManualForceRedaction) {
+                var manualForceRedact = (ManualForceRedaction) mrw.getItem();
                String manualOverrideReason = null;
-                if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
+                if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
                    redactionLogEntry.setRedacted(true);
-                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
                            .isRedacted(), false));
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
+                } else if (manualForceRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
-                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
                            .isRedacted(), false));
                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                } else {
-                    redactionLogEntry.setStatus(Status.DECLINED);
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                }

                redactionLogEntry.setManualRedactionUserId(manualForceRedact.getUser());
@@ -188,18 +184,18 @@ public class RedactionLogMergeService {
            if (mrw.getItem() instanceof ManualLegalBasisChange) {
                var manualLegalBasisChange = (ManualLegalBasisChange) mrw.getItem();
                String manualOverrideReason = null;
-                if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
-                    redactionLogEntry.setStatus(Status.APPROVED);
+                if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
                    redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
+                } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
-                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
                            .isRedacted(), false));
                    redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
                } else {
-                    redactionLogEntry.setStatus(Status.DECLINED);
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                }

                redactionLogEntry.setManualRedactionUserId(manualLegalBasisChange.getUser());
@@ -234,10 +230,9 @@ public class RedactionLogMergeService {
        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {

            if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry
-                        .getId(), dossierTemplateId);
-                redactionLogEntry.setPositions(manualRedactionEntry.getPositions());
-                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getId()));
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
+                redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
+                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
                redactionLogEntries.add(redactionLogEntry);
            }
        }
@@ -245,11 +240,16 @@ public class RedactionLogMergeService {
        return redactionLogEntries;
    }

+    private List<Rectangle> convertPositions(List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions){
+       return positions.stream().map(pos -> new Rectangle(new Point(pos.getTopLeftX(), pos.getTopLeftY()), pos.getWidth(), pos
+                .getHeight(), pos.getPage())).collect(Collectors.toList());
+    }
+

    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {

        return manualRedactionEntry.getStatus()
-                .equals(Status.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+                .equals(AnnotationStatus.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
    }


@@ -290,11 +290,11 @@ public class RedactionLogMergeService {
    }


-    private float[] getColorForManualAdd(String type, String dossierTemplateId, Status status) {
+    private float[] getColorForManualAdd(String type, String dossierTemplateId, AnnotationStatus status) {

-        if (status.equals(Status.REQUESTED)) {
+        if (status.equals(AnnotationStatus.REQUESTED)) {
            return dictionaryService.getRequestAddColor(dossierTemplateId);
-        } else if (status.equals(Status.DECLINED)) {
+        } else if (status.equals(AnnotationStatus.DECLINED)) {
            return dictionaryService.getNotRedactedColor(dossierTemplateId);
        }
        return getColor(type, dossierTemplateId);
@@ -324,5 +324,6 @@ public class RedactionLogMergeService {

    }

+
 }

@@ -140,12 +140,20 @@ public class EntitySearchUtils {
    public void addEntitiesWithHigherRank(Set<Entity> entities, Entity found, Dictionary dictionary) {

        if (entities.contains(found)) {
-            Entity existing = entities.stream().filter(entity -> entity.equals(found)).findFirst().get();
-            if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
+            Optional<Entity> existingOptional = entities.stream().filter(entity -> entity.equals(found)).findFirst();
+            if(!existingOptional.isPresent()){
+                return;
+            }
+            var existing = existingOptional.get();
+
+            log.info("existing: {}", existing);
+            log.info("found: {} ", found);
+            if(existing.getType().equals(found.getType())){
+                existing.getEngines().addAll(found.getEngines());
+            } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())){
+                found.getEngines().addAll(existing.getEngines());
                entities.remove(found);
                entities.add(found);
-            } else {
-                existing.getEngines().addAll(found.getEngines());
            }
        } else {
            entities.add(found);
@@ -164,7 +172,11 @@ public class EntitySearchUtils {

        for(Entity toAdd: toBeAdded){
            if (existing.contains(toAdd)) {
-                Entity existingEntity = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst().get();
+                Optional<Entity> existingOptional  = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst();
+                if(!existingOptional.isPresent()){
+                    return;
+                }
+                var existingEntity = existingOptional.get();
                existingEntity.getEngines().addAll(toAdd.getEngines());
            } else {
                existing.add(toAdd);
@@ -30,4 +30,8 @@ public class IdBuilder {
    }


+    public String getTypeId(String type, String dossierTemplateId, String dossierId) {
+        return type + ":" + dossierTemplateId + (dossierId != null ? ":" + dossierId : "");
+    }
+
 }
@@ -11,8 +11,7 @@ public class Patterns {

    public static Map<String, Pattern> patternCache = new HashMap<>();

-    public static Pattern AUTHOR_TABLE_SPITTER = Pattern.compile("((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2}\\.)+|((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2} )+");
-
+    public static Pattern AUTHOR_TABLE_SPITTER = Pattern.compile("(((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,500}( ?[A-ZÄÖÜ]{1,2}\\.){1,3})|(((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,500}( ?[A-ZÄÖÜ]{1,2} ){1,3})");

    public Pattern getCompiledPattern(String pattern, boolean caseInsensitive) {

@@ -12,7 +12,7 @@ public class TextNormalizationUtilities {
     * @return Text without line-break hyphenation.
     */
    public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R", "$1");
+        return text.replaceAll("([^\\s\\d\\-]{2,500})[\\-\\u00AD]\\R", "$1");
    }

 }
@@ -4,10 +4,16 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.attribute.FileAttribute;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;

 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -59,77 +65,93 @@ public class PdfSegmentationService {
        PDDocument pdDocument = null;
        try {
            //create tempFile
-            File tempFile = File.createTempFile("document", ".pdf");
-            IOUtils.copy(documentInputStream, new FileOutputStream(tempFile));
+            File tempFile;

-            // initialize required variables
-            Document document = new Document();
-            List<Page> pages = new ArrayList<>();
-
-            pdDocument = reinitializePDDocument(tempFile, null);
-            long pageCount = pdDocument.getNumberOfPages();
-
-            for (int pageNumber = 1; pageNumber <= pageCount; pageNumber++) {
-
-                if (pageNumber % MAX_PAGES_BEFORE_GC == 0) {
-                    pdDocument = reinitializePDDocument(tempFile, pdDocument);
-                }
-
-                PDFLinesTextStripper stripper = new PDFLinesTextStripper();
-                PDPage pdPage = pdDocument.getPage(pageNumber - 1);
-                stripper.setPageNumber(pageNumber);
-                stripper.setStartPage(pageNumber);
-                stripper.setEndPage(pageNumber);
-                stripper.setPdpage(pdPage);
-                stripper.getText(pdDocument);
-
-                PDRectangle pdr = pdPage.getMediaBox();
-                boolean isLandscape = pdr.getWidth() > pdr.getHeight();
-
-                int rotation = pdPage.getRotation();
-                boolean isRotated = rotation != 0 && rotation != 360;
-
-                CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(stripper.getRulings(), stripper.getMinCharWidth(), stripper
-                        .getMaxCharHeight());
-
-                Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings
-                        .getVertical());
-
-                PDRectangle cropbox = pdPage.getCropBox();
-                float cropboxArea = cropbox.getHeight() * cropbox.getWidth();
-                page.setCropBoxArea(cropboxArea);
-
-                page.setRotation(rotation);
-                page.setLandscape(isLandscape || isRotated);
-                page.setPageNumber(pageNumber);
-
-                List<PdfImage> mergedList = imageMergeService.mergeImages(stripper.getImages(), rotation);
-                page.setImages(mergedList);
-
-                tableExtractionService.extractTables(cleanRulings, page);
-                buildPageStatistics(page);
-                increaseDocumentStatistics(page, document);
-
-                if (!ignoreImages) {
-                    imageClassificationService.classifyImages(page);
-                }
-
-                pages.add(page);
+            if(SystemUtils.IS_OS_UNIX) {
+                FileAttribute<Set<PosixFilePermission>> attr = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"));
+                tempFile = Files.createTempFile("document", ".pdf", attr).toFile();
+            }
+            else {
+                tempFile = Files.createTempFile("document", ".pdf").toFile();
+                tempFile.setReadable(true, true);
+                tempFile.setWritable(true, true);
+                tempFile.setExecutable(true, true);
            }

-            document.setPages(pages);
+            try (var fos = new FileOutputStream(tempFile)) {
+                IOUtils.copy(documentInputStream, fos);

-            classificationService.classifyDocument(document);
-            sectionsBuilderService.buildSections(document);
-            sectionsBuilderService.addImagesToSections(document);
+                // initialize required variables
+                Document document = new Document();
+                List<Page> pages = new ArrayList<>();

-            pdDocument = reinitializePDDocument(tempFile, pdDocument);
+                pdDocument = reinitializePDDocument(tempFile, null);
+                long pageCount = pdDocument.getNumberOfPages();

-            IOUtils.close(pdDocument);
+                for (int pageNumber = 1; pageNumber <= pageCount; pageNumber++) {

-            tempFile.delete();
+                    if (pageNumber % MAX_PAGES_BEFORE_GC == 0) {
+                        pdDocument = reinitializePDDocument(tempFile, pdDocument);
+                    }

-            return document;
+                    PDFLinesTextStripper stripper = new PDFLinesTextStripper();
+                    PDPage pdPage = pdDocument.getPage(pageNumber - 1);
+                    stripper.setPageNumber(pageNumber);
+                    stripper.setStartPage(pageNumber);
+                    stripper.setEndPage(pageNumber);
+                    stripper.setPdpage(pdPage);
+                    stripper.getText(pdDocument);
+
+                    PDRectangle pdr = pdPage.getMediaBox();
+                    boolean isLandscape = pdr.getWidth() > pdr.getHeight();
+
+                    int rotation = pdPage.getRotation();
+                    boolean isRotated = rotation != 0 && rotation != 360;
+
+                    CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(stripper.getRulings(), stripper.getMinCharWidth(), stripper
+                            .getMaxCharHeight());
+
+                    Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings
+                            .getVertical());
+
+                    PDRectangle cropbox = pdPage.getCropBox();
+                    float cropboxArea = cropbox.getHeight() * cropbox.getWidth();
+                    page.setCropBoxArea(cropboxArea);
+
+                    page.setRotation(rotation);
+                    page.setLandscape(isLandscape || isRotated);
+                    page.setPageNumber(pageNumber);
+
+                    List<PdfImage> mergedList = imageMergeService.mergeImages(stripper.getImages(), rotation);
+                    page.setImages(mergedList);
+
+                    tableExtractionService.extractTables(cleanRulings, page);
+                    buildPageStatistics(page);
+                    increaseDocumentStatistics(page, document);
+
+                    if (!ignoreImages) {
+                        imageClassificationService.classifyImages(page);
+                    }
+
+                    pages.add(page);
+                }
+
+                document.setPages(pages);
+
+                classificationService.classifyDocument(document);
+                sectionsBuilderService.buildSections(document);
+                sectionsBuilderService.addImagesToSections(document);
+
+                pdDocument = reinitializePDDocument(tempFile, pdDocument);
+
+                IOUtils.close(pdDocument);
+
+                if(!tempFile.delete()){
+                    log.warn("Could not delete tmp file");
+                }
+
+                return document;
+            }
        } finally {
            if (pdDocument != null) {
                pdDocument.close();
@@ -1,7 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.storage;

 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.FileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
@@ -40,3 +40,4 @@ storage:
  bucket-name: 'redaction'
  region: 'us-east-1'
  endpoint: 'https://s3.amazonaws.com'
+  backend: 's3'
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server;

 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
+import com.iqser.red.storage.commons.service.S3StorageService;
 import com.iqser.red.storage.commons.service.StorageService;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
@@ -12,7 +13,7 @@ import java.io.FileOutputStream;
 import java.util.HashMap;
 import java.util.Map;

-public class FileSystemBackedStorageService extends StorageService {
+public class FileSystemBackedStorageService extends S3StorageService {

    private final Map<String, File> dataMap = new HashMap<>();

@@ -2,11 +2,13 @@ package com.iqser.red.service.redaction.v1.server;

 import com.amazonaws.services.s3.AmazonS3;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.FileType;
-import com.iqser.red.service.persistence.service.v1.api.model.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DictionaryEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Type;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
+import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
 import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
@@ -19,11 +21,11 @@ import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeServic
 import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
-
 import lombok.SneakyThrows;
-
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -137,7 +139,7 @@ public class RedactionIntegrationTest {
    private final static String TEST_FILE_ID = "123";

    @Configuration
-    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class})
    public static class RedactionIntegrationTestConfiguration {

        @Bean
@@ -189,53 +191,53 @@ public class RedactionIntegrationTest {

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
        when(dictionaryClient.getAllTypesForDossier(TEST_DOSSIER_ID)).thenReturn(List.of(Type.builder()
-                .id(DOSSIER_REDACTIONS +":"+ TEST_DOSSIER_TEMPLATE_ID)
+                .id(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID)
                .type(DOSSIER_REDACTIONS)
-                        .dossierTemplateId(TEST_DOSSIER_ID)
-                        .hexColor("#ffe187")
-                        .isHint(hintTypeMap.get(DOSSIER_REDACTIONS))
-                        .isCaseInsensitive(caseInSensitiveMap.get(DOSSIER_REDACTIONS))
-                        .isRecommendation(recommendationTypeMap.get(DOSSIER_REDACTIONS))
-                        .rank(rankTypeMap.get(DOSSIER_REDACTIONS))
-                        .build()));
+                .dossierTemplateId(TEST_DOSSIER_ID)
+                .hexColor("#ffe187")
+                .isHint(hintTypeMap.get(DOSSIER_REDACTIONS))
+                .isCaseInsensitive(caseInSensitiveMap.get(DOSSIER_REDACTIONS))
+                .isRecommendation(recommendationTypeMap.get(DOSSIER_REDACTIONS))
+                .rank(rankTypeMap.get(DOSSIER_REDACTIONS))
+                .build()));

        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(TEST_METHOD, false));
-        when(dictionaryClient.getDictionaryForType(PII+ ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PII, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
-        when(dictionaryClient.getDictionaryForType(PURITY+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(PURITY, false));
-        when(dictionaryClient.getDictionaryForType(IMAGE+ ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(IMAGE, false));
-        when(dictionaryClient.getDictionaryForType(OCR+ ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(OCR, false));
-        when(dictionaryClient.getDictionaryForType(LOGO+ ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(IMAGE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(IMAGE, false));
+        when(dictionaryClient.getDictionaryForType(OCR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(OCR, false));
+        when(dictionaryClient.getDictionaryForType(LOGO + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(LOGO, false));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA+ ":" + TEST_DOSSIER_TEMPLATE_ID))
+        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID))
                .thenReturn(getDictionaryResponse(FORMULA, false));
-        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS+ ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
+        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
        when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
    }

@@ -496,7 +498,7 @@ public class RedactionIntegrationTest {
    private Type getDictionaryResponse(String type, boolean isDossierDictionary) {

        return Type.builder()
-                .id(type + ":" +TEST_DOSSIER_TEMPLATE_ID)
+                .id(type + ":" + TEST_DOSSIER_TEMPLATE_ID)
                .hexColor(typeColorMap.get(type))
                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary
                        .get(type)))
@@ -514,9 +516,8 @@ public class RedactionIntegrationTest {
        entries.forEach(entry -> {
            dictionaryEntries.add(DictionaryEntry.builder()
                    .value(entry)
-                    .version(reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L)
-                    .deleted(deleted
-                            .contains(entry) ? true : false).build());
+                    .version(reanlysisVersions.getOrDefault(entry, 0L))
+                    .deleted(deleted.contains(entry)).build());
        });
        return dictionaryEntries;
    }
@@ -575,7 +576,7 @@ public class RedactionIntegrationTest {
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated3.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated3.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long rstart = System.currentTimeMillis();
@@ -683,17 +684,11 @@ public class RedactionIntegrationTest {
        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
        var text = redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID);

-        redactionLog.getRedactionLogEntry().forEach(entry -> {
-            if (entry.isImage()) {
-                System.out.println("---->" + entry.getType());
-            }
-        });
-
        long end = System.currentTimeMillis();

        System.out.println("first analysis duration: " + (end - start));

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Test.json")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Test.json")) {
            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID)));
        }

@@ -744,9 +739,10 @@ public class RedactionIntegrationTest {

        ManualRedactions manualRedactions = new ManualRedactions();

-        manualRedactions.setImageRecategorizations(Set.of(ManualImageRecategorization.builder()
-                .id("37eee3e9d589a5cc529bfec38c3ba479")
-                .status(Status.APPROVED)
+        manualRedactions.setImageRecategorization(Set.of(ManualImageRecategorization.builder()
+                .annotationId("37eee3e9d589a5cc529bfec38c3ba479")
+                .fileId("fileId")
+                .status(AnnotationStatus.APPROVED)
                .type("signature")
                .build()));

@@ -764,7 +760,7 @@ public class RedactionIntegrationTest {
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }

@@ -800,7 +796,7 @@ public class RedactionIntegrationTest {
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();
@@ -829,13 +825,15 @@ public class RedactionIntegrationTest {
                .text("This is a comment test")
                .build();
        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
-                .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
-                .status(Status.DECLINED)
+                .annotationId("5b940b2cb401ed9f5be6fc24f6e77bcf")
+                .fileId("fileId")
+                .status(AnnotationStatus.DECLINED)
                .build()));
-        manualRedactions.setForceRedacts(Set.of(ManualForceRedact.builder()
-                .id("675eba69b0c2917de55462c817adaa05")
+        manualRedactions.setForceRedactions(Set.of(ManualForceRedaction.builder()
+                .annotationId("675eba69b0c2917de55462c817adaa05")
+                .fileId("fileId")
                .legalBasis("Something")
-                .status(Status.APPROVED)
+                .status(AnnotationStatus.APPROVED)
                .build()));

        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
@@ -843,12 +841,27 @@ public class RedactionIntegrationTest {
        manualRedactions.getComments().put(manualAddId, List.of(comment));

        ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
-        manualRedactionEntry.setId(manualAddId);
-        manualRedactionEntry.setStatus(Status.REQUESTED);
+        manualRedactionEntry.setAnnotationId(manualAddId);
+        manualRedactionEntry.setFileId("fileId");
+        manualRedactionEntry.setStatus(AnnotationStatus.REQUESTED);
        manualRedactionEntry.setType("name");
        manualRedactionEntry.setValue("O'Loughlin C.K.");
        manualRedactionEntry.setReason("Manual Redaction");
-        manualRedactionEntry.setPositions(List.of(new Rectangle(new Point(375.61096f, 241.282f), 7.648041f, 43.72262f, 1), new Rectangle(new Point(384.83517f, 241.282f), 7.648041f, 17.043358f, 1)));
+        manualRedactionEntry.setPositions(List.of(Rectangle
+                        .builder()
+                        .topLeftX(375.61096f)
+                        .topLeftY(241.282f)
+                        .width(7.648041f)
+                        .height(43.72262f)
+                        .page(1).build()
+                , Rectangle
+                        .builder()
+                        .topLeftX(384.83517f)
+                        .topLeftY(241.282f)
+                        .width(7.648041f)
+                        .height(17.043358f)
+                        .page(1).build())
+        );

 //        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);

@@ -859,14 +872,16 @@ public class RedactionIntegrationTest {

        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
-                .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
-                .status(Status.APPROVED)
+                .annotationId("5b940b2cb401ed9f5be6fc24f6e77bcf")
+                .fileId("fileId")
+                .status(AnnotationStatus.APPROVED)
                .build()));
-        manualRedactions.setManualLegalBasisChanges(Set.of(ManualLegalBasisChange.builder()
-                .id("675eba69b0c2917de55462c817adaa05")
+        manualRedactions.setLegalBasisChanges((Set.of(ManualLegalBasisChange.builder()
+                .annotationId("675eba69b0c2917de55462c817adaa05")
+                .fileId("fileId")
                .legalBasis("Manual Legal Basis Change")
-                .status(Status.APPROVED)
-                .build()));
+                .status(AnnotationStatus.APPROVED)
+                .build())));

        analyzeService.reanalyze(request);

@@ -877,7 +892,7 @@ public class RedactionIntegrationTest {
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();
@@ -903,7 +918,7 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.classify(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Classified.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Classified.pdf")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -925,7 +940,7 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.sections(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Sections.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Sections.pdf")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -947,7 +962,7 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.htmlTables(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Tables.html")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Tables.html")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -969,7 +984,7 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.htmlTables(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Tables.html")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Tables.html")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -1039,7 +1054,7 @@ public class RedactionIntegrationTest {
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();
@@ -1067,4 +1082,12 @@ public class RedactionIntegrationTest {
        }
    }

+    private static String getTemporaryDirectory() {
+        String tmpdir = System.getProperty("java.io.tmpdir");
+        if (StringUtils.isNotBlank(tmpdir)) {
+            return tmpdir;
+        }
+        return "/tmp";
+    }
+
 }
@@ -13,6 +13,7 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingC
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.platform.commons.util.StringUtils;
 import org.junit.runner.RunWith;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -95,7 +96,7 @@ public class PdfSegmentationServiceTest {
            for (PdfImage image : page.getImages()) {
                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
                    ImageIO.write(image.getImage(), "png", baos);
-                    try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Image " + i + ".png")) {
+                    try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Image " + i + ".png")) {
                        fileOutputStream.write(baos.toByteArray());
                    }
                }
@@ -239,4 +240,12 @@ public class PdfSegmentationServiceTest {
                        .equals(firstTableHeaderCells))).isTrue();
    }

+    private static String getTemporaryDirectory() {
+        String tmpdir = System.getProperty("java.io.tmpdir");
+        if (StringUtils.isNotBlank(tmpdir)) {
+            return tmpdir;
+        }
+        return "/tmp";
+    }
+
 }
@@ -18,3 +18,10 @@ platform.multi-tenancy:
 redaction-service:
  enable-image-classification: false
  enable-entity-recognition: false
+
+storage:
+  signer-type: 'AWSS3V4SignerType'
+  bucket-name: 'redaction'
+  region: 'us-east-1'
+  endpoint: 'https://s3.amazonaws.com'
+  backend: 's3'
Author	SHA1	Message	Date
Dominique Eifländer	4d0c5eda57	test 1	2021-10-19 14:52:55 +02:00
Dominique Eifländer	2f66d223fd	Added some logs	2021-10-19 14:38:03 +02:00
Dominique Eifländer	fa8f598763	RED-2224: Fixed missing values in engines	2021-10-19 10:55:51 +02:00
Dominique Eiflaender	46c6385d11	Pull request #250 : RED-2223: Fixed adding annotations to rotated words on non rotated pages Merge in RED/redaction-service from RED-2223 to master * commit '6005c476962dcdfd1d4e4fabf10fa840377b78db': RED-2223: Fixed adding annotations to rotated words on non rotated pages	2021-10-15 15:35:28 +02:00
Dominique Eifländer	6005c47696	RED-2223: Fixed adding annotations to rotated words on non rotated pages	2021-10-15 15:27:15 +02:00
Dominique Eiflaender	ac556dfc9f	Pull request #249 : RED-2468: Fixed push recommendations to dictionary Merge in RED/redaction-service from RED-2468 to master * commit '15d836644b6a74273e81de361091d6ea1b71bea9': RED-2468: Fixed push recommendations to dictionary	2021-10-15 10:45:10 +02:00
Dominique Eifländer	15d836644b	RED-2468: Fixed push recommendations to dictionary	2021-10-15 10:36:01 +02:00
Ali Oezyetimoglu	d0cd3853cc	Pull request #248 : RED-2263: fixed Regex-Issue that can lead to stack overflow in redaction-service Merge in RED/redaction-service from RED-2263-rs1 to master * commit 'b96c39d5e58317e989faf8dc881ee6e596dbf363': RED-2263: fixed Regex-Issue that can lead to stack overflow in redaction-service	2021-10-14 13:21:58 +02:00
aoezyetimoglu	b96c39d5e5	RED-2263: fixed Regex-Issue that can lead to stack overflow in redaction-service	2021-10-14 13:04:49 +02:00
Timo Bejan	b83baf4bc4	Pull request #247 : RED-2334 Merge in RED/redaction-service from 3.0-efsa-readiness to master * commit '8bfe8acb85e33502f4978b12b5cc09f68a602f47': RED-2334	2021-10-13 09:24:16 +02:00
Timo Bejan	8bfe8acb85	RED-2334	2021-10-12 17:23:28 +03:00
Ali Oezyetimoglu	57f6bd77ed	Pull request #246 : RED-2246: updated platform-commons-dependency Merge in RED/redaction-service from RED-2246-rs1 to master * commit '15ed333478313f3f23d439ad6163553f9b68760e': RED-2246: updated platform-commons-dependency	2021-10-08 15:30:38 +02:00
aoezyetimoglu	15ed333478	RED-2246: updated platform-commons-dependency	2021-10-08 15:18:48 +02:00
Timo Bejan	b3393a5f16	Pull request #245 : RED-2378 Merge in RED/redaction-service from 3.0-efsa-readiness to master * commit 'a299a326eb5587cd76b19ba848f5a771e2741edc': RED-2378	2021-10-08 13:59:30 +02:00
Timo Bejan	a299a326eb	RED-2378	2021-10-08 14:13:50 +03:00
Philipp Schramm	1034066e38	Pull request #244 : Bugfix/workaround for windows Merge in RED/redaction-service from bugfix/workaround-for-windows to master * commit '535316c3a7740f61c682ae3d938f33671660c667': Bugfix with 'posix:permissions' for Windows systems Just a test without PosixFilePermission	2021-10-07 16:51:34 +02:00
Philipp Schramm	535316c3a7	Bugfix with 'posix:permissions' for Windows systems	2021-10-07 15:35:42 +02:00
Philipp Schramm	1e86073dff	Just a test without PosixFilePermission	2021-10-07 14:35:44 +02:00
Philipp Schramm	5dc0e1932e	Get temporary directory for tests dynamically to prevent issues with Windows systems	2021-10-07 14:12:39 +02:00
Philipp Schramm	8f75ff89a1	Use platform-docker-dependency version 1.1.0 which contains bugfix for Windows systems	2021-10-07 14:02:51 +02:00
Timo Bejan	1e61ea8736	Pull request #243 : Updated Persistence Service Version Merge in RED/redaction-service from 3.0-efsa-readiness to master * commit '0fa4c54490422cf06f0a9034e3e9a83c78a66f6e': Updated Persistence Service Version	2021-10-07 09:12:46 +02:00
Timo Bejan	0fa4c54490	Updated Persistence Service Version	2021-10-07 10:06:36 +03:00
Dominique Eiflaender	243b4e4808	Pull request #242 : RED-2172: Enbled to configure azure blob storage as storage backend Merge in RED/redaction-service from RED-2172 to master * commit 'e22e454fb5c16b326183179193bf24a8e7d724be': RED-2172: Enbled to configure azure blob storage as storage backend	2021-10-06 15:13:09 +02:00
Dominique Eifländer	e22e454fb5	RED-2172: Enbled to configure azure blob storage as storage backend	2021-10-06 15:02:44 +02:00
Ali Oezyetimoglu	4316f36484	Pull request #241 : RED-2261 rs7 Merge in RED/redaction-service from RED-2261-rs7 to master * commit '22ae1ad6a98a0db4383e545c931d41111d0463ed': RED-2261: update dependencies RED-2261: update dependencies	2021-10-04 16:47:17 +02:00
aoezyetimoglu	22ae1ad6a9	RED-2261: update dependencies	2021-10-01 15:31:39 +02:00
aoezyetimoglu	e7fc3f8079	RED-2261: update dependencies	2021-10-01 14:56:19 +02:00
Ali Oezyetimoglu	8f54adc8e6	Pull request #239 : RED-2261: update dependencies Merge in RED/redaction-service from RED-2261-rs5 to master * commit '94622a90f373248ed0c10d7c6d7fddbee65c3028': RED-2261: update dependencies	2021-10-01 13:18:53 +02:00
aoezyetimoglu	94622a90f3	RED-2261: update dependencies	2021-10-01 10:59:37 +02:00
Ali Oezyetimoglu	58383467bb	Pull request #238 : RED-2261: update dependencies Merge in RED/redaction-service from RED-2261-rs4 to master * commit '8f31abf8dc9817be3a9a110eefd33ee919ae5313': RED-2261: update dependencies	2021-09-30 17:00:57 +02:00
aoezyetimoglu	8f31abf8dc	RED-2261: update dependencies	2021-09-30 16:54:28 +02:00
Ali Oezyetimoglu	71e698da9d	Pull request #237 : RED-2261 rs3 Merge in RED/redaction-service from RED-2261-rs3 to master * commit 'f3b6a2e57e00fc3892370408f6ba0a70b20791a1': RED-2261: update dependencies RED-2261: update dependencies	2021-09-30 16:51:41 +02:00
aoezyetimoglu	f3b6a2e57e	RED-2261: update dependencies	2021-09-30 16:41:35 +02:00
aoezyetimoglu	a058bb996b	RED-2261: update dependencies	2021-09-30 16:00:35 +02:00
Ali Oezyetimoglu	8633b02f4e	Pull request #233 : RED-2272: Make sure publicly writable directories are used safely && regex upper bound Merge in RED/redaction-service from RED-2272-rs1 to master * commit 'c4e47a48f8973ca1bbd602727a205647deb809fe': RED-2272: Make sure publicly writable directories are used safely && regex upper bound RED-2272: Make sure publicly writable directories are used safely && regex upper bound	2021-09-30 12:45:46 +02:00
aoezyetimoglu	c4e47a48f8	RED-2272: Make sure publicly writable directories are used safely && regex upper bound	2021-09-30 12:37:01 +02:00
aoezyetimoglu	adba0f99a0	RED-2272: Make sure publicly writable directories are used safely && regex upper bound	2021-09-30 11:51:48 +02:00
Timo Bejan	10ae7fc20d	Pull request #232 : typeId to type internal refactor Merge in RED/redaction-service from persistence-service-integration to master * commit 'dcd6d9d2c9cb66ad55e08d82a6044ea1b01c54eb': fixed pmd typeId to type internal refactor	2021-09-29 15:57:45 +02:00
Timo Bejan	dcd6d9d2c9	fixed pmd	2021-09-29 16:52:06 +03:00
Timo Bejan	0856c542bc	typeId to type internal refactor	2021-09-29 16:34:04 +03:00
Dominique Eiflaender	dd8a07d2ad	Pull request #231 : Fixed update dictionary request Merge in RED/redaction-service from UpdateDictionaryFix to master * commit 'ded1b6eb66bd179589cb6191f748e39ea834a7a6': Fixed update dictionary request	2021-09-29 09:49:45 +02:00
Dominique Eifländer	ded1b6eb66	Fixed update dictionary request	2021-09-29 09:40:40 +02:00
Timo Bejan	1a82cd0b84	Pull request #230 : dep cleanup Merge in RED/redaction-service from persistence-service-integration to master * commit 'cd192ebf4e0f1937f5a3ba1b1d1f2701a6e74443': dep cleanup	2021-09-28 15:46:53 +02:00
Timo Bejan	cd192ebf4e	dep cleanup	2021-09-28 16:33:21 +03:00
Timo Bejan	6d50fe1d06	Pull request #229 : upgraded ps integration Merge in RED/redaction-service from persistence-service-integration to master * commit '530747fa20bf5beb95a6b3d167cbfe09f0d145d5': upgraded ps integration upgraded ps integration	2021-09-28 14:53:46 +02:00
Timo Bejan	530747fa20	upgraded ps integration	2021-09-28 15:47:39 +03:00
Timo Bejan	3a9911dcac	upgraded ps integration	2021-09-28 15:30:30 +03:00
Dominique Eiflaender	bee124f394	Pull request #228 : RED-2276: Fixed sonar bug findings Merge in RED/redaction-service from RED-2276 to master * commit '34daa4c22c3b5c8692f2f5f3056a633f9ec09649': RED-2276: Fixed sonar bug findings	2021-09-24 13:13:08 +02:00
Dominique Eifländer	34daa4c22c	RED-2276: Fixed sonar bug findings	2021-09-24 13:06:54 +02:00
Dominique Eiflaender	100c1d68c3	Pull request #227 : RED-2228: Use manual redaction classes from persistence-service, changed type in redactionlog to typeId Merge in RED/redaction-service from RED-2228-2 to master * commit '6ca134bdbd1084d530ba81a4a9895549d927d7a4': RED-2228: Use manual redaction classes from persistence-service, changed type in redactionlog to typeId	2021-09-23 12:39:53 +02:00
Dominique Eifländer	6ca134bdbd	RED-2228: Use manual redaction classes from persistence-service, changed type in redactionlog to typeId	2021-09-23 12:15:00 +02:00