Log every exception that occurs on image service calls

2021-04-12 11:51:28 +02:00
144 changed files with 3287 additions and 5135 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.atlassian.bamboo</groupId>
    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.2.2</version>
+    <version>7.1.2</version>
    <relativePath/>
  </parent>

@@ -1,5 +1,7 @@
 package buildjob;

+import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
+
 import com.atlassian.bamboo.specs.api.BambooSpec;
 import com.atlassian.bamboo.specs.api.builders.BambooKey;
 import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
@@ -21,10 +23,6 @@ import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
 import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
 import com.atlassian.bamboo.specs.util.BambooServer;
-import com.atlassian.bamboo.specs.builders.task.ScriptTask;
-import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
-
-import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;

 /**
 * Plan configuration for Bamboo.
@@ -35,8 +33,6 @@ public class PlanSpec {

    private static final String SERVICE_NAME = "redaction-service";

-    private static final String JVM_ARGS =" -Xmx4g -XX:+ExitOnOutOfMemoryError -XX:SurvivorRatio=2 -XX:NewRatio=1 -XX:InitialTenuringThreshold=16 -XX:MaxTenuringThreshold=16 -XX:InitiatingHeapOccupancyPercent=35 ";
-
    private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");

    /**
@@ -55,8 +51,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);
@@ -87,18 +82,24 @@ public class PlanSpec {
                                                .checkoutItems(new CheckoutItem().defaultRepository()),
                                        new ScriptTask()
                                                .description("Build")
-                                                .location(Location.FILE)
-                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
-                                                .argument(SERVICE_NAME),
+                                                .inlineBody("#!/bin/bash\n" +
+                                                        "set -e\n" +
+
+                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
+                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
+
+                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean install -Djava.security.egd=file:/dev/./urandom; fi\n" +
+                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean deploy -e -DdeployAtEnd=true -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases; fi\n" +
+
+                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml package\n" +
+                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml docker:push\n" +
+
+                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then echo \"gitTag=${bamboo.planRepository.1.branch}_${bamboo.buildNumber}\" > git.tag; fi\n" +
+                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then echo \"gitTag=${bamboo.version_tag}\" > git.tag; fi\n"),
                                        createJUnitParserTask()
                                                .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,51 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-
-if [[ "${bamboo_version_tag}" = "dev" ]]
-then 
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        --no-transfer-progress \
-        clean install \
-        -Djava.security.egd=file:/dev/./urandomelse
-else        
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-        --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        versions:set \
-        -DnewVersion=${bamboo_version_tag}
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-        --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-        versions:set  \
-        -DnewVersion=${bamboo_version_tag}
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        --no-transfer-progress \
-        clean deploy \
-        -e \
-        -DdeployAtEnd=true \
-        -Dmaven.wagon.http.ssl.insecure=true \
-        -Dmaven.wagon.http.ssl.allowall=true \
-        -Dmaven.wagon.http.ssl.ignore.validity.dates=true \
-        -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases
-fi
-
-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-    --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    package
-
-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-    --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    docker:push
-
-if [[ "${bamboo_version_tag}" = "dev" ]]
-then 
-    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
-else
-    echo "gitTag=${bamboo_version_tag}" > git.tag
-fi
@@ -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 \
- && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \
- && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \
+ && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \
+ && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.1.5</version>
+        <version>1.0.8</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.2.5</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>
+</project>
@@ -17,10 +17,5 @@
            <artifactId>spring-web</artifactId>
            <optional>true</optional>
        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>persistence-service-api-v1</artifactId>
-            <version>0.44.0</version>
-        </dependency>
    </dependencies>
 </project>
@@ -1,38 +1,17 @@
 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;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
 public class AnalyzeRequest {

-    private String dossierId;
-    private String fileId;
-    private String dossierTemplateId;
-    private boolean reanalyseOnlyIfPossible;
+    private byte[] document;
+    private String ruleSetId;
    private ManualRedactions manualRedactions;
-    private OffsetDateTime lastProcessed;
-
-    @Builder.Default
-    private Set<Integer> excludedPages = new HashSet<>();
-    @Builder.Default
-    private Set<Integer> sectionsToReanalyse = new HashSet<>();
-
-    @Builder.Default
-    private List<FileAttribute> fileAttributes = new ArrayList<>();
-
 }
-
@@ -11,20 +11,9 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class AnalyzeResult {

-    private String dossierId;
-    private String fileId;
-    private long duration;
    private int numberOfPages;
-    private boolean hasUpdates;
-    private long dictionaryVersion;
-    private long dossierDictionaryVersion;
-    private long rulesVersion;
-    private long legalBasisVersion;
-
-    private boolean wasReanalyzed;
-
-    private int analysisVersion;
-
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;
+    private Text text;

 }
-
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class AnnotateRequest {

-    private String dossierId;
-    private String dossierTemplateId;
-    private String fileId;
+    private byte[] document;
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;
 }
@@ -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 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum ChangeType {
-    ADDED, REMOVED, CHANGED
-}
@@ -11,8 +11,11 @@ import lombok.NoArgsConstructor;
@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
-}
@@ -7,12 +7,13 @@ import lombok.NoArgsConstructor;

@Data
@Builder
-@NoArgsConstructor
@AllArgsConstructor
-public class StructureAnalyzeRequest {
+@NoArgsConstructor
+public class IdRemoval {

-    private String dossierId;
-    private String fileId;
-
-}
+    private String id;
+    private String user;
+    private Status status;
+    private boolean removeFromDictionary;

+}
@@ -7,13 +7,13 @@ import lombok.NoArgsConstructor;

@Data
@Builder
-@NoArgsConstructor
@AllArgsConstructor
-public class FileAttribute {
+@NoArgsConstructor
+public class ManualForceRedact {

    private String id;
-    private String label;
-    private String placeholder;
-    private String value;
+    private String user;
+    private Status status;
+    private String legalBasis;

-}
+}
@@ -0,0 +1,30 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@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 String section;
+    private int sectionNumber;
+
+}
@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;

 public enum ManualRedactionType {
-    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE
+    ADD, REMOVE, FORCE_REDACT
 }
@@ -0,0 +1,32 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@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 Map<String, List<Comment>> comments = new HashMap<>();
+
+}
@@ -1,29 +1,32 @@
 package com.iqser.red.service.redaction.v1.model;

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

 import java.util.List;

-
@Data
@AllArgsConstructor
+@NoArgsConstructor
 public class RedactionLog {

-
-    /**
-     * Version 0 Redaction Logs have manual redactions merged inside them
-     * Version 1 Redaction Logs only contain system ( rule/dictionary ) redactions. Manual Redactions are merged in at runtime.
-     */
-    private long analysisVersion;
-
    private List<RedactionLogEntry> redactionLogEntry;
-    private List<LegalBasis> legalBasis;

    private long dictionaryVersion = -1;
-    private long dossierDictionaryVersion = -1;
    private long rulesVersion = -1;
-    private long legalBasisVersion = -1;
+
+    private String ruleSetId;
+    private String filename;
+
+
+    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion, String ruleSetId) {
+
+        this.redactionLogEntry = redactionLogEntry;
+        this.dictionaryVersion = dictionaryVersion;
+        this.rulesVersion = rulesVersion;
+        this.ruleSetId = ruleSetId;
+    }
+

 }
