Added equalsIgnoreCase fileattributes methods for rules

Pull request #213 : RED-1755: Calculate falgs in file-management-service async
Merge in RED/redaction-service from RED-1755-2 to release/2.52.x * commit 'dd585a13fd8d37319ce695eeb39a87ff197bec15': RED-1755: Calculate falgs in file-management-service async
2021-08-20 14:51:22 +02:00 · 2021-08-18 11:58:28 +02:00 · 2021-08-18 10:02:37 +02:00 · 2021-08-17 12:21:59 +02:00 · 2021-08-17 11:28:52 +02:00 · 2021-08-13 13:56:23 +02:00
80 changed files with 2009 additions and 2043 deletions
@@ -55,8 +55,7 @@ public class PlanSpec {
    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
        Permissions permission = new Permissions()
                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                .loggedInUserPermissions(PermissionType.VIEW)
                .anonymousUserPermissionView();
        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
@@ -94,11 +93,6 @@ public class PlanSpec {
                                                .description("Resultparser")
                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
                                                .enabled(true),
-                                        new ScriptTask()
-                                                .description("Sonar")
-                                                .location(Location.FILE)
-                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
-                                                .argument(SERVICE_NAME),
                                        new InjectVariablesTask()
                                                .description("Inject git Tag")
                                                .path("git.tag")
@@ -1,42 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-
-echo "dependency-check:aggregate"
-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-    --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    org.owasp:dependency-check-maven:aggregate
-
-if [[ -z "${bamboo_repository_pr_key}" ]]
-then
-    echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-            --no-transfer-progress \
-            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-            sonar:sonar \
-            -Dsonar.projectKey=RED_$SERVICE_NAME \
-            -Dsonar.host.url=https://sonarqube.iqser.com \
-            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-            -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
-            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-            
-else
-    echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-            --no-transfer-progress \
-            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-            sonar:sonar \
-            -Dsonar.projectKey=RED_$SERVICE_NAME \
-            -Dsonar.host.url=https://sonarqube.iqser.com \
-            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-            -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
-            -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
-            -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
-            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-fi
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.iqser.red</groupId>
        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.1.0</version>
+        <version>1.0.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.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.br.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.5</version>
+        <version>1.1.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

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

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


@@ -32,7 +32,7 @@
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.7.0</version>
+                <version>1.3.6</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -52,63 +52,4 @@

    </dependencyManagement>

-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.9.0.2155</version>
-                    </plugin>                    
-                <plugin>
-                    <groupId>org.owasp</groupId>
-                    <artifactId>dependency-check-maven</artifactId>
-                    <version>6.3.1</version>
-                    <configuration>
-                        <format>ALL</format>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>prepare-agent</id>
-                            <goals>
-                                <goal>prepare-agent</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>report</id>
-                            <goals>
-                                <goal>report</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.7</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <goals>
-                            <goal>report-aggregate</goal>
-                        </goals>
-                        <phase>verify</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
@@ -19,8 +19,14 @@
        </dependency>
        <dependency>
            <groupId>com.iqser.red.service</groupId>
-            <artifactId>persistence-service-api-v1</artifactId>
-            <version>0.44.0</version>
+            <artifactId>configuration-service-api-v1</artifactId>
+            <version>2.11.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>file-management-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
    </dependencies>
 </project>
@@ -1,6 +1,5 @@
 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;
@@ -12,7 +11,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-
@Data
@Builder
@NoArgsConstructor
@@ -1,15 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Argument {
-
-    private String name;
-    private ArgumentType type;
-
-}
@@ -1,7 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum ArgumentType {
-
-    INTEGER, BOOLEAN, STRING, FILE_ATTRIBUTE, REGEX, TYPE, RULE_NUMBER, LEGAL_BASIS, REFERENCE_TYPE
-
-}
@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;

 public enum ChangeType {
-    ADDED, REMOVED, CHANGED
+    ADDED, REMOVED
 }
@@ -1,18 +1,21 @@
 package com.iqser.red.service.redaction.v1.model;

-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.time.OffsetDateTime;
+
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class Change {
+public class Comment {
+
+    private String id;
+    private OffsetDateTime date;
+    private String text;
+    private String user;

-    private ChangeType type;
-    private OffsetDateTime dateTime;
 }
@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum Engine {
-    DICTIONARY, NER, RULE
-}
@@ -0,0 +1,25 @@
+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;
+
+}
@@ -0,0 +1,25 @@
+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;
+
+}
@@ -0,0 +1,25 @@
+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;
+
+}
@@ -0,0 +1,25 @@
+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;
+
+}
@@ -0,0 +1,34 @@
+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;
+
+}
@@ -0,0 +1,38 @@
+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<>();
+
+}
@@ -0,0 +1,22 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RedactionChangeLog {
+
+    private List<RedactionChangeLogEntry> redactionLogEntry = new ArrayList<>();
+
+    private long dictionaryVersion = -1;
+    private long dossierDictionaryVersion = -1;
+    private long rulesVersion = -1;
+    private long legalBasisVersion = -1;
+
+}
@@ -0,0 +1,49 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RedactionChangeLogEntry {
+
+    private String id;
+    private String type;
+    private String value;
+    private String reason;
+    private int matchedRule;
+    private String legalBasis;
+    private boolean redacted;
+    private boolean isHint;
+    private boolean isRecommendation;
+    private String section;
+    private float[] color;
+
+    @Builder.Default
+    private List<Rectangle> positions = new ArrayList<>();
+    private int sectionNumber;
+    private boolean manual;
+    private Status status;
+    private ManualRedactionType manualRedactionType;
+    private boolean isDictionaryEntry;
+
+    private String textBefore;
+    private String textAfter;
+
+    @Builder.Default
+    private List<Comment> comments = new ArrayList<>();
+
+    private ChangeType changeType;
+
+    private boolean isDossierDictionaryEntry;
+
+    private boolean excluded;
+
+}
@@ -1,12 +1,11 @@
 package com.iqser.red.service.redaction.v1.model;

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

 import java.util.List;

