RED-2575: Fixed annotating entries on pages with cropbox != mediabox

Pull request #256 : RED-2429: As a user I want to resize a redaction
Merge in RED/redaction-service from RED-2429-rs1 to master * commit 'd8f8702b2a78e7a3bc12e55791c251f3445d5b5e': RED-2429: As a user I want to resize a redaction
2021-10-26 13:51:47 +02:00 · 2021-10-22 12:23:54 +02:00 · 2021-10-22 12:05:31 +02:00 · 2021-10-22 11:05:38 +02:00 · 2021-10-22 10:33:42 +02:00 · 2021-10-19 15:38:44 +02:00
160 changed files with 7911 additions and 3232 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.atlassian.bamboo</groupId>
    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.1.2</version>
+    <version>7.2.2</version>
    <relativePath/>
  </parent>

@@ -1,7 +1,5 @@
 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;
@@ -23,6 +21,10 @@ 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.
@@ -33,6 +35,8 @@ 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("-", "");

    /**
@@ -51,7 +55,8 @@ 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("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                .loggedInUserPermissions(PermissionType.VIEW)
                .anonymousUserPermissionView();
        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
@@ -72,14 +77,6 @@ public class PlanSpec {
                        .jobs(new Job("Default Job",
                                new BambooKey("JOB1"))
                                .tasks(
-                                        new ScriptTask()
-                                                .description("Clean")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +
-                                                        "rm -rf ./*"),
-                                        new VcsCheckoutTask()
-                                                .description("Checkout Default Repository")
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
                                        new ScriptTask()
                                                .description("Clean")
                                                .inlineBody("#!/bin/bash\n" +
@@ -90,24 +87,18 @@ public class PlanSpec {
                                                .checkoutItems(new CheckoutItem().defaultRepository()),
                                        new ScriptTask()
                                                .description("Build")
-                                                .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"),
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
+                                                .argument(SERVICE_NAME),
                                        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")
@@ -0,0 +1,51 @@
+#!/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
@@ -0,0 +1,42 @@
+#!/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.0.0</version>
+        <version>1.1.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

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

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

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

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


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

    </dependencyManagement>

-</project>
+    <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>
@@ -17,5 +17,10 @@
            <artifactId>spring-web</artifactId>
            <optional>true</optional>
        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>persistence-service-api-v1</artifactId>
+            <version>0.77.0</version>
+        </dependency>
    </dependencies>
 </project>
@@ -0,0 +1,38 @@
+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 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<>();
+
+}
+
@@ -0,0 +1,30 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class 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;
+
+
+}
+
@@ -0,0 +1,20 @@
+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;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AnnotateRequest {
+
+    private String dossierId;
+    private String dossierTemplateId;
+    private String fileId;
+    private ManualRedactions manualRedactions;
+}
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AnnotateResponse {
+
+    private byte[] document;
+}
@@ -0,0 +1,15 @@
+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;
+
+}
@@ -0,0 +1,7 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ArgumentType {
+
+    INTEGER, BOOLEAN, STRING, FILE_ATTRIBUTE, REGEX, TYPE, RULE_NUMBER, LEGAL_BASIS, REFERENCE_TYPE
+
+}
@@ -11,11 +11,8 @@ import lombok.NoArgsConstructor;
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class Comment {
-
-    private String id;
-    private OffsetDateTime date;
-    private String text;
-    private String user;
+public class Change {

+    private ChangeType type;
+    private OffsetDateTime dateTime;
 }
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ChangeType {
+    ADDED, REMOVED, CHANGED
+}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Engine {
+    DICTIONARY, NER, RULE
+}
@@ -7,13 +7,13 @@ import lombok.NoArgsConstructor;

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

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

-}
+}
@@ -1,30 +0,0 @@
-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
+    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE, RESIZE
 }
@@ -1,29 +0,0 @@
-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<ManualRedactionEntry> entriesToAdd = new HashSet<>();
-
-    @Builder.Default
-    private Map<String, List<Comment>> comments = new HashMap<>();
-
-}
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReanalyzeResult {
+
+    private RedactionLog redactionLog;
+}
@@ -1,29 +1,29 @@
 package com.iqser.red.service.redaction.v1.model;

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

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

@Data
@AllArgsConstructor
-@NoArgsConstructor
 public class RedactionLog {

-    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion) {

-        this.redactionLogEntry = redactionLogEntry;
-        this.dictionaryVersion = dictionaryVersion;
-        this.rulesVersion = rulesVersion;
-    }
+    /**
+     * 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 String filename;
+    private long legalBasisVersion = -1;

 }
@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class RedactionLogChanges {
+
+    private RedactionLog redactionLog;
+    private boolean hasChanges;
+
+}
@@ -1,17 +1,24 @@
 package com.iqser.red.service.redaction.v1.model;

-import java.util.ArrayList;
-import java.util.List;
-
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+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;
@@ -30,11 +37,38 @@ public class RedactionLogEntry {
    private List<Rectangle> positions = new ArrayList<>();
    private int sectionNumber;
    private boolean manual;
-    private Status status;
+    private AnnotationStatus status;
    private ManualRedactionType manualRedactionType;
+    private String manualRedactionUserId;
    private boolean isDictionaryEntry;

    private String textBefore;
    private String textAfter;

+    @Builder.Default
+    private List<Comment> comments = new ArrayList<>();
+
+    private int startOffset;
+    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,5 +1,10 @@
 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;
@@ -11,7 +16,10 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class RedactionRequest {

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

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

 }
@@ -0,0 +1,14 @@
+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<>();
+
+}
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RuleElement {
+
+    private String conditionName;
+    private List<Argument> arguments = new ArrayList<>();
+
+}
@@ -0,0 +1,33 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
+public class SectionArea {
+
+    @NonNull
+    private Point topLeft;
+
+    @NonNull
+    private float width;
+
+    @NonNull
+    private float height;
+
+    @NonNull
+    private int page;
+
+    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();
+    }
+
+}
@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;

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

+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
@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,4 +30,5 @@ public class SectionRectangle {
    private int numberOfParts;

    private List<CellRectangle> tableCells;
+
 }
@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum Status {
-    REQUESTED, APPROVED, DECLINED
-}
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StructureAnalyzeRequest {
+
+    private String dossierId;
+    private String fileId;
+
+}
+
@@ -1,18 +1,15 @@
 package com.iqser.red.service.redaction.v1.resources;

+import com.iqser.red.service.redaction.v1.model.*;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-
 public interface RedactionResource {

-    String SERVICE_NAME = "redaction-service-v1";
-
-    @PostMapping(value = "/redact", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult redact(@RequestBody RedactionRequest redactionRequest);
+    @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);

    @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult classify(@RequestBody RedactionRequest redactionRequest);
@@ -23,7 +20,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", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRules(@RequestBody String rules);
+    @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);
+
+}
@@ -0,0 +1,12 @@
+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,25 +12,24 @@
    <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>1.3.7</version>
-        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
            <artifactId>drools-core</artifactId>
-            <version>7.37.0.Final</version>
+            <version>7.59.0.Final</version>
        </dependency>
        <dependency>
            <groupId>org.kie</groupId>
            <artifactId>kie-spring</artifactId>
-            <version>7.37.0.Final</version>
+            <version>7.59.0.Final</version>
        </dependency>
        <dependency>
            <groupId>org.locationtech.jts</groupId>
@@ -40,8 +39,24 @@
        <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>
@@ -56,10 +71,6 @@
            <artifactId>metric-commons</artifactId>
        </dependency>
        <!-- other external -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox</artifactId>
@@ -73,11 +84,12 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
-        <!-- ribbon must be included because transitive a dependency on it.-->
+
        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
        </dependency>
+
        <!-- test dependencies -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -1,71 +1,26 @@
 package com.iqser.red.service.redaction.v1.server;

-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.KieModule;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.beans.factory.annotation.Autowired;
+import 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.metrics.web.servlet.WebMvcMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;

-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-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.settings.RedactionServiceSettings;
-
@Import({DefaultWebMvcConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@EnableConfigurationProperties(RedactionServiceSettings.class)
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class, WebMvcMetricsAutoConfiguration.class})
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
 public class Application {

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


-    @Bean
-    public KieContainer kieContainer() {
-
-        try {
-            KieServices kieServices = KieServices.Factory.get();
-
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            RulesResponse rules = rulesClient.getRules();
-            if (StringUtils.isEmpty(rules.getRules())) {
-                throw new RuntimeException("Rules cannot be empty.");
-            }
-            InputStream input = new ByteArrayInputStream(rules.getRules().getBytes(StandardCharsets.UTF_8));
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources()
-                    .newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-
-            return kieServices.newKieContainer(kieModule.getReleaseId());
-        } catch (Exception e) {
-            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
-        }
-
-    }
-
-}
+}
@@ -1,13 +1,10 @@
 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.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;

 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,15 +15,17 @@ public class Document {

    private List<Page> pages = new ArrayList<>();
    private List<Paragraph> paragraphs = new ArrayList<>();
-    private Map<Integer, List<Entity>> entities = new HashMap<>();
+    private List<Header> headers = new ArrayList<>();
+    private List<Footer> footers = new ArrayList<>();
+    private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
    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 long dictionaryVersion;
+    private DictionaryVersion dictionaryVersion;
    private long rulesVersion;
+
 }
@@ -1,5 +1,7 @@
 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;
@@ -7,38 +9,35 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

-import lombok.Getter;
-
-public class FloatFrequencyCounter
-{
+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;
            }
        }
@@ -46,12 +45,11 @@ 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);
            }
        }
@@ -60,12 +58,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;
            }
        }
@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -0,0 +1,6 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+public enum Orientation {
+
+    NONE, LEFT, RIGHT
+}
@@ -1,14 +1,14 @@
 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 {
@@ -16,6 +16,8 @@ public class Page {
    @NonNull
    private List<AbstractTextContainer> textBlocks;

+    private List<PdfImage> images;
+
    private Rectangle bodyTextFrame;

    private boolean landscape;
@@ -28,8 +30,12 @@ public class Page {
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();

+    private double cropBoxArea;
+
+
    public boolean isRotated() {
+
        return rotation != 0;
    }

-}
+}
@@ -1,20 +1,21 @@
 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 {
+public class Paragraph implements Comparable {

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


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

-}
+
+    @Override
+    public int compareTo(Object o) {
+
+        return 0;
+    }
+
+}
@@ -0,0 +1,52 @@
+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;
    }

-}
+}
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+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,19 +1,21 @@
 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
@@ -30,6 +32,7 @@ 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;
@@ -98,7 +101,6 @@ public class TextBlock extends AbstractTextContainer {
    }


-
    @Override
    public String toString() {

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

    @Override
+    @JsonIgnore
    public String getText() {

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

    }

-}
+}
@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -1,15 +1,11 @@
 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;
@@ -17,11 +13,20 @@ 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 {

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

        List<TextPositionSequence> chunkWords = new ArrayList<>();
        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
@@ -29,21 +34,46 @@ 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 || 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();
+                }

                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;
@@ -73,9 +103,62 @@ 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) {

@@ -118,7 +201,8 @@ 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)) {
@@ -129,7 +213,8 @@ 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,19 +1,17 @@
 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
@@ -111,6 +109,8 @@ public class ClassificationService {
            textBlock.setClassification("TextBlock Italic");
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock)) {
            textBlock.setClassification("TextBlock Unknown");
+        } else {
+            textBlock.setClassification("Other");
        }
    }

@@ -2,7 +2,6 @@ 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
@@ -2,9 +2,8 @@ package com.iqser.red.service.redaction.v1.server.client;

 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
+import com.iqser.red.service.persistence.service.v1.api.resources.DictionaryResource;

-@FeignClient(name = "DictionaryResource", url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "DictionaryResource", url = "${persistence-service.url}")
 public interface DictionaryClient extends DictionaryResource {
 }
@@ -0,0 +1,19 @@
+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);
+}
@@ -0,0 +1,10 @@
+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 {
+}
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.multipart.MultipartFile;
+
+@FeignClient(name = "ImageClassificationResource", url = "${image-service.url}")
+public interface ImageClassificationClient {
+
+    @PostMapping(value = "/process_full_img", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    ImageClassificationResponse classify(@RequestBody MultipartFile file);
+
+}
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImageClassificationResponse {
+
+    private String category;
+}
@@ -0,0 +1,9 @@
+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 {
+}
@@ -0,0 +1,102 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+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;
+    private final String originalFilename;
+    @Nullable
+    private final String contentType;
+    private final byte[] content;
+
+
+    public MockMultipartFile(String name, @Nullable byte[] content) {
+
+        this(name, "", null, content);
+    }
+
+
+    public MockMultipartFile(String name, InputStream contentStream) throws IOException {
+
+        this(name, "", null, FileCopyUtils.copyToByteArray(contentStream));
+    }
+
+
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
+                             @Nullable byte[] content) {
+
+        Assert.hasLength(name, "Name must not be empty");
+        this.name = name;
+        this.originalFilename = originalFilename != null ? originalFilename : "";
+        this.contentType = contentType;
+        this.content = content != null ? content : new byte[0];
+    }
+
+
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
+                             InputStream contentStream) throws IOException {
+
+        this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
+    }
+
+
+    public String getName() {
+
+        return this.name;
+    }
+
+
+    @NonNull
+    public String getOriginalFilename() {
+
+        return this.originalFilename;
+    }
+
+
+    @Nullable
+    public String getContentType() {
+
+        return this.contentType;
+    }
+
+
+    public boolean isEmpty() {
+
+        return this.content.length == 0;
+    }
+
+
+    public long getSize() {
+
+        return this.content.length;
+    }
+
+
+    public byte[] getBytes() throws IOException {
+
+        return this.content;
+    }
+
+
+    public InputStream getInputStream() throws IOException {
+
+        return new ByteArrayInputStream(this.content);
+    }
+
+
+    public void transferTo(File dest) throws IOException, IllegalStateException {
+
+        FileCopyUtils.copy(this.content, dest);
+    }
+
+}
@@ -2,8 +2,8 @@ package com.iqser.red.service.redaction.v1.server.client;

 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
+import com.iqser.red.service.persistence.service.v1.api.resources.RulesResource;

-@FeignClient(name = RulesResource.SERVICE_NAME, url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "RulesResource", url = "${persistence-service.url}")
 public interface RulesClient extends RulesResource {
-}
+}
@@ -0,0 +1,19 @@
+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;
+
+}
@@ -0,0 +1,18 @@
+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;
+
+}
@@ -0,0 +1,20 @@
+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<>();
+}
@@ -0,0 +1,16 @@
+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;
+}
@@ -0,0 +1,21 @@
+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,17 +1,16 @@
 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.NotFoundException;
+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 com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-
-import lombok.extern.slf4j.Slf4j;
+import java.time.OffsetDateTime;

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

-}
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    @ExceptionHandler(value = NotFoundException.class)
+    public ErrorMessage handleFileNotFoundException(NotFoundException e) {
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+}
@@ -1,33 +1,30 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.resources.RedactionResource;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
+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.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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

-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.SectionGrid;
-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;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-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.AnnotationHighlightService;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;

@Slf4j
@RestController
@@ -35,128 +32,151 @@ import lombok.extern.slf4j.Slf4j;
 public class RedactionController implements RedactionResource {

    private final PdfVisualisationService pdfVisualisationService;
-    private final PdfSegmentationService pdfSegmentationService;
-    private final AnnotationHighlightService annotationHighlightService;
-    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;
+
+    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
+
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
+        var mergedRedactionLog = getRedactionLog(RedactionRequest.builder().fileId(annotateRequest.getFileId()).manualRedactions(annotateRequest.getManualRedactions()).dossierId(annotateRequest.getDossierId()).dossierTemplateId(annotateRequest.getDossierTemplateId()).build());
+        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());
+
+        try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
+            pdDocument.setAllSecurityToBeRemoved(true);
+
+            dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId());
+            annotationService.annotate(pdDocument, mergedRedactionLog, sectionsGrid);
+
+            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+                pdDocument.save(byteArrayOutputStream);
+                return AnnotateResponse.builder().document(byteArrayOutputStream.toByteArray()).build();
+            }
+
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+    }


    @Override
-    public RedactionResult redact(@RequestBody RedactionRequest redactionRequest) {
+    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);

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

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

-            log.info("Document structure analysis successful, starting redaction analysis...");
+                return convert(pdDocument, classifiedDoc.getPages().size());

-            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getManualRedactions());
-            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest
-                    .getManualRedactions());
-
-            log.info("Redaction analysis successful...");
-
-            return convert(pdDocument, classifiedDoc.getPages()
-                    .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid(), classifiedDoc.getDictionaryVersion(), classifiedDoc.getRulesVersion());
+            } catch (IOException e) {
+                throw new RedactionException(e);
+            }

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

-    }
-
-
-    @Override
-    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {
-
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(pdfSegmentationRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
-
-            return convert(pdDocument, classifiedDoc.getPages().size());
-
-        } 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);

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

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

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

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

+
    }


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

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

-            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) {
+        try {
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
+        } catch (Exception 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(@RequestBody String rules) {
+    public void testRules(@RequestBody String rules) {

-        droolsExecutionService.updateRules(rules);
+        droolsExecutionService.testRules(rules);
    }

+    @Override
+    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {
+
+        log.info("Requested preview for: {}", redactionRequest);
+        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
+
+        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());
+        }
+    }

    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {

-        return convert(document, numberOfPages, null, null, 0, 0);
-    }
-
-
-    private RedactionResult convert(PDDocument document, int numberOfPages,
-                                    List<RedactionLogEntry> redactionLogEntities,
-                                    SectionGrid sectionGrid, long dictionaryVersion, long rulesVersion) throws IOException {
-
        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
            return RedactionResult.builder()
                    .document(byteArrayOutputStream.toByteArray())
                    .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities,dictionaryVersion, rulesVersion))
-                    .sectionGrid(sectionGrid)
                    .build();
        }

    }

+
 }
@@ -0,0 +1,21 @@
+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();
+    }
+
+}
@@ -0,0 +1,9 @@
+package com.iqser.red.service.redaction.v1.server.exception;
+
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException(String message) {
+        super(message);
+    }
+
+}
@@ -0,0 +1,52 @@
+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();
+    }
+}
@@ -0,0 +1,92 @@
+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;
+
+public class PDFAreaTextStripper extends PDFTextStripperByArea {
+
+    @Getter
+    private List<TextPositionSequence> textPositionSequences = new ArrayList<>();
+
+    @Setter
+    private int pageNumber;
+
+    public PDFAreaTextStripper() throws IOException {
+
+    }
+
+    @Override
+    public void writeString(String text, List<TextPosition> textPositions) throws IOException {
+
+        int startIndex = 0;
+        for (int i = 0; i <= textPositions.size() - 1; i++) {
+
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0"))) {
+                startIndex++;
+                continue;
+            }
+
+            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
+            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
+                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 (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) {
+                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 + 1;
+            }
+        }
+
+        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
+        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
+                .getUnicode()
+                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
+            sublist = sublist.subList(0, sublist.size() - 1);
+        }
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
+                .getUnicode()
+                .equals("\u00A0")))) {
+            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+        }
+        super.writeString(text);
+    }
+
+
+    public void clearPositions() {
+        textPositionSequences = new ArrayList<>();
+    }
+
+}
@@ -1,61 +1,55 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

-import java.awt.geom.Point2D;
-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.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.COSNumber;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.apache.pdfbox.text.TextPosition;
-
 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 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.text.SetFontAndSize;
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.graphics.PDXObject;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+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;

@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {

-    @Getter
-    private int maxCharWidths;
-
-    @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<>();
+    @Setter
+    protected PDPage pdpage;
+    @Getter
+    private int minCharWidth;
+    @Getter
+    private int maxCharWidth;
+    @Getter
+    private int minCharHeight;
+    @Getter
+    private int maxCharHeight;
+    @Getter
+    private List<PdfImage> images = new ArrayList<>();

    private float path_x;
    private float path_y;
@@ -63,7 +57,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    @Setter
    private int pageNumber;

+
    public PDFLinesTextStripper() throws IOException {
+
        super();
        this.addOperator(new SetStrokingColorSpace());
        this.addOperator(new SetNonStrokingColorSpace());
@@ -87,9 +83,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        this.addOperator(new SetLineWidth());
    }

+
    @Override
-    protected void processOperator(Operator operator, List<COSBase> arguments)
-            throws IOException {
+    protected void processOperator(Operator operator, List<COSBase> arguments) throws IOException {

        String operation = operator.getName();

@@ -110,9 +106,11 @@ public class PDFLinesTextStripper extends PDFTextStripper {

                    // The direction of vertical lines must always be from bottom to top for the table extraction algorithm.
                    if (pos.getY() > path_y) {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos
+                                .getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos.getX(), path_y)));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos
+                                .getX(), path_y)));
                    }

                    path_x = (float) pos.getX();
@@ -133,19 +131,25 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                    Point2D p2 = transformPosition(x + width, y + height);

                    // Horizontal lines
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2
+                            .getX(), (float) p1.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2
+                            .getX(), (float) p2.getY())));

                    // Vertical lines, direction must always be from bottom to top for the table extraction algorithm.
                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2
+                                .getX(), (float) p2.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2
+                                .getX(), (float) p1.getY())));
                    }
                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1.getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1
+                                .getX(), (float) p2.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1.getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1
+                                .getX(), (float) p1.getY())));
                    }
                }
                break;
@@ -168,12 +172,45 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            case OperatorName.ENDPATH:
                graphicsPath.clear();
                break;
+
+            case OperatorName.DRAW_OBJECT:
+                processImageOperation(arguments);
+                break;
+
        }

        super.processOperator(operator, arguments);
    }

+
+    protected void processImageOperation(List<COSBase> arguments) {
+
+        try {
+            COSName objectName = (COSName) arguments.get(0);
+            PDXObject xobject = getResources().getXObject(objectName);
+            if (xobject instanceof PDImageXObject) {
+                PDImageXObject image = (PDImageXObject)xobject;
+                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();
+
+                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
+
+                // Memory Hack - sofReference kills me
+                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);
+
+                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
+                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage().getColorModel().hasAlpha()));
+                }
+            }
+        } catch (Exception e) {
+            log.warn("Problem during image extraction: {}", e.getMessage());
+        }
+    }
+
+
+
+
    private float floatValue(COSBase value) {
+
        if (value instanceof COSNumber) {
            return ((COSNumber) value).floatValue();
        } else {
@@ -181,38 +218,56 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        }
    }

+
    private Point2D.Float transformPosition(float x, float y) {
+
        return super.transformedPoint(x, y);
    }

+
    private void addVisibleRulings(List<Ruling> path, boolean stroke) throws IOException {

        try {
-            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor().toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor().isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
+            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor()
+                    .toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor()
+                    .isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
                rulings.addAll(path);
            }
        } catch (UnsupportedOperationException e) {
-            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor().getColorSpace().getName() + " or " + getGraphicsState().getNonStrokingColor().getColorSpace().getName() + " does not support toRGB");
+            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor()
+                    .getColorSpace()
+                    .getName() + " or " + getGraphicsState().getNonStrokingColor()
+                    .getColorSpace()
+                    .getName() + " does not support toRGB");
        }
    }

+
    @Override
    public void writeString(String text, List<TextPosition> textPositions) throws IOException {

        int startIndex = 0;
        for (int i = 0; i <= textPositions.size() - 1; i++) {

+            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
+            if (charWidth < minCharWidth) {
+                minCharWidth = charWidth;
+            }
+            if (charWidth > maxCharWidth) {
+                maxCharWidth = charWidth;
+            }
+
            int charHeight = (int) textPositions.get(i).getHeightDir();
-            if(charHeight > maxCharHeight){
+            if (charHeight < minCharHeight) {
+                minCharHeight = charHeight;
+            }
+            if (charWidth > maxCharHeight) {
                maxCharHeight = charHeight;
            }

-            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
-            if(charWidth > maxCharWidths){
-                maxCharWidths = charWidth;
-            }
-
-            if (i == 0 && textPositions.get(i).getUnicode().equals(" ")) {
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0"))) {
                startIndex++;
                continue;
            }
@@ -220,15 +275,33 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+                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(" ") && i <= textPositions.size() - 2) {
+
+            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(" "))) {
+                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) {
+                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 + 1;
@@ -236,22 +309,29 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        }

        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
-        if (!sublist.isEmpty() && sublist.get(sublist.size() - 1).getUnicode().equals(" ")) {
+        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
+                .getUnicode()
+                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
            sublist = sublist.subList(0, sublist.size() - 1);
        }
-        if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
+                .getUnicode()
+                .equals("\u00A0")))) {
            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
        }
        super.writeString(text);
-
    }

+
    @Override
    public String getText(PDDocument doc) throws IOException {

-        maxCharWidths = 0;
-        maxCharWidths = 0;
+        minCharWidth = Integer.MAX_VALUE;
+        maxCharWidth = 0;
+        minCharHeight = Integer.MAX_VALUE;
+        maxCharHeight = 0;
        textPositionSequences.clear();
+        images = new ArrayList<>();
        rulings.clear();
        graphicsPath.clear();
        path_x = 0.0f;
@@ -261,4 +341,4 @@ public class PDFLinesTextStripper extends PDFTextStripper {

    }

-}
+}
@@ -1,22 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class ParsedElements {
-
-    private List<TextPositionSequence> sequences;
-    private List<Ruling> rulings;
-
-    private boolean landscape;
-    private boolean rotated;
-
-    private float maxCharWidth;
-    private float maxCharHeight;
-}
@@ -0,0 +1,53 @@
+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;
+    private float widthDirAdj;
+
+    // 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,32 +1,54 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

+import static java.util.stream.Collectors.toSet;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.iqser.red.service.redaction.v1.model.Point;
+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 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;
+import java.util.stream.Collectors;

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

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

-    private final int page;
+    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;
+    }


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

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


+
+
+
    @Override
    public int length() {

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

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

    public char charAt(int index, boolean caseInSensitive) {

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

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


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


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

        return textPositions.get(index);
    }


-    public void add(TextPosition textPosition) {
+    public void add(RedTextPosition 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) {
@@ -91,6 +120,7 @@ public class TextPositionSequence implements CharSequence {
    }


+    @JsonIgnore
    public float getX2() {

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

+    @JsonIgnore
    public float getRotationAdjustedY() {
+
        return textPositions.get(0).getY();
    }

+
+    @JsonIgnore
    public float getY1() {

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


+    @JsonIgnore
    public float getY2() {

        if (textPositions.get(0).getRotation() == 90) {
@@ -125,38 +160,40 @@ 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)
-                .getFont()
-                .toString()
+        return textPositions.get(0).getFontName()
                .toLowerCase()
                .replaceAll(",bold", "")
                .replaceAll(",italic", "");
    }


+    @JsonIgnore
    public String getFontStyle() {

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

        if (lowercaseFontName.contains("bold") && lowercaseFontName.contains("italic")) {
            return "bold, italic";
@@ -170,25 +207,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();
@@ -202,7 +239,22 @@ public class TextPositionSequence implements CharSequence {
            posXEnd = textPositions.get(0).getYDirAdj() + 2;
            posYInit = getY1();
            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
-        } else {
+        } else if (textPositions.get(0).getRotation() == 270) {
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+        } else if(textPositions.get(0).getRotation() == 0 && textPositions.stream().map(t -> t.getY()).collect(toSet()).size() > 1) {
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+        }
+        else {
            posXEnd = textPositions.get(textPositions.size() - 1)
                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
@@ -213,5 +265,4 @@ public class TextPositionSequence implements CharSequence {
        return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
    }

-
-}
+}
@@ -0,0 +1,35 @@
+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();
+    }
+}
@@ -0,0 +1,69 @@
+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,22 +1,25 @@
 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 lombok.Value;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;

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

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

    private int rowSpanStart;

-
    @Override
    public String toString() {

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

-}
+}
@@ -1,12 +1,16 @@
 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 {
@@ -18,13 +22,21 @@ public class Dictionary {
    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();

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


-    public Dictionary(List<DictionaryModel> dictionaryModels, long dictionaryVersion){
+    public Dictionary(List<DictionaryModel> dictionaryModels, DictionaryVersion version) {
        this.dictionaryModels = dictionaryModels;
        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
-        this.version = dictionaryVersion;
+        this.version = version;
+    }
+
+
+    public int getDictionaryRank(String type) {
+        if (!localAccessMap.containsKey(type)) {
+            return 0;
+        }
+        return localAccessMap.get(type).getRank();
    }


@@ -52,18 +64,15 @@ public class Dictionary {

    public boolean containsValue(String type, String value) {

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


@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Set;
+
+@Data
+@AllArgsConstructor
+public class DictionaryIncrement {
+
+    private Set<DictionaryIncrementValue> values;
+    private DictionaryVersion dictionaryVersion;
+
+}
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class DictionaryIncrementValue {
+
+    private String value;
+    private boolean caseinsensitive;
+
+}
@@ -1,12 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;


-import java.io.Serializable;
-import java.util.Set;
-
+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;
+
+
@Data
@AllArgsConstructor
 public class DictionaryModel implements Serializable {
@@ -17,11 +20,13 @@ public class DictionaryModel implements Serializable {
    private boolean caseInsensitive;
    private boolean hint;
    private boolean recommendation;
-    private Set<String> entries;
+    private Set<DictionaryEntry> entries;
    private Set<String> localEntries;
+    private boolean isDossierDictionary;

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

 }
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class DictionaryRepresentation {
+
+    private String dossierTemplateId;
+    private long dictionaryVersion = -1;
+    private List<DictionaryModel> dictionary = new ArrayList<>();
+    private float[] defaultColor;
+    private float[] requestAddColor;
+    private float[] requestRemoveColor;
+    private float[] notRedactedColor;
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+
+}
@@ -0,0 +1,16 @@
+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,17 +1,19 @@
 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.model.Engine;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;

 import lombok.Data;
 import lombok.EqualsAndHashCode;

+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
@Data
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Entity {
-
+public class Entity implements ReasonHolder {

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

+    private boolean isDossierDictionaryEntry;

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

        this.word = word;
        this.type = type;
@@ -53,10 +64,16 @@ public class Entity {
        this.isDictionaryEntry = isDictionaryEntry;
        this.textBefore = textBefore;
        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) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber,
+                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine) {

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

+
 }
@@ -1,24 +1,23 @@
 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;

 }
@@ -0,0 +1,25 @@
+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;
+
+}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+public enum ImageType {
+    LOGO, FORMULA, SIGNATURE, OTHER, OCR
+}
@@ -0,0 +1,23 @@
+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<>();
+
+
+}
@@ -0,0 +1,33 @@
+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;
+
+@Data
+@RequiredArgsConstructor
+public class PdfImage {
+
+    @JsonIgnore
+    private BufferedImage image;
+    @NonNull
+    private RedRectangle2D 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,14 @@
+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);
+
+
+}
@@ -0,0 +1,42 @@
+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<>();
@@ -32,6 +32,7 @@ public class SearchableText {

    }

+
    @SuppressWarnings("checkstyle:ModifiedControlVariable")
    public List<EntityPositionSequence> getSequences(String searchString, boolean caseInsensitive,
                                                     List<TextPositionSequence> sequencesSubList) {
@@ -66,9 +67,12 @@ public class SearchableText {
            for (int j = 0; j < searchSpace.get(i).length(); j++) {

                if (i > 0 && j == 0 && searchSpace.get(i).charAt(0, caseInsensitive) == ' ' && searchSpace.get(i - 1)
-                        .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) == ' ' || j > 0 && searchSpace.get(i)
-                        .charAt(j, caseInsensitive) == ' ' && searchSpace.get(i).charAt(j - 1, caseInsensitive) == ' ') {
-                    if (j == searchSpace.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions().isEmpty()) {
+                        .charAt(searchSpace.get(i - 1)
+                                .length() - 1, caseInsensitive) == ' ' || j > 0 && searchSpace.get(i)
+                        .charAt(j, caseInsensitive) == ' ' && searchSpace.get(i)
+                        .charAt(j - 1, caseInsensitive) == ' ') {
+                    if (j == searchSpace.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions()
+                            .isEmpty()) {
                        crossSequenceParts.add(partMatch);
                    }
                    continue;
@@ -80,8 +84,8 @@ public class SearchableText {
                    counter++;
                }

-                if (searchSpace.get(i)
-                        .charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && searchSpace.get(i)
+                if (searchSpace.get(i).charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && searchSpace
+                        .get(i)
                        .charAt(j, caseInsensitive) == '-') {

                    if (counter != 0 || i == 0 && j == 0 || j != 0 && isSeparator(searchSpace.get(i)
@@ -100,14 +104,15 @@ public class SearchableText {
                    if (counter == searchString.length()) {
                        crossSequenceParts.add(partMatch);

-                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i).length() - 1 || j != searchSpace.get(i)
-                                .length() - 1 && isSeparator(searchSpace.get(i)
+                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i)
+                                .length() - 1 || j != searchSpace.get(i).length() - 1 && isSeparator(searchSpace.get(i)
                                .charAt(j + 1, caseInsensitive)) || j == searchSpace.get(i)
                                .length() - 1 && isSeparator(searchSpace.get(i + 1)
-                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i).length() - 1 && searchSpace.get(i)
+                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i)
+                                .length() - 1 && searchSpace.get(i)
                                .charAt(j, caseInsensitive) != ' ' && searchSpace.get(i + 1)
                                .charAt(0, caseInsensitive) != ' ') {
-                            finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts));
+                            finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts, normalizedSearchString));
                        }

                        counter = 0;
@@ -130,15 +135,21 @@ public class SearchableText {
        }

        return finalMatches;
-
    }


-    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts) {
+    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts,
+                                                                     String searchString) {
+
+        List<EntityPositionSequence> result = new ArrayList<>();
+        String asString = buildString(crossSequenceParts);
+        if (!asString.equalsIgnoreCase(searchString)) {
+            return result;
+        }

        String plainId = IdBuilder.buildId(crossSequenceParts);
        String id = plainId;
-        List<EntityPositionSequence> result = new ArrayList<>();
+
        int currentPage = -1;
        int idDiffentPageSuffix = 1;
        EntityPositionSequence entityPositionSequence = new EntityPositionSequence(id);
@@ -173,6 +184,12 @@ public class SearchableText {
    @Override
    public String toString() {

+        return buildString(sequences);
+    }
+
+
+    public String buildString(List<TextPositionSequence> sequences) {
+
        StringBuilder sb = new StringBuilder();

        TextPositionSequence previous = null;
@@ -215,4 +232,4 @@ public class SearchableText {
        return sb.append("\n").toString();
    }

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

-import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
-
-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.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.StringUtils;
-
+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 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.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;

@Data
@Slf4j
@@ -45,8 +48,56 @@ public class Section {

    private Map<String, CellValue> tabularData;

+    private Dictionary dictionary;

-    public boolean rowEquals(String headerName, String value) {
+    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) {

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

@@ -55,25 +106,88 @@ public class Section {
                .equals(value);
    }

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

-    public boolean matchesType(String type) {
+        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+        return tabularData != null && tabularData.containsKey(cleanHeaderName);
+    }
+
+    @WhenCondition
+    public boolean matchesType(@Argument(ArgumentType.TYPE) String type) {

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

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

-    public boolean headlineContainsWord(String word) {
+        return images.stream().anyMatch(image -> image.getType().equals(type));
+    }
+
+    @WhenCondition
+    public boolean headlineContainsWord(@Argument(ArgumentType.STRING) 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 redact(String type, int ruleNumber, String reason, String legalBasis) {
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

-        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+        Set<Entity> expanded = new HashSet<>();
+        for (Entity entity : entities) {
+
+            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
+                continue;
+            }
+
+            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
+
+            while (matcher.find()) {
+                String match = matcher.group(group);
+                if (StringUtils.isNotBlank(match)) {
+                    expanded.addAll(findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity
+                            .getRedactionReason(), entity.getLegalBasis()));
+
+                }
+            }
+        }
+
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
+        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) {
+
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
@@ -83,13 +197,29 @@ public class Section {
        });
    }

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

-    public void redactNot(String type, int ruleNumber, String reason) {
+        images.forEach(image -> {
+            if (image.getType().equals(type)) {
+                image.setRedaction(false);
+                image.setMatchedRule(ruleNumber);
+                image.setRedactionReason(reason);
+            }
+        });
+    }

-        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+    @ThenAction
+    public void redactNot(@Argument(ArgumentType.TYPE) String type,
+                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                          @Argument(ArgumentType.STRING) String reason) {
+
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(false);
                entity.setMatchedRule(ruleNumber);
@@ -99,7 +229,84 @@ public class Section {
    }


-    public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason, String legalBasis) {
+    @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) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Set<Entity> expanded = new HashSet<>();
+        for (Entity entity : entities) {
+
+            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
+                continue;
+            }
+
+            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
+
+            while (matcher.find()) {
+                String match = matcher.group(group);
+                if (StringUtils.isNotBlank(match)) {
+                    expanded.addAll(findEntities(entity.getWord() + match, asType, false, false, 0, null, null));
+                }
+            }
+        }
+
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
+        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) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match)) {
+                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null);
+                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+            }
+        }
+    }
+
+    @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) {

        entities.forEach(entity -> {
            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
@@ -111,76 +318,170 @@ 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);
-        entities.addAll(found);
+        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 redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, 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) {

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

        if (values != null) {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false);
-                    // HashSet keeps the older value, but we want the new only.
-                    entities.removeAll(found);
-                    entities.addAll(found);
-                }
-            }
-        }
+                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);

-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(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);
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false);
-                    // HashSet keeps the older value, but we want the new only.
-                    entities.removeAll(found);
-                    entities.addAll(found);
                    if (redactEverywhere && !isLocal()) {
                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
                    }
                }
            }
        }
-
-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
    }

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

-    public void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
-                                   String reason, String legalBasis) {
+        String[] values = StringUtils.substringsBetween(text, start, "\n");
+
+        if (values != null) {
+            for (String value : values) {
+
+                String trimmedValue = value.trim();
+                String cleanValue;
+                if (trimmedValue.startsWith(":")) {
+                    cleanValue = trimmedValue.substring(1).trim();
+                } else {
+                    cleanValue = trimmedValue;
+                }
+
+                if (StringUtils.isNotBlank(cleanValue) && cleanValue.length() >= 3) {
+                    localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>())
+                            .add(cleanValue);
+                }
+            }
+        }
+    }
+
+    @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) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match)) {
+                Set<Entity> found = findEntities(match.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+            }
+        }
+    }
+
+    @ThenAction
+    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                         @Argument(ArgumentType.INTEGER) int group,
+                                         @Argument(ArgumentType.TYPE) String asType) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(text);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
+                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
+            }
+        }
+    }
+
+    @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) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
+                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
+                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
+            }
+        }
+    }
+
+    @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) {
+
+        String[] values = StringUtils.substringsBetween(searchText, start, stop);
+
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+
+                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
+                    }
+                }
+            }
+        }
+    }
+
+    @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) {

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

@@ -195,11 +496,9 @@ public class Section {
                            return;
                        }

-                        Set<Entity> found = findEntities(line.trim(), asType, false);
+                        Set<Entity> found = findEntities(line.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);

-                        // HashSet keeps the older value, but we want the new only.
-                        entities.removeAll(found);
-                        entities.addAll(found);
                        if (redactEverywhere && !isLocal()) {
                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
                        }
@@ -207,85 +506,61 @@ public class Section {
                }
            }
        }
+    }

-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
+    @ThenAction
+    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.TYPE) 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) {
+
+        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) {
+
+        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) {
+
+        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);
+
+        found.forEach(entity -> {
+            if (redacted) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
                entity.setLegalBasis(legalBasis);
            }
        });
-    }

-
-    private Set<Entity> findEntities(String value, String asType, boolean caseinsensitive) {
-
-        if (value.trim().length() <= 2) {
-            return new HashSet<>();
-        }
-
-        Set<Entity> found = new HashSet<>();
-
-        String text = caseinsensitive ? searchText.toLowerCase() : searchText;
-        String searchValue = caseinsensitive ? value.toLowerCase() : value;
-
-        int startIndex;
-        int stopIndex = 0;
-        do {
-            startIndex = text.indexOf(searchValue, stopIndex);
-            stopIndex = startIndex + searchValue.length();
-
-            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(text.charAt(startIndex - 1)) || isSeparator(text
-                    .charAt(startIndex - 1))) && (stopIndex == text.length() || isSeparator(text.charAt(stopIndex)))) {
-                found.add(new Entity(searchText.substring(startIndex, stopIndex), asType, startIndex, stopIndex, headline, sectionNumber, false));
-            }
-        } while (startIndex > -1);
-
-        return removeEntitiesContainedInLarger(found);
-    }
-
-
-    private boolean isSeparator(char c) {
-
-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
-    }
-
-
-    public Set<Entity> removeEntitiesContainedInLarger(Set<Entity> entities) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        for (Entity word : entities) {
-            for (Entity inner : entities) {
-                if (inner.getWord().length() < word.getWord()
-                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner) {
-                    wordsToRemove.add(inner);
-                }
-            }
-        }
-        entities.removeAll(wordsToRemove);
-        return entities;
-    }
-
-
-    public void highlightCell(String cellHeader, int ruleNumber, String type) {
-
-        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
-    }
-
-
-    public void redactCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations, String reason,
-                           String legalBasis) {
-
-        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
-    }
-
-
-    public void redactNotCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations,
-                              String reason) {
-
-        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
+        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
    }


@@ -300,20 +575,24 @@ public class Section {
        } else {
            String word = value.toString();

-            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false);
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false, Engine.RULE);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
            entity.setTargetSequences(value.getTextBlocks()
-                    .get(0)
-                    .getSequences()); // Make sure no other cells with same content are highlighted
+                    .stream()
+                    .map(TextBlock::getSequences)
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toList())); // Make sure no other cells with same content are highlighted
            entity.setLegalBasis(legalBasis);

-            // HashSet keeps the older value, but we want the new only.
-            entities.remove(entity);
-            entities.add(entity);
+            Set<Entity> singleEntitySet = new HashSet<>();
+            singleEntitySet.add(entity);
+            EntitySearchUtils.clearAndFindPositions(singleEntitySet, searchableText, dictionary);

-            entities = removeEntitiesContainedInLarger(entities);
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, entity, dictionary);
+
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);

            if (addAsRecommendations && !isLocal()) {
                String cleanedWord = word.replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
@@ -334,6 +613,25 @@ 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;
+    }
+
 }


@@ -0,0 +1,36 @@
+package com.iqser.red.service.redaction.v1.server.redaction.rulebuilder;
+
+import com.iqser.red.service.redaction.v1.model.Argument;
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+import com.iqser.red.service.redaction.v1.model.RuleElement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class RuleBuilderModelService {
+
+    public RuleBuilderModel getRuleBuilderModel() {
+
+        var whenConditions = Arrays.stream(Section.class.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(Section.WhenCondition.class)).collect(Collectors.toList());
+        var thenActions = Arrays.stream(Section.class.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(Section.ThenAction.class)).collect(Collectors.toList());
+
+        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
+
+
+        ruleBuilderModel.setWhenClauses(whenConditions.stream().map(c -> new RuleElement(c.getName(), toArguments(c))).collect(Collectors.toList()));
+        ruleBuilderModel.setThenConditions(thenActions.stream().map(c -> new RuleElement(c.getName(), toArguments(c))).collect(Collectors.toList()));
+
+        return ruleBuilderModel;
+    }
+
+    private List<Argument> toArguments(Method c) {
+        return Arrays.stream(c.getParameters())
+                .map(parameter -> new Argument(parameter.getName(), parameter.getAnnotation(Section.Argument.class).value()))
+                .collect(Collectors.toList());
+    }
+}
@@ -0,0 +1,279 @@
+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);
+                }
+            }));
+        }
+    }
+
+}
@@ -0,0 +1,259 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
+import com.iqser.red.service.redaction.v1.model.*;
+import lombok.RequiredArgsConstructor;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+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;
+
+@Service
+@RequiredArgsConstructor
+public class AnnotationService {
+
+
+    public void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException {
+
+        Map<Integer, List<RedactionLogEntry>> redactionLogPerPage = convertRedactionLog(redactionLog);
+
+        for (int page = 1; page <= document.getNumberOfPages(); page++) {
+
+            PDPage pdPage = document.getPage(page - 1);
+
+            List<SectionRectangle> sectionRectangles = sectionGrid.getRectanglesPerPage().get(page);
+            if (sectionRectangles != null && !sectionRectangles.isEmpty()) {
+                drawSectionGrid(document, pdPage, sectionRectangles);
+            }
+
+            List<RedactionLogEntry> logEntries = redactionLogPerPage.get(page);
+            if (logEntries != null && !logEntries.isEmpty()) {
+                addAnnotations(logEntries, pdPage, page);
+            }
+        }
+    }
+
+
+    private void addAnnotations(List<RedactionLogEntry> logEntries, PDPage pdPage, int page) throws IOException {
+
+        List<PDAnnotation> annotations = pdPage.getAnnotations();
+
+        for (RedactionLogEntry entry : logEntries) {
+            annotations.addAll(createAnnotation(entry, page, pdPage.getMediaBox(), pdPage.getCropBox()));
+        }
+    }
+
+
+    private List<PDAnnotation> createAnnotation(RedactionLogEntry redactionLogEntry, int page, PDRectangle mediaBox,
+                                                PDRectangle cropBox) {
+
+        List<PDAnnotation> annotations = new ArrayList<>();
+
+        List<Rectangle> rectangles = redactionLogEntry.getPositions()
+                .stream()
+                .filter(pos -> pos.getPage() == page)
+                .collect(Collectors.toList());
+
+        if (rectangles.isEmpty()) {
+            return annotations;
+        }
+
+        PDAnnotationTextMarkup annotation = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
+        annotation.constructAppearances();
+        PDRectangle pdRectangle = toPDRectangle(rectangles, mediaBox, cropBox);
+        annotation.setRectangle(pdRectangle);
+        annotation.setQuadPoints(toQuadPoints(rectangles, mediaBox, cropBox));
+        if (!redactionLogEntry.isHint()) {
+            annotation.setContents(createAnnotationContent(redactionLogEntry));
+        }
+        annotation.setTitlePopup(redactionLogEntry.getId());
+        annotation.setAnnotationName(redactionLogEntry.getId());
+        annotation.setColor(new PDColor(redactionLogEntry.getColor(), PDDeviceRGB.INSTANCE));
+        annotations.add(annotation);
+
+        if (redactionLogEntry.getComments() != null) {
+            for (Comment comment : redactionLogEntry.getComments()) {
+                PDAnnotationText txtAnnot = new PDAnnotationText();
+                txtAnnot.setAnnotationName(String.valueOf(comment.getId()));
+                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
+                txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
+                txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));
+                txtAnnot.setTitlePopup(comment.getUser());
+                txtAnnot.setContents(comment.getText());
+                txtAnnot.setRectangle(pdRectangle);
+                annotations.add(txtAnnot);
+            }
+        }
+
+        return annotations;
+    }
+
+
+    private String createAnnotationContent(RedactionLogEntry redactionLogEntry) {
+
+        if (redactionLogEntry.isManual()) {
+            return "\nManual Redaction\n\nIn Section : \"" + redactionLogEntry.getSection() + "\"";
+        }
+        return "\nRule " + redactionLogEntry.getMatchedRule() + " matched\n\n" + redactionLogEntry.getReason() + "\n\nLegal basis:" + redactionLogEntry
+                .getLegalBasis() + "\n\nIn section: \"" + redactionLogEntry.getSection() + "\"";
+    }
+
+
+    private PDRectangle toPDRectangle(List<Rectangle> rectangles, PDRectangle mediaBox, PDRectangle cropBox) {
+
+        float lowerLeftX = Float.MAX_VALUE;
+        float upperRightX = 0;
+        float lowerLeftY = 0;
+        float upperRightY = Float.MAX_VALUE;
+
+        for (Rectangle rectangle : rectangles) {
+            if (rectangle.getTopLeft().getX() < lowerLeftX) {
+                lowerLeftX = rectangle.getTopLeft().getX();
+            }
+            if (rectangle.getTopLeft().getX() + rectangle.getWidth() > upperRightX) {
+                upperRightX = rectangle.getTopLeft().getX() + rectangle.getWidth();
+            }
+            if (rectangle.getTopLeft().getY() + rectangle.getHeight() > lowerLeftY) {
+                lowerLeftY = rectangle.getTopLeft().getY() + rectangle.getHeight();
+            }
+            if (rectangle.getTopLeft().getY() < upperRightY) {
+                upperRightY = rectangle.getTopLeft().getY();
+            }
+        }
+
+        var x1 = lowerLeftX + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y1 = lowerLeftY + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+        var x2 = upperRightX + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y2 = upperRightY - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+
+        PDRectangle annotationPosition = new PDRectangle();
+        annotationPosition.setLowerLeftX(x1);
+        annotationPosition.setLowerLeftY(y1);
+        annotationPosition.setUpperRightX(x2);
+        annotationPosition.setUpperRightY(y2);
+        return annotationPosition;
+    }
+
+
+    private float[] toQuadPoints(List<Rectangle> rectangles, PDRectangle mediaBox, PDRectangle cropBox) {
+
+        float[] quadPoints = new float[rectangles.size() * 8];
+        int i = 0;
+
+        for (Rectangle rectangle : rectangles) {
+            float[] quadPoint = toQuadPoint(rectangle, mediaBox, cropBox);
+            for (int j = 0; j <= 7; j++) {
+                quadPoints[i + j] = quadPoint[j];
+            }
+            i += 8;
+        }
+        return quadPoints;
+    }
+
+
+    private float[] toQuadPoint(Rectangle rectangle, PDRectangle mediaBox, PDRectangle cropBox) {
+
+        var x1 = rectangle.getTopLeft().getX() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftX() + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftX() : 0f);
+        var y1 = rectangle.getTopLeft().getY() + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY()) + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftY() : 0f);
+        var x2 = rectangle.getTopLeft()
+                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftX() + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftX() : 0f);
+        var y2 = rectangle.getTopLeft()
+                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY()) + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftY() : 0f);
+
+        // quadPoints is array of x,y coordinates in Z-like order (top-left, top-right, bottom-left,bottom-right)
+        // of the area to be highlighted
+        return new float[]{x1, y1, x2, y2, x1, y2 - rectangle.getHeight(), x2, y1 - rectangle.getHeight()};
+    }
+
+
+    private void drawSectionGrid(PDDocument document, PDPage pdPage,
+                                 List<SectionRectangle> sectionRectangles) throws IOException {
+
+        PDPageContentStream contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
+        for (SectionRectangle sectionRectangle : sectionRectangles) {
+            drawSectionRectangle(contentStream, sectionRectangle);
+            drawSectionPartNumberText(contentStream, sectionRectangle);
+            drawTableCells(contentStream, sectionRectangle);
+        }
+        contentStream.close();
+    }
+
+
+    private void drawSectionRectangle(PDPageContentStream contentStream,
+                                      SectionRectangle sectionRectangle) throws IOException {
+
+        contentStream.setStrokingColor(Color.LIGHT_GRAY);
+        contentStream.setLineWidth(0.5f);
+        contentStream.addRect(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft()
+                .getY(), sectionRectangle.getWidth(), sectionRectangle.getHeight());
+        contentStream.stroke();
+    }
+
+
+    private void drawSectionPartNumberText(PDPageContentStream contentStream,
+                                           SectionRectangle sectionRectangle) throws IOException {
+
+        contentStream.beginText();
+        contentStream.setNonStrokingColor(Color.DARK_GRAY);
+        contentStream.setFont(PDType1Font.TIMES_ROMAN, 8f);
+        if (sectionRectangle.getTableCells() == null) {
+            contentStream.newLineAtOffset(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft()
+                    .getY() + sectionRectangle.getHeight());
+        } else {
+            contentStream.newLineAtOffset(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft().getY());
+        }
+        contentStream.showText(sectionRectangle.getPart() + "/" + sectionRectangle.getNumberOfParts());
+        contentStream.endText();
+    }
+
+
+    private void drawTableCells(PDPageContentStream contentStream,
+                                SectionRectangle sectionRectangle) throws IOException {
+
+        if (sectionRectangle.getTableCells() != null) {
+            for (CellRectangle cell : sectionRectangle.getTableCells()) {
+                contentStream.setLineWidth(0.5f);
+                contentStream.setStrokingColor(Color.CYAN);
+                contentStream.addRect(cell.getTopLeft().getX(), cell.getTopLeft()
+                        .getY(), cell.getWidth(), cell.getHeight());
+                contentStream.stroke();
+            }
+        }
+    }
+
+
+    private Map<Integer, List<RedactionLogEntry>> convertRedactionLog(RedactionLog redactionLog) {
+
+        Map<Integer, List<RedactionLogEntry>> redactionLogPerPage = new HashMap<>();
+        if (redactionLog == null) {
+            return redactionLogPerPage;
+        }
+        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+            int page = 0;
+            for (Rectangle position : entry.getPositions()) {
+                if (position.getPage() != page) {
+                    redactionLogPerPage.computeIfAbsent(position.getPage(), x -> new ArrayList<>()).add(entry);
+                    page = position.getPage();
+                }
+            }
+        }
+        return redactionLogPerPage;
+    }
+
+}
@@ -1,93 +1,115 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-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.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;

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

-import com.iqser.red.service.configuration.v1.api.model.Colors;
-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.DictionaryModel;
+import java.awt.Color;
+import java.util.*;
+import java.util.stream.Collectors;

-import feign.FeignException;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@RequiredArgsConstructor
 public class DictionaryService {

-
    private final DictionaryClient dictionaryClient;

-    @Getter
-    private long dictionaryVersion = -1;
-
-    @Getter
-    private List<DictionaryModel> dictionary = new ArrayList<>();
-
-    @Getter
-    private float[] defaultColor;
-
-    @Getter
-    private float[] requestAddColor;
-
-    @Getter
-    private float[] requestRemoveColor;
-
-    @Getter
-    private float[] notRedactedColor;
+    private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
+    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();


-    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+    public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {

-
-
-    public void updateDictionary() {
-
-        long version = dictionaryClient.getVersion();
-        if (version > dictionaryVersion) {
-            dictionaryVersion = version;
-            updateDictionaryEntry();
+        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 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();
    }


-    private void updateDictionaryEntry() {
+    public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion, String dossierId) {
+
+        DictionaryVersion version = updateDictionary(dossierTemplateId, dossierId);
+
+        Set<DictionaryIncrementValue> newValues = new HashSet<>();
+        List<DictionaryModel> dictionaryModels = dictionariesByDossierTemplate.get(dossierTemplateId).getDictionary();
+        dictionaryModels.forEach(dictionaryModel -> {
+            dictionaryModel.getEntries().forEach(dictionaryEntry -> {
+                if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
+                    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) {

        try {
-            TypeResponse typeResponse = dictionaryClient.getAllTypes();
-            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
+            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();

-                dictionary = typeResponse.getTypes()
+            var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId) : dictionaryClient.getAllTypesForDossier(dossierId);
+            if (CollectionUtils.isNotEmpty(typeResponse)) {
+
+                List<DictionaryModel> dictionary = typeResponse
                        .stream()
                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                .isHint(), t.isRecommendation(), convertEntries(t), new HashSet<>()))
+                                .isHint(), t.isRecommendation(), convertEntries(t.getId()), new HashSet<>(), dossierId != null))
                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                        .collect(Collectors.toList());

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

-                Colors colors = dictionaryClient.getColors();
-                defaultColor = convertColor(colors.getDefaultColor());
-                requestAddColor = convertColor(colors.getRequestAdd());
-                requestRemoveColor = convertColor(colors.getRequestRemove());
-                notRedactedColor = convertColor(colors.getNotRedacted());
+                Colors colors = dictionaryClient.getColors(dossierTemplateId);
+
+                dictionaryRepresentation.setDefaultColor(convertColor(colors.getDefaultColor()));
+                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAdd()));
+                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemove()));
+                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getNotRedacted()));
+                dictionaryRepresentation.setDossierTemplateId(dossierTemplateId);
+                dictionaryRepresentation.setDictionaryVersion(version);
+                dictionaryRepresentation.setDictionary(dictionary);
+
+                if(dossierId == null) {
+                    dictionariesByDossierTemplate.put(dossierTemplateId, dictionaryRepresentation);
+                } else {
+                    dictionariesByDossier.put(dossierId, dictionaryRepresentation);
+                }
            }
        } catch (FeignException e) {
            log.warn("Got some unknown feignException", e);
@@ -96,30 +118,31 @@ public class DictionaryService {
    }


-    public void updateExternalDictionary(Dictionary dictionary){
+    public void updateExternalDictionary(Dictionary dictionary, String dossierTemplateId, String dossierId) {
+
        dictionary.getDictionaryModels().forEach(dm -> {
-            if(dm.isRecommendation() && !dm.getLocalEntries().isEmpty()){
-                dictionaryClient.addEntries(dm.getType(), new ArrayList<>(dm.getLocalEntries()), false);
-                long externalVersion = dictionaryClient.getVersion();
-                if(externalVersion == dictionary.getVersion() + 1){
-                    dictionary.setVersion(externalVersion);
+            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);
                }
            }
        });
    }


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

-        if (t.isCaseInsensitive()) {
-            return dictionaryClient.getDictionaryForType(t.getType())
-                    .getEntries()
-                    .stream()
-                    .map(String::toLowerCase)
-                    .collect(Collectors.toSet());
-        } else {
-            return new HashSet<>(dictionaryClient.getDictionaryForType(t.getType()).getEntries());
+        var type = dictionaryClient.getDictionaryForType(typeId);
+
+        Set<DictionaryEntry> entries = new HashSet<>(type
+                .getEntries());
+
+        if (type.isCaseInsensitive()) {
+            entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
        }
+        return entries;
    }


@@ -130,9 +153,9 @@ public class DictionaryService {
    }


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

-        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        DictionaryModel dictionaryModel = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (dictionaryModel != null) {
            return dictionaryModel.isCaseInsensitive();
        }
@@ -140,28 +163,29 @@ public class DictionaryService {
    }


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

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


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

-        DictionaryModel model = localAccessMap.get(type);
+        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isHint();
        }
        return false;
    }

-    public boolean isRecommendation(String type) {

-        DictionaryModel model = localAccessMap.get(type);
+    public boolean isRecommendation(String type, String dossierTemplateId) {
+
+        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isRecommendation();
        }
@@ -169,14 +193,44 @@ public class DictionaryService {
    }


-    public Dictionary getDeepCopyDictionary(){
+    public Dictionary getDeepCopyDictionary(String dossierTemplateId, String dossierId) {
+
        List<DictionaryModel> copy = new ArrayList<>();

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

-        return new Dictionary(copy, dictionaryVersion);
+        //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());
    }

-}
+
+    public float[] getRequestRemoveColor(String dossierTemplateId) {
+
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
+    }
+
+
+    public float[] getNotRedactedColor(String dossierTemplateId) {
+
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getNotRedactedColor();
+    }
+
+
+    public float[] getRequestAddColor(String dossierTemplateId) {
+
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
+    }
+
+}
@@ -1,9 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

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

@Service
@RequiredArgsConstructor
@@ -27,13 +25,23 @@ public class DroolsExecutionService {

    private final RulesClient rulesClient;

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

-    @Getter
-    private long rulesVersion = -1;
+    private final Map<String, Long> rulesVersionPerDossierTemplateId = new HashMap<>();

-    public Section executeRules(Section section) {
+
+    public KieContainer getKieContainer(String dossierTemplateId) {
+
+        KieContainer container = kieContainers.get(dossierTemplateId);
+        if (container == null) {
+            return createOrUpdateKieContainer(dossierTemplateId);
+        } else {
+            return container;
+        }
+    }
+
+
+    public Section executeRules(KieContainer kieContainer, Section section) {

        KieSession kieSession = kieContainer.newKieSession();
        kieSession.setGlobal("section", section);
@@ -45,34 +53,81 @@ public class DroolsExecutionService {

    }

-    public void updateRules() {

-        long version = rulesClient.getVersion();
-        if (version > rulesVersion) {
-            rulesVersion = version;
-            updateRules(rulesClient.getRules().getRules());
+    public KieContainer updateRules(String dossierTemplateId) {
+
+        long version = rulesClient.getVersion(dossierTemplateId);
+        Long rulesVersion = rulesVersionPerDossierTemplateId.get(dossierTemplateId);
+        if (rulesVersion == null) {
+            rulesVersion = -1L;
        }

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

-    public void updateRules(String drlAsString) {
+
+    private KieContainer createOrUpdateKieContainer(String dossierTemplateId) {

        try {
-            if (StringUtils.isEmpty(drlAsString)) {
+
+            var rules = rulesClient.getRules(dossierTemplateId);
+            if (rules == null || StringUtils.isEmpty(rules.getValue())) {
                throw new RuntimeException("Rules cannot be empty.");
            }
+
            KieServices kieServices = KieServices.Factory.get();
-            InputStream input = new ByteArrayInputStream(drlAsString.getBytes(StandardCharsets.UTF_8));
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources().newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-            kieContainer.updateToVersion(kieModule.getReleaseId());
+            KieModule kieModule = getKieModule(dossierTemplateId, rules.getValue(), kieServices);
+
+            var container = kieContainers.get(dossierTemplateId);
+            if (container != null) {
+                container.updateToVersion(kieModule.getReleaseId());
+                return container;
+            }
+
+            container = kieServices.newKieContainer(kieModule.getReleaseId());
+            kieContainers.put(dossierTemplateId, container);
+            return container;
        } catch (Exception e) {
            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
        }

    }

-}
+
+    private KieModule getKieModule(String dossierTemplateId, 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()
+                .newInputStreamResource(input));
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
+        kieBuilder.buildAll();
+        return kieBuilder.getKieModule();
+    }
+
+
+    public void testRules(String rules) {
+
+        KieServices kieServices = KieServices.Factory.get();
+        KieModule kieModule = getKieModule("test-rules", rules, kieServices);
+        var container = kieServices.newKieContainer(kieModule.getReleaseId());
+        container.newKieSession();
+        container.dispose();
+    }
+
+
+    public long getRulesVersion(String dossierTemplateId) {
+
+        Long rulesVersion = rulesVersionPerDossierTemplateId.get(dossierTemplateId);
+        if (rulesVersion == null) {
+            return -1;
+        }
+        return rulesVersion;
+    }
+
+}
--- a/Show More
+++ b/Show More