@@ -1,24 +1,17 @@
 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 java.util.ArrayList;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@EqualsAndHashCode
 public class RedactionLogEntry {

    private String id;
@@ -37,9 +30,8 @@ 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;

    private String textBefore;
@@ -52,23 +44,5 @@ public class RedactionLogEntry {
    private int endOffset;

    private boolean isImage;
-    private boolean imageHasTransparency;
-
-    private boolean isDossierDictionaryEntry;
-
-    private boolean excluded;
-
-    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<>();
-
-

 }
@@ -1,10 +1,5 @@
 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;
@@ -16,10 +11,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class RedactionRequest {

-    private String dossierId;
-    private String fileId;
-    private String dossierTemplateId;
+    private byte[] document;
+    private String ruleSetId;
    private ManualRedactions manualRedactions;
-    @Builder.Default
-    private Set<Integer> excludedPages = new HashSet<>();
 }
@@ -13,5 +13,7 @@ public class RedactionResult {

    private byte[] document;
    private int numberOfPages;
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;

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

+import java.time.OffsetDateTime;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -7,11 +9,14 @@ import lombok.NoArgsConstructor;

@Data
@Builder
-@AllArgsConstructor
@NoArgsConstructor
-public class RedactionLogChanges {
+@AllArgsConstructor
+public class RenalyzeRequest {

+    private byte[] document;
+    private String ruleSetId;
+    private ManualRedactions manualRedactions;
+    private Text text;
    private RedactionLog redactionLog;
-    private boolean hasChanges;
-
+    private OffsetDateTime lastProcessed;
 }
@@ -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<>();
-
-}
@@ -27,7 +27,7 @@ public class SectionArea {
    private String header;

    public boolean contains(Rectangle other) {
-        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
+        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY()  && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
    }

 }
@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;

-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;

-import java.util.List;
-
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -30,5 +30,4 @@ public class SectionRectangle {
    private int numberOfParts;

    private List<CellRectangle> tableCells;
-
 }
@@ -1,18 +1,25 @@
 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;

+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
@Data
+@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class RuleElement {
+public class SectionText {

-    private String conditionName;
-    private List<Argument> arguments = new ArrayList<>();
+    private int sectionNumber;
+    private String text;
+
+    private boolean isTable;
+    private String headline;
+
+    private List<SectionArea> sectionAreas = new ArrayList<>();

 }
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Status {
+    REQUESTED, APPROVED, DECLINED
+}
@@ -1,18 +1,17 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.ArrayList;
+import java.util.List;

 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
-import java.util.List;
-
@Data
@NoArgsConstructor
@AllArgsConstructor
 public class Text {

-    private int numberOfPages;
    private List<SectionText> sectionTexts = new ArrayList<>();

 }
@@ -1,6 +1,14 @@
 package com.iqser.red.service.redaction.v1.resources;

-import com.iqser.red.service.redaction.v1.model.*;
+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.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
+import com.iqser.red.service.redaction.v1.model.ReanalyzeResult;
+import com.iqser.red.service.redaction.v1.model.RedactionRequest;
+import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.RenalyzeRequest;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -8,6 +16,17 @@ import org.springframework.web.bind.annotation.RequestBody;

 public interface RedactionResource {

+    String SERVICE_NAME = "redaction-service-v1";
+
+    String RULE_SET_PARAMETER_NAME = "ruleSetId";
+    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
+
+    @PostMapping(value = "/analyze", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest);
+
+    @PostMapping(value = "/reanalyze", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ReanalyzeResult reanalyze(@RequestBody RenalyzeRequest renalyzeRequest);
+
    @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);

@@ -20,10 +39,10 @@ public interface RedactionResource {
    @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);

+    @PostMapping(value = "/rules/update"+RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId);
+
    @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
    void testRules(@RequestBody String rules);

-    @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
-
-}
+}
@@ -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();
-
-}
@@ -12,24 +12,25 @@
    <artifactId>redaction-service-server-v1</artifactId>

    <dependencies>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>storage-commons</artifactId>
-        </dependency>
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>redaction-service-api-v1</artifactId>
            <version>${project.version}</version>
        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>configuration-service-api-v1</artifactId>
+            <version>2.2.9</version>
+        </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,24 +40,8 @@
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
        </dependency>
-
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>jbig2-imageio</artifactId>
-            <version>3.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.jai-imageio</groupId>
-            <artifactId>jai-imageio-core</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.jai-imageio</groupId>
-            <artifactId>jai-imageio-jpeg2000</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-
        <!-- commons -->
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
@@ -71,6 +56,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>
@@ -85,11 +74,6 @@
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-
        <!-- test dependencies -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -1,8 +1,5 @@
 package com.iqser.red.service.redaction.v1.server;

-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -11,6 +8,10 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Import;

+import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
@Import({DefaultWebMvcConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@EnableConfigurationProperties(RedactionServiceSettings.class)
@@ -18,9 +19,8 @@ import org.springframework.context.annotation.Import;
 public class Application {

    public static void main(String[] args) {
-        System.setProperty("org.apache.pdfbox.rendering.UsePureJavaCMYKConversion", "true");
        SpringApplication.run(Application.class, args);
    }


-}
+}
@@ -1,10 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

+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.model.SectionText;

 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,14 +22,17 @@ 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 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 dictionaryVersion;
    private long rulesVersion;

+    private List<SectionText> sectionText = new ArrayList<>();
 }
@@ -1,7 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import lombok.Getter;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -9,35 +7,38 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

-public class FloatFrequencyCounter {
+import lombok.Getter;
+
+public class FloatFrequencyCounter
+{

    @Getter
    Map<Float, Integer> countPerValue = new HashMap<>();

-    public void add(float value) {
-        if (!countPerValue.containsKey(value)) {
+    public void add(float value){
+        if(!countPerValue.containsKey(value)){
            countPerValue.put(value, 1);
        } else {
            countPerValue.put(value, countPerValue.get(value) + 1);
        }
    }

-    public void addAll(Map<Float, Integer> otherCounter) {
-        for (Map.Entry<Float, Integer> entry : otherCounter.entrySet()) {
-            if (countPerValue.containsKey(entry.getKey())) {
-                countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey()) + entry.getValue());
+    public void addAll(Map<Float, Integer> otherCounter){
+        for(Map.Entry<Float, Integer> entry: otherCounter.entrySet()){
+            if(countPerValue.containsKey(entry.getKey())){
+                countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey())+ entry.getValue());
            } else {
                countPerValue.put(entry.getKey(), entry.getValue());
            }
        }
    }

-    public Float getMostPopular() {
+    public Float getMostPopular(){
        Map.Entry<Float, Integer> mostPopular = null;
-        for (Map.Entry<Float, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null) {
+        for(Map.Entry<Float, Integer> entry: countPerValue.entrySet()){
+            if(mostPopular == null){
                mostPopular = entry;
-            } else if (entry.getValue() >= mostPopular.getValue()) {
+            } else if(entry.getValue() >= mostPopular.getValue()){
                mostPopular = entry;
            }
        }
@@ -45,11 +46,12 @@ public class FloatFrequencyCounter {
    }


-    public List<Float> getHighterThanMostPopular() {
+
+    public List<Float> getHighterThanMostPopular(){
        Float mostPopular = getMostPopular();
        List<Float> higher = new ArrayList<>();
-        for (Float value : countPerValue.keySet()) {
-            if (value > mostPopular) {
+        for(Float value: countPerValue.keySet()){
+            if(value > mostPopular){
                higher.add(value);
            }
        }
@@ -58,12 +60,12 @@ public class FloatFrequencyCounter {
    }


-    public Float getHighest() {
+    public Float getHighest(){
        Float highest = null;
-        for (Float value : countPerValue.keySet()) {
-            if (highest == null) {
+        for(Float value: countPerValue.keySet()){
+            if (highest == null){
                highest = value;
-            } else if (value > highest) {
+            } else if(value > highest){
                highest = value;
            }
        }
@@ -1,19 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

-import java.util.List;
-
@Data
@AllArgsConstructor
 public class Footer {

    private List<TextBlock> textBlocks;

-    @JsonIgnore
+
    public SearchableText getSearchableText() {

        SearchableText searchableText = new SearchableText();
@@ -21,4 +21,4 @@ public class Footer {
        return searchableText;
    }

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

-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

-import java.util.List;
-
@Data
@AllArgsConstructor
 public class Header {

    private List<TextBlock> textBlocks;

-    @JsonIgnore
+
    public SearchableText getSearchableText() {

        SearchableText searchableText = new SearchableText();
@@ -21,4 +21,4 @@ public class Header {
        return searchableText;
    }

-}
+}
@@ -1,6 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-public enum Orientation {
-
-    NONE, LEFT, RIGHT
-}
@@ -1,14 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
+
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;

-import java.util.List;
-
@Data
@RequiredArgsConstructor
 public class Page {
@@ -30,12 +31,10 @@ public class Page {
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();

-    private double cropBoxArea;
-

    public boolean isRotated() {

        return rotation != 0;
    }

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

-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.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.List;

+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
@Data
@NoArgsConstructor
-public class Paragraph implements Comparable {
+public class Paragraph {

    private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
-    private List<PdfImage> images = new ArrayList<>();
    private String headline;


@@ -54,11 +53,4 @@ public class Paragraph implements Comparable {
        return textBlocks;
    }

-
-    @Override
-    public int compareTo(Object o) {
-
-        return 0;
-    }
-
-}
+}
@@ -1,52 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-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.SearchableText;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.*;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SectionText {
-
-    private int sectionNumber;
-    private String text;
-
-    private boolean isTable;
-    private String headline;
-
-    private List<SectionArea> sectionAreas = new ArrayList<>();
-    private Set<Image> images = new HashSet<>();
-
-    private List<TextBlock> textBlocks = new ArrayList<>();
-    private Map<String, CellValue> tabularData = new HashMap<>();
-    private List<Integer> cellStarts = new ArrayList<>();
-
-
-    public void setTabularData(Map<String, CellValue> tabularData) {
-        tabularData.remove(null);
-        this.tabularData = tabularData;
-    }
-
-    @JsonIgnore
-    public SearchableText getSearchableText() {
-
-        SearchableText searchableText = new SearchableText();
-        textBlocks.forEach(block -> {
-            if (block != null) {
-                searchableText.addAll(block.getSequences());
-            }
-        });
-        return searchableText;
-    }
-
-}
@@ -1,10 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import lombok.Getter;
-
 import java.util.HashMap;
 import java.util.Map;

+import lombok.Getter;
+
 public class StringFrequencyCounter {

    @Getter
@@ -46,4 +46,4 @@ public class StringFrequencyCounter {
        return mostPopular != null ? mostPopular.getKey() : null;
    }

-}
+}
@@ -1,21 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.List;

+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
@AllArgsConstructor
@Builder
@Data
-@NoArgsConstructor
 public class TextBlock extends AbstractTextContainer {

    @Builder.Default
@@ -32,7 +30,6 @@ public class TextBlock extends AbstractTextContainer {

    private String classification;

-
    public TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
        this.minX = minX;
        this.maxX = maxX;
@@ -101,6 +98,7 @@ public class TextBlock extends AbstractTextContainer {
    }


+
    @Override
    public String toString() {

@@ -120,7 +118,6 @@ public class TextBlock extends AbstractTextContainer {
    }

    @Override
-    @JsonIgnore
    public String getText() {

        StringBuilder sb = new StringBuilder();
@@ -142,4 +139,4 @@ public class TextBlock extends AbstractTextContainer {

    }

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

-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

-import java.util.List;
-
@Data
@AllArgsConstructor
 public class UnclassifiedText {

    private List<TextBlock> textBlocks;

-    @JsonIgnore
+
    public SearchableText getSearchableText() {

        SearchableText searchableText = new SearchableText();
@@ -21,4 +21,4 @@ public class UnclassifiedText {
        return searchableText;
    }

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

+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
-import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.StringFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
@@ -13,20 +17,11 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;

-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
@Service
@SuppressWarnings("all")
 public class BlockificationService {

-    static final float THRESHOLD = 1f;
-
-    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
-                         List<Ruling> verticalRulingLines) {
+    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {

        List<TextPositionSequence> chunkWords = new ArrayList<>();
        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
@@ -34,46 +29,21 @@ public class BlockificationService {
        float minX = 1000, maxX = 0, minY = 1000, maxY = 0;
        TextPositionSequence prev = null;

-        boolean wasSplitted = false;
-        Float splitX1 = null;
        for (TextPositionSequence word : textPositions) {

            boolean lineSeparation = minY - word.getY2() > word.getHeight() * 1.25;
            boolean startFromTop = word.getY1() > maxY + word.getHeight();
-            boolean splitByX = prev != null && maxX + 50 < word.getX1() && prev.getY1() == word.getY1();
-            boolean newLineAfterSplit = prev != null && word.getY1() != prev.getY1() && wasSplitted && splitX1 != word.getX1();
-            boolean splittedByRuling = word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), verticalRulingLines) || word
-                    .getRotation() == 0 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), horizontalRulingLines) || word
-                    .getRotation() == 90 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), horizontalRulingLines) || word
-                    .getRotation() == 90 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), verticalRulingLines);

-            if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) {
-
-                Orientation prevOrientation = null;
-                if(!chunkBlockList1.isEmpty()) {
-                    prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
-                }
+            if (prev != null && (lineSeparation || startFromTop || word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word
+                    .getX1(), word.getY1(), verticalRulingLines) || word.getRotation() == 0 && isSplittedByRuling(minX, minY, word
+                    .getX1(), word.getY2(), horizontalRulingLines) || word.getRotation() == 90 && isSplittedByRuling(maxX, minY, word
+                    .getX1(), word.getY1(), horizontalRulingLines) || word.getRotation() == 90 && isSplittedByRuling(minX, minY, word
+                    .getX1(), word.getY2(), verticalRulingLines))) {

                TextBlock cb1 = buildTextBlock(chunkWords);
                chunkBlockList1.add(cb1);
                chunkWords = new ArrayList<>();

-                if (splitByX && !splittedByRuling) {
-                    wasSplitted = true;
-                    cb1.setOrientation(Orientation.LEFT);
-                    splitX1 = word.getX1();
-                } else
-
-                if (newLineAfterSplit && !splittedByRuling) {
-                    wasSplitted = false;
-                    cb1.setOrientation(Orientation.RIGHT);
-                    splitX1 = null;
-                } else
-
-                if(prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)){
-                    cb1.setOrientation(Orientation.LEFT);
-                }
-
                minX = 1000;
                maxX = 0;
                minY = 1000;
@@ -103,62 +73,9 @@ public class BlockificationService {
            chunkBlockList1.add(cb1);
        }

-        Iterator<AbstractTextContainer> itty = chunkBlockList1.iterator();
-
-        TextBlock previousLeft = null;
-        TextBlock previousRight = null;
-        while (itty.hasNext()) {
-            TextBlock block = (TextBlock) itty.next();
-
-            if(previousLeft != null && block.getOrientation().equals(Orientation.LEFT)){
-                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()){
-                    previousLeft.add(block);
-                    itty.remove();
-                    continue;
-                }
-            }
-
-            if(previousRight != null && block.getOrientation().equals(Orientation.RIGHT)){
-                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()){
-                    previousRight.add(block);
-                    itty.remove();
-                    continue;
-                }
-            }
-
-            if (block.getOrientation().equals(Orientation.LEFT)) {
-                previousLeft = block;
-            } else if (block.getOrientation().equals(Orientation.RIGHT)) {
-                previousRight = block;
-            }
-        }
-
-
-        itty = chunkBlockList1.iterator();
-        TextBlock previous = null;
-        while (itty.hasNext()) {
-            TextBlock block = (TextBlock) itty.next();
-
-            if(previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous
-                    .getMaxY())||
-                    previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous
-                    .getMaxY())){
-                previous.add(block);
-                itty.remove();
-                continue;
-            }
-
-            previous = block;
-        }
-
-
        return new Page(chunkBlockList1);
    }

-    private boolean equalsWithThreshold(float f1, float f2){
-        return Math.abs(f1 - f2) < THRESHOLD;
-    }
-

    private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList) {

@@ -201,8 +118,7 @@ public class BlockificationService {
    }


-    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1,
-                                       List<Ruling> rulingLines) {
+    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines) {

        for (Ruling ruling : rulingLines) {
            if (ruling.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
@@ -213,8 +129,7 @@ public class BlockificationService {
    }


-    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter,
-                                            boolean landscape) {
+    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {

        float minX = 10000;
        float maxX = -100;
@@ -1,17 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;

+import java.util.List;
+import java.util.regex.Pattern;
+
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.regex.Pattern;

@Slf4j
@Service
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.classification.utils;

 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
+
 import lombok.experimental.UtilityClass;

@UtilityClass
@@ -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 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-
-import org.springframework.cloud.openfeign.FeignClient;
-
-import com.iqser.red.service.persistence.service.v1.api.resources.FileStatusProcessingUpdateResource;
-
-@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
-public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
-}
@@ -1,9 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-import org.springframework.cloud.openfeign.FeignClient;
-
-import com.iqser.red.service.persistence.service.v1.api.resources.LegalBasisMappingResource;
-
-@FeignClient(name = "LegalBasisMappingResource", url = "${persistence-service.url}")
-public interface LegalBasisClient extends LegalBasisMappingResource {
-}
@@ -1,16 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.client;

+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;

-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 public class MockMultipartFile implements MultipartFile {

    private final String name;
@@ -22,13 +22,13 @@ public class MockMultipartFile implements MultipartFile {

    public MockMultipartFile(String name, @Nullable byte[] content) {

-        this(name, "", null, content);
+        this(name, "", (String) null, (byte[]) content);
    }


    public MockMultipartFile(String name, InputStream contentStream) throws IOException {

-        this(name, "", null, FileCopyUtils.copyToByteArray(contentStream));
+        this(name, "", (String) null, (byte[]) FileCopyUtils.copyToByteArray(contentStream));
    }


@@ -78,7 +78,7 @@ public class MockMultipartFile implements MultipartFile {

    public long getSize() {

-        return this.content.length;
+        return (long) this.content.length;
    }


@@ -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.SERVICE_NAME, 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,15 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.controller;

+import java.time.OffsetDateTime;
+
 import com.iqser.red.commons.spring.ErrorMessage;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;

-import java.time.OffsetDateTime;
+import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
+
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@RestControllerAdvice
@@ -36,4 +38,4 @@ public class ControllerAdvice {
        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
    }

-}
+}
@@ -1,8 +1,17 @@
 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.redaction.v1.model.*;
+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.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
+import com.iqser.red.service.redaction.v1.model.ReanalyzeResult;
+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.RedactionRequest;
+import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.RenalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.Text;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
@@ -10,21 +19,27 @@ import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 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.redaction.service.EntityRedactionService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ImageClassificationService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogCreatorService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-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;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
+
 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;

+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.List;

@Slf4j
@RestController
@@ -32,24 +47,61 @@ import java.io.IOException;
 public class RedactionController implements RedactionResource {

    private final PdfVisualisationService pdfVisualisationService;
+    private final PdfSegmentationService pdfSegmentationService;
+    private final RedactionLogCreatorService redactionLogCreatorService;
+    private final EntityRedactionService entityRedactionService;
    private final DroolsExecutionService droolsExecutionService;
    private final DictionaryService dictionaryService;
    private final AnnotationService annotationService;
-    private final PdfSegmentationService pdfSegmentationService;
-    private final RedactionStorageService redactionStorageService;
-    private final RedactionLogMergeService redactionLogMergeService;
+    private final ReanalyzeService reanalyzeService;
+    private final ImageClassificationService imageClassificationService;
+
+
+    @Override
+    public AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest) {
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(analyzeRequest.getDocument()))) {
+            pdDocument.setAllSecurityToBeRemoved(true);
+
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+
+            log.info("Document structure analysis successful, starting redaction analysis...");
+
+            entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions());
+            imageClassificationService.classifyImages(classifiedDoc);
+            redactionLogCreatorService.createRedactionLog(classifiedDoc, pdDocument.getNumberOfPages(), analyzeRequest.getManualRedactions(), analyzeRequest
+                    .getRuleSetId());
+
+            log.info("Redaction analysis successful...");
+
+            return AnalyzeResult.builder()
+                    .sectionGrid(classifiedDoc.getSectionGrid())
+                    .redactionLog(new RedactionLog(classifiedDoc.getRedactionLogEntities(), classifiedDoc.getDictionaryVersion(), classifiedDoc
+                            .getRulesVersion(), analyzeRequest.getRuleSetId()))
+                    .numberOfPages(classifiedDoc.getPages().size())
+                    .text(new Text(classifiedDoc.getSectionText()))
+                    .build();
+
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+
+    }
+
+
+    public ReanalyzeResult reanalyze(@RequestBody RenalyzeRequest renalyzeRequest) {
+
+        return reanalyzeService.reanalyze(renalyzeRequest);
+    }
+

    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {

-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
-        var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getDossierId(), annotateRequest.getFileId());
-        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(annotateRequest.getDocument()))) {

-        try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
            pdDocument.setAllSecurityToBeRemoved(true);
-
-            dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId());
-            annotationService.annotate(pdDocument, redactionLog, sectionsGrid);
+            dictionaryService.updateDictionary(annotateRequest.getRedactionLog().getRuleSetId());
+            annotationService.annotate(pdDocument, annotateRequest.getRedactionLog(), annotateRequest.getSectionGrid());

            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
                pdDocument.save(byteArrayOutputStream);
@@ -63,120 +115,102 @@ public class RedactionController implements RedactionResource {


    @Override
-    public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-        try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
+    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {

-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
-                pdDocument.setAllSecurityToBeRemoved(true);
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(pdfSegmentationRequest.getDocument()))) {
+            pdDocument.setAllSecurityToBeRemoved(true);

-                pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);

-                return convert(pdDocument, classifiedDoc.getPages().size());
-
-            } catch (IOException e) {
-                throw new RedactionException(e);
-            }
+            return convert(pdDocument, classifiedDoc.getPages().size(), pdfSegmentationRequest.getRuleSetId());

        } catch (IOException e) {
            throw new RedactionException(e);
        }

-
    }

+
    @Override
    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-        try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);

-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
-                pdDocument.setAllSecurityToBeRemoved(true);
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+            pdDocument.setAllSecurityToBeRemoved(true);

-                pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);
-                return convert(pdDocument, classifiedDoc.getPages().size());
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);

-            } catch (IOException e) {
-                throw new RedactionException(e);
-            }
+            return convert(pdDocument, classifiedDoc.getPages().size(), redactionRequest.getRuleSetId());

        } catch (IOException e) {
            throw new RedactionException(e);
        }

-
    }


    @Override
    public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {

-        Document classifiedDoc;
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+            pdDocument.setAllSecurityToBeRemoved(true);

-        try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
-        } catch (Exception e) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+
+            StringBuilder sb = new StringBuilder();
+            for (Page page : classifiedDoc.getPages()) {
+                for (AbstractTextContainer textContainer : page.getTextBlocks()) {
+                    if (textContainer instanceof Table) {
+                        Table table = (Table) textContainer;
+                        sb.append(table.getTextAsHtml()).append("<br />").append("<br />");
+                    }
+                }
+            }
+
+            return RedactionResult.builder().document(sb.toString().getBytes()).build();
+
+        } catch (IOException e) {
            throw new RedactionException(e);
        }

-
-        StringBuilder sb = new StringBuilder();
-        for (Page page : classifiedDoc.getPages()) {
-            for (AbstractTextContainer textContainer : page.getTextBlocks()) {
-                if (textContainer instanceof Table) {
-                    Table table = (Table) textContainer;
-                    sb.append(table.getTextAsHtml()).append("<br />").append("<br />");
-                }
-            }
-        }
-
-        return RedactionResult.builder().document(sb.toString().getBytes()).build();
-
    }

+
+    @Override
+    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId) {
+
+        droolsExecutionService.updateRules(ruleSetId);
+    }
+
+
    @Override
    public void testRules(@RequestBody String rules) {

        droolsExecutionService.testRules(rules);
    }

-    @Override
-    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {

-        log.info("Requested preview for: {}", redactionRequest);
-        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
+    private RedactionResult convert(PDDocument document, int numberOfPages, String ruleSetId) throws IOException {

-        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
-            return redactionLog;
-        } else {
-            return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
-        }
+        return convert(document, numberOfPages, null, null, 0, 0, ruleSetId);
    }

-    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
+
+    private RedactionResult convert(PDDocument document, int numberOfPages,
+                                    List<RedactionLogEntry> redactionLogEntities, SectionGrid sectionGrid,
+                                    long dictionaryVersion, long rulesVersion, String ruleSetId) throws IOException {

        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
            return RedactionResult.builder()
                    .document(byteArrayOutputStream.toByteArray())
                    .numberOfPages(numberOfPages)
+                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryVersion, rulesVersion, ruleSetId))
+                    .sectionGrid(sectionGrid)
                    .build();
        }

    }