-
@Data
@AllArgsConstructor
 public class RedactionLog {
@@ -19,7 +18,7 @@ public class RedactionLog {
    private long analysisVersion;

    private List<RedactionLogEntry> redactionLogEntry;
-    private List<LegalBasis> legalBasis;
+    private List<LegalBasisMapping> legalBasis;

    private long dictionaryVersion = -1;
    private long dossierDictionaryVersion = -1;
@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class RedactionLogChanges {
-
-    private RedactionLog redactionLog;
-    private boolean hasChanges;
-
-}
@@ -1,7 +1,5 @@
 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;
@@ -9,9 +7,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+


@Data
@@ -37,7 +34,7 @@ public class RedactionLogEntry {
    private List<Rectangle> positions = new ArrayList<>();
    private int sectionNumber;
    private boolean manual;
-    private AnnotationStatus status;
+    private Status status;
    private ManualRedactionType manualRedactionType;
    private String manualRedactionUserId;
    private boolean isDictionaryEntry;
@@ -61,14 +58,4 @@ public class RedactionLogEntry {
    private String recategorizationType;
    private String legalBasisChangeValue;

-    @EqualsAndHashCode.Exclude
-    @Builder.Default
-    private List<Change> changes = new ArrayList<>();
-
-    private Set<Engine> engines= new HashSet<>();
-
-    private Set<String> reference = new HashSet<>();
-
-
-
 }
@@ -3,8 +3,6 @@ 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,14 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class RuleBuilderModel {
-
-    private List<RuleElement> whenClauses = new ArrayList<>();
-    private List<RuleElement> thenConditions = new ArrayList<>();
-
-}
@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RuleElement {
-
-    private String conditionName;
-    private List<Argument> arguments = new ArrayList<>();
-
-}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Status {
+    REQUESTED, APPROVED, DECLINED
+}
@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class StructureAnalyzeRequest {
-
-    private String dossierId;
-    private String fileId;
-
-}
-
@@ -1,12 +0,0 @@
-package com.iqser.red.service.redaction.v1.resources;
-
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-
-public interface RuleBuilderResource {
-
-    @PostMapping(value = "/rule-builder-model", produces = MediaType.APPLICATION_JSON_VALUE)
-    RuleBuilderModel getRuleBuilderModel();
-
-}
@@ -21,15 +21,30 @@
            <artifactId>redaction-service-api-v1</artifactId>
            <version>${project.version}</version>
        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>file-management-service-api-v1</artifactId>
+            <version>2.25.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>redaction-service-api-v1</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>configuration-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
            <artifactId>drools-core</artifactId>
-            <version>7.59.0.Final</version>
+            <version>7.37.0.Final</version>
        </dependency>
        <dependency>
            <groupId>org.kie</groupId>
            <artifactId>kie-spring</artifactId>
-            <version>7.59.0.Final</version>
+            <version>7.37.0.Final</version>
        </dependency>
        <dependency>
            <groupId>org.locationtech.jts</groupId>
@@ -39,6 +54,7 @@
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
        </dependency>

        <dependency>
@@ -71,6 +87,10 @@
            <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>
@@ -88,6 +108,7 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-amqp</artifactId>
+            <version>2.3.1.RELEASE</version>
        </dependency>

        <!-- test dependencies -->
@@ -101,6 +122,12 @@
            <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,14 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import java.util.ArrayList;
-import java.util.List;
-
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
-
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
@Data
@NoArgsConstructor
 public class Document {
@@ -18,14 +23,20 @@ public class Document {
    private List<Header> headers = new ArrayList<>();
    private List<Footer> footers = new ArrayList<>();
    private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
+    private Map<Integer, List<Entity>> entities = new HashMap<>();
    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
    private boolean headlines;

+    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
    private SectionGrid sectionGrid = new SectionGrid();
    private DictionaryVersion dictionaryVersion;
    private long rulesVersion;

+    private List<SectionText> sectionText = new ArrayList<>();
+
+    private Map<Integer, Set<Image>> images = new HashMap<>();
+
 }
@@ -1,9 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;

+import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.DictionaryResource;
-
-@FeignClient(name = "DictionaryResource", url = "${persistence-service.url}")
+@FeignClient(name = "DictionaryResource", url = "${configuration-service.url}")
 public interface DictionaryClient extends DictionaryResource {
 }
@@ -1,19 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import com.iqser.red.service.redaction.v1.server.client.model.EntityRecogintionEntity;
-import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionRequest;
-import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
-
-@FeignClient(name = "EntityRecognitionClient", url = "${entity-recognition-service.url}")
-public interface EntityRecognitionClient {
-
-    @PostMapping(value = "/find_authors", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    NerEntities findAuthors(EntityRecognitionRequest entityRecognitionRequest);
-}
@@ -1,10 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.client;


+import com.iqser.red.service.file.management.v1.api.resources.FileStatusProcessingUpdateResource;
 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.FileStatusProcessingUpdateResource;
-
-@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
+@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${file-management-service.url}")
 public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
 }
@@ -1,9 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;

+import com.iqser.red.service.configuration.v1.api.resource.LegalBasisMappingResource;
 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.LegalBasisMappingResource;
-
-@FeignClient(name = "LegalBasisMappingResource", url = "${persistence-service.url}")
+@FeignClient(name = "LegalBasisMappingResource", url = "${configuration-service.url}")
 public interface LegalBasisClient extends LegalBasisMappingResource {
 }
@@ -1,9 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;

+import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.RulesResource;
-
-@FeignClient(name = "RulesResource", url = "${persistence-service.url}")
+@FeignClient(name = "RulesResource", url = "${configuration-service.url}")
 public interface RulesClient extends RulesResource {
 }
@@ -1,19 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class EntityRecogintionEntity {
-
-      private String value;
-      private int startOffset;
-      private int endOffset;
-      private String type;
-
-}
@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class EntityRecognitionRequest {
-
-   private List<EntityRecognitionSection> data;
-
-}
@@ -1,20 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class EntityRecognitionResult {
-
-    @Builder.Default
-    private Map<Integer, List<EntityRecogintionEntity>> entities = new HashMap<>();
-}
@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class EntityRecognitionSection {
-
-    private int sectionNumber;
-    private String text;
-}
@@ -1,21 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class NerEntities {
-
-   @Builder.Default
-   private Map<Integer, List<EntityRecogintionEntity>> result = new HashMap<>();
-
-}
@@ -1,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-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.file.management.v1.api.model.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;
@@ -12,6 +11,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.service.DictionarySer
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
@@ -20,6 +20,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

@@ -153,10 +154,6 @@ 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
@@ -1,21 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.controller;
-
-
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-import com.iqser.red.service.redaction.v1.resources.RuleBuilderResource;
-import com.iqser.red.service.redaction.v1.server.redaction.rulebuilder.RuleBuilderModelService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequiredArgsConstructor
-public class RuleBuilderController implements RuleBuilderResource {
-
-    private final RuleBuilderModelService ruleBuilderModelService;
-
-    @Override
-    public RuleBuilderModel getRuleBuilderModel() {
-        return ruleBuilderModelService.getRuleBuilderModel();
-    }
-
-}
@@ -4,14 +4,10 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 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.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.NerAnalyserService;
-
+import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Service;
@@ -25,37 +21,26 @@ import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfigura
 public class RedactionMessageReceiver {

    private final ObjectMapper objectMapper;
-    private final AnalyzeService analyzeService;
+    private final ReanalyzeService reanalyzeService;
    private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
-    private final NerAnalyserService nerAnalyserService;
-

    @RabbitHandler
    @RabbitListener(queues = REDACTION_QUEUE)
    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {

        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
-        log.info("Processing analyze request for file: {}", analyzeRequest.getFileId());
+        log.info("Processing analyze request: {}", analyzeRequest);
        AnalyzeResult result;
        if (analyzeRequest.isReanalyseOnlyIfPossible()) {
-            result = analyzeService.reanalyze(analyzeRequest);
-            log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+            result = reanalyzeService.reanalyze(analyzeRequest);
        } else {
-            // TODO Seperate stucture analysis by other queue
-            analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
-
-            // TODO NerEntities should be computed and stored in entity-recognition-service, should be triggered by a seperate queue after structure analysis
-            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-
-            result = analyzeService.analyze(analyzeRequest);
-            log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result
-                    .getDuration());
+            result = reanalyzeService.analyze(analyzeRequest);
        }
+        log.info("Successfully analyzed {}", analyzeRequest);

        fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
    }

-
    @RabbitHandler
    @RabbitListener(queues = REDACTION_DQL)
    public void receiveAnalyzeRequestDQL(String in) throws JsonProcessingException {
@@ -1,8 +1,5 @@
 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;

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

-
@Data
 public class Dictionary {

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

        return localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getEntries().stream().map(DictionaryEntry::getValue).collect(toSet())
+                .getEntries()
                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
                .getLocalEntries()
                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getEntries().stream().map(DictionaryEntry::getValue).collect(toSet())
+                .getEntries()
                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
                .getLocalEntries()
                .contains(value);
@@ -1,7 +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 com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

-
@Data
@AllArgsConstructor
 public class DictionaryModel implements Serializable {
@@ -1,20 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;

 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;

@Data
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity implements ReasonHolder {

+
    private final String word;
    private final String type;
    private boolean redaction;
@@ -42,15 +39,8 @@ public class Entity implements ReasonHolder {

    private boolean isDossierDictionaryEntry;

-    private Set<Engine> engines = new HashSet<>();

-    private Set<Entity> references = new HashSet<>();
-
-
-    public Entity(String word, String type, boolean redaction, String redactionReason,
-                  List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber,
-                  String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start,
-                  Integer end, boolean isDossierDictionaryEntry, Set<Engine> engines, Set<Entity> references) {
+    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start, Integer end, boolean isDossierDictionaryEntry) {

        this.word = word;
        this.type = type;
@@ -67,13 +57,10 @@ public class Entity implements ReasonHolder {
        this.start = start;
        this.end = end;
        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
-        this.engines = engines;
-        this.references = references;
    }


-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber,
-                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry, boolean isDossierDictionaryEntry) {

        this.word = word;
        this.type = type;
@@ -83,8 +70,6 @@ public class Entity implements ReasonHolder {
        this.sectionNumber = sectionNumber;
        this.isDictionaryEntry = isDictionaryEntry;
        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
-        this.engines.add(engine);
    }

-
 }
@@ -1,23 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class PageEntities {
-
-    @Builder.Default
-    private Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
-
-    @Builder.Default
-    private Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
-
-
-}
@@ -1,7 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.model.ArgumentType;
-import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.model.FileAttribute;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
@@ -11,11 +9,13 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -59,45 +59,33 @@ public class Section {
    private List<FileAttribute> fileAttributes = new ArrayList<>();


-    @WhenCondition
-    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
-                                           @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByIdEquals(String id, String value){
        return fileAttributes != null && fileAttributes.stream().filter(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue())).findFirst().isPresent();
    }

-    @WhenCondition
-    public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder,
-                                                    @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByPlaceholderEquals(String placeholder, String value){
        return fileAttributes != null && fileAttributes.stream().filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue())).findFirst().isPresent();
    }

-    @WhenCondition
-    public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
-                                              @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByLabelEquals(String label, String value){
        return fileAttributes != null && fileAttributes.stream().filter(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue())).findFirst().isPresent();
    }

-    @WhenCondition
-    public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
-                                                     @Argument(ArgumentType.STRING) String value) {
+
+    public boolean fileAttributeByIdEqualsIgnoreCase(String id, String value){
        return fileAttributes != null && fileAttributes.stream().filter(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
    }

-    @WhenCondition
-    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder,
-                                                              @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(String placeholder, String value){
        return fileAttributes != null && fileAttributes.stream().filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
    }

-    @WhenCondition
-    public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
-                                                        @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByLabelEqualsIgnoreCase(String label, String value){
        return fileAttributes != null && fileAttributes.stream().filter(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
    }

-    @WhenCondition
-    public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName,
-                             @Argument(ArgumentType.STRING) String value) {
+
+    public boolean rowEquals(String headerName, String value) {

        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

@@ -106,36 +94,33 @@ public class Section {
                .equals(value);
    }

-    @WhenCondition
-    public boolean hasTableHeader(@Argument(ArgumentType.STRING) String headerName) {
+
+    public boolean hasTableHeader(String headerName) {

        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
        return tabularData != null && tabularData.containsKey(cleanHeaderName);
    }

-    @WhenCondition
-    public boolean matchesType(@Argument(ArgumentType.TYPE) String type) {
+
+    public boolean matchesType(String type) {

        return entities.stream().anyMatch(entity -> entity.getType().equals(type));
    }

-    @WhenCondition
-    public boolean matchesImageType(@Argument(ArgumentType.TYPE) String type) {
+
+    public boolean matchesImageType(String type) {

        return images.stream().anyMatch(image -> image.getType().equals(type));
    }

-    @WhenCondition
-    public boolean headlineContainsWord(@Argument(ArgumentType.STRING) String word) {
+
+    public boolean headlineContainsWord(String word) {

        return StringUtils.containsIgnoreCase(headline, word);
    }

-    @ThenAction
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
-                              @Argument(ArgumentType.REGEX) String pattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group) {
+
+    public void expandByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -162,11 +147,8 @@ public class Section {
        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
    }

-    @ThenAction
-    public void redactImage(@Argument(ArgumentType.TYPE) String type,
-                            @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                            @Argument(ArgumentType.STRING) String reason,
-                            @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redactImage(String type, int ruleNumber, String reason, String legalBasis) {

        images.forEach(image -> {
            if (image.getType().equals(type)) {
@@ -178,11 +160,8 @@ public class Section {
        });
    }

-    @ThenAction
-    public void redact(@Argument(ArgumentType.TYPE) String type,
-                       @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                       @Argument(ArgumentType.STRING) String reason,
-                       @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redact(String type, int ruleNumber, String reason, String legalBasis) {

        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

@@ -197,10 +176,8 @@ public class Section {
        });
    }

-    @ThenAction
-    public void redactNotImage(@Argument(ArgumentType.TYPE) String type,
-                               @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                               @Argument(ArgumentType.STRING) String reason) {
+
+    public void redactNotImage(String type, int ruleNumber, String reason) {

        images.forEach(image -> {
            if (image.getType().equals(type)) {
@@ -211,10 +188,8 @@ public class Section {
        });
    }

-    @ThenAction
-    public void redactNot(@Argument(ArgumentType.TYPE) String type,
-                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                          @Argument(ArgumentType.STRING) String reason) {
+
+    public void redactNot(String type, int ruleNumber, String reason) {

        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

@@ -229,35 +204,8 @@ public class Section {
    }


-    @ThenAction
-    public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type,
-                                      @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
-                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                          @Argument(ArgumentType.STRING) String reason) {
-
-        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
-
-        Set<Entity> references = entities.stream().filter(entity -> entity.getType().equals(referenceType)).collect(Collectors.toSet());
-
-        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
-                    .equals(RECOMMENDATION_PREFIX + type)) {
-                entity.setRedaction(false);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setReferences(references);
-            }
-        });
-    }
-
-
-
-    @ThenAction
-    public void expandToHintAnnotationByRegEx(@Argument(ArgumentType.TYPE) String type,
-                                              @Argument(ArgumentType.STRING) String pattern,
-                                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                              @Argument(ArgumentType.INTEGER) int group,
-                                              @Argument(ArgumentType.TYPE) String asType) {
+    public void expandToHintAnnotationByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group,
+                                              String asType) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -282,11 +230,8 @@ public class Section {
        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
    }

-    @ThenAction
-    public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                         @Argument(ArgumentType.INTEGER) int group,
-                                         @Argument(ArgumentType.TYPE) String asType) {
+
+    public void addHintAnnotationByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -301,12 +246,8 @@ public class Section {
        }
    }

-    @ThenAction
-    public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix,
-                                   @Argument(ArgumentType.TYPE) String type,
-                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.STRING) String reason,
-                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason, String legalBasis) {

        entities.forEach(entity -> {
            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
@@ -318,32 +259,23 @@ public class Section {
        });
    }

-    @ThenAction
-    public void addHintAnnotation(@Argument(ArgumentType.STRING) String value,
-                                  @Argument(ArgumentType.TYPE) String asType) {
+
+    public void addHintAnnotation(String value, String asType) {

        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null);
        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
    }

-    @ThenAction
-    public void addRedaction(@Argument(ArgumentType.STRING) String value,
-                             @Argument(ArgumentType.TYPE) String asType,
-                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                             @Argument(ArgumentType.STRING) String reason,
-                             @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void addRedaction(String value, String asType, int ruleNumber, String reason, String legalBasis) {

        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis);
        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
    }

-    @ThenAction
-    public void redactLineAfter(@Argument(ArgumentType.STRING) String start,
-                                @Argument(ArgumentType.TYPE) String asType,
-                                @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                @Argument(ArgumentType.STRING) String reason,
-                                @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason,
+                                String legalBasis) {

        String[] values = StringUtils.substringsBetween(text, start, "\n");

@@ -361,9 +293,8 @@ public class Section {
        }
    }

-    @ThenAction
-    public void recommendLineAfter(@Argument(ArgumentType.STRING) String start,
-                                   @Argument(ArgumentType.TYPE) String asType) {
+
+    public void recommendLineAfter(String start, String asType) {

        String[] values = StringUtils.substringsBetween(text, start, "\n");

@@ -386,14 +317,9 @@ public class Section {
        }
    }

-    @ThenAction
-    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber,
+                              String reason, String legalBasis) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -408,11 +334,8 @@ public class Section {
        }
    }

-    @ThenAction
-    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                         @Argument(ArgumentType.INTEGER) int group,
-                                         @Argument(ArgumentType.TYPE) String asType) {
+
+    public void addRecommendationByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -426,14 +349,9 @@ public class Section {
        }
    }

-    @ThenAction
-    public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                          @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                          @Argument(ArgumentType.INTEGER) int group,
-                                          @Argument(ArgumentType.TYPE) String asType,
-                                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                          @Argument(ArgumentType.STRING) String reason,
-                                          @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType,
+                                          int ruleNumber, String reason, String legalBasis) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -448,14 +366,9 @@ public class Section {
        }
    }

-    @ThenAction
-    public void redactBetween(@Argument(ArgumentType.STRING) String start,
-                              @Argument(ArgumentType.STRING) String stop,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
+                              String reason, String legalBasis) {

        String[] values = StringUtils.substringsBetween(searchText, start, stop);

@@ -474,14 +387,9 @@ public class Section {
        }
    }

-    @ThenAction
-    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start,
-                                   @Argument(ArgumentType.STRING) String stop,
-                                   @Argument(ArgumentType.TYPE) String asType,
-                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                   @Argument(ArgumentType.STRING) String reason,
-                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
+                                   String reason, String legalBasis) {

        String[] values = StringUtils.substringsBetween(text, start, stop);

@@ -508,48 +416,34 @@ public class Section {
        }
    }

-    @ThenAction
-    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.TYPE) String type) {
+
+    public void highlightCell(String cellHeader, int ruleNumber, String type) {

        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
    }

-    @ThenAction
-    public void redactCell(@Argument(ArgumentType.STRING) String cellHeader,
-                           @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                           @Argument(ArgumentType.TYPE) String type,
-                           @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
-                           @Argument(ArgumentType.STRING) String reason,
-                           @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+    public void redactCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations, String reason,
+                           String legalBasis) {

        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
    }

-    @ThenAction
-    public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.TYPE) String type,
-                              @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
-                              @Argument(ArgumentType.STRING) String reason) {
+
+    public void redactNotCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations,
+                              String reason) {

        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
    }


-    private Set<Entity> findEntities(@Argument(ArgumentType.STRING) String value,
-                                     @Argument(ArgumentType.TYPE) String asType,
-                                     @Argument(ArgumentType.BOOLEAN) boolean caseInsensitive,
-                                     @Argument(ArgumentType.BOOLEAN) boolean redacted,
-                                     @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                     @Argument(ArgumentType.STRING) String reason,
-                                     @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted,
+                                     int ruleNumber, String reason, String legalBasis) {

        String text = caseInsensitive ? searchText.toLowerCase() : searchText;
        String searchValue = caseInsensitive ? value.toLowerCase() : value;

-        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, false, false, Engine.RULE);
+        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, true, false);

        found.forEach(entity -> {
            if (redacted) {
@@ -575,7 +469,7 @@ public class Section {
        } else {
            String word = value.toString();

-            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false, Engine.RULE);
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
@@ -613,25 +507,6 @@ public class Section {
        }
    }

-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface WhenCondition {
-
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface ThenAction {
-
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.PARAMETER)
-    public @interface Argument {
-
-        ArgumentType value() default ArgumentType.STRING;
-    }
-
 }


@@ -1,36 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.rulebuilder;
-
-import com.iqser.red.service.redaction.v1.model.Argument;
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-import com.iqser.red.service.redaction.v1.model.RuleElement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
-import org.springframework.stereotype.Service;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-public class RuleBuilderModelService {
-
-    public RuleBuilderModel getRuleBuilderModel() {
-
-        var whenConditions = Arrays.stream(Section.class.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(Section.WhenCondition.class)).collect(Collectors.toList());
-        var thenActions = Arrays.stream(Section.class.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(Section.ThenAction.class)).collect(Collectors.toList());
-
-        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
-
-
-        ruleBuilderModel.setWhenClauses(whenConditions.stream().map(c -> new RuleElement(c.getName(), toArguments(c))).collect(Collectors.toList()));
-        ruleBuilderModel.setThenConditions(thenActions.stream().map(c -> new RuleElement(c.getName(), toArguments(c))).collect(Collectors.toList()));
-
-        return ruleBuilderModel;
-    }
-
-    private List<Argument> toArguments(Method c) {
-        return Arrays.stream(c.getParameters())
-                .map(parameter -> new Argument(parameter.getName(), parameter.getAnnotation(Section.Argument.class).value()))
-                .collect(Collectors.toList());
-    }
-}
@@ -0,0 +1,43 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
+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.server.settings.RedactionServiceSettings;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AnalyzeResponseService {
+
+    private final RedactionServiceSettings redactionServiceSettings;
+
+    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
+                                               RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
+
+
+        boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
+                .getRedactionLogEntry()
+                .isEmpty() && redactionChangeLog.getRedactionLogEntry()
+                .stream()
+                .anyMatch(entry -> !entry.getType().equals("false_positive"));
+
+        return AnalyzeResult.builder()
+                .dossierId(dossierId)
+                .fileId(fileId)
+                .duration(duration)
+                .numberOfPages(pageCount)
+                .hasUpdates(hasUpdates)
+                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
+                .rulesVersion(redactionLog.getRulesVersion())
+                .dictionaryVersion(redactionLog.getDictionaryVersion())
+                .legalBasisVersion(redactionLog.getLegalBasisVersion())
+                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
+                .build();
+    }
+
+}
@@ -1,279 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-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.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-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.StructureAnalyzeRequest;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.Text;
-import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
-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.model.RedRectangle2D;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-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.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AnalyzeService {
-
-    private final DictionaryService dictionaryService;
-    private final DroolsExecutionService droolsExecutionService;
-    private final EntityRedactionService entityRedactionService;
-    private final RedactionLogCreatorService redactionLogCreatorService;
-    private final RedactionStorageService redactionStorageService;
-    private final PdfSegmentationService pdfSegmentationService;
-    private final RedactionChangeLogService redactionChangeLogService;
-    private final LegalBasisClient legalBasisClient;
-    private final RedactionServiceSettings redactionServiceSettings;
-    private final SectionTextBuilderService sectionTextBuilderService;
-    private final SectionGridCreatorService sectionGridCreatorService;
-    private final NerAnalyserService nerAnalyserService;
-
-
-    public void analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-
-        var pageCount = 0;
-        Document classifiedDoc;
-
-        try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest
-                    .getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
-            pageCount = classifiedDoc.getPages().size();
-        } catch (Exception e) {
-            throw new RedactionException(e);
-        }
-
-        List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
-        sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);
-
-        Text text = new Text(pageCount, sectionTexts);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, text);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
-                .getSectionGrid());
-
-        log.info("Document structure analysis successful, took: {}", System.currentTimeMillis() - startTime);
-    }
-
-
-    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-
-        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        var nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        if(redactionServiceSettings.isEnableEntityRecognition() && nerEntities == null){
-            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        }
-
-        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
-        long rulesVersion = droolsExecutionService.getRulesVersion(analyzeRequest.getDossierTemplateId());
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
-                .getDossierId());
-
-        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, text.getSectionTexts(), kieContainer, analyzeRequest, nerEntities);
-
-        dictionaryService.updateExternalDictionary(dictionary, analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-
-        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest
-                .getDossierTemplateId());
-
-        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), redactionLogEntries, legalBasis, dictionary
-                .getVersion()
-                .getDossierTemplateVersion(), dictionary.getVersion()
-                .getDossierVersion(), rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
-
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionary.getVersion(), false);
-    }
-
-
-    @SneakyThrows
-    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-
-        var redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-
-        // not yet ready for reanalysis
-        if (redactionLog == null || text == null || text.getNumberOfPages() == 0) {
-            return analyze(analyzeRequest);
-        }
-
-        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
-                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
-
-        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse()
-                .isEmpty() ? analyzeRequest.getSectionsToReanalyse() : findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);
-
-        if (sectionsToReanalyse.isEmpty()) {
-            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
-        }
-
-        var nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        if(redactionServiceSettings.isEnableEntityRecognition() && nerEntities == null){
-            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        }
-
-        List<SectionText> reanalysisSections = text.getSectionTexts()
-                .stream()
-                .filter(sectionText -> sectionsToReanalyse.contains(sectionText.getSectionNumber()))
-                .collect(Collectors.toList());
-
-        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
-
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
-                .getDossierId());
-
-        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, reanalysisSections, kieContainer, analyzeRequest, nerEntities);
-        var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest
-                .getDossierTemplateId());
-
-        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
-        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
-    }
-
-
-    private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
-                                                 Text text, AnalyzeRequest analyzeRequest) {
-
-        long start = System.currentTimeMillis();
-        Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
-
-        Set<Integer> sectionsToReanalyse = new HashSet<>();
-        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
-        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-            if (entry.isManual() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
-                sectionsToReanalyse.add(entry.getSectionNumber());
-            }
-            if (entry.isImage()) {
-                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
-            }
-        }
-
-        for (SectionText sectionText : text.getSectionTexts()) {
-
-            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
-                sectionsToReanalyse.add(sectionText.getSectionNumber());
-            }
-
-        }
-
-        log.info("Should reanalyze {} sections for request: {}, took: {}", sectionsToReanalyse.size(), analyzeRequest, System.currentTimeMillis() - start);
-
-        return sectionsToReanalyse;
-    }
-
-
-    private AnalyzeResult finalizeAnalysis(@RequestBody AnalyzeRequest analyzeRequest, long startTime,
-                                           RedactionLog redactionLog, Text text, DictionaryVersion dictionaryVersion,
-                                           boolean isReanalysis) {
-
-        redactionLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion());
-        redactionLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion());
-
-        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
-
-        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange
-                .getRedactionLog());
-
-        long duration = System.currentTimeMillis() - startTime;
-
-        return AnalyzeResult.builder()
-                .dossierId(analyzeRequest.getDossierId())
-                .fileId(analyzeRequest.getFileId())
-                .duration(duration)
-                .numberOfPages(text.getNumberOfPages())
-                .hasUpdates(redactionLogChange.isHasChanges())
-                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
-                .rulesVersion(redactionLog.getRulesVersion())
-                .dictionaryVersion(redactionLog.getDictionaryVersion())
-                .legalBasisVersion(redactionLog.getLegalBasisVersion())
-                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
-                .wasReanalyzed(isReanalysis)
-                .build();
-    }
-
-
-    private Set<String> getRelevantManuallyModifiedAnnotationIds(ManualRedactions manualRedactions) {
-
-        if (manualRedactions == null) {
-            return new HashSet<>();
-        }
-
-        return Stream.concat(manualRedactions.getLegalBasisChanges()
-                .stream()
-                .map(ManualLegalBasisChange::getAnnotationId), Stream.concat(manualRedactions.getImageRecategorization()
-                .stream()
-                .map(ManualImageRecategorization::getAnnotationId), Stream.concat(manualRedactions.getIdsToRemove()
-                .stream()
-                .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId))))
-                .collect(Collectors.toSet());
-    }
-
-
-    public Image convert(RedactionLogEntry entry) {
-
-        Rectangle position = entry.getPositions().get(0);
-
-        return Image.builder()
-                .type(entry.getType())
-                .position(new RedRectangle2D(position.getTopLeft().getX(), position.getTopLeft()
-                        .getY(), position.getWidth(), position.getHeight()))
-                .sectionNumber(entry.getSectionNumber())
-                .section(entry.getSection())
-                .page(position.getPage())
-                .hasTransparency(entry.isImageHasTransparency())
-                .build();
-    }
-
-
-    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {
-
-        if (excludedPages != null && !excludedPages.isEmpty()) {
-            redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> {
-                if (excludedPages.contains(pos.getPage())) {
-                    entry.setExcluded(true);
-                }
-            }));
-        }
-    }
-
-}
@@ -1,6 +1,5 @@
 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;