-
 }
@@ -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();
-    }
-
-}
@@ -1,52 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.memory;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-
-@Slf4j
-public class MemoryStats {
-
-
-    public static void printMemoryStats() {
-        log.info("\n\n ------------------------------ \n" +
-                " Used Memory: " + humanReadableByteCountBin(getUsedMemory()) + "\n" +
-                " Free Memory: " + humanReadableByteCountBin(getFreeMemory()) + "\n" +
-                " Total Memory: " + humanReadableByteCountBin(getTotalMemory()) + "\n" +
-                " Max Memory: " + humanReadableByteCountBin(getMaxMemory()) + "\n" +
-                "\n ------------------------------ \n");
-    }
-
-
-    public static String humanReadableByteCountBin(long bytes) {
-        long absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
-        if (absB < 1024) {
-            return bytes + " B";
-        }
-        long value = absB;
-        CharacterIterator ci = new StringCharacterIterator("KMGTPE");
-        for (int i = 40; i >= 0 && absB > 0xfffccccccccccccL >> i; i -= 10) {
-            value >>= 10;
-            ci.next();
-        }
-        value *= Long.signum(bytes);
-        return String.format("%.1f %ciB", value / 1024.0, ci.current());
-    }
-
-    private static long getMaxMemory() {
-        return Runtime.getRuntime().maxMemory();
-    }
-
-    private static long getUsedMemory() {
-        return getMaxMemory() - getFreeMemory();
-    }
-
-    private static long getTotalMemory() {
-        return Runtime.getRuntime().totalMemory();
-    }
-
-    private static long getFreeMemory() {
-        return Runtime.getRuntime().freeMemory();
-    }
-}
@@ -1,15 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.pdfbox.text.PDFTextStripperByArea;
-import org.apache.pdfbox.text.TextPosition;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

+import org.apache.pdfbox.text.PDFTextStripperByArea;
+import org.apache.pdfbox.text.TextPosition;
+
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+import lombok.Getter;
+import lombok.Setter;
+
 public class PDFAreaTextStripper extends PDFTextStripperByArea {

    @Getter
@@ -46,17 +48,6 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {
                startIndex = i;
            }

-
-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
-                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i;
-            }
-
            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
@@ -85,7 +76,7 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {
    }


-    public void clearPositions() {
+    public void clearPositions(){
        textPositionSequences = new ArrayList<>();
    }

@@ -1,16 +1,33 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.reflect.FieldUtils;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.*;
-import org.apache.pdfbox.contentstream.operator.state.*;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.state.SetFlatness;
+import org.apache.pdfbox.contentstream.operator.state.SetLineCapStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineDashPattern;
+import org.apache.pdfbox.contentstream.operator.state.SetLineJoinStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineMiterLimit;
+import org.apache.pdfbox.contentstream.operator.state.SetLineWidth;
+import org.apache.pdfbox.contentstream.operator.state.SetRenderingIntent;
 import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
@@ -23,31 +40,40 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.apache.pdfbox.util.Matrix;

-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {

-    @Getter
-    private final List<TextPositionSequence> textPositionSequences = new ArrayList<>();
-    @Getter
-    private final List<Ruling> rulings = new ArrayList<>();
-    private final List<Ruling> graphicsPath = new ArrayList<>();
    @Setter
    protected PDPage pdpage;
+
    @Getter
    private int minCharWidth;
+
    @Getter
    private int maxCharWidth;
+
    @Getter
    private int minCharHeight;
+
    @Getter
    private int maxCharHeight;
+
+    @Getter
+    private final List<TextPositionSequence> textPositionSequences = new ArrayList<>();
+
+    @Getter
+    private final List<Ruling> rulings = new ArrayList<>();
+
+    private final List<Ruling> graphicsPath = new ArrayList<>();
+
    @Getter
    private List<PdfImage> images = new ArrayList<>();

@@ -189,16 +215,15 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            COSName objectName = (COSName) arguments.get(0);
            PDXObject xobject = getResources().getXObject(objectName);
            if (xobject instanceof PDImageXObject) {
-                PDImageXObject image = (PDImageXObject)xobject;
-                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();
+                PDImageXObject pdfImage = (PDImageXObject) xobject;

-                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
+                Rectangle2D imageBounds = calculateImagePosition(pdfImage);

-                // Memory Hack - sofReference kills me
-                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);
+                Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
+                        .getWidth(), (float) imageBounds.getHeight());

                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage().getColorModel().hasAlpha()));
+                    this.images.add(new PdfImage(pdfImage.getImage(), rect));
                }
            }
        } catch (Exception e) {
@@ -207,6 +232,21 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    }


+    private Rectangle2D calculateImagePosition(PDImageXObject pdfImage) throws IOException {
+
+        Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
+
+        Rectangle2D imageBounds = pdfImage.getImage().getRaster().getBounds();
+
+        AffineTransform imageTransform = new AffineTransform(ctm.createAffineTransform());
+        imageTransform.scale(1.0 / pdfImage.getWidth(), -1.0 / pdfImage.getHeight());
+        imageTransform.translate(0, -pdfImage.getHeight());
+
+        AffineTransform pageTransform = new AffineTransform();
+        pageTransform.concatenate(imageTransform);
+
+        return pageTransform.createTransformedShape(imageBounds).getBounds2D();
+    }


    private float floatValue(COSBase value) {
@@ -283,18 +323,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                startIndex = i;
            }

-
-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
-                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i;
-            }
-
-
            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
@@ -341,4 +369,4 @@ public class PDFLinesTextStripper extends PDFTextStripper {

    }

-}
+}
@@ -1,52 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
-import org.apache.pdfbox.text.TextPosition;
-import org.springframework.beans.BeanUtils;
-
-@Data
-@NoArgsConstructor
-public class RedTextPosition {
-
-    private String textMatrix;
-    private int rotation;
-    private float y;
-    private float pageHeight;
-    private float pageWidth;
-    private String unicode;
-    private float XDirAdj;
-    private float YDirAdj;
-    private float width;
-    private float heightDir;
-
-    // not used in reanalysis
-    @JsonIgnore
-    private float widthOfSpace;
-
-    // not used in reanalysis
-    @JsonIgnore
-    private float fontSizeInPt;
-
-    // not used in reanalysis
-    @JsonIgnore
-    private String fontName;
-
-
-    @SneakyThrows
-    public static RedTextPosition fromTextPosition(TextPosition textPosition) {
-        var pos = new RedTextPosition();
-        BeanUtils.copyProperties(textPosition, pos);
-        pos.setFontName(textPosition.getFont().getName());
-
-        pos.setFontSizeInPt(textPosition.getFontSizeInPt());
-
-        pos.setTextMatrix(textPosition.getTextMatrix().toString());
-
-        return pos;
-    }
-
-
-}
@@ -1,52 +1,32 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.pdfbox.text.TextPosition;
-
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+
+import org.apache.pdfbox.text.TextPosition;
+
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;

@Data
-@NoArgsConstructor
-@JsonIgnoreProperties({ "empty" })
+@RequiredArgsConstructor
 public class TextPositionSequence implements CharSequence {

-    private int page;
-    private List<RedTextPosition> textPositions = new ArrayList<>();
+    private List<TextPosition> textPositions = new ArrayList<>();

-    private float x1;
-    private float x2;
-
-    public TextPositionSequence(int page) {
-        this.page = page;
-    }
-
-
-    public static TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
-        var textPositionSequence = new TextPositionSequence();
-        textPositionSequence.textPositions = textPositions;
-        textPositionSequence.page = page;
-
-        return textPositionSequence;
-    }
+    private final int page;


    public TextPositionSequence(List<TextPosition> textPositions, int page) {

-        this.textPositions = textPositions.stream().map(RedTextPosition::fromTextPosition).collect(Collectors.toList());
+        this.textPositions = textPositions;
        this.page = page;
    }