@@ -28,6 +27,8 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
 public class AnnotationService {

+    private final DictionaryService dictionaryService;
+

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

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

-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.configuration.v1.api.model.Colors;
+import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
+import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
+import com.iqser.red.service.configuration.v1.api.model.TypeResult;
 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;
@@ -18,6 +18,7 @@ import java.awt.Color;
 import java.util.*;
 import java.util.stream.Collectors;

+import static com.iqser.red.service.configuration.v1.api.resource.DictionaryResource.GLOBAL_DOSSIER;

@Slf4j
@Service
@@ -32,14 +33,14 @@ public class DictionaryService {

    public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {

-        log.info("Updating dictionary data for dossierTemplate {} and dossier {}", dossierTemplateId, dossierId);
-        long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId);
+        log.info("Updating dictionary data for: {} / {}", dossierTemplateId, dossierId);
+        long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER);
        var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId);
        if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, null);
+            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, GLOBAL_DOSSIER);
        }

-        long dossierDictionaryVersion = dictionaryClient.getVersionForDossier(dossierId);
+        long dossierDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, dossierId);
        var dossierDictionary = dictionariesByDossier.get(dossierId);
        if (dossierDictionary == null || dossierDictionaryVersion > dossierDictionary.getDictionaryVersion()) {
            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, dossierId);
@@ -83,13 +84,13 @@ public class DictionaryService {
        try {
            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();

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

-                List<DictionaryModel> dictionary = typeResponse
+                List<DictionaryModel> dictionary = typeResponse.getTypes()
                        .stream()
                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                .isHint(), t.isRecommendation(), convertEntries(t.getId()), new HashSet<>(), dossierId != null))
+                                .isHint(), t.isRecommendation(), convertEntries(t, dossierId), new HashSet<>(), !dossierId.equals(GLOBAL_DOSSIER)))
                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                        .collect(Collectors.toList());

@@ -105,7 +106,7 @@ public class DictionaryService {
                dictionaryRepresentation.setDictionaryVersion(version);
                dictionaryRepresentation.setDictionary(dictionary);

-                if(dossierId == null) {
+                if(dossierId.equals(GLOBAL_DOSSIER)) {
                    dictionariesByDossierTemplate.put(dossierTemplateId, dictionaryRepresentation);
                } else {
                    dictionariesByDossier.put(dossierId, dictionaryRepresentation);
@@ -118,12 +119,12 @@ public class DictionaryService {
    }


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

        dictionary.getDictionaryModels().forEach(dm -> {
            if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
-                dictionaryClient.addEntries(IdBuilder.getTypeId(dm.getType(), dossierTemplateId, dm.isDossierDictionary() ? dossierId : null), new ArrayList<>(dm.getLocalEntries()), false);
-                long externalVersion = dictionaryClient.getVersion(dossierTemplateId);
+                dictionaryClient.addEntries(dm.getType(), dossierTemplateId, new ArrayList<>(dm.getLocalEntries()), false, GLOBAL_DOSSIER);
+                long externalVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER);
                if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
                    dictionary.getVersion().setDossierTemplateVersion(externalVersion);
                }
@@ -132,14 +133,12 @@ public class DictionaryService {
    }


-    private Set<DictionaryEntry> convertEntries(String typeId) {
+    private Set<DictionaryEntry> convertEntries(TypeResult t, String dossierId) {

-        var type = dictionaryClient.getDictionaryForType(typeId);
-
-        Set<DictionaryEntry> entries = new HashSet<>(type
+        Set<DictionaryEntry> entries = new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getDossierTemplateId(), dossierId)
                .getEntries());

-        if (type.isCaseInsensitive()) {
+        if (t.isCaseInsensitive()) {
            entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
        }
        return entries;
@@ -165,6 +164,7 @@ public class DictionaryService {

    public float[] getColor(String type, String dossierTemplateId) {

+        log.info("requested : {} / {}",type,dossierTemplateId);
        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.getColor();
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
@@ -75,13 +76,13 @@ public class DroolsExecutionService {

        try {

-            var rules = rulesClient.getRules(dossierTemplateId);
-            if (rules == null || StringUtils.isEmpty(rules.getValue())) {
+            RulesResponse rules = rulesClient.getRules(dossierTemplateId);
+            if (rules == null || StringUtils.isEmpty(rules.getRules())) {
                throw new RuntimeException("Rules cannot be empty.");
            }

            KieServices kieServices = KieServices.Factory.get();
-            KieModule kieModule = getKieModule(dossierTemplateId, rules.getValue(), kieServices);
+            KieModule kieModule = getKieModule(dossierTemplateId, rules.getRules(), kieServices);

            var container = kieContainers.get(dossierTemplateId);
            if (container != null) {
@@ -1,141 +1,64 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-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 com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.server.classification.model.*;
+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.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.KieContainer;
 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.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;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-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.model.SearchableText;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

@Slf4j
@Service
@RequiredArgsConstructor
 public class EntityRedactionService {

-    private final RedactionServiceSettings redactionServiceSettings;
+    private final DictionaryService dictionaryService;
    private final DroolsExecutionService droolsExecutionService;
    private final SurroundingWordsService surroundingWordsService;


-    public PageEntities findEntities(Dictionary dictionary, List<SectionText> sectionTexts, KieContainer kieContainer,
-                                     AnalyzeRequest analyzeRequest, NerEntities nerEntities) {
+    public void processDocument(Document classifiedDoc, String dossierTemplateId, ManualRedactions manualRedactions,
+                                String dossierId, List<FileAttribute> fileAttributes) {

-        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
-        Set<Entity> entities = findEntities(sectionTexts, dictionary, kieContainer, analyzeRequest, false, null, imagesPerPage, nerEntities);
+        dictionaryService.updateDictionary(dossierTemplateId, dossierId);
+        KieContainer container = droolsExecutionService.updateRules(dossierTemplateId);
+        long rulesVersion = droolsExecutionService.getRulesVersion(dossierTemplateId);
+
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(dossierTemplateId, dossierId);
+
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null, fileAttributes));

        if (dictionary.hasLocalEntries()) {
-            Map<Integer, Set<Entity>> hintsPerSectionNumber = getHintsPerSection(entities, dictionary);
-            Set<Entity> foundByLocal = findEntities(sectionTexts, dictionary, kieContainer, analyzeRequest, true, hintsPerSectionNumber, imagesPerPage, nerEntities);
-            EntitySearchUtils.addEntitiesWithHigherRank(entities, foundByLocal, dictionary);
-            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = getHintsPerSection(documentEntities, dictionary);
+            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber, fileAttributes);
+            EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
        }

-        Map<Integer, List<Entity>> entitiesPerPage = convertToEnititesPerPage(entities);
-        return new PageEntities(entitiesPerPage, imagesPerPage);
+        classifiedDoc.setEntities(convertToEnititesPerPage(documentEntities));
+
+        dictionaryService.updateExternalDictionary(dictionary, dossierTemplateId);
+
+        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
+        classifiedDoc.setRulesVersion(rulesVersion);
    }


-    public Set<Entity> findEntities(List<SectionText> reanalysisSections, Dictionary dictionary,
-                                    KieContainer kieContainer, AnalyzeRequest analyzeRequest, boolean local,
-                                    Map<Integer, Set<Entity>> hintsPerSectionNumber,
-                                    Map<Integer, Set<Image>> imagesPerPage, NerEntities nerEntities) {
-
-        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
-        for (SectionText reanalysisSection : reanalysisSections) {
-
-            Set<Entity> entities = findEntities(reanalysisSection.getSearchableText(), reanalysisSection.getHeadline(), reanalysisSection
-                    .getSectionNumber(), dictionary, local, nerEntities, reanalysisSection.getCellStarts());
-
-            if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
-                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
-                        .getCellStarts());
-            } else {
-                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
-            }
-
-            if (!local && reanalysisSection.getImages() != null && !reanalysisSection.getImages()
-                    .isEmpty() && analyzeRequest.getManualRedactions() != null && analyzeRequest.getManualRedactions()
-                    .getImageRecategorization() != null) {
-                for (Image image : reanalysisSection.getImages()) {
-                    String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
-                    for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
-                            .getImageRecategorization()) {
-                        if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED) && imageRecategorization.getAnnotationId()
-                                .equals(imageId)) {
-                            image.setType(imageRecategorization.getType());
-                        }
-                    }
-                }
-            }
-
-            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
-                    .isLocal(false)
-                    .dictionaryTypes(dictionary.getTypes())
-                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
-                            .concat(entities.stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
-                                    .stream())
-                            .collect(Collectors.toSet()) : entities)
-                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
-                    .searchText(reanalysisSection.getSearchableText().toString())
-                    .headline(reanalysisSection.getHeadline())
-                    .sectionNumber(reanalysisSection.getSectionNumber())
-                    .tabularData(reanalysisSection.getTabularData())
-                    .searchableText(reanalysisSection.getSearchableText())
-                    .dictionary(dictionary)
-                    .images(reanalysisSection.getImages())
-                    .fileAttributes(analyzeRequest.getFileAttributes())
-                    .build(), reanalysisSection.getSearchableText()));
-        }
-
-        Set<Entity> entities = new HashSet<>();
-        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            EntitySearchUtils.removeEntitiesContainedInLarger(analysedSection.getEntities());
-            entities.addAll(analysedSection.getEntities());
-
-            if (!local) {
-                for (Image image : analysedSection.getImages()) {
-                    imagesPerPage.computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
-                }
-                addLocalValuesToDictionary(analysedSection, dictionary);
-            }
-        });
-
-        return entities;
-    }
-
-
-    private Map<Integer, List<Entity>> convertToEnititesPerPage(Set<Entity> entities) {
-
+    public Map<Integer, List<Entity>> convertToEnititesPerPage(Set<Entity> entities){
        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
        for (Entity entity : entities) {
            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
@@ -145,31 +68,87 @@ public class EntityRedactionService {
            }

            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
+                entitiesPerPage
+                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity.getReferences()));
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
            }
        }
        return entitiesPerPage;
    }