-
-
-
    @Override
    public int length() {

@@ -57,7 +37,7 @@ public class TextPositionSequence implements CharSequence {
    @Override
    public char charAt(int index) {

-        RedTextPosition textPosition = textPositionAt(index);
+        TextPosition textPosition = textPositionAt(index);
        String text = textPosition.getUnicode();
        return text.charAt(0);
    }
@@ -65,7 +45,7 @@ public class TextPositionSequence implements CharSequence {

    public char charAt(int index, boolean caseInSensitive) {

-        RedTextPosition textPosition = textPositionAt(index);
+        TextPosition textPosition = textPositionAt(index);
        String text = textPosition.getUnicode();
        return caseInSensitive ? text.toLowerCase().charAt(0) : text.charAt(0);
    }
@@ -74,7 +54,7 @@ public class TextPositionSequence implements CharSequence {
    @Override
    public TextPositionSequence subSequence(int start, int end) {

-        return fromData(textPositions.subList(start, end), page);
+        return new TextPositionSequence(textPositions.subList(start, end), page);
    }


@@ -89,25 +69,18 @@ public class TextPositionSequence implements CharSequence {
    }


-    public RedTextPosition textPositionAt(int index) {
+    public TextPosition textPositionAt(int index) {

        return textPositions.get(index);
    }


-    public void add(RedTextPosition textPosition) {
+    public void add(TextPosition textPosition) {

        this.textPositions.add(textPosition);
    }


-    public void add(TextPosition textPosition) {
-
-        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
-    }
-
-
-    @JsonIgnore
    public float getX1() {

        if (textPositions.get(0).getRotation() == 90) {
@@ -118,7 +91,6 @@ public class TextPositionSequence implements CharSequence {
    }


-    @JsonIgnore
    public float getX2() {

        if (textPositions.get(0).getRotation() == 90) {
@@ -129,14 +101,13 @@ public class TextPositionSequence implements CharSequence {
        }
    }

-    @JsonIgnore
+
    public float getRotationAdjustedY() {

        return textPositions.get(0).getY();
    }


-    @JsonIgnore
    public float getY1() {

        if (textPositions.get(0).getRotation() == 90) {
@@ -147,7 +118,6 @@ public class TextPositionSequence implements CharSequence {
    }


-    @JsonIgnore
    public float getY2() {

        if (textPositions.get(0).getRotation() == 90) {
@@ -158,40 +128,38 @@ public class TextPositionSequence implements CharSequence {
    }


-    @JsonIgnore
    public float getTextHeight() {

        return textPositions.get(0).getHeightDir() + 2;
    }


-    @JsonIgnore
    public float getHeight() {

        return getY2() - getY1();
    }


-    @JsonIgnore
    public float getWidth() {

        return getX2() - getX1();
    }


-    @JsonIgnore
    public String getFont() {
-        return textPositions.get(0).getFontName()
+
+        return textPositions.get(0)
+                .getFont()
+                .toString()
                .toLowerCase()
                .replaceAll(",bold", "")
                .replaceAll(",italic", "");
    }


-    @JsonIgnore
    public String getFontStyle() {

-        String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();
+        String lowercaseFontName = textPositions.get(0).getFont().toString().toLowerCase();

        if (lowercaseFontName.contains("bold") && lowercaseFontName.contains("italic")) {
            return "bold, italic";
@@ -205,25 +173,25 @@ public class TextPositionSequence implements CharSequence {

    }

-    @JsonIgnore
+
    public float getFontSize() {

        return textPositions.get(0).getFontSizeInPt();
    }

-    @JsonIgnore
+
    public float getSpaceWidth() {

        return textPositions.get(0).getWidthOfSpace();
    }

-    @JsonIgnore
+
    public int getRotation() {

        return textPositions.get(0).getRotation();
    }

-    @JsonIgnore
+
    public Rectangle getRectangle() {

        float height = getTextHeight();
@@ -255,4 +223,4 @@ public class TextPositionSequence implements CharSequence {
        return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
    }

-}
+}
@@ -1,35 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.queue;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.core.QueueBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@RequiredArgsConstructor
-public class MessagingConfiguration {
-
-
-    public static final String REDACTION_QUEUE = "redactionQueue";
-
-    public static final String REDACTION_DQL = "redactionDQL";
-
-
-    @Bean
-    public Queue redactionQueue() {
-
-        return QueueBuilder.durable(REDACTION_QUEUE)
-                .withArgument("x-dead-letter-exchange", "")
-                .withArgument("x-dead-letter-routing-key", REDACTION_DQL)
-                .maxPriority(2)
-                .build();
-    }
-
-
-    @Bean
-    public Queue redactionDeadLetterQueue() {
-
-        return QueueBuilder.durable(REDACTION_DQL).build();
-    }
-}
@@ -1,69 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.queue;
-
-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 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;
-
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class RedactionMessageReceiver {
-
-    private final ObjectMapper objectMapper;
-    private final AnalyzeService analyzeService;
-    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());
-        AnalyzeResult result;
-        if (analyzeRequest.isReanalyseOnlyIfPossible()) {
-            result = analyzeService.reanalyze(analyzeRequest);
-            log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-        } else {
-            // TODO Seperate stucture analysis by other queue
-            analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
-
-            // 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());
-        }
-
-        fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
-    }
-
-
-    @RabbitHandler
-    @RabbitListener(queues = REDACTION_DQL)
-    public void receiveAnalyzeRequestDQL(String in) throws JsonProcessingException {
-
-        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
-        log.info("Failed to process analyze request: {}", analyzeRequest);
-
-        fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-    }
-
-}
@@ -1,25 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import java.util.Iterator;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;

-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import lombok.Value;

-@Data
-@NoArgsConstructor
-@AllArgsConstructor
+@Value
 public class CellValue {

-    private List<TextBlock> textBlocks = new ArrayList<>();
+    private List<TextBlock> textBlocks;

    private int rowSpanStart;

+
    @Override
    public String toString() {

@@ -50,4 +47,4 @@ public class CellValue {
                .replaceAll(" {2}", " ");
    }

-}
+}
@@ -1,16 +1,12 @@
 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;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

+import lombok.Data;
+import lombok.Getter;

@Data
 public class Dictionary {
@@ -22,18 +18,18 @@ public class Dictionary {
    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();

    @Getter
-    private DictionaryVersion version;
+    private long version;


-    public Dictionary(List<DictionaryModel> dictionaryModels, DictionaryVersion version) {
+    public Dictionary(List<DictionaryModel> dictionaryModels, long dictionaryVersion){
        this.dictionaryModels = dictionaryModels;
        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
-        this.version = version;
+        this.version = dictionaryVersion;
    }


-    public int getDictionaryRank(String type) {
-        if (!localAccessMap.containsKey(type)) {
+    public int getDictionaryRank(String type){
+        if(!localAccessMap.containsKey(type)){
            return 0;
        }
        return localAccessMap.get(type).getRank();
@@ -64,15 +60,18 @@ public class Dictionary {

    public boolean containsValue(String type, String value) {

-        return localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getEntries().stream().map(DictionaryEntry::getValue).collect(toSet())
+        if (localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .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);
+                .contains(value)) {
+            return true;
+        }
+        return false;
    }


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

+import java.util.Set;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

-import java.util.Set;
-
@Data
@AllArgsConstructor
 public class DictionaryIncrement {

    private Set<DictionaryIncrementValue> values;
-    private DictionaryVersion dictionaryVersion;
+    private long dictionaryVersion;

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


-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Set;
 import java.util.stream.Collectors;

+import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;

@Data
@AllArgsConstructor
@@ -22,10 +22,9 @@ public class DictionaryModel implements Serializable {
    private boolean recommendation;
    private Set<DictionaryEntry> entries;
    private Set<String> localEntries;
-    private boolean isDossierDictionary;

-    public Set<String> getValues(boolean local) {
-        return local ? localEntries : entries.stream().filter(e -> !e.isDeleted()).map(e -> e.getValue()).collect(Collectors
+    public Set<String> getValues(boolean local){
+        return local ? localEntries : entries.stream().filter(e -> !e.isDeleted()).map(e-> e.getValue()).collect(Collectors
                .toSet());
    }

@@ -10,7 +10,7 @@ import java.util.Map;
@Data
 public class DictionaryRepresentation {

-    private String dossierTemplateId;
+    private String ruleSetId;
    private long dictionaryVersion = -1;
    private List<DictionaryModel> dictionary = new ArrayList<>();
    private float[] defaultColor;
@@ -20,4 +20,5 @@ public class DictionaryRepresentation {
    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();


+
 }
@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DictionaryVersion {
-
-    long dossierTemplateVersion;
-    long dossierVersion;
-}
@@ -1,19 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.model.Engine;
+import java.util.ArrayList;
+import java.util.List;
+
 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 {
+public class Entity {
+

    private final String word;
    private final String type;
@@ -40,17 +38,8 @@ public class Entity implements ReasonHolder {
    private String textBefore;
    private String textAfter;

-    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) {

        this.word = word;
        this.type = type;
@@ -66,14 +55,10 @@ public class Entity implements ReasonHolder {
        this.textAfter = textAfter;
        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) {

        this.word = word;
        this.type = type;
@@ -82,9 +67,6 @@ public class Entity implements ReasonHolder {
        this.headline = headline;
        this.sectionNumber = sectionNumber;
        this.isDictionaryEntry = isDictionaryEntry;
-        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
-        this.engines.add(engine);
    }

-
 }
@@ -1,23 +1,24 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import java.util.ArrayList;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;

-import java.util.ArrayList;
-import java.util.List;
-
@Data
@RequiredArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
 public class EntityPositionSequence {

-    private final String id;
    @EqualsAndHashCode.Exclude
    private List<TextPositionSequence> sequences = new ArrayList<>();
    private int pageNumber;
+    private final String id;

 }
@@ -1,25 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Image implements ReasonHolder {
-
-    private String type;
-    private RedRectangle2D position;
-    private boolean redaction;
-    private String redactionReason;
-    private String legalBasis;
-    private int matchedRule;
-    private int sectionNumber;
-    private String section;
-    private int page;
-    private boolean hasTransparency;
-
-}
@@ -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,33 +1,24 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;

+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
@Data
+@NoArgsConstructor
+@AllArgsConstructor
@RequiredArgsConstructor
 public class PdfImage {

-    @JsonIgnore
+    @NonNull
    private BufferedImage image;
    @NonNull
-    private RedRectangle2D position;
+    private Rectangle2D position;
    private ImageType imageType;
-    private boolean isAppendedToParagraph;
-    private boolean hasTransparency;

-    @NonNull
-    private int page;
-
-    public PdfImage(BufferedImage image, Rectangle2D position, int page, boolean hasTransparency) {
-        this.image = image;
-        this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
-        this.page = page;
-        this.hasTransparency = hasTransparency;
-    }
-
-}
+}
@@ -0,0 +1,34 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ReanalysisSection {
+
+    private int sectionNumber;
+    private String headline;
+    private List<TextBlock> textBlocks;
+    private Map<String, CellValue> tabularData = new HashMap<>();
+    private List<Integer> cellStarts;
+
+
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> {
+            if (block instanceof TextBlock) {
+                searchableText.addAll(block.getSequences());
+            }
+        });
+        return searchableText;
+    }
+
+}
@@ -1,14 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-public interface ReasonHolder {
-
-    String getRedactionReason();
-
-    void setRedactionReason(String reason);
-
-    boolean isRedaction();
-
-    void setRedaction(boolean value);
-
-
-}
@@ -1,42 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RedRectangle2D {
-
-    public static final double THRESHOLD = 0.01;
-
-    private double x;
-    private double y;
-    private double width;
-    private double height;
-
-    @JsonIgnore
-    public boolean isEmpty() {
-        return width <= 0.0f || height <= 0.0f;
-    }
-
-    public boolean contains(double x, double y, double w, double h) {
-        if (isEmpty() || w <= 0 || h <= 0) {
-            return false;
-        }
-        double x0 = getX();
-        double y0 = getY();
-        return round(x) >= round(x0) &&
-                round(y) >= round(y0) &&
-                (x + w) - (x0 + getWidth()) <= THRESHOLD &&
-                (y + h) - (y0 + getHeight()) <= THRESHOLD;
-    }
-
-    private double round(double value) {
-        double d = Math.pow(10, 2);
-        return Math.round(value * d) / d;
-    }
-}
@@ -1,14 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;

+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+
 public class SearchableText {

    private final List<TextPositionSequence> sequences = new ArrayList<>();
@@ -232,4 +232,4 @@ public class SearchableText {
        return sb.append("\n").toString();
    }

-}
+}
@@ -1,26 +1,25 @@
 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;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-import lombok.Builder;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;

-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.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

-import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+import org.apache.commons.lang3.StringUtils;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;

@Data
@Slf4j
@@ -52,52 +51,8 @@ public class Section {

    private SearchableText searchableText;

-    @Builder.Default
-    private Set<Image> images = new HashSet<>();

-    @Builder.Default
-    private List<FileAttribute> fileAttributes = new ArrayList<>();
-
-
-    @WhenCondition
-    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
-                                           @Argument(ArgumentType.STRING) 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) {
-        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) {
-        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) {
-        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) {
-        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) {
-        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 +61,27 @@ 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) {

-        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,27 +108,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) {

-        images.forEach(image -> {
-            if (image.getType().equals(type)) {
-                image.setRedaction(true);
-                image.setMatchedRule(ruleNumber);
-                image.setRedactionReason(reason);
-                image.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-    @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,24 +124,8 @@ public class Section {
        });
    }

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

-        images.forEach(image -> {
-            if (image.getType().equals(type)) {
-                image.setRedaction(false);
-                image.setMatchedRule(ruleNumber);
-                image.setRedactionReason(reason);
-            }
-        });
-    }
-
-    @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 +140,7 @@ 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 +165,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 +181,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 +194,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 +228,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 +252,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 +269,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 +284,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 +301,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 +322,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 +351,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);

        found.forEach(entity -> {
            if (redacted) {
@@ -575,7 +404,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);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
@@ -613,25 +442,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());
-    }
-}
@@ -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,8 +1,14 @@
 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 java.awt.Color;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -15,19 +21,22 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
 import org.springframework.stereotype.Service;

-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+import com.iqser.red.service.redaction.v1.model.Comment;
+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.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
+
+import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
 public class AnnotationService {

+    private final DictionaryService dictionaryService;
+

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

@@ -90,7 +99,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,23 +1,34 @@
 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.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 java.awt.Color;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;

-import feign.FeignException;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.stereotype.Service;

-import java.awt.Color;
-import java.util.*;
-import java.util.stream.Collectors;
+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.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryRepresentation;

+import feign.FeignException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@@ -26,90 +37,69 @@ public class DictionaryService {

    private final DictionaryClient dictionaryClient;

-    private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
-    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();
+    private Map<String, DictionaryRepresentation> dictionariesByRuleSets = new HashMap<>();


-    public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {
+    public long updateDictionary(String ruleSetId) {

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

-        long dossierDictionaryVersion = dictionaryClient.getVersionForDossier(dossierId);
-        var dossierDictionary = dictionariesByDossier.get(dossierId);
-        if (dossierDictionary == null || dossierDictionaryVersion > dossierDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, dossierId);
-        }
-
-        return DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateDictionaryVersion).dossierVersion(dossierDictionaryVersion).build();
+        return version;
    }


-    public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion, String dossierId) {
+    public DictionaryIncrement getDictionaryIncrements(String ruleSetId, long fromVersion) {

-        DictionaryVersion version = updateDictionary(dossierTemplateId, dossierId);
+        long version = updateDictionary(ruleSetId);

        Set<DictionaryIncrementValue> newValues = new HashSet<>();
-        List<DictionaryModel> dictionaryModels = dictionariesByDossierTemplate.get(dossierTemplateId).getDictionary();
+        List<DictionaryModel> dictionaryModels = dictionariesByRuleSets.get(ruleSetId).getDictionary();
        dictionaryModels.forEach(dictionaryModel -> {
            dictionaryModel.getEntries().forEach(dictionaryEntry -> {
-                if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
+                if (dictionaryEntry.getVersion() > fromVersion) {
                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
                }
            });
        });

-        if(dictionariesByDossier.containsKey(dossierId)) {
-            dictionaryModels = dictionariesByDossier.get(dossierId).getDictionary();
-            dictionaryModels.forEach(dictionaryModel -> {
-                dictionaryModel.getEntries().forEach(dictionaryEntry -> {
-                    if (dictionaryEntry.getVersion() > fromVersion.getDossierVersion()) {
-                        newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
-                    }
-                });
-            });
-        }
-
        return new DictionaryIncrement(newValues, version);
    }


-    private void updateDictionaryEntry(String dossierTemplateId, long version, String dossierId) {
+    private void updateDictionaryEntry(String ruleSetId, long version) {

        try {
            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();

-            var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId) : dictionaryClient.getAllTypesForDossier(dossierId);
-            if (CollectionUtils.isNotEmpty(typeResponse)) {
+            TypeResponse typeResponse = dictionaryClient.getAllTypes(ruleSetId);
+            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), new HashSet<>()))
                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                        .collect(Collectors.toList());

                dictionary.forEach(dm -> dictionaryRepresentation.getLocalAccessMap().put(dm.getType(), dm));

-                Colors colors = dictionaryClient.getColors(dossierTemplateId);
+                Colors colors = dictionaryClient.getColors(ruleSetId);

                dictionaryRepresentation.setDefaultColor(convertColor(colors.getDefaultColor()));
                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAdd()));
                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemove()));
                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getNotRedacted()));
-                dictionaryRepresentation.setDossierTemplateId(dossierTemplateId);
+                dictionaryRepresentation.setRuleSetId(ruleSetId);
                dictionaryRepresentation.setDictionaryVersion(version);
                dictionaryRepresentation.setDictionary(dictionary);

-                if(dossierId == null) {
-                    dictionariesByDossierTemplate.put(dossierTemplateId, dictionaryRepresentation);
-                } else {
-                    dictionariesByDossier.put(dossierId, dictionaryRepresentation);
-                }
+                dictionariesByRuleSets.put(ruleSetId, dictionaryRepresentation);
            }
        } catch (FeignException e) {
            log.warn("Got some unknown feignException", e);
@@ -118,28 +108,26 @@ public class DictionaryService {
    }


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

        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);
-                if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
-                    dictionary.getVersion().setDossierTemplateVersion(externalVersion);
+                dictionaryClient.addEntries(dm.getType(), ruleSetId, new ArrayList<>(dm.getLocalEntries()), false);
+                long externalVersion = dictionaryClient.getVersion(ruleSetId);
+                if (externalVersion == dictionary.getVersion() + 1) {
+                    dictionary.setVersion(externalVersion);
                }
            }
        });
    }


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

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

-        if (type.isCaseInsensitive()) {
+        if (t.isCaseInsensitive()) {
            entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
        }
        return entries;
@@ -153,9 +141,9 @@ public class DictionaryService {
    }


-    public boolean isCaseInsensitiveDictionary(String type, String dossierTemplateId) {
+    public boolean isCaseInsensitiveDictionary(String type, String ruleSetId) {

-        DictionaryModel dictionaryModel = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
+        DictionaryModel dictionaryModel = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
        if (dictionaryModel != null) {
            return dictionaryModel.isCaseInsensitive();
        }
@@ -163,19 +151,19 @@ public class DictionaryService {
    }


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

-        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.getColor();
        }
-        return dictionariesByDossierTemplate.get(dossierTemplateId).getDefaultColor();
+        return dictionariesByRuleSets.get(ruleSetId).getDefaultColor();
    }


-    public boolean isHint(String type, String dossierTemplateId) {
+    public boolean isHint(String type, String ruleSetId) {

-        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isHint();
        }
@@ -183,9 +171,9 @@ public class DictionaryService {
    }


-    public boolean isRecommendation(String type, String dossierTemplateId) {
+    public boolean isRecommendation(String type, String ruleSetId) {

-        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isRecommendation();
        }
@@ -193,44 +181,35 @@ public class DictionaryService {
    }


-    public Dictionary getDeepCopyDictionary(String dossierTemplateId, String dossierId) {
+    public Dictionary getDeepCopyDictionary(String ruleSetId) {

        List<DictionaryModel> copy = new ArrayList<>();

-        var dossierTemplateRepresentation = dictionariesByDossierTemplate.get(dossierTemplateId);
-        dossierTemplateRepresentation.getDictionary().forEach(dm -> {
+        var representation = dictionariesByRuleSets.get(ruleSetId);
+        var dictionary = dictionariesByRuleSets.get(ruleSetId).getDictionary();
+        dictionary.forEach(dm -> {
            copy.add(SerializationUtils.clone(dm));
        });

-        //TODO merge dictionaries if they have same names
-        long dossierDictionaryVersion = -1;
-        if(dictionariesByDossier.containsKey(dossierId)) {
-            var dossierRepresentation = dictionariesByDossier.get(dossierId);
-            dossierRepresentation.getDictionary().forEach(dm -> {
-                copy.add(SerializationUtils.clone(dm));
-            });
-            dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
-        }
-
-        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
+        return new Dictionary(copy, representation.getDictionaryVersion());
    }


-    public float[] getRequestRemoveColor(String dossierTemplateId) {
+    public float[] getRequestRemoveColor(String ruleSetId) {

-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
+        return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
    }


-    public float[] getNotRedactedColor(String dossierTemplateId) {
+    public float[] getNotRedactedColor(String ruleSetId) {

-        return dictionariesByDossierTemplate.get(dossierTemplateId).getNotRedactedColor();
+        return dictionariesByRuleSets.get(ruleSetId).getNotRedactedColor();
    }


-    public float[] getRequestAddColor(String dossierTemplateId) {
+    public float[] getRequestAddColor(String ruleSetId) {

-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
+        return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
    }

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

-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;
-import lombok.RequiredArgsConstructor;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
@@ -13,11 +15,12 @@ import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 import org.springframework.stereotype.Service;

-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
+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;
+
+import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
@@ -25,16 +28,16 @@ public class DroolsExecutionService {

    private final RulesClient rulesClient;

-    private final Map<String, KieContainer> kieContainers = new HashMap<>();
+    private Map<String, KieContainer> kieContainers = new HashMap<>();

-    private final Map<String, Long> rulesVersionPerDossierTemplateId = new HashMap<>();
+    private Map<String, Long> rulesVersionPerRuleSetId = new HashMap<>();


-    public KieContainer getKieContainer(String dossierTemplateId) {
+    public KieContainer getKieContainer(String ruleSetId) {

-        KieContainer container = kieContainers.get(dossierTemplateId);
+        KieContainer container = kieContainers.get(ruleSetId);
        if (container == null) {
-            return createOrUpdateKieContainer(dossierTemplateId);
+            return createOrUpdateKieContainer(ruleSetId);
        } else {
            return container;
        }
@@ -54,43 +57,43 @@ public class DroolsExecutionService {
    }


-    public KieContainer updateRules(String dossierTemplateId) {
+    public KieContainer updateRules(String ruleSetId) {

-        long version = rulesClient.getVersion(dossierTemplateId);
-        Long rulesVersion = rulesVersionPerDossierTemplateId.get(dossierTemplateId);
+        long version = rulesClient.getVersion(ruleSetId);
+        Long rulesVersion = rulesVersionPerRuleSetId.get(ruleSetId);
        if (rulesVersion == null) {
            rulesVersion = -1L;
        }

-        if (version > rulesVersion) {
-            rulesVersionPerDossierTemplateId.put(dossierTemplateId, version);
-            return createOrUpdateKieContainer(dossierTemplateId);
+        if (version > rulesVersion.longValue()) {
+            rulesVersionPerRuleSetId.put(ruleSetId, version);
+            return createOrUpdateKieContainer(ruleSetId);
        }
-        return getKieContainer(dossierTemplateId);
+        return getKieContainer(ruleSetId);

    }


-    private KieContainer createOrUpdateKieContainer(String dossierTemplateId) {
+    private KieContainer createOrUpdateKieContainer(String ruleSetId) {

        try {

-            var rules = rulesClient.getRules(dossierTemplateId);
-            if (rules == null || StringUtils.isEmpty(rules.getValue())) {
+            RulesResponse rules = rulesClient.getRules(ruleSetId);
+            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(ruleSetId, rules.getRules(), kieServices);

-            var container = kieContainers.get(dossierTemplateId);
+            var container = kieContainers.get(ruleSetId);
            if (container != null) {
                container.updateToVersion(kieModule.getReleaseId());
                return container;
            }

            container = kieServices.newKieContainer(kieModule.getReleaseId());
-            kieContainers.put(dossierTemplateId, container);
+            kieContainers.put(ruleSetId, container);
            return container;
        } catch (Exception e) {
            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
@@ -99,11 +102,11 @@ public class DroolsExecutionService {
    }


-    private KieModule getKieModule(String dossierTemplateId, String rules, KieServices kieServices) {
+    private KieModule getKieModule(String ruleSetId, String rules, KieServices kieServices) {

        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
        InputStream input = new ByteArrayInputStream(rules.getBytes(StandardCharsets.UTF_8));
-        kieFileSystem.write("src/main/resources/drools/rules" + dossierTemplateId + ".drl", kieServices.getResources()
+        kieFileSystem.write("src/main/resources/drools/rules" + ruleSetId + ".drl", kieServices.getResources()
                .newInputStreamResource(input));
        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
        kieBuilder.buildAll();
@@ -121,13 +124,13 @@ public class DroolsExecutionService {
    }


-    public long getRulesVersion(String dossierTemplateId) {
+    public long getRulesVersion(String ruleSetId) {

-        Long rulesVersion = rulesVersionPerDossierTemplateId.get(dossierTemplateId);
+        Long rulesVersion = rulesVersionPerRuleSetId.get(ruleSetId);
        if (rulesVersion == null) {
            return -1;
        }
-        return rulesVersion;
+        return rulesVersion.longValue();
    }

-}
+}
@@ -6,32 +6,38 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualImageRecategorization;
-import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.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.model.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.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.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.model.UnclassifiedText;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
 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.model.SectionText;
 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 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;
@@ -41,103 +47,37 @@ import lombok.extern.slf4j.Slf4j;
@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 ruleSetId, ManualRedactions manualRedactions) {

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

        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 = new HashMap<>();
+            documentEntities.stream().forEach(entity -> {
+                if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
+                    hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
+                            .add(entity);
+                }
+            });
+
+            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber);
+            EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
        }

-        Map<Integer, List<Entity>> entitiesPerPage = convertToEnititesPerPage(entities);
-        return new PageEntities(entitiesPerPage, imagesPerPage);
-    }
-
-
-    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) {
-
-        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
-        for (Entity entity : entities) {
+        for (Entity entity : documentEntities) {
            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
@@ -145,59 +85,272 @@ public class EntityRedactionService {
            }

            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
+                classifiedDoc.getEntities()
+                        .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()));
+                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity.getStart(), entity.getEnd()));
            }
        }
-        return entitiesPerPage;
+
+        dictionaryService.updateExternalDictionary(dictionary, ruleSetId);
+
+        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
+        classifiedDoc.setRulesVersion(rulesVersion);
    }


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

-        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);
+        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, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                } else {
+                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                }
+                sectionNumber.incrementAndGet();
            }
-        });
-        return hintsPerSectionNumber;
-    }
+            sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
+                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+            sectionNumber.incrementAndGet();
+        }

+        for (Header header : classifiedDoc.getHeaders()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+            sectionNumber.incrementAndGet();
+        }

-    private void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary) {
+        for (Footer footer : classifiedDoc.getFooters()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText.getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+            sectionNumber.incrementAndGet();
+        }
+
+        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            documentEntities.addAll(analysedRowSection.getEntities());
+
+            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+                if (dictionary.isRecommendation(key)) {
+                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                        if (!dictionary.containsValue(key, value)) {
+                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                        }
+                    });
+                } else {
+                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+
+                        if (dictionary.getLocalAccessMap().get(key) == null) {
+                            log.warn("Dictionary {} is null", key);
+                        }
+
+                        if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                            log.warn("Dictionary {} localEntries is null", key);
+                        }

-        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
-            if (dictionary.isRecommendation(key)) {
-                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-                    if (!dictionary.containsValue(key, value)) {
                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                    }
-                });
-            } else {
-                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                    });
+                }
+            });

-                    if (dictionary.getLocalAccessMap().get(key) == null) {
-                        log.warn("Dictionary {} is null", key);
-                    }
-
-                    if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
-                        log.warn("Dictionary {} localEntries is null", key);
-                    }
-
-                    dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                });
-            }
        });
+
+        return documentEntities;
    }


-    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, ManualRedactions manualRedactions,
+                                                               AtomicInteger sectionNumber, Dictionary dictionary,
+                                                               boolean local,
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+
+        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);
+
+                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
+                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)
+                    .build(), searchableRow));
+
+            if(!local) {
+                sectionText.setText(searchableRow.toString());
+                sectionText.setHeadline(table.getHeadline());
+                sectionText.setSectionNumber(sectionNumber.intValue());
+                sectionText.setTable(true);
+                classifiedDoc.getSectionText().add(sectionText);
+            }
+
+            sectionNumber.incrementAndGet();
+        }
+
+        return sectionSearchableTextPairs;
+    }
+
+
+    private List<SectionSearchableTextPair> processTableAsOneText(Document classifiedDoc, Table table, ManualRedactions manualRedactions,
+                                                                  AtomicInteger sectionNumber, Dictionary dictionary,
+                                                                  boolean local,
+                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+
+        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.getSectionAreas().add(sectionArea);
+                }
+
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    entireTableText.addAll(textBlock.getSequences());
+                }
+                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
+            }
+        }
+
+
+        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)
+                .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) {
+
+        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);
+            classifiedDoc.getSectionText().add(sectionText);
+        }
+
+        addSectionToManualRedactions(paragraphTextBlocks, manualRedactions, headline, sectionNumber.intValue());
+        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)
+                .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 +361,33 @@ 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));
            } 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));
            }
        }

-        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 void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
+                                              String section, int sectionNumber) {

-        Map<String, Set<String>> nerValuesPerType = new HashMap<>();
+        if (manualRedactions == null || manualRedactions.getEntriesToAdd().isEmpty()) {
+            return;
+        }

-        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())));
+        for (TextBlock textBlock : textBlocks) {
+            for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
+                for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
+                    if (textBlock.contains(rectangle)) {
+                        manualRedactionEntry.setSection(section);
+                        manualRedactionEntry.setSectionNumber(sectionNumber);
                    }
                }
-            });
+            }
        }
-        return nerValuesPerType;
    }

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

-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import java.io.ByteArrayOutputStream;
+
+import javax.imageio.ImageIO;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
 import com.iqser.red.service.redaction.v1.server.client.ImageClassificationResponse;
 import com.iqser.red.service.redaction.v1.server.client.MockMultipartFile;
 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.settings.RedactionServiceSettings;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.imageio.ImageIO;
-import java.io.ByteArrayOutputStream;