-    private Map<Integer, Set<Entity>> getHintsPerSection(Set<Entity> entities, Dictionary dictionary) {
-
+    public Map<Integer, Set<Entity>> getHintsPerSection(Set<Entity> entities, Dictionary dictionary){
        Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
        entities.stream().forEach(entity -> {
            if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
-                hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>()).add(entity);
+                hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
+                        .add(entity);
            }
        });
        return hintsPerSectionNumber;
    }

+    private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
+                                     ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                     List<FileAttribute> fileAttributes) {

-    private void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary) {
+        Set<Entity> documentEntities = new HashSet<>();

+        AtomicInteger sectionNumber = new AtomicInteger(1);
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
+
+            List<Table> tables = paragraph.getTables();
+            for (Table table : tables) {
+                if (table.getColCount() == 2) {
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
+                } else {
+                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
+                }
+                sectionNumber.incrementAndGet();
+            }
+            sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
+                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
+                    .getImages(), fileAttributes));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (Header header : classifiedDoc.getHeaders()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (Footer footer : classifiedDoc.getFooters()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText
+                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
+            sectionNumber.incrementAndGet();
+        }
+
+        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            documentEntities.addAll(analysedSection.getEntities());
+
+            for (Image image : analysedSection.getImages()) {
+                classifiedDoc.getImages().computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
+            }
+
+            addLocalValuesToDictionary(analysedSection, dictionary);
+        });
+
+        return documentEntities;
+    }
+
+
+    public void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary){
        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
            if (dictionary.isRecommendation(key)) {
                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
@@ -195,9 +174,207 @@ public class EntityRedactionService {
    }


-    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
-                                     Dictionary dictionary, boolean local, NerEntities nerEntities,
-                                     List<Integer> cellstarts) {
+    private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table,
+                                                               AtomicInteger sectionNumber, Dictionary dictionary,
+                                                               boolean local,
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                                               List<FileAttribute> fileAttributes) {
+
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+
+        for (List<Cell> row : table.getRows()) {
+            SearchableText searchableRow = new SearchableText();
+            Map<String, CellValue> tabularData = new HashMap<>();
+            int start = 0;
+            List<Integer> cellStarts = new ArrayList<>();
+            SectionText sectionText = new SectionText();
+            for (Cell cell : row) {
+
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
+
+                SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
+                        .get(0)
+                        .getSequences()
+                        .get(0)
+                        .getPage());
+                sectionText.getSectionAreas().add(sectionArea);
+                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
+
+                int cellStart = start;
+
+                if (!cell.isHeaderCell()) {
+                    cell.getHeaderCells().forEach(headerCell -> {
+                        StringBuilder headerBuilder = new StringBuilder();
+                        headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
+                        String headerName = headerBuilder.toString()
+                                .replaceAll("\n", "")
+                                .replaceAll(" ", "")
+                                .replaceAll("-", "");
+                        sectionArea.setHeader(headerName);
+                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
+                    });
+                }
+
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    // TODO avoid cell overlap merging.
+                    searchableRow.addAll(textBlock.getSequences());
+                }
+                cellStarts.add(cellStart);
+                start = start + cell.toString().trim().length() + 1;
+
+            }
+            Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
+            surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);
+
+            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                    .isLocal(local)
+                    .dictionaryTypes(dictionary.getTypes())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
+                            .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
+                            .collect(Collectors.toSet()) : rowEntities)
+                    .text(searchableRow.getAsStringWithLinebreaks())
+                    .searchText(searchableRow.toString())
+                    .headline(table.getHeadline())
+                    .sectionNumber(sectionNumber.intValue())
+                    .tabularData(tabularData)
+                    .searchableText(searchableRow)
+                    .dictionary(dictionary)
+                    .fileAttributes(fileAttributes)
+                    .build(), searchableRow));
+
+            if (!local) {
+                sectionText.setText(searchableRow.toString());
+                sectionText.setHeadline(table.getHeadline());
+                sectionText.setSectionNumber(sectionNumber.intValue());
+                sectionText.setTable(true);
+                sectionText.setTabularData(tabularData);
+                sectionText.setCellStarts(cellStarts);
+                classifiedDoc.getSectionText().add(sectionText);
+            }
+
+            sectionNumber.incrementAndGet();
+        }
+
+        return sectionSearchableTextPairs;
+    }
+
+
+    private List<SectionSearchableTextPair> processTableAsOneText(Document classifiedDoc, Table table,
+                                                                  AtomicInteger sectionNumber, Dictionary dictionary,
+                                                                  boolean local,
+                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                                                  List<FileAttribute> fileAttributes) {
+
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        SearchableText entireTableText = new SearchableText();
+        SectionText sectionText = new SectionText();
+        for (List<Cell> row : table.getRows()) {
+            for (Cell cell : row) {
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
+
+                if (!local) {
+                    SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                            .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
+                            .get(0)
+                            .getSequences()
+                            .get(0)
+                            .getPage());
+                    sectionText.getTextBlocks().addAll(cell.getTextBlocks());
+                    sectionText.getSectionAreas().add(sectionArea);
+                }
+
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    entireTableText.addAll(textBlock.getSequences());
+                }
+            }
+        }
+
+        Set<Entity> rowEntities = findEntities(entireTableText, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
+        surroundingWordsService.addSurroundingText(rowEntities, entireTableText, dictionary);
+
+        sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                .isLocal(local)
+                .dictionaryTypes(dictionary.getTypes())
+                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
+                        .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
+                        .collect(Collectors.toSet()) : rowEntities)
+                .text(entireTableText.getAsStringWithLinebreaks())
+                .searchText(entireTableText.toString())
+                .headline(table.getHeadline())
+                .sectionNumber(sectionNumber.intValue())
+                .searchableText(entireTableText)
+                .dictionary(dictionary)
+                .fileAttributes(fileAttributes)
+                .build(), entireTableText));
+
+        if (!local) {
+            sectionText.setText(entireTableText.toString());
+            sectionText.setHeadline(table.getHeadline());
+            sectionText.setSectionNumber(sectionNumber.intValue());
+            sectionText.setTable(true);
+            classifiedDoc.getSectionText().add(sectionText);
+        }
+
+        return sectionSearchableTextPairs;
+    }
+
+
+    private SectionSearchableTextPair processText(Document classifiedDoc, SearchableText searchableText,
+                                                  List<TextBlock> paragraphTextBlocks, String headline,
+                                                  ManualRedactions manualRedactions, AtomicInteger sectionNumber,
+                                                  Dictionary dictionary, boolean local,
+                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                                  List<PdfImage> images, List<FileAttribute> fileAttributes) {
+
+        if (!local) {
+            SectionText sectionText = new SectionText();
+            for (TextBlock paragraphTextBlock : paragraphTextBlocks) {
+                SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()), paragraphTextBlock
+                        .getWidth(), paragraphTextBlock.getHeight(), paragraphTextBlock.getPage());
+                sectionText.getSectionAreas().add(sectionArea);
+            }
+
+            sectionText.setText(searchableText.toString());
+            sectionText.setHeadline(headline);
+            sectionText.setSectionNumber(sectionNumber.intValue());
+            sectionText.setTable(false);
+            sectionText.setImages(images.stream()
+                    .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
+                    .collect(Collectors.toSet()));
+            sectionText.setTextBlocks(paragraphTextBlocks);
+            classifiedDoc.getSectionText().add(sectionText);
+        }
+
+        Set<Entity> entities = findEntities(searchableText, headline, sectionNumber.intValue(), dictionary, local);
+        surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
+
+        return new SectionSearchableTextPair(Section.builder()
+                .isLocal(local)
+                .dictionaryTypes(dictionary.getTypes())
+                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
+                        .concat(entities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
+                        .collect(Collectors.toSet()) : entities)
+                .text(searchableText.getAsStringWithLinebreaks())
+                .searchText(searchableText.toString())
+                .headline(headline)
+                .sectionNumber(sectionNumber.intValue())
+                .searchableText(searchableText)
+                .dictionary(dictionary)
+                .images(images.stream()
+                        .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
+                        .collect(Collectors.toSet()))
+                .fileAttributes(fileAttributes)
+                .build(), searchableText);
+    }
+
+
+    public Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
+                                    Dictionary dictionary, boolean local) {

        Set<Entity> found = new HashSet<>();
        String searchableString = searchableText.toString();
@@ -208,52 +385,42 @@ public class EntityRedactionService {
        String lowercaseInputString = searchableString.toLowerCase();
        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));
+                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model
+                        .isDossierDictionary()));
            } else {
-                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), Engine.DICTIONARY));
+                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model
+                        .isDossierDictionary()));
            }
        }

-        if (!local) {
-            Map<String, Set<String>> nerValuesPerType = getNerValues(sectionNumber, nerEntities, cellstarts);
-            nerValuesPerType.entrySet().forEach(entry -> {
-                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, entry.getValue(), entry
-                        .getKey(), headline, sectionNumber, false, false, Engine.NER));
-            });
-        }
-
        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
    }