@Slf4j
@Service
@@ -23,49 +25,37 @@ public class ImageClassificationService {
    private final RedactionServiceSettings settings;


-    public void classifyImages(Page page) {
+    public void classifyImages(Document classifiedDoc) {

-        page.getImages().forEach(image -> {
+        long start = System.currentTimeMillis();
+        classifiedDoc.getPages().forEach(page -> {
+            page.getImages().forEach(image -> {

-            if (settings.isEnableImageClassification() && !isEntirePageImage(image, page)) {
+                if (settings.isEnableImageClassification()) {
+                    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                        ImageIO.write(image.getImage(), "png", baos);
+                        ImageClassificationResponse response = imageClassificationClient.classify(new MockMultipartFile("file", "Image.png", "image/png", baos
+                                .toByteArray()));
+                        image.setImageType(ImageType.valueOf(response.getCategory()));

-                long start = System.currentTimeMillis();
-                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-                    ImageIO.write(image.getImage(), "png", baos);
-                    var mockFile = new MockMultipartFile("file", "Image.png", "image/png", baos.toByteArray());
-                    ImageClassificationResponse response = imageClassificationClient.classify(mockFile);
-                    image.setImageType(ImageType.valueOf(response.getCategory()));
-                } catch (Exception e) {
-                    log.error("Could not classify image", e);
+                    } catch (Exception e) {
+                        log.error("Could not classify image", e);
+                    }
+                } else {
                    image.setImageType(ImageType.OTHER);
                }
-                log.info("Image classification took: " + (System.currentTimeMillis() - start));
-            } else {
-                image.setImageType(ImageType.OTHER);
-            }

-            image.getImage().flush();
-            image.setImage(null);
-
-            if (image.getImageType().equals(ImageType.OTHER)) {
-                page.getTextBlocks().forEach(textblock -> {
-                    if (image.getPosition()
-                            .contains(textblock.getMinX(), textblock.getMinY(), textblock.getWidth(), textblock.getHeight())) {
-                        image.setImageType(ImageType.OCR);
-                    }
-                });
-            }
+                if (image.getImageType().equals(ImageType.OTHER)) {
+                    page.getTextBlocks().forEach(textblock -> {
+                        if (image.getPosition()
+                                .contains(textblock.getMinX(), textblock.getMinY(), textblock.getWidth(), textblock.getHeight())) {
+                            image.setImageType(ImageType.OCR);
+                        }
+                    });
+                }
+            });
        });
-
-    }
-
-    private boolean isEntirePageImage(PdfImage image, Page page){
-        double imageArea = image.getPosition().getHeight() * image.getPosition().getWidth();
-        if(imageArea / page.getCropBoxArea() >= settings.getMaxImageCropboxRatio()){
-            log.info("Skipping image classification because images is almost as large as the entire page");
-            return true;
-        }
-        return false;
+        log.info("Image classification took: " + (System.currentTimeMillis() - start));
    }

 }
@@ -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,280 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.awt.geom.Rectangle2D;
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+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.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.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.ReanalyzeResult;
+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.RenalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.parsing.PDFAreaTextStripper;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
+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.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.ReanalysisSection;
+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.tableextraction.model.Cell;
+
+import lombok.RequiredArgsConstructor;
+
+@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;
+
+
+    public ReanalyzeResult reanalyze(@RequestBody RenalyzeRequest renalyzeRequest) {
+
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(renalyzeRequest.getRuleSetId(), renalyzeRequest
+                .getRedactionLog()
+                .getDictionaryVersion());
+
+        Set<String> manualForceAndRemoveIds = getForceAndRemoveIds(renalyzeRequest.getManualRedactions());
+        Map<String, List<Comment>> comments = null;
+        Set<ManualRedactionEntry> manualAdds = null;
+
+        if (renalyzeRequest.getManualRedactions() != null) {
+            // TODO comments will be removed from redactionLog, so we ignore this first.
+            comments = renalyzeRequest.getManualRedactions().getComments();
+            manualAdds = renalyzeRequest.getManualRedactions().getEntriesToAdd();
+        }
+
+        Set<Integer> sectionsToReanaylse = new HashSet<>();
+        for (RedactionLogEntry entry : renalyzeRequest.getRedactionLog().getRedactionLogEntry()) {
+            if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
+                sectionsToReanaylse.add(entry.getSectionNumber());
+            }
+        }
+
+        for (SectionText sectionText : renalyzeRequest.getText().getSectionTexts()) {
+
+            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
+                sectionsToReanaylse.add(sectionText.getSectionNumber());
+            }
+
+            if (manualAdds != null) {
+                for (SectionArea sectionArea : sectionText.getSectionAreas()) {
+                    for (ManualRedactionEntry manualAdd : manualAdds) {
+                        for (Rectangle manualPosition : manualAdd.getPositions()) {
+                            if (sectionArea.contains(manualPosition)) {
+                                manualAdd.setSection(sectionText.getHeadline());
+                                manualAdd.setSectionNumber(sectionText.getSectionNumber());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (sectionsToReanaylse.isEmpty() && (manualAdds == null || manualAdds.isEmpty())) {
+            renalyzeRequest.getRedactionLog().setDictionaryVersion(dictionaryIncrement.getDictionaryVersion());
+            return ReanalyzeResult.builder().redactionLog(renalyzeRequest.getRedactionLog()).build();
+        }
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(renalyzeRequest.getDocument()))) {
+
+            List<ReanalysisSection> reanalysisSections = new ArrayList<>();
+            for (SectionText sectionText : renalyzeRequest.getText().getSectionTexts()) {
+
+                if (!sectionsToReanaylse.contains(sectionText.getSectionNumber())) {
+                    continue;
+                }
+
+                ReanalysisSection reanalysisSection = new ReanalysisSection();
+                reanalysisSection.setHeadline(sectionText.getHeadline());
+                reanalysisSection.setSectionNumber(sectionText.getSectionNumber());
+                List<TextBlock> textBlocks = new ArrayList<>();
+
+                Map<Integer, List<SectionArea>> sectionAreasPerPage = new HashMap<>();
+                for (SectionArea sectionArea : sectionText.getSectionAreas()) {
+                    sectionAreasPerPage.computeIfAbsent(sectionArea.getPage(), (x) -> new ArrayList<>())
+                            .add(sectionArea);
+                }
+
+                Map<String, CellValue> tabularData = new HashMap<>();
+                List<Integer> cellStarts = new ArrayList<>();
+                for (Integer page : sectionAreasPerPage.keySet()) {
+                    List<SectionArea> areasOnPage = sectionAreasPerPage.get(page);
+
+                    PDPage pdPage = pdDocument.getPage(page - 1);
+                    PDRectangle cropBox = pdPage.getCropBox();
+                    PDFAreaTextStripper textStripper = new PDFAreaTextStripper();
+                    textStripper.setPageNumber(page);
+
+                    int cellStart = 0;
+                    for (SectionArea sectionArea : areasOnPage) {
+
+                        Rectangle2D rect = null;
+                        if (pdPage.getRotation() == 90) {
+                            rect = new Rectangle2D.Float(sectionArea.getTopLeft().getY(), sectionArea.getTopLeft()
+                                    .getX(), sectionArea.getHeight(), sectionArea.getWidth() + 0.001f);
+                        } else {
+                            rect = new Rectangle2D.Float(sectionArea.getTopLeft().getX(), -sectionArea.getTopLeft()
+                                    .getY() + cropBox.getUpperRightY() - sectionArea.getHeight(), sectionArea.getWidth(), sectionArea
+                                    .getHeight() + 0.001f);
+                        }
+
+                        textStripper.addRegion(String.valueOf(1), rect);
+                        textStripper.extractRegions(pdPage);
+                        textStripper.getTextForRegion(String.valueOf(1));
+                        List<TextPositionSequence> positions = textStripper.getTextPositionSequences();
+
+                        TextBlock textBlock = new TextBlock(sectionArea.getTopLeft().getX(), sectionArea.getTopLeft()
+                                .getX() + sectionArea.getWidth(), sectionArea.getTopLeft()
+                                .getY(), sectionArea.getTopLeft().getY() + sectionArea.getHeight(), positions, 0);
+
+                        if (sectionText.isTable()) {
+                            Cell cell = new Cell();
+                            cell.addTextBlock(textBlock);
+                            tabularData.put(sectionArea.getHeader(), new CellValue(cell.getTextBlocks(), cellStart));
+                            cellStarts.add(cellStart);
+                            cellStart = cellStart + cell.toString().trim().length() + 1;
+                        }
+
+                        textBlocks.add(textBlock);
+                        textStripper.clearPositions();
+                    }
+
+                }
+                reanalysisSection.setTextBlocks(textBlocks);
+                reanalysisSection.setTabularData(tabularData);
+                reanalysisSections.add(reanalysisSection);
+                if (sectionText.isTable()) {
+                    reanalysisSection.setCellStarts(cellStarts);
+                }
+            }
+
+            //--
+
+            KieContainer kieContainer = droolsExecutionService.updateRules(renalyzeRequest.getRuleSetId());
+
+            Dictionary dictionary = dictionaryService.getDeepCopyDictionary(renalyzeRequest.getRuleSetId());
+
+            List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+            for (ReanalysisSection reanalysisSection : reanalysisSections) {
+
+                Set<Entity> entities = entityRedactionService.findEntities(reanalysisSection.getSearchableText(), reanalysisSection
+                        .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, false);
+                if (reanalysisSection.getCellStarts() != null) {
+                    surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
+                            .getCellStarts());
+                } else {
+                    surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
+                }
+
+                sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                        .isLocal(false)
+                        .dictionaryTypes(dictionary.getTypes())
+                        .entities(entities)
+                        .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
+                        .searchText(reanalysisSection.getSearchableText().toString())
+                        .headline(reanalysisSection.getHeadline())
+                        .sectionNumber(reanalysisSection.getSectionNumber())
+                        .tabularData(reanalysisSection.getTabularData())
+                        .searchableText(reanalysisSection.getSearchableText())
+                        .dictionary(dictionary)
+                        .build(), reanalysisSection.getSearchableText()));
+            }
+
+            Set<Entity> entities = new HashSet<>();
+            sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+                Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair
+                        .getSection());
+                entities.addAll(analysedRowSection.getEntities());
+            });
+
+            Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
+            for (Entity entity : entities) {
+                Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
+                for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
+                    sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
+                            .add(entityPositionSequence);
+                }
+
+                for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
+                    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()));
+                }
+            }
+
+            List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
+            for (int page = 1; page <= pdDocument.getNumberOfPages(); page++) {
+                if (entitiesPerPage.get(page) != null) {
+                    newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, renalyzeRequest
+                            .getManualRedactions(), page, renalyzeRequest.getRuleSetId()));
+                }
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addManualAddEntries(manualAdds, comments, page, renalyzeRequest
+                        .getRuleSetId()));
+            }
+
+            Iterator<RedactionLogEntry> itty = renalyzeRequest.getRedactionLog().getRedactionLogEntry().iterator();
+            while (itty.hasNext()) {
+                RedactionLogEntry entry = itty.next();
+                if (sectionsToReanaylse.contains(entry.getSectionNumber()) && !entry.isImage() || entry.getSectionNumber() == 0 && !entry.isImage()) {
+                    itty.remove();
+                }
+            }
+
+            renalyzeRequest.getRedactionLog().getRedactionLogEntry().addAll(newRedactionLogEntries);
+            renalyzeRequest.getRedactionLog().setDictionaryVersion(dictionaryIncrement.getDictionaryVersion());
+
+            return ReanalyzeResult.builder().redactionLog(renalyzeRequest.getRedactionLog()).build();
+
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+
+    }
+
+
+    private Set<String> getForceAndRemoveIds(ManualRedactions manualRedactions) {
+
+        if (manualRedactions == null) {
+            return new HashSet<>();
+        }
+
+        return Stream.concat(manualRedactions.getIdsToRemove()
+                .stream()
+                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))
+                .collect(Collectors.toSet());
+    }
+
+}
@@ -1,107 +0,0 @@
-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.redaction.v1.model.ChangeType;
-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;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class RedactionChangeLogService {
-
-    private final RedactionStorageService redactionStorageService;
-
-
-    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);
-        }
-
-        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);
-        removed.removeAll(currentRedactionLog.getRedactionLogEntry());
-
-        Map<String, RedactionLogEntry> addedIds = new HashMap<>();
-        added.forEach(entry -> {
-            addedIds.put(entry.getId(), entry);
-        });
-
-        Set<String> removedIds = new HashSet<>();
-        removed.forEach(entry -> {
-            removedIds.add(entry.getId());
-        });
-
-        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);
-            }
-        });
-
-        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());
-    }
-
-}
@@ -1,21 +1,43 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.pdfbox.text.TextPosition;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+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.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
+import com.iqser.red.service.redaction.v1.model.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
+import com.iqser.red.service.redaction.v1.model.Status;
+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.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.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
+import 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 java.util.*;
-import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
@@ -24,62 +46,88 @@ public class RedactionLogCreatorService {
    private final DictionaryService dictionaryService;


-    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages, String dossierTemplateId) {
+    public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions,
+                                   String ruleSetId) {

-        List<RedactionLogEntry> entries = new ArrayList<>();
+        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);

        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(), manualRedactions, page, ruleSetId));
            }

-            if (pageEntities.getImagesPerPage().get(page) != null) {
-                entries.addAll(addImageEntries(pageEntities.getImagesPerPage(), page, dossierTemplateId));
+            if (manualRedactionPages.contains(page)) {
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, ruleSetId));
+            }
+
+            if (!classifiedDoc.getPages().get(page - 1).getImages().isEmpty()) {
+                addImageEntries(classifiedDoc, page, ruleSetId);
            }
        }
-
-        return entries;
    }


-    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, int pageNumber,
-                                                   String dossierTemplateId) {
-
-        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
-
-        for (Image image : images.get(pageNumber)) {
-
-            String id = IdBuilder.buildId(image.getPosition(), pageNumber);
+    private void addImageEntries(Document classifiedDoc, int pageNumber, String ruleSetId) {

+        for (PdfImage image : classifiedDoc.getPages().get(pageNumber - 1).getImages()) {
            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
-                    .id(id)
-                    .color(getColor(image.getType(), dossierTemplateId, image.isRedaction()))
+                    .id(IdBuilder.buildId(image.getPosition(), pageNumber))
+                    .color(getColor(image.getImageType().name().toLowerCase(Locale.ROOT), ruleSetId))
                    .isImage(true)
-                    .type(image.getType())
-                    .redacted(image.isRedaction())
-                    .reason(image.getRedactionReason())
-                    .legalBasis(image.getLegalBasis())
-                    .matchedRule(image.getMatchedRule())
-                    .isHint(dictionaryService.isHint(image.getType(), dossierTemplateId))
+                    .type(image.getImageType().equals(ImageType.OTHER) ? "image" : image.getImageType().name().toLowerCase(Locale.ROOT))
+                    .redacted(isImageRedactionType(image.getImageType()))
+                    .isHint(!isImageRedactionType(image.getImageType()))
                    .manual(false)
                    .isDictionaryEntry(false)
                    .isRecommendation(false)
                    .positions(List.of(new Rectangle(new Point((float) image.getPosition()
                            .getX(), (float) image.getPosition().getY()), (float) image.getPosition()
                            .getWidth(), (float) image.getPosition().getHeight(), pageNumber)))
-                    .sectionNumber(image.getSectionNumber())
-                    .section(image.getSection())
-                    .imageHasTransparency(image.isHasTransparency())
                    .build();
-
-            redactionLogEntities.add(redactionLogEntry);
+            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
        }
-
-        return redactionLogEntities;
    }


-    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, int page, String dossierTemplateId) {
+    private boolean isImageRedactionType(ImageType imageType) {
+
+        if (imageType.equals(ImageType.LOGO)) {
+            return true;
+        }
+        if (imageType.equals(ImageType.FORMULA)) {
+            return true;
+        }
+        if (imageType.equals(ImageType.SIGNATURE)) {
+            return true;
+        }
+        return false;
+    }
+
+
+    private Set<Integer> getManualRedactionPages(ManualRedactions manualRedactions) {
+
+        Set<Integer> manualRedactionPages = new HashSet<>();
+
+        if (manualRedactions == null) {
+            return manualRedactionPages;
+        }
+
+        manualRedactions.getEntriesToAdd().forEach(entry -> {
+            entry.getPositions().forEach(pos -> {
+                manualRedactionPages.add(pos.getPage());
+            });
+        });
+        return manualRedactionPages;
+    }
+
+
+    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, ManualRedactions manualRedactions,
+                                              int page, String ruleSetId) {

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

@@ -89,9 +137,11 @@ public class RedactionLogCreatorService {
        entityLoop:
        for (Entity entity : entities.get(page)) {

+            List<Comment> comments = null;
+
            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {

-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity, dossierTemplateId);
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity, ruleSetId);
                if (processedIds.contains(entityPositionSequence.getId())) {

                    // TODO refactor this outer loop jump as soon as we have the time.
@@ -100,7 +150,60 @@ public class RedactionLogCreatorService {
                    processedIds.add(entityPositionSequence.getId());
                }

-                redactionLogEntry.setId(entityPositionSequence.getId());
+                if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
+                    for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
+                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
+                            comments = manualRedactions.getComments().get(manualRemoval.getId());
+                            String manualOverrideReason = null;
+                            if (manualRemoval.getStatus().equals(Status.APPROVED)) {
+                                entity.setRedaction(false);
+                                redactionLogEntry.setRedacted(false);
+                                redactionLogEntry.setStatus(Status.APPROVED);
+                                manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, false));
+                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
+                                redactionLogEntry.setStatus(Status.REQUESTED);
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, true));
+                            } else {
+                                redactionLogEntry.setStatus(Status.DECLINED);
+                            }
+
+                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
+                            redactionLogEntry.setReason(manualOverrideReason);
+                            redactionLogEntry.setManual(true);
+                            redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
+                        }
+                    }
+                }
+
+                if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
+                    for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
+                        if (manualForceRedact.getId().equals(entityPositionSequence.getId())) {
+                            String manualOverrideReason = null;
+                            if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
+                                entity.setRedaction(true);
+                                redactionLogEntry.setRedacted(true);
+                                redactionLogEntry.setStatus(Status.APPROVED);
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, false));
+                                manualOverrideReason = entity.getRedactionReason() + ", forced by manual override";
+                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                            } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
+                                manualOverrideReason = entity.getRedactionReason() + ", requested to force redact";
+                                redactionLogEntry.setStatus(Status.REQUESTED);
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, true));
+                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                            } else {
+                                redactionLogEntry.setStatus(Status.DECLINED);
+                            }
+
+                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
+                            redactionLogEntry.setReason(manualOverrideReason);
+                            redactionLogEntry.setManual(true);
+                            redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
+                        }
+                    }
+                }

                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
@@ -108,10 +211,17 @@ public class RedactionLogCreatorService {
                            .flatMap(seq -> seq.getTextPositions().stream())
                            .collect(Collectors.toList()), page);

+                    if (manualRedactions != null) {
+                        comments = manualRedactions.getComments().get(entityPositionSequence.getId());
+                    }
+
+                    redactionLogEntry.setComments(comments);
                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);

                }

+                redactionLogEntry.setId(entityPositionSequence.getId());
+
                // FIXME ids should never be null. Figure out why this happens.
                if (redactionLogEntry.getId() != null) {
                    redactionLogEntities.add(redactionLogEntry);
@@ -123,26 +233,24 @@ public class RedactionLogCreatorService {
    }


-    private List<Rectangle> getRectanglesPerLine(List<RedTextPosition> textPositions, int page) {
+    private List<Rectangle> getRectanglesPerLine(List<TextPosition> textPositions, int page) {

        List<Rectangle> rectangles = new ArrayList<>();
        if (textPositions.size() == 1) {
-            rectangles.add(TextPositionSequence.fromData(textPositions, page).getRectangle());
+            rectangles.add(new TextPositionSequence(textPositions, page).getRectangle());
        } else {
            float y = textPositions.get(0).getYDirAdj();
            int startIndex = 0;
            for (int i = 1; i < textPositions.size(); i++) {
                float yDirAdj = textPositions.get(i).getYDirAdj();
                if (yDirAdj != y) {
-                    rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, i), page)
-                            .getRectangle());
+                    rectangles.add(new TextPositionSequence(textPositions.subList(startIndex, i), page).getRectangle());
                    y = yDirAdj;
                    startIndex = i;
                }
            }
            if (startIndex != textPositions.size()) {
-                rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page)
-                        .getRectangle());
+                rectangles.add(new TextPositionSequence(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
            }
        }

@@ -150,20 +258,79 @@ public class RedactionLogCreatorService {
    }


-    private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {
+    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
+                                                       Map<String, List<Comment>> comments, int page,
+                                                       String ruleSetId) {

-        Set<String> referenceIds = new HashSet<>();
-        entity.getReferences().forEach(ref -> ref.getPositionSequences().forEach(pos -> referenceIds.add(pos.getId())));
+        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
+
+        if (manualAdds == null) {
+            return redactionLogEntities;
+        }
+
+        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
+
+            String id = manualRedactionEntry.getId();
+
+            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id, ruleSetId);
+
+            List<Rectangle> rectanglesOnPage = new ArrayList<>();
+            for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
+                if (page == rectangle.getPage()) {
+                    rectanglesOnPage.add(rectangle);
+                    redactionLogEntry.getPositions().add(rectangle);
+                }
+            }
+
+            redactionLogEntry.setComments(comments.get(id));
+            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
+                redactionLogEntities.add(redactionLogEntry);
+            }
+        }
+
+        return redactionLogEntities;
+    }
+
+
+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary();
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
+                                                      String ruleSetId) {

        return RedactionLogEntry.builder()
-                .color(getColor(entity.getType(), dossierTemplateId, entity.isRedaction()))
+                .id(id)
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), ruleSetId, manualRedactionEntry.getStatus()))
+                .reason(manualRedactionEntry.getReason())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
+                .value(manualRedactionEntry.getValue())
+                .type(manualRedactionEntry.getType())
+                .redacted(true)
+                .isHint(false)
+                .section(manualRedactionEntry.getSection())
+                .sectionNumber(manualRedactionEntry.getSectionNumber())
+                .manual(true)
+                .status(manualRedactionEntry.getStatus())
+                .manualRedactionType(ManualRedactionType.ADD)
+                .isDictionaryEntry(false)
+                .build();
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(Entity entity, String ruleSetId) {
+
+        return RedactionLogEntry.builder()
+                .color(getColor(entity, ruleSetId, false))
                .reason(entity.getRedactionReason())
                .legalBasis(entity.getLegalBasis())
                .value(entity.getWord())
                .type(entity.getType())
                .redacted(entity.isRedaction())
-                .isHint(isHint(entity.getType(), dossierTemplateId))
-                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
+                .isHint(isHint(entity, ruleSetId))
+                .isRecommendation(isRecommendation(entity, ruleSetId))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
@@ -172,32 +339,92 @@ public class RedactionLogCreatorService {
                .textBefore(entity.getTextBefore())
                .startOffset(entity.getStart())
                .endOffset(entity.getEnd())
-                .isDossierDictionaryEntry(entity.isDossierDictionaryEntry())
-                .engines(entity.getEngines())
-                .reference(referenceIds)
                .build();
    }


-    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction) {
+    private float[] getColor(Entity entity, String ruleSetId, boolean requestedToRemove) {

-        if (!isRedaction && !isHint(type, dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        if (requestedToRemove) {
+            return dictionaryService.getRequestRemoveColor(ruleSetId);
        }
-        return dictionaryService.getColor(type, dossierTemplateId);
+        if (!entity.isRedaction() && !isHint(entity, ruleSetId)) {
+            return dictionaryService.getNotRedactedColor(ruleSetId);
+        }
+        return dictionaryService.getColor(entity.getType(), ruleSetId);
    }


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

-        return dictionaryService.isHint(type, dossierTemplateId);
+        if (status.equals(Status.REQUESTED)) {
+            return dictionaryService.getRequestAddColor(ruleSetId);
+        } else if (status.equals(Status.DECLINED)) {
+            return dictionaryService.getNotRedactedColor(ruleSetId);
+        }
+        return getColor(type, ruleSetId);
    }


-    private boolean isRecommendation(String type, String dossierTemplateId) {
+    private float[] getColor(String type, String ruleSetId) {

-        return dictionaryService.isRecommendation(type, dossierTemplateId);
+        return dictionaryService.getColor(type, ruleSetId);
    }


+    private boolean isHint(Entity entity, String ruleSetId) {
+
+        return dictionaryService.isHint(entity.getType(), ruleSetId);
+    }
+
+
+    private boolean isRecommendation(Entity entity, String ruleSetId) {
+
+        return dictionaryService.isRecommendation(entity.getType(), ruleSetId);
+    }
+
+
+    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,329 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-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.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.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class RedactionLogMergeService {
-
-    private final DictionaryService dictionaryService;
-
-
-    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId,
-                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {
-
-        log.info("Merging Redaction log with manual redactions");
-        if (manualRedactions != null) {
-
-            var manualRedactionLogEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
-
-            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
-
-            var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions);
-
-            for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-
-                processRedactionLogEntry(manualRedactionWrappers.stream()
-                        .filter(mr -> entry.getId().equals(mr.getId()))
-                        .collect(Collectors.toList()), dossierTemplateId, entry);
-
-                entry.setComments(manualRedactions.getComments().get(entry.getId()));
-
-                if (excludedPages != null && !excludedPages.isEmpty()) {
-                    entry.getPositions().forEach(pos -> {
-                        if (excludedPages.contains(pos.getPage())) {
-                            entry.setExcluded(true);
-                        }
-                    });
-                }
-            }
-
-        }
-
-        return redactionLog;
-    }
-
-
-    private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {
-
-        List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
-
-        manualRedactions.getImageRecategorization().forEach(item -> {
-            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
-            }
-        });
-
-        manualRedactions.getIdsToRemove().forEach(item -> {
-            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
-            }
-        });
-
-        manualRedactions.getForceRedactions().forEach(item -> {
-            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
-            }
-        });
-
-        manualRedactions.getLegalBasisChanges().forEach(item -> {
-            if (item.getSoftDeletedTime() == null) {
-                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
-            }
-        });
-
-        Collections.sort(manualRedactionWrappers);
-
-        return manualRedactionWrappers;
-    }
-
-
-    private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers,
-                                          String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
-
-        manualRedactionWrappers.forEach(mrw -> {
-
-            if (mrw.getItem() instanceof ManualImageRecategorization) {
-                var imageRecategorization = (ManualImageRecategorization) mrw.getItem();
-                String manualOverrideReason = null;
-                if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
-                    redactionLogEntry.setType(imageRecategorization.getType());
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
-                } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) {
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
-                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
-                            .isRedacted(), false));
-                    redactionLogEntry.setRecategorizationType(imageRecategorization.getType());
-                } else {
-                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
-                }
-
-                redactionLogEntry.setManualRedactionUserId(imageRecategorization.getUser());
-                redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.setManual(true);
-                redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
-            }
-
-            if (mrw.getItem() instanceof IdRemoval) {
-                var manualRemoval = (IdRemoval) mrw.getItem();
-                String manualOverrideReason = null;
-                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    redactionLogEntry.setRedacted(false);
-                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
-                            .isRedacted(), true));
-                } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
-                            .isRedacted(), false));
-                } else {
-                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
-                }
-
-                redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.setManual(true);
-                redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
-                redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-            }
-
-            if (mrw.getItem() instanceof ManualForceRedaction) {
-                var manualForceRedact = (ManualForceRedaction) mrw.getItem();
-                String manualOverrideReason = null;
-                if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    redactionLogEntry.setRedacted(true);
-                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
-                            .isRedacted(), false));
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
-                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                } else if (manualForceRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
-                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
-                            .isRedacted(), false));
-                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                } else {
-                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
-                }
-
-                redactionLogEntry.setManualRedactionUserId(manualForceRedact.getUser());
-                redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.setManual(true);
-                redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-
-            }
-
-            if (mrw.getItem() instanceof ManualLegalBasisChange) {
-                var manualLegalBasisChange = (ManualLegalBasisChange) mrw.getItem();
-                String manualOverrideReason = null;
-                if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
-                    redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
-                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
-                            .isRedacted(), false));
-                    redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
-                } else {
-                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
-                }
-
-                redactionLogEntry.setManualRedactionUserId(manualLegalBasisChange.getUser());
-                redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.setManual(true);
-                redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
-            }
-
-        });
-
-    }
-
-
-    private String mergeReasonIfNecessary(String currentReason, String addition) {
-
-        if (currentReason != null) {
-            if (!currentReason.contains(addition)) {
-                return currentReason + addition;
-            }
-            return currentReason;
-        } else {
-            return "";
-        }
-    }
-
-
-    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {
-
-        List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
-
-        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()));
-                redactionLogEntries.add(redactionLogEntry);
-            }
-        }
-
-        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());
-    }
-
-
-    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      String dossierTemplateId) {
-
-        return RedactionLogEntry.builder()
-                .id(id)
-                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
-                .reason(manualRedactionEntry.getReason())
-                .isDictionaryEntry(manualRedactionEntry.isAddToDictionary())
-                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
-                .legalBasis(manualRedactionEntry.getLegalBasis())
-                .value(manualRedactionEntry.getValue())
-                .type(manualRedactionEntry.getType())
-                .redacted(true)
-                .isHint(false)
-                .section(null)
-                .sectionNumber(-1)
-                .manual(true)
-                .status(manualRedactionEntry.getStatus())
-                .manualRedactionType(ManualRedactionType.ADD)
-                .manualRedactionUserId(manualRedactionEntry.getUser())
-                .build();
-    }
-
-
-    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
-                             boolean skipped) {
-
-        if (requested) {
-            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
-        }
-        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return dictionaryService.getColor(type, dossierTemplateId);
-    }
-
-
-    private float[] getColorForManualAdd(String type, String dossierTemplateId, AnnotationStatus status) {
-
-        if (status.equals(AnnotationStatus.REQUESTED)) {
-            return dictionaryService.getRequestAddColor(dossierTemplateId);
-        } else if (status.equals(AnnotationStatus.DECLINED)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return getColor(type, dossierTemplateId);
-    }
-
-
-    private float[] getColor(String type, String dossierTemplateId) {
-
-        return dictionaryService.getColor(type, dossierTemplateId);
-    }
-
-
-    @Data
-    @AllArgsConstructor
-    private static class ManualRedactionWrapper implements Comparable<ManualRedactionWrapper> {
-
-        private String id;
-        private OffsetDateTime date;
-        private Object item;
-
-
-        @Override
-        public int compareTo(ManualRedactionWrapper o) {
-
-            return this.date.compareTo(o.date);
-        }
-
-    }
-
-
-}
-
--- a/Show More
+++ b/Show More