-    private Map<String, Set<String>> getNerValues(int sectionNumber, NerEntities nerEntities,
-                                                  List<Integer> cellstarts) {
+    private Image convertAndRecategorize(PdfImage pdfImage, int sectionNumber, String headline, ManualRedactions manualRedactions) {

-        Map<String, Set<String>> nerValuesPerType = new HashMap<>();
+        Image image = Image.builder()
+                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
+                        .name()
+                        .toLowerCase(Locale.ROOT))
+                .position(pdfImage.getPosition())
+                .sectionNumber(sectionNumber)
+                .section(headline)
+                .page(pdfImage.getPage())
+                .hasTransparency(pdfImage.isHasTransparency())
+                .build();

-        if (redactionServiceSettings.isEnableEntityRecognition() && nerEntities.getResult()
-                .containsKey(sectionNumber)) {
-            nerEntities.getResult().get(sectionNumber).forEach(res -> {
-                if (cellstarts == null || cellstarts.isEmpty()) {
-                    nerValuesPerType.computeIfAbsent(res.getType(), (a) -> new HashSet<>())
-                            .add(new String(Base64.decodeBase64(res.getValue().getBytes())));
-                } else {
-                    boolean intersectsCellStart = false;
-                    for (Integer cellStart : cellstarts) {
-                        if (res.getStartOffset() < cellStart && cellStart < res.getEndOffset()) {
-                            intersectsCellStart = true;
-                        }
-                    }
-                    if (!intersectsCellStart) {
-                        nerValuesPerType.computeIfAbsent(res.getType(), (a) -> new HashSet<>())
-                                .add(new String(Base64.decodeBase64(res.getValue().getBytes())));
-                    }
+        String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
+        if (manualRedactions != null && manualRedactions.getImageRecategorizations() != null) {
+            for (ManualImageRecategorization imageRecategorization : manualRedactions.getImageRecategorizations()) {
+                if (imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId()
+                        .equals(imageId)) {
+                    image.setType(imageRecategorization.getType());
                }
-            });
+            }
        }
-        return nerValuesPerType;
+
+        return image;
    }

 }
@@ -1,53 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-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
-@RequiredArgsConstructor
-public class NerAnalyserService {
-
-    private final RedactionStorageService redactionStorageService;
-    private final EntityRecognitionClient entityRecognitionClient;
-    private final RedactionServiceSettings redactionServiceSettings;
-
-    public void computeNerEntities(String dossierId, String fileId) {
-
-        if (redactionServiceSettings.isEnableEntityRecognition()) {
-            var text = redactionStorageService.getText(dossierId, fileId);
-
-            long start = System.currentTimeMillis();
-
-            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);
-
-                log.info("Computing NER entities took: {} ms for dossierId {} and fileId {}", System.currentTimeMillis() - start, dossierId, fileId);
-
-                redactionStorageService.storeObject(dossierId, fileId, FileType.NER_ENTITIES, nerResponse);
-            } else {
-                log.warn("Warning, text for file: {} in dossier: {} is null", fileId, dossierId);
-            }
-        }
-    }
-
-}
@@ -0,0 +1,321 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.file.management.v1.api.model.FileType;
+import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.classification.model.Text;
+import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+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.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+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.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ReanalyzeService {
+
+    private final DictionaryService dictionaryService;
+    private final DroolsExecutionService droolsExecutionService;
+    private final SurroundingWordsService surroundingWordsService;
+    private final EntityRedactionService entityRedactionService;
+    private final RedactionLogCreatorService redactionLogCreatorService;
+    private final RedactionStorageService redactionStorageService;
+    private final PdfSegmentationService pdfSegmentationService;
+    private final RedactionChangeLogService redactionChangeLogService;
+    private final AnalyzeResponseService analyzeResponseService;
+    private final LegalBasisClient legalBasisClient;
+    private final RedactionServiceSettings redactionServiceSettings;
+
+
+    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+
+        var pageCount = 0;
+        Document classifiedDoc;
+
+        try {
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest
+                    .getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
+            pageCount = classifiedDoc.getPages().size();
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+        log.info("Document structure analysis successful, starting redaction analysis...");
+
+        entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getDossierTemplateId(), analyzeRequest.getManualRedactions(), analyzeRequest
+                .getDossierId(), analyzeRequest.getFileAttributes());
+        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getDossierTemplateId());
+
+        log.info("Redaction analysis successful...");
+
+        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
+                .getDossierTemplateVersion(), classifiedDoc.getDictionaryVersion()
+                .getDossierVersion(), classifiedDoc.getRulesVersion(), legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+
+        log.info("Analyzed with rules {} and dictionary {} for dossierTemplate: {}", classifiedDoc.getRulesVersion(), classifiedDoc
+                .getDictionaryVersion(), analyzeRequest.getDossierTemplateId());
+
+        // first create changelog - this only happens when we migrate files analyzed via the old process and we don't want to loose changeLog data
+        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
+        // store redactionLog
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, new Text(pageCount, classifiedDoc
+                .getSectionText()));
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
+                .getSectionGrid());
+
+        long duration = System.currentTimeMillis() - startTime;
+        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, pageCount, redactionLog, changeLog);
+    }
+
+
+    @SneakyThrows
+    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+
+        var redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+
+        // not yet ready for reanalysis
+        if (redactionLog == null || text == null || text.getNumberOfPages() == 0) {
+            return analyze(analyzeRequest);
+        }
+
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
+                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
+
+        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse().isEmpty() ? analyzeRequest.getSectionsToReanalyse() :
+                findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);
+
+        if (sectionsToReanalyse.isEmpty()) {
+            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+        }
+
+        List<SectionText> reanalysisSections = text.getSectionTexts()
+                .stream()
+                .filter(sectionText -> sectionsToReanalyse.contains(sectionText.getSectionNumber()))
+                .collect(Collectors.toList());
+
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
+                .getDossierId());
+
+        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
+        Set<Entity> entities = findEntities(reanalysisSections, dictionary, kieContainer, analyzeRequest, false, null, imagesPerPage);
+
+        if (dictionary.hasLocalEntries()) {
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = entityRedactionService.getHintsPerSection(entities, dictionary);
+            Set<Entity> foundByLocal = findEntities(reanalysisSections, dictionary, kieContainer, analyzeRequest, true, hintsPerSectionNumber, imagesPerPage);
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, foundByLocal, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+        }
+
+        Map<Integer, List<Entity>> entitiesPerPage = entityRedactionService.convertToEnititesPerPage(entities);
+
+        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
+        for (int page = 1; page <= text.getNumberOfPages(); page++) {
+            if (entitiesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, page, analyzeRequest
+                        .getDossierTemplateId()));
+            }
+
+            if (imagesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, page, analyzeRequest
+                        .getDossierTemplateId()));
+            }
+
+        }
+
+        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
+        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
+        AnalyzeResult analyzeResult = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+        analyzeResult.setWasReanalyzed(true);
+        return analyzeResult;
+    }
+
+
+    private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
+                                                 Text text, AnalyzeRequest analyzeRequest) {
+
+        Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
+
+        Set<Integer> sectionsToReanalyse = new HashSet<>();
+        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
+        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+            if (entry.isManual() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
+                sectionsToReanalyse.add(entry.getSectionNumber());
+            }
+            if (entry.isImage() || entry.getType().equals("image")) {
+                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
+            }
+        }
+
+        for (SectionText sectionText : text.getSectionTexts()) {
+
+            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
+                sectionsToReanalyse.add(sectionText.getSectionNumber());
+            }
+
+        }
+
+        log.info("Should reanalyze {} sections for request: {}", sectionsToReanalyse.size(), analyzeRequest);
+
+        return sectionsToReanalyse;
+    }
+
+
+    private Set<Entity> findEntities(List<SectionText> reanalysisSections, Dictionary dictionary,
+                                     KieContainer kieContainer, AnalyzeRequest analyzeRequest, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                     Map<Integer, Set<Image>> imagesPerPage) {
+
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        for (SectionText reanalysisSection : reanalysisSections) {
+
+            Set<Entity> entities = entityRedactionService.findEntities(reanalysisSection.getSearchableText(), reanalysisSection
+                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, local);
+            if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
+                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
+                        .getCellStarts());
+            } else {
+                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
+            }
+
+            if (!local && reanalysisSection.getImages() != null && !reanalysisSection.getImages()
+                    .isEmpty() && analyzeRequest.getManualRedactions() != null && analyzeRequest.getManualRedactions()
+                    .getImageRecategorizations() != 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()
+                                .equals(imageId)) {
+                            image.setType(imageRecategorization.getType());
+                        }
+                    }
+                }
+            }
+
+            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                    .isLocal(false)
+                    .dictionaryTypes(dictionary.getTypes())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
+                            .concat(entities.stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
+                                    .stream())
+                            .collect(Collectors.toSet()) : entities)
+                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
+                    .searchText(reanalysisSection.getSearchableText().toString())
+                    .headline(reanalysisSection.getHeadline())
+                    .sectionNumber(reanalysisSection.getSectionNumber())
+                    .tabularData(reanalysisSection.getTabularData())
+                    .searchableText(reanalysisSection.getSearchableText())
+                    .dictionary(dictionary)
+                    .images(reanalysisSection.getImages())
+                    .fileAttributes(analyzeRequest.getFileAttributes())
+                    .build(), reanalysisSection.getSearchableText()));
+        }
+
+        Set<Entity> entities = new HashSet<>();
+        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            entities.addAll(analysedSection.getEntities());
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+
+            for (Image image : analysedSection.getImages()) {
+                imagesPerPage.computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
+            }
+
+            entityRedactionService.addLocalValuesToDictionary(analysedSection, dictionary);
+        });
+
+        return entities;
+    }
+
+
+    private AnalyzeResult finalizeAnalysis(@RequestBody AnalyzeRequest analyzeRequest, long startTime,
+                                           RedactionLog redactionLog, Text text,
+                                           DictionaryIncrement dictionaryIncrement) {
+
+        redactionLog.setDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierTemplateVersion());
+        redactionLog.setDossierDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierVersion());
+
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+
+        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
+
+        long duration = System.currentTimeMillis() - startTime;
+
+        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, text
+                .getNumberOfPages(), redactionLog, changeLog);
+    }
+
+
+    private Set<String> getRelevantManuallyModifiedAnnotationIds(ManualRedactions manualRedactions) {
+
+        if (manualRedactions == null) {
+            return new HashSet<>();
+        }
+
+        return Stream.concat(manualRedactions.getManualLegalBasisChanges()
+                .stream()
+                .map(ManualLegalBasisChange::getId), Stream.concat(manualRedactions.getImageRecategorizations()
+                .stream()
+                .map(ManualImageRecategorization::getId), Stream.concat(manualRedactions.getIdsToRemove()
+                .stream()
+                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))))
+                .collect(Collectors.toSet());
+    }
+
+
+    public Image convert(RedactionLogEntry entry) {
+
+        Rectangle position = entry.getPositions().get(0);
+
+        return Image.builder()
+                .type(entry.getType())
+                .position(new RedRectangle2D(position.getTopLeft().getX(), position.getTopLeft()
+                        .getY(), position.getWidth(), position.getHeight()))
+                .sectionNumber(entry.getSectionNumber())
+                .section(entry.getSection())
+                .page(position.getPage())
+                .hasTransparency(entry.isImageHasTransparency())
+                .build();
+    }
+
+
+    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {
+
+        if(excludedPages != null && !excludedPages.isEmpty()) {
+            redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> { if (excludedPages.contains(pos.getPage())) {
+                entry.setExcluded(true);
+            }}));
+        }
+    }
+
+}
@@ -1,25 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.model.Change;
+import com.iqser.red.service.file.management.v1.api.model.FileType;
 import com.iqser.red.service.redaction.v1.model.ChangeType;
+import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
+import com.iqser.red.service.redaction.v1.model.RedactionChangeLogEntry;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogChanges;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;

@Slf4j
@Service
@@ -28,80 +22,76 @@ public class RedactionChangeLogService {

    private final RedactionStorageService redactionStorageService;

+    public RedactionChangeLog createAndStoreChangeLog(String dossierId, String fileId, RedactionLog currentRedactionLog) {

-    public RedactionLogChanges computeChanges(String dossierId, String fileId, RedactionLog currentRedactionLog) {
-
-        long start = System.currentTimeMillis();
-
-        RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(dossierId, fileId);
-
-        if (previousRedactionLog == null) {
-            currentRedactionLog.getRedactionLogEntry().forEach(entry -> {
-                entry.getChanges().add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
-            });
-            return new RedactionLogChanges(currentRedactionLog, false);
+        try {
+            RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(dossierId, fileId);
+            var changeLog = createChangeLog(currentRedactionLog, previousRedactionLog);
+            redactionStorageService.storeObject(dossierId, fileId, FileType.REDACTION_CHANGELOG, changeLog);
+            return changeLog;
+        } catch (Exception e) {
+            log.debug("Previous redaction log not available");
+            return null;
        }

-        List<RedactionLogEntry> notRemovedPreviousEntries = previousRedactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.getChanges()
-                        .get(entry.getChanges().size() - 1)
-                        .getType()
-                        .equals(ChangeType.REMOVED))
-                .collect(Collectors.toList());
+    }

-        Set<RedactionLogEntry> added = new HashSet<>(currentRedactionLog.getRedactionLogEntry());
-        added.removeAll(notRemovedPreviousEntries);

-        Set<RedactionLogEntry> removed = new HashSet<>(notRemovedPreviousEntries);
+    private RedactionChangeLog createChangeLog(RedactionLog currentRedactionLog, RedactionLog previousRedactionLog) {
+
+
+        if (previousRedactionLog == null) {
+            return null;
+        }
+
+        List<RedactionLogEntry> added = new ArrayList<>(currentRedactionLog.getRedactionLogEntry());
+        added.removeAll(previousRedactionLog.getRedactionLogEntry());
+
+        List<RedactionLogEntry> removed = new ArrayList<>(previousRedactionLog.getRedactionLogEntry());
        removed.removeAll(currentRedactionLog.getRedactionLogEntry());

-        Map<String, RedactionLogEntry> addedIds = new HashMap<>();
-        added.forEach(entry -> {
-            addedIds.put(entry.getId(), entry);
-        });
+        List<RedactionChangeLogEntry> changeLogEntries = added.stream()
+                .map(entry -> convert(entry, ChangeType.ADDED))
+                .collect(Collectors.toList());
+        changeLogEntries.addAll(removed.stream()
+                .map(entry -> convert(entry, ChangeType.REMOVED))
+                .collect(Collectors.toList()));

-        Set<String> removedIds = new HashSet<>();
-        removed.forEach(entry -> {
-            removedIds.add(entry.getId());
-        });
+        return new RedactionChangeLog(changeLogEntries,
+                currentRedactionLog.getDictionaryVersion(),
+                currentRedactionLog.getDossierDictionaryVersion(),
+                currentRedactionLog.getRulesVersion(),
+                currentRedactionLog.getLegalBasisVersion());
+    }

-        List<RedactionLogEntry> newRedactionLogEntries = previousRedactionLog.getRedactionLogEntry();

-        List<RedactionLogEntry> toRemove = new ArrayList<>();
-        newRedactionLogEntries.forEach(entry -> {
-            if (removedIds.contains(entry.getId()) && addedIds.containsKey(entry.getId())) {
-                List<Change> changes = entry.getChanges();
-                changes.add(new Change(ChangeType.CHANGED, OffsetDateTime.now()));
-                var newEntry = addedIds.get(entry.getId());
-                newEntry.setChanges(changes);
-                addedIds.put(entry.getId(), newEntry);
-                toRemove.add(entry);
-            } else if (removedIds.contains(entry.getId())) {
-                entry.getChanges().add(new Change(ChangeType.REMOVED, OffsetDateTime.now()));
-            } else if (addedIds.containsKey(entry.getId())) {
-                List<Change> changes = entry.getChanges();
-                changes.add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
-                var newEntry = addedIds.get(entry.getId());
-                newEntry.setChanges(changes);
-                addedIds.put(entry.getId(), newEntry);
-                toRemove.add(entry);
-            }
-        });
+    private RedactionChangeLogEntry convert(RedactionLogEntry entry, ChangeType changeType) {

-        newRedactionLogEntries.removeAll(toRemove);
-
-        addedIds.forEach((k, v) -> {
-            if(v.getChanges().isEmpty()) {
-                v.getChanges().add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
-            }
-            newRedactionLogEntries.add(v);
-        });
-
-        currentRedactionLog.setRedactionLogEntry(newRedactionLogEntries);
-
-        log.info("Change computation took: {}", System.currentTimeMillis() - start);
-        return new RedactionLogChanges(currentRedactionLog, !addedIds.isEmpty() || !removedIds.isEmpty());
+        return RedactionChangeLogEntry.builder()
+                .id(entry.getId())
+                .type(entry.getType())
+                .value(entry.getValue())
+                .reason(entry.getReason())
+                .matchedRule(entry.getMatchedRule())
+                .legalBasis(entry.getLegalBasis())
+                .redacted(entry.isRedacted())
+                .isHint(entry.isHint())
+                .isRecommendation(entry.isRecommendation())
+                .section(entry.getSection())
+                .color(entry.getColor())
+                .positions(entry.getPositions())
+                .sectionNumber(entry.getSectionNumber())
+                .manual(entry.isManual())
+                .status(entry.getStatus())
+                .manualRedactionType(entry.getManualRedactionType())
+                .isDictionaryEntry(entry.isDictionaryEntry())
+                .textBefore(entry.getTextBefore())
+                .textAfter(entry.getTextAfter())
+                .comments(entry.getComments())
+                .changeType(changeType)
+                .isDossierDictionaryEntry(entry.isDossierDictionaryEntry())
+                .excluded(entry.isExcluded())
+                .build();
    }

 }
@@ -1,20 +1,31 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import com.iqser.red.service.redaction.v1.model.CellRectangle;
 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;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 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 com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;

-import java.util.*;
+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;

@Service
@@ -24,26 +35,26 @@ public class RedactionLogCreatorService {
    private final DictionaryService dictionaryService;


-    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages, String dossierTemplateId) {
-
-        List<RedactionLogEntry> entries = new ArrayList<>();
+    public void createRedactionLog(Document classifiedDoc, int numberOfPages, String dossierTemplateId) {

        for (int page = 1; page <= numberOfPages; page++) {
-            if (pageEntities.getEntitiesPerPage().get(page) != null) {
-                entries.addAll(addEntries(pageEntities.getEntitiesPerPage(), page, dossierTemplateId));
+
+            addSectionGrid(classifiedDoc, page);
+
+            if (classifiedDoc.getEntities().get(page) != null) {
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addEntries(classifiedDoc.getEntities(), page, dossierTemplateId));
            }

-            if (pageEntities.getImagesPerPage().get(page) != null) {
-                entries.addAll(addImageEntries(pageEntities.getImagesPerPage(), page, dossierTemplateId));
+            if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addImageEntries(classifiedDoc.getImages(), page, dossierTemplateId));
            }
        }
-
-        return entries;
    }


-    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, int pageNumber,
-                                                   String dossierTemplateId) {
+    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, int pageNumber, String dossierTemplateId) {

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

@@ -72,6 +83,7 @@ public class RedactionLogCreatorService {
                    .imageHasTransparency(image.isHasTransparency())
                    .build();

+
            redactionLogEntities.add(redactionLogEntry);
        }

@@ -89,6 +101,7 @@ public class RedactionLogCreatorService {
        entityLoop:
        for (Entity entity : entities.get(page)) {

+
            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {

                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity, dossierTemplateId);
@@ -108,10 +121,12 @@ public class RedactionLogCreatorService {
                            .flatMap(seq -> seq.getTextPositions().stream())
                            .collect(Collectors.toList()), page);

+
                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);

                }

+
                // FIXME ids should never be null. Figure out why this happens.
                if (redactionLogEntry.getId() != null) {
                    redactionLogEntities.add(redactionLogEntry);
@@ -152,9 +167,6 @@ public class RedactionLogCreatorService {

    private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {

-        Set<String> referenceIds = new HashSet<>();
-        entity.getReferences().forEach(ref -> ref.getPositionSequences().forEach(pos -> referenceIds.add(pos.getId())));
-
        return RedactionLogEntry.builder()
                .color(getColor(entity.getType(), dossierTemplateId, entity.isRedaction()))
                .reason(entity.getRedactionReason())
@@ -173,12 +185,54 @@ public class RedactionLogCreatorService {
                .startOffset(entity.getStart())
                .endOffset(entity.getEnd())
                .isDossierDictionaryEntry(entity.isDossierDictionaryEntry())
-                .engines(entity.getEngines())
-                .reference(referenceIds)
                .build();
    }


+    private void addSectionGrid(Document classifiedDoc, int page) {
+
+        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
+
+            for (int i = 0; i <= paragraph.getPageBlocks().size() - 1; i++) {
+
+                AbstractTextContainer textBlock = paragraph.getPageBlocks().get(i);
+
+                if (textBlock.getPage() != page) {
+                    continue;
+                }
+
+                if (textBlock instanceof TextBlock) {
+
+                    classifiedDoc.getSectionGrid()
+                            .getRectanglesPerPage()
+                            .computeIfAbsent(page, (x) -> new ArrayList<>())
+                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
+                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
+
+                } else if (textBlock instanceof Table) {
+
+                    List<CellRectangle> cellRectangles = new ArrayList<>();
+                    for (List<Cell> row : ((Table) textBlock).getRows()) {
+                        for (Cell cell : row) {
+                            if (cell != null) {
+                                cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                                        .getWidth(), (float) cell.getHeight()));
+                            }
+                        }
+                    }
+
+                    classifiedDoc.getSectionGrid()
+                            .getRectanglesPerPage()
+                            .computeIfAbsent(page, (x) -> new ArrayList<>())
+                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
+                                    .getHeight(), i + 1, paragraph.getPageBlocks().size(), cellRectangles));
+
+                }
+            }
+        }
+    }
+
+
    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction) {

        if (!isRedaction && !isHint(type, dossierTemplateId)) {
@@ -8,15 +8,19 @@ 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.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.ManualRedactions;
 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.server.redaction.utils.IdBuilder;
+import com.iqser.red.service.redaction.v1.model.Status;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

            if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
-                redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
-                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry
+                        .getId(), dossierTemplateId);
+                redactionLogEntry.setPositions(manualRedactionEntry.getPositions());
+                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getId()));
                redactionLogEntries.add(redactionLogEntry);
            }
        }
@@ -240,16 +245,11 @@ 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(AnnotationStatus.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+                .equals(Status.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
    }


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


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

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

    }

-
 }

@@ -1,76 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.model.CellRectangle;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.SectionRectangle;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class SectionGridCreatorService {
-
-
-    public void createSectionGrid(Document classifiedDoc, int numberOfPages) {
-
-        for (int page = 1; page <= numberOfPages; page++) {
-            addSectionGrid(classifiedDoc, page);
-        }
-    }
-
-
-    private void addSectionGrid(Document classifiedDoc, int page) {
-
-        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
-
-            for (int i = 0; i <= paragraph.getPageBlocks().size() - 1; i++) {
-
-                AbstractTextContainer textBlock = paragraph.getPageBlocks().get(i);
-
-                if (textBlock.getPage() != page) {
-                    continue;
-                }
-
-                if (textBlock instanceof TextBlock) {
-
-                    classifiedDoc.getSectionGrid()
-                            .getRectanglesPerPage()
-                            .computeIfAbsent(page, (x) -> new ArrayList<>())
-                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
-
-                } else if (textBlock instanceof Table) {
-
-                    List<CellRectangle> cellRectangles = new ArrayList<>();
-                    for (List<Cell> row : ((Table) textBlock).getRows()) {
-                        for (Cell cell : row) {
-                            if (cell != null) {
-                                cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                                        .getWidth(), (float) cell.getHeight()));
-                            }
-                        }
-                    }
-
-                    classifiedDoc.getSectionGrid()
-                            .getRectanglesPerPage()
-                            .computeIfAbsent(page, (x) -> new ArrayList<>())
-                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size(), cellRectangles));
-
-                }
-            }
-        }
-    }
-
-}
@@ -1,220 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-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.SectionArea;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
-import com.iqser.red.service.redaction.v1.server.classification.model.Header;
-import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.classification.model.UnclassifiedText;
-import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class SectionTextBuilderService {
-
-    public List<SectionText> buildSectionText(Document classifiedDoc) {
-
-        List<SectionText> sectionTexts = new ArrayList<>();
-        AtomicInteger sectionNumber = new AtomicInteger(1);
-        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
-
-            List<Table> tables = paragraph.getTables();
-            for (Table table : tables) {
-                if (table.getColCount() == 2) {
-                    sectionTexts.add(processTableAsOneText(table, sectionNumber));
-                } else {
-                    sectionTexts.addAll(processTablePerRow(table, sectionNumber));
-                }
-                sectionNumber.incrementAndGet();
-            }
-            sectionTexts.add(processText(paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph.getHeadline(), sectionNumber, paragraph
-                    .getImages()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (Header header : classifiedDoc.getHeaders()) {
-            sectionTexts.add(processText(header.getSearchableText(), header.getTextBlocks(), "Header", sectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (Footer footer : classifiedDoc.getFooters()) {
-            sectionTexts.add(processText(footer.getSearchableText(), footer.getTextBlocks(), "Footer", sectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
-            sectionTexts.add(processText(unclassifiedText.getSearchableText(), unclassifiedText.getTextBlocks(), "", sectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        return sectionTexts;
-    }
-
-
-    private List<SectionText> processTablePerRow(Table table, AtomicInteger sectionNumber) {
-
-        List<SectionText> sectionTexts = new ArrayList<>();
-        for (List<Cell> row : table.getRows()) {
-            SearchableText searchableRow = new SearchableText();
-            Map<String, CellValue> tabularData = new HashMap<>();
-            int start = 0;
-            List<Integer> cellStarts = new ArrayList<>();
-            SectionText sectionText = new SectionText();
-            for (Cell cell : row) {
-
-                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
-                    continue;
-                }
-
-                SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
-                        .get(0)
-                        .getSequences()
-                        .get(0)
-                        .getPage());
-                sectionText.getSectionAreas().add(sectionArea);
-                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
-
-                int cellStart = start;
-
-                if (!cell.isHeaderCell()) {
-                    cell.getHeaderCells().forEach(headerCell -> {
-                        StringBuilder headerBuilder = new StringBuilder();
-                        headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
-                        String headerName = headerBuilder.toString()
-                                .replaceAll("\n", "")
-                                .replaceAll(" ", "")
-                                .replaceAll("-", "");
-                        sectionArea.setHeader(headerName);
-                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
-                    });
-                }
-
-                for (TextBlock textBlock : cell.getTextBlocks()) {
-                    // TODO avoid cell overlap merging.
-                    searchableRow.addAll(textBlock.getSequences());
-                }
-                cellStarts.add(cellStart);
-                start = start + cell.toString().trim().length() + 1;
-
-            }
-
-            sectionText.setText(searchableRow.toString());
-            sectionText.setHeadline(table.getHeadline());
-            sectionText.setSectionNumber(sectionNumber.intValue());
-            sectionText.setTable(true);
-            sectionText.setTabularData(tabularData);
-            sectionText.setCellStarts(cellStarts);
-            sectionTexts.add(sectionText);
-
-            sectionNumber.incrementAndGet();
-        }
-
-        return sectionTexts;
-    }
-
-
-    private SectionText processTableAsOneText(Table table, AtomicInteger sectionNumber) {
-
-        SearchableText entireTableText = new SearchableText();
-        SectionText sectionText = new SectionText();
-        int start = 0;
-        List<Integer> cellStarts = new ArrayList<>();
-        for (List<Cell> row : table.getRows()) {
-
-
-            for (Cell cell : row) {
-                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
-                    continue;
-                }
-
-                SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
-                        .get(0)
-                        .getSequences()
-                        .get(0)
-                        .getPage());
-                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
-                sectionText.getSectionAreas().add(sectionArea);
-
-                for (TextBlock textBlock : cell.getTextBlocks()) {
-                    entireTableText.addAll(textBlock.getSequences());
-                }
-
-
-                cellStarts.add(start);
-                start = start + cell.toString().trim().length() + 1;
-            }
-
-        }
-        sectionText.setCellStarts(cellStarts);
-
-        sectionText.setText(entireTableText.toString());
-        sectionText.setHeadline(table.getHeadline());
-        sectionText.setSectionNumber(sectionNumber.intValue());
-        sectionText.setTable(true);
-        return sectionText;
-    }
-
-
-    private SectionText processText(SearchableText searchableText, List<TextBlock> paragraphTextBlocks, String headline,
-                                    AtomicInteger sectionNumber, List<PdfImage> images) {
-
-        SectionText sectionText = new SectionText();
-        for (TextBlock paragraphTextBlock : paragraphTextBlocks) {
-            SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()), paragraphTextBlock
-                    .getWidth(), paragraphTextBlock.getHeight(), paragraphTextBlock.getPage());
-            sectionText.getSectionAreas().add(sectionArea);
-        }
-
-        sectionText.setText(searchableText.toString());
-        sectionText.setHeadline(headline);
-        sectionText.setSectionNumber(sectionNumber.intValue());
-        sectionText.setTable(false);
-        sectionText.setImages(images.stream()
-                .map(image -> convertImage(image, sectionNumber.intValue(), headline))
-                .collect(Collectors.toSet()));
-        sectionText.setTextBlocks(paragraphTextBlocks);
-        return sectionText;
-    }
-
-
-    private Image convertImage(PdfImage pdfImage, int sectionNumber, String headline) {
-
-        return Image.builder()
-                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
-                        .name()
-                        .toLowerCase(Locale.ROOT))
-                .position(pdfImage.getPosition())
-                .sectionNumber(sectionNumber)
-                .section(headline)
-                .page(pdfImage.getPage())
-                .hasTransparency(pdfImage.isHasTransparency())
-                .build();
-    }
-
-}
@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;

-import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
@@ -48,7 +47,7 @@ public class EntitySearchUtils {


    public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
-                            boolean isDictionaryEntry, boolean isDossierDictionary, Engine engine) {
+                            boolean local, boolean isDossierDictionary) {

        Set<Entity> found = new HashSet<>();

@@ -68,7 +67,7 @@ public class EntitySearchUtils {

                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine));
+                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, !local, isDossierDictionary));
                }
            } while (startIndex > -1);
        }
@@ -140,21 +139,12 @@ public class EntitySearchUtils {
    public void addEntitiesWithHigherRank(Set<Entity> entities, Entity found, Dictionary dictionary) {

        if (entities.contains(found)) {
-            Optional<Entity> existingOptional = entities.stream().filter(entity -> entity.equals(found)).findFirst();
-            if(!existingOptional.isPresent()){
-                return;
-            }
-            var existing = existingOptional.get();
-
+            Entity existing = entities.stream().filter(entity -> entity.equals(found)).findFirst().get();
            if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
                entities.remove(found);
-                entities.add(found);
-            } else {
-                existing.getEngines().addAll(found.getEngines());
            }
-        } else {
-            entities.add(found);
        }
+        entities.add(found);
    }


@@ -164,21 +154,4 @@ public class EntitySearchUtils {
        entities.addAll(found);
    }

-
-    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded){
-
-        for(Entity toAdd: toBeAdded){
-            if (existing.contains(toAdd)) {
-                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,8 +30,4 @@ public class IdBuilder {
    }


-    public String getTypeId(String type, String dossierTemplateId, String dossierId) {
-        return type + ":" + dossierTemplateId + (dossierId != null ? ":" + dossierId : "");
-    }
-
 }
@@ -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,500})[\\-\\u00AD]\\R", "$1");
+        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R", "$1");
    }

 }
@@ -4,16 +4,10 @@ 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;
@@ -65,93 +59,77 @@ public class PdfSegmentationService {
        PDDocument pdDocument = null;
        try {
            //create tempFile
-            File tempFile;
+            File tempFile = File.createTempFile("document", ".pdf");
+            IOUtils.copy(documentInputStream, new FileOutputStream(tempFile));

-            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);
-            }
+            // initialize required variables
+            Document document = new Document();
+            List<Page> pages = new ArrayList<>();

-            try (var fos = new FileOutputStream(tempFile)) {
-                IOUtils.copy(documentInputStream, fos);
+            pdDocument = reinitializePDDocument(tempFile, null);
+            long pageCount = pdDocument.getNumberOfPages();

-                // initialize required variables
-                Document document = new Document();
-                List<Page> pages = new ArrayList<>();
+            for (int pageNumber = 1; pageNumber <= pageCount; pageNumber++) {

-                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 (pageNumber % MAX_PAGES_BEFORE_GC == 0) {
+                    pdDocument = reinitializePDDocument(tempFile, pdDocument);
                }

-                document.setPages(pages);
+                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);

-                classificationService.classifyDocument(document);
-                sectionsBuilderService.buildSections(document);
-                sectionsBuilderService.addImagesToSections(document);
+                PDRectangle pdr = pdPage.getMediaBox();
+                boolean isLandscape = pdr.getWidth() > pdr.getHeight();

-                pdDocument = reinitializePDDocument(tempFile, pdDocument);
+                int rotation = pdPage.getRotation();
+                boolean isRotated = rotation != 0 && rotation != 360;

-                IOUtils.close(pdDocument);
+                CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(stripper.getRulings(), stripper.getMinCharWidth(), stripper
+                        .getMaxCharHeight());

-                if(!tempFile.delete()){
-                    log.warn("Could not delete tmp file");
+                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);
                }

-                return document;
+                pages.add(page);
            }
+
+            document.setPages(pages);
+
+            classificationService.classifyDocument(document);
+            sectionsBuilderService.buildSections(document);
+            sectionsBuilderService.addImagesToSections(document);
+
+            pdDocument = reinitializePDDocument(tempFile, pdDocument);
+
+            IOUtils.close(pdDocument);
+
+            tempFile.delete();
+
+            return document;
        } finally {
            if (pdDocument != null) {
                pdDocument.close();
@@ -17,6 +17,4 @@ public class RedactionServiceSettings {

    private int analysisVersion = 1;

-    private boolean enableEntityRecognition = true;
-
 }
@@ -1,11 +1,10 @@
 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.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.file.management.v1.api.model.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;
-import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 import com.iqser.red.storage.commons.service.StorageService;
 import lombok.Getter;
@@ -74,25 +73,6 @@ public class RedactionStorageService {
    }


-    public NerEntities getNerEntities(String dossierId, String fileId) {
-
-        InputStreamResource inputStreamResource;
-        try {
-            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.NER_ENTITIES));
-        } catch (StorageObjectDoesNotExist e) {
-            log.debug("NER Entities not available.");
-            return null;
-        }
-
-        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), NerEntities.class);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not convert NerEntities", e);
-        }
-    }
-
-
-
    public SectionGrid getSectionGrid(String dossierId, String fileId) {

        var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
@@ -1,9 +1,9 @@
 info:
  description: Redaction Service Server V1

-persistence-service.url: "http://persistence-service-v1:8080"
+configuration-service.url: "http://configuration-service-v1:8080"
+file-management-service.url: "http://file-management-service-v1:8080"
 image-service.url: "http://image-service-v1:8080"
-entity-recognition-service.url: "http://entity-recognition-service-v1:8080"

 server:
  port: 8080
@@ -40,4 +40,3 @@ storage:
  bucket-name: 'redaction'
  region: 'us-east-1'
  endpoint: 'https://s3.amazonaws.com'
-  backend: 's3'
@@ -1,7 +1,6 @@
 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;
@@ -13,7 +12,7 @@ import java.io.FileOutputStream;
 import java.util.HashMap;
 import java.util.Map;

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

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

@@ -2,13 +2,9 @@ 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.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.configuration.v1.api.model.*;
+import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
+import com.iqser.red.service.file.management.v1.api.model.FileType;
 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;
@@ -17,15 +13,15 @@ import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
 import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService;
 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;
@@ -94,7 +90,7 @@ public class RedactionIntegrationTest {
    private RedactionController redactionController;

    @Autowired
-    private AnalyzeService analyzeService;
+    private ReanalyzeService reanalyzeService;

    @Autowired
    private ObjectMapper objectMapper;
@@ -139,7 +135,7 @@ public class RedactionIntegrationTest {
    private final static String TEST_FILE_ID = "123";

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

        @Bean
@@ -182,62 +178,66 @@ public class RedactionIntegrationTest {
    public void stubClients() {

        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(JSONPrimitive.of(RULES));
+        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(new RulesResponse(RULES));

        loadDictionaryForTest();
        loadTypeForTest();
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypesForDossierTemplate(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getTypeResponse());
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(0L);
+        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(TypeResponse
+                .builder()
+                .types(getTypeResponse())
+                .build());

-        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)
-                .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()));
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID)).thenReturn(0L);
+        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID)).thenReturn(TypeResponse.builder()
+                .types(List.of(TypeResult.builder()
+                        .type(DOSSIER_REDACTIONS)
+                        .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
+                        .hexColor("#ffe187")
+                        .isHint(hintTypeMap.get(DOSSIER_REDACTIONS))
+                        .isCaseInsensitive(caseInSensitiveMap.get(DOSSIER_REDACTIONS))
+                        .isRecommendation(recommendationTypeMap.get(DOSSIER_REDACTIONS))
+                        .rank(rankTypeMap.get(DOSSIER_REDACTIONS))
+                        .build()))
+                .build());

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

@@ -476,12 +476,11 @@ public class RedactionIntegrationTest {
    }


-    private List<Type> getTypeResponse() {
+    private List<TypeResult> getTypeResponse() {

        return typeColorMap.entrySet()
                .stream()
-                .map(typeColor -> Type.builder()
-                        .id(typeColor.getKey() + ":" + TEST_DOSSIER_TEMPLATE_ID)
+                .map(typeColor -> TypeResult.builder()
                        .type(typeColor.getKey())
                        .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
                        .hexColor(typeColor.getValue())
@@ -495,10 +494,9 @@ public class RedactionIntegrationTest {
    }


-    private Type getDictionaryResponse(String type, boolean isDossierDictionary) {
+    private DictionaryResponse getDictionaryResponse(String type, boolean isDossierDictionary) {

-        return Type.builder()
-                .id(type + ":" + TEST_DOSSIER_TEMPLATE_ID)
+        return DictionaryResponse.builder()
                .hexColor(typeColorMap.get(type))
                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary
                        .get(type)))
@@ -514,10 +512,8 @@ public class RedactionIntegrationTest {

        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
        entries.forEach(entry -> {
-            dictionaryEntries.add(DictionaryEntry.builder()
-                    .value(entry)
-                    .version(reanlysisVersions.getOrDefault(entry, 0L))
-                    .deleted(deleted.contains(entry)).build());
+            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, deleted
+                    .contains(entry) ? true : false));
        });
        return dictionaryEntries;
    }
@@ -528,8 +524,7 @@ public class RedactionIntegrationTest {

        AnalyzeRequest request = prepareStorage("files/Minimal Examples/270Rotated.pdf");
        MemoryStats.printMemoryStats();
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
+        AnalyzeResult result = reanalyzeService.analyze(request);
        assertThat(result).isNotNull();
    }

@@ -540,8 +535,7 @@ public class RedactionIntegrationTest {

        AnalyzeRequest request = prepareStorage("scanned/VV-377031.pdf");
        MemoryStats.printMemoryStats();
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
+        AnalyzeResult result = reanalyzeService.analyze(request);
        assertThat(result).isNotNull();
    }

@@ -553,8 +547,7 @@ public class RedactionIntegrationTest {
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/merge_images.pdf");

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
+        AnalyzeResult result = reanalyzeService.analyze(request);

        Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();

@@ -569,18 +562,18 @@ public class RedactionIntegrationTest {
        });

        dictionary.get(AUTHOR).add("Drinking water");
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(1L);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(1L);

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated3.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated3.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long rstart = System.currentTimeMillis();
-        analyzeService.reanalyze(request);
+        reanalyzeService.reanalyze(request);

        long rend = System.currentTimeMillis();
        System.out.println("reanalysis analysis duration: " + (rend - rstart));
@@ -609,11 +602,7 @@ public class RedactionIntegrationTest {

            AnalyzeRequest request = prepareStorage(new FileInputStream((path)));
            System.out.println("Redacting file : " + path.getName());
-            analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-
-            long fstart = System.currentTimeMillis();
-            AnalyzeResult result = analyzeService.analyze(request);
-            System.out.println("analysis analysis duration: " + (System.currentTimeMillis() - fstart));
+            AnalyzeResult result = reanalyzeService.analyze(request);

            Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();

@@ -628,10 +617,10 @@ public class RedactionIntegrationTest {
            });

            dictionary.get(AUTHOR).add("Drinking water");
-            when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(1L);
+            when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(1L);

            long rstart = System.currentTimeMillis();
-            analyzeService.reanalyze(request);
+            reanalyzeService.reanalyze(request);

            long rend = System.currentTimeMillis();
            System.out.println("reanalysis analysis duration: " + (rend - rstart));
@@ -667,7 +656,7 @@ public class RedactionIntegrationTest {
    public void redactionTest() throws IOException {

        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
        request.setExcludedPages(Set.of(1));

@@ -678,17 +667,22 @@ public class RedactionIntegrationTest {
                .value("true")
                .build()));

-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
+        AnalyzeResult result = reanalyzeService.analyze(request);

        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(getTemporaryDirectory() + "/Test.json")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Test.json")) {
            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID)));
        }

@@ -720,35 +714,31 @@ public class RedactionIntegrationTest {
        reanlysisVersions.put("physical", 2L);

        deleted.add("David Chubb");
-        deleted.add("mouse");

        dictionary.get(FALSE_POSITIVE).add("David Chubb");
        reanlysisVersions.put("David Chubb", 3L);

-        reanlysisVersions.put("mouse", 3L);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(3L);

-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
-
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE))
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
                .thenReturn(getDictionaryResponse(VERTEBRATE, false));

-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE))
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));

        start = System.currentTimeMillis();

        ManualRedactions manualRedactions = new ManualRedactions();

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

        request.setManualRedactions(manualRedactions);

-        AnalyzeResult reanalyzeResult = analyzeService.reanalyze(request);
+        AnalyzeResult reanalyzeResult = reanalyzeService.reanalyze(request);

        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

@@ -760,24 +750,10 @@ public class RedactionIntegrationTest {
                .fileId(TEST_FILE_ID)
                .build());

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

-
-        deleted.remove("mouse");
-        reanlysisVersions.put("mouse", 4L);
-
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(4L);
-
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE))
-                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
-
-        analyzeService.reanalyze(request);
-
-        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        System.out.println("hi");
    }


@@ -788,15 +764,14 @@ public class RedactionIntegrationTest {
        long start = System.currentTimeMillis();

        AnalyzeRequest request = prepareStorage("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
+        AnalyzeResult result = reanalyzeService.analyze(request);

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());

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

        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
@@ -841,49 +814,31 @@ public class RedactionIntegrationTest {
        manualRedactions.getComments().put(manualAddId, List.of(comment));

        ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
-        manualRedactionEntry.setAnnotationId(manualAddId);
-        manualRedactionEntry.setFileId("fileId");
-        manualRedactionEntry.setStatus(AnnotationStatus.REQUESTED);
+        manualRedactionEntry.setId(manualAddId);
+        manualRedactionEntry.setStatus(Status.REQUESTED);
        manualRedactionEntry.setType("name");
        manualRedactionEntry.setValue("O'Loughlin C.K.");
        manualRedactionEntry.setReason("Manual Redaction");
-        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())
-        );
+        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)));

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

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
        request.setManualRedactions(manualRedactions);
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
+        AnalyzeResult result = reanalyzeService.analyze(request);

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

-        analyzeService.reanalyze(request);
+        reanalyzeService.reanalyze(request);

        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

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

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

        System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

@@ -918,7 +873,7 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.classify(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Classified.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Classified.pdf")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -928,7 +883,7 @@ public class RedactionIntegrationTest {
    public void sectionsTest() throws IOException {

        System.out.println("sectionsTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " + "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

@@ -940,7 +895,7 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.sections(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Sections.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Sections.pdf")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -950,7 +905,7 @@ public class RedactionIntegrationTest {
    public void htmlTablesTest() throws IOException {

        System.out.println("htmlTablesTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

@@ -962,7 +917,7 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.htmlTables(redactionRequest);

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

        RedactionResult result = redactionController.htmlTables(redactionRequest);

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

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
+        AnalyzeResult result = reanalyzeService.analyze(request);

        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

@@ -1046,15 +1000,14 @@ public class RedactionIntegrationTest {

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
+        AnalyzeResult result = reanalyzeService.analyze(request);

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());

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

-    private static String getTemporaryDirectory() {
-        String tmpdir = System.getProperty("java.io.tmpdir");
-        if (StringUtils.isNotBlank(tmpdir)) {
-            return tmpdir;
-        }
-        return "/tmp";
-    }
-
 }
@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.rulebuilder;
-
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-import org.junit.Test;
-
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
-public class RuleBuilderModelServiceTest {
-
-    @Test
-    public void testRuleBuilderModelProvider() {
-
-        RuleBuilderModel model = new RuleBuilderModelService().getRuleBuilderModel();
-
-        assertThat(model.getWhenClauses().size()).isGreaterThan(1);
-        assertThat(model.getThenConditions().size()).isGreaterThan(1);
-    }
-}
@@ -0,0 +1,511 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.iqser.red.service.configuration.v1.api.model.*;
+import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
+import com.iqser.red.service.redaction.v1.server.Application;
+import com.iqser.red.service.redaction.v1.server.FileSystemBackedStorageService;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.storage.commons.service.StorageService;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.KieServices;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.KieFileSystem;
+import org.kie.api.builder.KieModule;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Import(EntityRedactionServiceTest.RedactionIntegrationTestConfiguration.class)
+public class EntityRedactionServiceTest {
+
+    private static final String DEFAULT_RULES = loadFromClassPath("drools/rules.drl");
+    private static final String AUTHOR_CODE = "author";
+    private static final String ADDRESS_CODE = "address";
+    private static final String SPONSOR_CODE = "sponsor";
+
+    private static final AtomicLong DICTIONARY_VERSION = new AtomicLong();
+    private static final AtomicLong RULES_VERSION = new AtomicLong();
+
+    @MockBean
+    private DictionaryClient dictionaryClient;
+
+    @MockBean
+    private RulesClient rulesClient;
+
+    @Autowired
+    private EntityRedactionService entityRedactionService;
+
+    @Autowired
+    private PdfSegmentationService pdfSegmentationService;
+
+    @Autowired
+    private DroolsExecutionService droolsExecutionService;
+
+    @MockBean
+    private AmazonS3 amazonS3;
+
+    @MockBean
+    private LegalBasisClient legalBasisClient;
+
+    private final static String TEST_DOSSIER_TEMPLATE_ID = "123";
+
+    @Configuration
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    public static class RedactionIntegrationTestConfiguration {
+
+        @Bean
+        public KieContainer kieContainer() {
+
+            KieServices kieServices = KieServices.Factory.get();
+
+            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+            InputStream input = new ByteArrayInputStream(DEFAULT_RULES.getBytes(StandardCharsets.UTF_8));
+            kieFileSystem.write("src/test/resources/drools/rules.drl", kieServices.getResources()
+                    .newInputStreamResource(input));
+            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
+            kieBuilder.buildAll();
+            KieModule kieModule = kieBuilder.getKieModule();
+
+            return kieServices.newKieContainer(kieModule.getReleaseId());
+        }
+
+
+        @Bean
+        @Primary
+        public StorageService inmemoryStorage() {
+            return new FileSystemBackedStorageService();
+        }
+
+    }
+
+
+    @Test
+    public void testNestedEntitiesRemoval() {
+
+        Set<Entity> entities = new HashSet<>();
+        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false, false);
+        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false);
+        entities.add(nested);
+        entities.add(nesting);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+
+        assertThat(entities.size()).isEqualTo(1);
+        assertThat(entities).contains(nesting);
+
+    }
+
+
+    @Test
+    public void testTableRedaction() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H.")))
+                .build();
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+
+        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+        assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
+    }
+
+
+    @Test
+    public void testNestedRedaction() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/nested_redaction.pdf");
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H.")))
+                .build();
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+
+        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+        assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
+    }
+
+
+    @Test
+    public void testTrueNegativesInTable() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Cyprodinil/40 Cyprodinil - EU AIR3 - LCA Section 1" +
+                " Supplement - Identity of the active substance - Reference list.pdf");
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()
+                .entrySet()
+                .stream()
+                .noneMatch(entry -> entry.getValue().stream().anyMatch(e -> e.getMatchedRule() == 9))).isTrue();
+        pdfFileResource = new ClassPathResource("files/Compounds/27 A8637C - EU AIR3 - MCP Section 1 - Identity of " +
+                "the plant protection product.pdf");
+        classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()
+                .entrySet()
+                .stream()
+                .noneMatch(entry -> entry.getValue().stream().anyMatch(e -> e.getMatchedRule() == 9))).isTrue();
+    }
+
+    @Test
+    public void testFalsePositiveInWrongCell() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Row With Ambiguous Redaction.pdf");
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+        assertThat(classifiedDoc.getEntities().get(1).stream()
+                .filter(entity -> entity.getMatchedRule() == 9)
+                .count()).isEqualTo(10);
+
+    }
+
+
+    @Test
+    public void testApplicantInTableRedaction() throws IOException {
+
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" +
+                "rule \"6: Redact contact information if applicant is found\"\n" +
+                "   when\n" +
+                "       eval(section.headlineContainsWord(\"applicant\") || section.getText().contains(\"Applicant\"));\n" +
+                "   then\n" +
+                "       section.redactLineAfter(\"Name:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
+                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"Address:\", \"Contact\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact point:\",  \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Phone:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
+                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
+                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Tel:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
+                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"E-mail:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Email:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Telephone number:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax number:\", \"address\", 6,true, \"Applicant information was found\"," +
+                " \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Telephone:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "   end";
+        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules(TEST_DOSSIER_TEMPLATE_ID);
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Applicant Producer Table.pdf");
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+        assertThat(classifiedDoc.getEntities().get(1).stream()
+                .filter(entity -> entity.getMatchedRule() == 6)
+                .count()).isEqualTo(13);
+
+    }
+
+
+    @Test
+    public void testSponsorInCell() throws IOException {
+
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" + "rule \"11: Redact sponsor company\"\n" + "    when\n" + "        " +
+                "Section(searchText.toLowerCase().contains(\"batches produced at\"))\n" + "    then\n" + "        section" +
+                ".redactIfPrecededBy(\"batches produced at\", \"sponsor\", 11, \"Redacted because it represents a " +
+                "sponsor company\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" + "    end";
+        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules(TEST_DOSSIER_TEMPLATE_ID);
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/batches_new_line.pdf");
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        DictionaryResponse authorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(authorResponse);
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+        assertThat(classifiedDoc.getEntities().get(1).stream()
+                .filter(entity -> entity.getMatchedRule() == 11)
+                .count()).isEqualTo(1);
+
+    }
+
+
+    @Test
+    public void headerPropagation() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Header Propagation.pdf");
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Arrays.asList("Bissig R.", "Thanei P.")))
+                .build();
+
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()).hasSize(2); // two pages
+        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(8);
+        assertThat(classifiedDoc.getEntities().get(2).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(5); // 2 names, 1 address, 2 Y
+
+        pdfFileResource = new ClassPathResource("files/Minimal Examples/Header Propagation2.pdf");
+
+        dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Arrays.asList("Tribolet, R.", "Muir, G.", "Kühne-Thu, H.", "Close, C.")))
+                .build();
+
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+
+        classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(3);
+        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(9);
+    }
+
+
+    @Test
+    @Ignore
+    public void testNGuideline() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Empty Tabular Data.pdf");
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Aldershof S.")))
+                .build();
+
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
+        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(6);
+    }
+
+
+    @Before
+    public void stubRedaction() {
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" +
+                "rule \"8: Not redacted because Vertebrate Study = N\"\n" +
+                "    when\n" +
+                "        Section(rowEquals(\"Vertebrate study Y/N\", \"N\") || rowEquals(\"Vertebrate study Y/N\", \"No\"))\n" +
+                "    then\n" +
+                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", false, \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.redactNot(\"address\", 8, \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.highlightCell(\"Vertebrate study Y/N\", 8, \"hint_only\");\n" +
+                "    end\n" +
+                "rule \"9: Redact Authors and Addresses in Reference Table, if it is a Vertebrate study\"\n" +
+                "    when\n" +
+                "        Section(rowEquals(\"Vertebrate study Y/N\", \"Y\") || rowEquals(\"Vertebrate study Y/N\", " +
+                "\"Yes\"))\n" +
+                "    then\n" +
+                "        section.redactCell(\"Author(s)\", 9,  \"name\", false, \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate sgitudy\", \"Reg (EC) No" +
+                " 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.highlightCell(\"Vertebrate study Y/N\", 9, \"must_redact\");\n" +
+                "    end";
+        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(new RulesResponse(tableRules));
+        TypeResponse typeResponse = TypeResponse.builder()
+                .types(Arrays.asList(
+                        TypeResult.builder().dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID).type(AUTHOR_CODE).hexColor("#ffff00").build(),
+                        TypeResult.builder().dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID).type(ADDRESS_CODE).hexColor("#ff00ff").build(),
+                        TypeResult.builder().dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID).type(SPONSOR_CODE).hexColor("#00ffff").build()))
+                .build();
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(typeResponse);
+
+        // Default empty return to prevent NPEs
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+
+        Colors colors = new Colors();
+        colors.setDefaultColor("#acfc00");
+        colors.setNotRedacted("#cccccc");
+        colors.setRequestAdd("#04b093");
+        colors.setRequestRemove("#04b093");
+
+        when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
+    }
+
+
+    private static String loadFromClassPath(String path) {
+
+        URL resource = ResourceLoader.class.getClassLoader().getResource(path);
+        if (resource == null) {
+            throw new IllegalArgumentException("could not load classpath resource: drools/rules.drl");
+        }
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
+            StringBuilder sb = new StringBuilder();
+            String str;
+            while ((str = br.readLine()) != null) {
+                sb.append(str).append("\n");
+            }
+            return sb.toString();
+        } catch (IOException e) {
+            throw new IllegalArgumentException("could not load classpath resource: " + path, e);
+        }
+    }
+
+    private List<DictionaryEntry> toDictionaryEntry(List<String> entries) {
+        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
+        entries.forEach(entry -> {
+            dictionaryEntries.add(new DictionaryEntry(entry, 1L, false));
+        });
+        return dictionaryEntries;
+    }
+
+}
@@ -1,30 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-
-public class EntitySearchUtilsTest {
-
-    @Test
-    public void testNestedEntitiesRemoval() {
-
-        Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false, false, Engine.RULE);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false, Engine.RULE);
-        entities.add(nested);
-        entities.add(nesting);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-
-        assertThat(entities.size()).isEqualTo(1);
-        assertThat(entities).contains(nesting);
-
-    }
-
-}
@@ -13,7 +13,6 @@ 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;
@@ -96,7 +95,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(getTemporaryDirectory() + "/Image " + i + ".png")) {
+                    try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Image " + i + ".png")) {
                        fileOutputStream.write(baos.toByteArray());
                    }
                }
@@ -240,12 +239,4 @@ 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";
-    }
-
 }
@@ -1,6 +1,6 @@
+configuration-service.url: "http://configuration-service-v1:8080"
 image-service.url: "http://image-service-v1:8080"
-persistence-service.url: "http://persistence-service-v1:8080"
-entity-recognition-service.url: "localhost:8080"
+file-management-service.url: "http://file-management-service-v1:8080"

 ribbon:
  ConnectTimeout: 600000
@@ -17,11 +17,3 @@ 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'
@@ -56,8 +56,8 @@ rule "5: Do not redact Names and Addresses if no redaction Indicator is containe
    when
        Section(matchesType("vertebrate"), matchesType("published_information"))
    then
-        section.redactNotAndReference("CBI_author","published_information", 5, "Vertebrate and Published Information found");
-        section.redactNotAndReference("CBI_address","published_information", 5, "Vertebrate and Published Information found");
+        section.redactNot("CBI_author", 5, "Vertebrate and Published Information found");
+        section.redactNot("CBI_address", 5, "Vertebrate and Published Information found");
    end
Author	SHA1	Message	Date
Dominique Eifländer	7a7733b8e4	Added equalsIgnoreCase fileattributes methods for rules	2021-08-20 14:51:22 +02:00
Dominique Eiflaender	952a00b19c	Pull request #213 : RED-1755: Calculate falgs in file-management-service async Merge in RED/redaction-service from RED-1755-2 to release/2.52.x * commit 'dd585a13fd8d37319ce695eeb39a87ff197bec15': RED-1755: Calculate falgs in file-management-service async	2021-08-18 11:58:28 +02:00
Dominique Eifländer	dd585a13fd	RED-1755: Calculate falgs in file-management-service async	2021-08-18 10:02:37 +02:00
Dominique Eiflaender	2d305bd6fe	Pull request #210 : RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages Merge in RED/redaction-service from RED-2015 to release/2.52.x * commit '9650ff75ca44dbb0dc0bb74552a03d3d938015cb': RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages	2021-08-17 12:21:59 +02:00
Dominique Eifländer	9650ff75ca	RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages	2021-08-17 11:28:52 +02:00
Timo Bejan	b2acdc646d	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 13:56:23 +02:00
Timo Bejan	dc2508d0d0	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 13:19:53 +02:00
Timo Bejan	e5099f321e	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 12:50:15 +02:00
Timo Bejan	de2282bc24	Pull request #209 : logs Merge in RED/redaction-service from realease/2.52x-fix to release/2.52.x * commit 'b1f73fb5b169710a56a74a9ecb55b7e0cc4b7b88': logs	2021-08-13 12:33:09 +02:00
Timo Bejan	b1f73fb5b1	logs	2021-08-13 13:28:07 +03:00
Timo Bejan	fe737108e7	Pull request #208 : Proper Order of manual actions based on time Merge in RED/redaction-service from realease/2.52x-fix to release/2.52.x * commit 'fe95224471def99ee158dbf150f9985064313070': Proper Order of manual actions based on time	2021-08-13 10:27:31 +02:00
Timo Bejan	fe95224471	Proper Order of manual actions based on time	2021-08-13 11:22:52 +03:00