Merge branch 'RED-7040' into 'master'

RED-7040: Syngenta rule 29 does not work

Closes RED-7040

See merge request redactmanager/redaction-service!157

.gitlab-ci.yml

@@ -4,3 +4,20 @@ include:
   - project: 'gitlab/gitlab'
     ref: 'main'
     file: 'ci-templates/gradle_java.yml'
+
+deploy:
+  stage: deploy
+  tags:
+    - dind
+  script:
+    - echo "Building with gradle version ${BUILDVERSION}"
+    - gradle -Pversion=${BUILDVERSION} publish
+    - gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
+    - echo "BUILDVERSION=$BUILDVERSION" >> version.env
+  artifacts:
+    reports:
+      dotenv: version.env
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH =~ /^release/
+    - if: $CI_COMMIT_TAG

buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     jacoco
 }
 
-group = "com.iqser.red"
+group = "com.iqser.red.service"
 
 java.sourceCompatibility = JavaVersion.VERSION_17
 java.targetCompatibility = JavaVersion.VERSION_17
@@ -39,25 +39,6 @@ tasks.jacocoTestReport {
     }
 }
 
-allprojects {
-    publishing {
-        publications {
-            create<MavenPublication>(name) {
-                from(components["java"])
-            }
-        }
-        repositories {
-            maven {
-                url = uri("https://nexus.knecon.com/repository/red-platform-releases/")
-                credentials {
-                    username = providers.gradleProperty("mavenUser").getOrNull();
-                    password = providers.gradleProperty("mavenPassword").getOrNull();
-                }
-            }
-        }
-    }
-}
-
 java {
     withJavadocJar()
 }
@@ -72,4 +53,4 @@ repositories {
             password = providers.gradleProperty("mavenPassword").getOrNull();
         }
     }
-}
+}

publish-custom-image.sh

@@ -9,7 +9,7 @@ branch=$(git rev-parse --abbrev-ref HEAD)
 commit_hash=$(git rev-parse --short=5 HEAD)
 
 # Combine branch and commit hash
-buildName="${branch}-${commit_hash}"
+buildName="${USER}-${branch}-${commit_hash}"
 
 gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName
 echo "nexus.knecon.com:5001/red/${dir}-server-v1:$buildName"

redaction-service-v1/redaction-service-api-v1/build.gradle.kts

@@ -1,14 +1,28 @@
-
 plugins {
     id("com.iqser.red.service.java-conventions")
-    id("io.freefair.lombok") version "8.2.2"
+    id("io.freefair.lombok") version "8.4"
 }
 
 description = "redaction-service-api-v1"
 
 dependencies {
-    implementation("org.springframework:spring-web:6.0.11")
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:RED-6725")
+    implementation("org.springframework:spring-web:6.0.12")
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.207.0")
 }
 
-
+publishing {
+    publications {
+        create<MavenPublication>(name) {
+            from(components["java"])
+        }
+    }
+    repositories {
+        maven {
+            url = uri("https://nexus.knecon.com/repository/red-platform-releases/")
+            credentials {
+                username = providers.gradleProperty("mavenUser").getOrNull();
+                password = providers.gradleProperty("mavenPassword").getOrNull();
+            }
+        }
+    }
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/DroolsSyntaxErrorMessage.java

@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DroolsSyntaxErrorMessage {
+
+    Integer line;
+    Integer column;
+    String message;
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/DroolsSyntaxValidation.java

@@ -0,0 +1,34 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DroolsSyntaxValidation {
+
+    @Builder.Default
+    List<DroolsSyntaxErrorMessage> droolsSyntaxErrorMessages = new LinkedList<>();
+
+
+    public void addErrorMessage(int line, int column, String message) {
+
+        getDroolsSyntaxErrorMessages().add(DroolsSyntaxErrorMessage.builder().line(line).column(column).message(message).build());
+    }
+
+    public boolean isCompiled() {
+
+        return droolsSyntaxErrorMessages.isEmpty();
+    }
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RuleValidationModel.java

@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class RuleValidationModel {
+
+    String ruleFileType;
+    String rulesString;
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/resources/RedactionResource.java

@@ -4,9 +4,12 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
+import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
+
 public interface RedactionResource {
 
     @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void testRules(@RequestBody String rules);
+    DroolsSyntaxValidation testRules(@RequestBody RuleValidationModel rulesValidationModel);
 
 }

redaction-service-v1/redaction-service-server-v1/build.gradle.kts

@@ -3,19 +3,20 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
 plugins {
     application
     id("com.iqser.red.service.java-conventions")
-    id("org.springframework.boot") version "3.1.2"
+    id("org.springframework.boot") version "3.1.4"
     id("io.spring.dependency-management") version "1.1.3"
-    id("org.sonarqube") version "4.3.0.3225"
-    id("io.freefair.lombok") version "8.2.2"
+    id("org.sonarqube") version "4.4.1.3373"
+    id("io.freefair.lombok") version "8.4"
 }
 
 description = "redaction-service-server-v1"
 
 
-val layoutParserVersion = "0.25.0"
+val layoutParserVersion = "0.71.0"
 val jacksonVersion = "2.15.2"
-val droolsVersion = "8.42.0.Final"
-val pdfBoxVersion = "3.0.0-alpha2"
+val droolsVersion = "9.44.0.Final"
+val pdfBoxVersion = "3.0.0"
+val persistenceServiceVersion = "2.210.0"
 
 configurations {
     all {
@@ -26,15 +27,15 @@ configurations {
 dependencies {
 
     implementation(project(":redaction-service-api-v1")) { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") }
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.119.0") { exclude(group = "org.springframework.boot") }
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") { exclude(group = "org.springframework.boot") }
     implementation("com.knecon.fforesight:layoutparser-service-internal-api:${layoutParserVersion}")
 
-    implementation("com.iqser.red.commons:spring-commons:2.6.0")
+    implementation("com.iqser.red.commons:spring-commons:6.2.0")
     implementation("com.iqser.red.commons:metric-commons:2.3.0")
 
     implementation("com.iqser.red.commons:dictionary-merge-commons:1.5.0")
-    implementation("com.iqser.red.commons:storage-commons:2.27.0")
-    implementation("com.knecon.fforesight:tenant-commons:0.10.0")
+    implementation("com.iqser.red.commons:storage-commons:2.45.0")
+    implementation("com.knecon.fforesight:tenant-commons:0.13.0")
 
     implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
@@ -48,12 +49,12 @@ dependencies {
     implementation("org.locationtech.jts:jts-core:1.19.0")
 
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4")
-    implementation("org.springframework.boot:spring-boot-starter-amqp:3.1.2")
+    implementation("org.springframework.boot:spring-boot-starter-amqp:3.1.4")
 
     testImplementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
     testImplementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
 
-    testImplementation("org.springframework.boot:spring-boot-starter-test:3.1.2")
+    testImplementation("org.springframework.boot:spring-boot-starter-test:3.1.4")
     testImplementation("com.knecon.fforesight:layoutparser-service-processor:${layoutParserVersion}") {
         exclude(
             group = "com.iqser.red.service",

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/Application.java

@@ -12,7 +12,6 @@ import org.springframework.context.annotation.Import;
 
 import com.iqser.red.service.dictionarymerge.commons.DictionaryMergeService;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration;
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/RedactionServiceSettings.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.settings;
+package com.iqser.red.service.redaction.v1.server;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -28,4 +28,6 @@ public class RedactionServiceSettings {
 
     private int dictionaryCacheExpireAfterAccessDays = 3;
 
+    private int droolsExecutionTimeoutSecs = 300;
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/ControllerAdvice.java

@@ -1,8 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
 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 com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.utils.exception.RulesValidationException;
 
 import lombok.extern.slf4j.Slf4j;
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java

@@ -3,9 +3,11 @@ package com.iqser.red.service.redaction.v1.server.controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
+import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
+import com.iqser.red.service.redaction.v1.server.service.drools.DroolsSyntaxValidationService;
+import com.iqser.red.service.redaction.v1.server.utils.exception.RulesValidationException;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,14 +17,14 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class RedactionController implements RedactionResource {
 
-    private final DroolsExecutionService droolsExecutionService;
+    private final DroolsSyntaxValidationService droolsSyntaxValidationService;
 
 
     @Override
-    public void testRules(@RequestBody String rules) {
+    public DroolsSyntaxValidation testRules(@RequestBody RuleValidationModel rulesValidationModel) {
 
         try {
-            droolsExecutionService.testRules(rules);
+            return droolsSyntaxValidationService.testRules(rulesValidationModel);
         } catch (Exception e) {
             throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
         }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java

@@ -1,10 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
+import java.util.Collections;
+
 import org.springframework.web.bind.annotation.RestController;
 
 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.service.RuleBuilderModelService;
 
 import lombok.RequiredArgsConstructor;
 
@@ -12,13 +13,16 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class RuleBuilderController implements RuleBuilderResource {
 
-    private final RuleBuilderModelService ruleBuilderModelService;
-
 
     @Override
     public RuleBuilderModel getRuleBuilderModel() {
 
-        return ruleBuilderModelService.getRuleBuilderModel();
+        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
+
+        ruleBuilderModel.setWhenClauses(Collections.emptyList());
+        ruleBuilderModel.setThenConditions(Collections.emptyList());
+
+        return ruleBuilderModel;
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/document/graph/entity/MatchedRule.java

@@ -1,70 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.entity;
-
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Set;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@Builder
-@AllArgsConstructor
-@EqualsAndHashCode
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public final class MatchedRule implements Comparable<MatchedRule> {
-
-    @Builder.Default
-    RuleIdentifier ruleIdentifier = RuleIdentifier.empty();
-    @Builder.Default
-    String reason = "";
-    @Builder.Default
-    String legalBasis = "";
-    boolean applied;
-    boolean writeValueWithLineBreaks;
-    @Builder.Default
-    Set<RedactionEntity> references = Collections.emptySet();
-
-
-    public static MatchedRule empty() {
-
-        return MatchedRule.builder().build();
-    }
-
-
-    @Override
-    public int compareTo(MatchedRule matchedRule) {
-
-        RuleIdentifier otherRuleIdentifier = matchedRule.getRuleIdentifier();
-        if (!Objects.equals(ruleIdentifier.type(), otherRuleIdentifier.type())) {
-            if (Objects.equals(otherRuleIdentifier.type(), "MAN")) {
-                return 1;
-            }
-            if (Objects.equals(ruleIdentifier.type(), "MAN")) {
-                return -1;
-            }
-            if (Objects.equals(otherRuleIdentifier.type(), "X")) {
-                return 1;
-            }
-            if (Objects.equals(ruleIdentifier.type(), "X")) {
-                return -1;
-            }
-        }
-        if (!Objects.equals(otherRuleIdentifier.unit(), getRuleIdentifier().unit())) {
-            return otherRuleIdentifier.unit() - ruleIdentifier.unit();
-        }
-        return otherRuleIdentifier.id() - ruleIdentifier.id();
-    }
-
-
-    @Override
-    public String toString() {
-
-        return "MatchedRule[" + "ruleIdentifier=" + ruleIdentifier + ", " + "reason=" + reason + ", " + "legalBasis=" + legalBasis + ", " + "applied=" + applied + ", " + "writeValueWithLineBreaks=" + writeValueWithLineBreaks + ", " + "references=" + references + ']';
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/document/graph/entity/RuleIdentifier.java

@@ -1,41 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.entity;
-
-import java.util.Objects;
-
-public record RuleIdentifier(String type, Integer unit, Integer id) {
-
-    public static RuleIdentifier fromString(String identifier) {
-
-        String[] values = identifier.split("\\.");
-        if (values.length != 3) {
-            throw new IllegalArgumentException("Illegal rule identifier provided: " + identifier);
-        }
-        String type = values[0];
-        Integer group = Integer.parseInt(values[1]);
-        Integer id = Integer.parseInt(values[2]);
-        return new RuleIdentifier(type, group, id);
-    }
-
-
-    public static RuleIdentifier empty() {
-
-        return new RuleIdentifier("", null, null);
-    }
-
-
-    @Override
-    public String toString() {
-
-        StringBuilder sb = new StringBuilder();
-        sb.append(type());
-        if (Objects.nonNull(unit()) && Objects.nonNull(id())) {
-            sb.append(".").append(unit()).append(".").append(id());
-        } else if (Objects.nonNull(id())) {
-            sb.append(".*.").append(id());
-        } else if (Objects.nonNull(unit())) {
-            sb.append(".").append(unit()).append(".*");
-        }
-        return sb.toString();
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/document/services/EntityCreationService.java

@@ -1,670 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.services;
-
-import static com.iqser.red.service.redaction.v1.server.redaction.utils.SeparatorUtils.boundaryIsSurroundedBySeparators;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.kie.api.runtime.KieSession;
-
-import com.google.common.base.Functions;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.ConsecutiveBoundaryCollector;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionPosition;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Table;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCell;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
-import com.iqser.red.service.redaction.v1.server.document.utils.RedactionSearchUtility;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntitiesAdapter;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@RequiredArgsConstructor
-public class EntityCreationService {
-
-    private final EntityEnrichmentService entityEnrichmentService;
-    private final KieSession kieSession;
-
-
-    public EntityCreationService(EntityEnrichmentService entityEnrichmentService) {
-
-        this.entityEnrichmentService = entityEnrichmentService;
-        this.kieSession = null;
-    }
-
-
-    public Stream<RedactionEntity> betweenStrings(String start, String stop, String type, EntityType entityType, SemanticNode node) {
-
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-    public Stream<RedactionEntity> betweenStringsIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
-
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-    public Stream<RedactionEntity> betweenStringsIncludeStart(String start, String stop, String type, EntityType entityType, SemanticNode node) {
-
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
-
-        startBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() - start.length());
-            boundary.setEnd(boundary.end() - start.length());
-        });
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-    public Stream<RedactionEntity> betweenStringsIncludeStartIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
-
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
-
-        startBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() - start.length());
-            boundary.setEnd(boundary.end() - start.length());
-        });
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-    public Stream<RedactionEntity> betweenStringsIncludeEnd(String start, String stop, String type, EntityType entityType, SemanticNode node) {
-
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
-
-        stopBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() + stop.length());
-            boundary.setEnd(boundary.end() + stop.length());
-        });
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-    public Stream<RedactionEntity> betweenStringsIncludeEndIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
-
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
-
-        stopBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() + stop.length());
-            boundary.setEnd(boundary.end() + stop.length());
-        });
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-    public Stream<RedactionEntity> betweenStringsIncludeStartAndEnd(String start, String stop, String type, EntityType entityType, SemanticNode node) {
-
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
-
-        startBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() - start.length());
-            boundary.setEnd(boundary.end() - start.length());
-        });
-        stopBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() + stop.length());
-            boundary.setEnd(boundary.end() + stop.length());
-        });
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-
-
-
-    public Stream<RedactionEntity> betweenStringsIncludeStartAndEndIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
-
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
-
-        startBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() - start.length());
-            boundary.setEnd(boundary.end() - start.length());
-        });
-        stopBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() + stop.length());
-            boundary.setEnd(boundary.end() + stop.length());
-        });
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-
-
-
-    public Stream<RedactionEntity> betweenRegexes(String regexStart, String regexStop, String type, EntityType entityType, SemanticNode node) {
-
-        TextBlock textBlock = node.getTextBlock();
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByRegex(regexStart, textBlock);
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByRegex(regexStop, textBlock);
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-    public Stream<RedactionEntity> betweenRegexesIgnoreCase(String regexStart, String regexStop, String type, EntityType entityType, SemanticNode node) {
-
-        TextBlock textBlock = node.getTextBlock();
-        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByRegexIgnoreCase(regexStart, 0, textBlock);
-        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByRegexIgnoreCase(regexStop, 0, textBlock);
-
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
-    }
-
-
-    public Stream<RedactionEntity> betweenBoundaries(List<Boundary> startBoundaries, List<Boundary> stopBoundaries, String type, EntityType entityType, SemanticNode node) {
-
-        if (startBoundaries.isEmpty() || stopBoundaries.isEmpty()) {
-            return Stream.empty();
-        }
-        List<Boundary> entityBoundaries = findNonOverlappingBoundariesBetweenBoundariesWithMinimalDistances(startBoundaries, stopBoundaries);
-        return entityBoundaries.stream()
-                .map(boundary -> boundary.trim(node.getTextBlock()))
-                .filter(boundary -> isValidEntityBoundary(node.getTextBlock(), boundary))
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    private static List<Boundary> findNonOverlappingBoundariesBetweenBoundariesWithMinimalDistances(List<Boundary> startBoundaries, List<Boundary> stopBoundaries) {
-
-        List<Boundary> entityBoundaries = new LinkedList<>();
-        for (Boundary startBoundary : startBoundaries) {
-            Optional<Boundary> optionalStopBoundaryWithMinimalDistance = stopBoundaries.stream()
-                    .filter(stopBoundary -> stopBoundary.start() > startBoundary.end())
-                    .min(Comparator.comparingInt(Boundary::start));
-            if (optionalStopBoundaryWithMinimalDistance.isEmpty()) {
-                break;
-            }
-            entityBoundaries.add(new Boundary(startBoundary.end(), optionalStopBoundaryWithMinimalDistance.get().start()));
-        }
-        return removeOuterOverlappingBoundaries(entityBoundaries);
-    }
-
-
-    private static List<Boundary> removeOuterOverlappingBoundaries(List<Boundary> entityBoundaries) {
-        /*
-        In some cases we get boundaries, where one contains the other. This happens for Example when we have two start boundaries and one stop boundary after the two start boundaries.
-        Then we get two boundaries where one is entirely contained in the other. So we want to remove the outer boundary.
-        For Example consider the text: "a this is some text. a here is more text b". If "a" is the start string and "b" is the stop string, there are two possibilities.
-        "this is some text. a here is more text" and "here is more text". We only want to keep the latter.
-         */
-        return entityBoundaries.stream()
-                .filter(boundary -> entityBoundaries.stream().noneMatch(innerBoundary -> innerBoundary != boundary && innerBoundary.containedBy(boundary)))
-                .toList();
-
-    }
-
-
-    public Stream<RedactionEntity> bySearchImplementation(SearchImplementation searchImplementation, String type, EntityType entityType, SemanticNode node) {
-
-        return searchImplementation.getBoundaries(node.getTextBlock(), node.getBoundary())
-                .stream()
-                .filter(boundary -> isValidEntityBoundary(node.getTextBlock(), boundary))
-                .map(bounds -> byBoundary(bounds, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> lineAfterStrings(List<String> strings, String type, EntityType entityType, SemanticNode node) {
-
-        TextBlock textBlock = node.getTextBlock();
-        SearchImplementation searchImplementation = new SearchImplementation(strings, false);
-        return searchImplementation.getBoundaries(textBlock, node.getBoundary())
-                .stream()
-                .map(boundary -> toLineAfterBoundary(textBlock, boundary))
-                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> lineAfterString(String string, String type, EntityType entityType, SemanticNode node) {
-
-        TextBlock textBlock = node.getTextBlock();
-        return RedactionSearchUtility.findBoundariesByString(string, textBlock)
-                .stream()
-                .map(boundary -> toLineAfterBoundary(textBlock, boundary))
-                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> lineAfterStringAcrossColumns(String string, String type, EntityType entityType, Table tableNode) {
-
-        return tableNode.streamTableCells()
-                .flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findBoundariesByString(string, tableCell.getTextBlock()),
-                        tableCell,
-                        type,
-                        entityType,
-                        tableNode));
-    }
-
-
-    public Stream<RedactionEntity> lineAfterStringAcrossColumnsIgnoreCase(String string, String type, EntityType entityType, Table tableNode) {
-
-        return tableNode.streamTableCells()
-                .flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findBoundariesByStringIgnoreCase(string, tableCell.getTextBlock()),
-                        tableCell,
-                        type,
-                        entityType,
-                        tableNode));
-    }
-
-
-    /**
-     * Looks across the remaining table row to the right of the provided TableCell if any line intersects the y coordinates of the found text.
-     *
-     * @param boundaries a list of boundaries
-     * @param tableCell  the table cell
-     * @param type       the type
-     * @param entityType the entity type
-     * @param tableNode  the table node
-     * @return a stream of RedactionEntities
-     */
-    private Stream<RedactionEntity> lineAfterBoundariesAcrossColumns(List<Boundary> boundaries, TableCell tableCell, String type, EntityType entityType, Table tableNode) {
-
-        return boundaries.stream()
-                .map(boundary -> RectangleTransformations.rectangle2DBBox(tableCell.getTextBlock().getPositions(boundary)))
-                .map(bBox -> Pair.of(bBox.getMaxY(), bBox.getMinY()))
-                .map(maxMinPair -> tableNode.streamRow(tableCell.getRow())
-                        .filter(nextTableCell -> nextTableCell.getCol() > tableCell.getCol())
-                        .map(nextTableCell -> RedactionSearchUtility.findBoundaryOfAllLinesInYRange(maxMinPair.getLeft(), maxMinPair.getRight(), nextTableCell.getTextBlock()))
-                        .map(b -> b.trim(tableNode.getTextBlock()))
-                        .filter(boundary -> isValidEntityBoundary(tableNode.getTextBlock(), boundary))
-                        .map(boundary -> byBoundary(boundary, type, entityType, tableNode))
-                        .filter(Optional::isPresent)
-                        .map(Optional::get))
-                .flatMap(Functions.identity());
-    }
-
-
-    public Optional<RedactionEntity> semanticNodeAfterString(SemanticNode semanticNode, String string, String type, EntityType entityType) {
-
-        var textBlock = semanticNode.getTextBlock();
-        int startIndex = Math.min(textBlock.indexOf(string), 0);
-        var boundary = new Boundary(startIndex, semanticNode.getBoundary().end());
-        if (boundary.length() > 0) {
-            boundary = new Boundary(boundary.start(), boundary.end() - 1);
-        }
-        if (!isValidEntityBoundary(textBlock, boundary)) {
-            return Optional.empty();
-        }
-        return byBoundary(boundary, type, entityType, semanticNode);
-    }
-
-
-    public Stream<RedactionEntity> byRegexWithLineBreaks(String regexPattern, String type, EntityType entityType, SemanticNode node) {
-
-        return byRegexWithLineBreaks(regexPattern, type, entityType, 0, node);
-    }
-
-
-    public Stream<RedactionEntity> byRegexWithLineBreaksIgnoreCase(String regexPattern, String type, EntityType entityType, SemanticNode node) {
-
-        return byRegexWithLineBreaksIgnoreCase(regexPattern, type, entityType, 0, node);
-    }
-
-
-    public Stream<RedactionEntity> byRegex(String regexPattern, String type, EntityType entityType, SemanticNode node) {
-
-        return byRegex(regexPattern, type, entityType, 0, node);
-    }
-
-
-    public Stream<RedactionEntity> byRegexIgnoreCase(String regexPattern, String type, EntityType entityType, SemanticNode node) {
-
-        return byRegexIgnoreCase(regexPattern, type, entityType, 0, node);
-    }
-
-
-    public Stream<RedactionEntity> byRegexWithLineBreaks(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
-
-        return RedactionSearchUtility.findBoundariesByRegexWithLineBreaks(regexPattern, group, node.getTextBlock())
-                .stream()
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> byRegexWithLineBreaksIgnoreCase(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
-
-        return RedactionSearchUtility.findBoundariesByRegexWithLineBreaksIgnoreCase(regexPattern, group, node.getTextBlock())
-                .stream()
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> byRegex(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
-
-        return RedactionSearchUtility.findBoundariesByRegex(regexPattern, group, node.getTextBlock())
-                .stream()
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> byRegexIgnoreCase(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
-
-        return RedactionSearchUtility.findBoundariesByRegexIgnoreCase(regexPattern, group, node.getTextBlock())
-                .stream()
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> byString(String keyword, String type, EntityType entityType, SemanticNode node) {
-
-        return RedactionSearchUtility.findBoundariesByString(keyword, node.getTextBlock())
-                .stream()
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> bySemanticNodeParagraphsOnly(SemanticNode node, String type, EntityType entityType) {
-
-        return node.streamAllSubNodesOfType(NodeType.PARAGRAPH).map(semanticNode -> bySemanticNode(semanticNode, type, entityType)).filter(Optional::isPresent).map(Optional::get);
-    }
-
-
-    public Stream<RedactionEntity> bySemanticNodeParagraphsOnlyMergeConsecutive(SemanticNode node, String type, EntityType entityType) {
-
-        return node.streamAllSubNodesOfType(NodeType.PARAGRAPH)
-                .map(SemanticNode::getBoundary)
-                .collect(new ConsecutiveBoundaryCollector())
-                .stream()
-                .map(boundary -> byBoundary(boundary, type, entityType, node))
-                .filter(Optional::isPresent)
-                .map(Optional::get);
-    }
-
-    public Optional<RedactionEntity> semanticNodeAfterString(String string, String type, EntityType entityType, SemanticNode node) {
-
-        if (!node.containsString(string)) {
-            return Optional.empty();
-        }
-        Boundary boundary = new Boundary(node.getTextBlock().indexOf(string) + string.length(), node.getBoundary().end());
-        return byBoundary(boundary, type, entityType, node);
-    }
-
-    public Optional<RedactionEntity> bySemanticNode(SemanticNode node, String type, EntityType entityType) {
-
-        Boundary boundary = node.getTextBlock().getBoundary();
-
-        if (boundary.length() > 0) {
-            boundary = new Boundary(boundary.start(), boundary.end() - 1);
-        }
-        if (!isValidEntityBoundary(node.getTextBlock(), boundary)) {
-            return Optional.empty();
-        }
-        return byBoundary(boundary, type, entityType, node);
-    }
-
-
-    public Optional<RedactionEntity> byPrefixExpansionRegex(RedactionEntity entity, String regexPattern) {
-
-        int expandedStart = RedactionSearchUtility.getExpandedStartByRegex(entity, regexPattern);
-        return byBoundary(new Boundary(expandedStart, entity.getBoundary().end()), entity.getType(), entity.getEntityType(), entity.getDeepestFullyContainingNode());
-    }
-
-
-    public Optional<RedactionEntity> bySuffixExpansionRegex(RedactionEntity entity, String regexPattern) {
-
-        int expandedEnd = RedactionSearchUtility.getExpandedEndByRegex(entity, regexPattern);
-        expandedEnd = truncateEndIfLineBreakIsBetween(entity.getBoundary().end(), expandedEnd, entity.getDeepestFullyContainingNode().getTextBlock());
-        return byBoundary(new Boundary(entity.getBoundary().start(), expandedEnd), entity.getType(), entity.getEntityType(), entity.getDeepestFullyContainingNode());
-    }
-
-
-    private int truncateEndIfLineBreakIsBetween(int end, int expandedEnd, TextBlock textBlock) {
-
-        if (textBlock.getNextLinebreak(end) < expandedEnd) {
-            return end;
-        }
-        return expandedEnd;
-    }
-
-
-    /**
-     * Creates a redaction entity based on the given boundary, type, entity type, and semantic node.
-     * If the document already contains an equal redaction entity, then the original Entity is returned.
-     * Also inserts the Entity into the kieSession.
-     *
-     * @param boundary   The boundary of the redaction entity.
-     * @param type       The type of the redaction entity.
-     * @param entityType The entity type of the redaction entity.
-     * @param node       The semantic node to associate with the redaction entity.
-     * @return An Optional containing the redaction entity, or the previous entity if the entity already exists.
-     */
-    public Optional<RedactionEntity> byBoundary(Boundary boundary, String type, EntityType entityType, SemanticNode node) {
-
-        if (!node.getBoundary().contains(boundary)) {
-            throw new IllegalArgumentException(String.format("%s is not in the %s of the provided semantic node %s", boundary, node.getBoundary(), node));
-        }
-        Boundary trimmedBoundary = boundary.trim(node.getTextBlock());
-        RedactionEntity entity = RedactionEntity.initialEntityNode(trimmedBoundary, type, entityType);
-        if (node.getEntities().contains(entity)) {
-            return node.getEntities().stream().filter(entity::equals).peek(e -> e.addEngine(Engine.RULE)).findAny();
-        }
-        addEntityToGraph(entity, node);
-        entity.addEngine(Engine.RULE);
-        insertToKieSession(entity);
-        return Optional.of(entity);
-    }
-
-
-    public RedactionEntity forceByBoundary(Boundary boundary, String type, EntityType entityType, SemanticNode node) {
-
-        Boundary trimmedBoundary = boundary.trim(node.getTextBlock());
-        RedactionEntity entity = RedactionEntity.initialEntityNode(trimmedBoundary, type, entityType);
-        addEntityToGraph(entity, node);
-        return entity;
-    }
-
-
-    public RedactionEntity byEntities(List<RedactionEntity> entitiesToMerge, String type, EntityType entityType, SemanticNode node) {
-
-        if (!allEntitiesIntersectAndHaveSameTypes(entitiesToMerge)) {
-            throw new IllegalArgumentException("Provided entities can not be merged, since they do not intersect or are not the same type!" + entitiesToMerge);
-        }
-        if (entitiesToMerge.isEmpty()) {
-            throw new IllegalArgumentException("No Entities to merge!");
-        }
-        if (entitiesToMerge.size() == 1) {
-            return entitiesToMerge.get(0);
-        }
-
-        RedactionEntity mergedEntity = RedactionEntity.initialEntityNode(Boundary.merge(entitiesToMerge.stream().map(RedactionEntity::getBoundary).toList()), type, entityType);
-        mergedEntity.addEngines(entitiesToMerge.stream().flatMap(entityNode -> entityNode.getEngines().stream()).collect(Collectors.toSet()));
-        entitiesToMerge.stream().map(RedactionEntity::getMatchedRuleList).flatMap(Collection::stream).forEach(matchedRule -> mergedEntity.getMatchedRuleList().add(matchedRule));
-
-        mergedEntity.setDictionaryEntry(entitiesToMerge.stream().anyMatch(RedactionEntity::isDictionaryEntry));
-        mergedEntity.setDossierDictionaryEntry(entitiesToMerge.stream().anyMatch(RedactionEntity::isDossierDictionaryEntry));
-        mergedEntity.setIgnored(entitiesToMerge.stream().allMatch(RedactionEntity::isIgnored));
-        mergedEntity.setRemoved(entitiesToMerge.stream().allMatch(RedactionEntity::isRemoved));
-
-        addEntityToGraph(mergedEntity, node);
-        insertToKieSession(mergedEntity);
-        return mergedEntity;
-    }
-
-
-    private void insertToKieSession(RedactionEntity mergedEntity) {
-
-        if (kieSession != null) {
-            kieSession.insert(mergedEntity);
-        }
-    }
-
-
-    public RedactionEntity byNerEntity(NerEntities.NerEntity nerEntity, EntityType entityType, SemanticNode semanticNode) {
-
-        var entity = forceByBoundary(nerEntity.boundary(), nerEntity.type(), entityType, semanticNode);
-        entity.addEngine(Engine.NER);
-        insertToKieSession(entity);
-        return entity;
-    }
-
-
-    public RedactionEntity byNerEntity(NerEntities.NerEntity nerEntity, String type, EntityType entityType, SemanticNode semanticNode) {
-
-        var entity = forceByBoundary(nerEntity.boundary(), type, entityType, semanticNode);
-        entity.addEngine(Engine.NER);
-        insertToKieSession(entity);
-        return entity;
-    }
-
-
-    public Stream<RedactionEntity> combineNerEntitiesToCbiAddressDefaults(NerEntities nerEntities, String type, EntityType entityType, SemanticNode semanticNode) {
-
-        return NerEntitiesAdapter.combineNerEntitiesToCbiAddressDefaults(nerEntities)
-                .map(boundary -> forceByBoundary(boundary, type, entityType, semanticNode))
-                .peek(entity -> entity.addEngine(Engine.NER))
-                .peek(this::insertToKieSession);
-    }
-
-
-    public RedactionEntity byTableCellAsHighlight(TableCell tableCell, String type, EntityType entityType) {
-
-        RedactionEntity highlightEntity = RedactionEntity.initialEntityNode(new Boundary(tableCell.getBoundary().start(), tableCell.getBoundary().start()), type, entityType);
-
-        String positionId = IdBuilder.buildId(tableCell.getBBox().keySet(), tableCell.getBBox().values().stream().toList(), type, entityType.name());
-        highlightEntity.setRedactionPositionsPerPage(tableCell.getBBox()
-                .entrySet()
-                .stream()
-                .map(entry -> new RedactionPosition(positionId, entry.getKey(), List.of(entry.getValue())))
-                .toList());
-        addEntityToGraph(highlightEntity, tableCell);
-        return highlightEntity;
-    }
-
-
-    public boolean isValidEntityBoundary(TextBlock textBlock, Boundary boundary) {
-
-        return boundary.length() > 0 && boundaryIsSurroundedBySeparators(textBlock, boundary);
-    }
-
-
-    public void addEntityToGraph(RedactionEntity entity, SemanticNode node) {
-
-        DocumentTree documentTree = node.getDocumentTree();
-        try {
-            addEntityToGraph(entity, documentTree);
-            entity.addIntersectingNode(documentTree.getRoot().getNode());
-            documentTree.getRoot().getNode().getEntities().add(entity);
-        } catch (NoSuchElementException e) {
-            entity.setDeepestFullyContainingNode(documentTree.getRoot().getNode());
-            entityEnrichmentService.enrichEntity(entity, entity.getDeepestFullyContainingNode().getTextBlock());
-            entity.addIntersectingNode(documentTree.getRoot().getNode());
-            addToPages(entity);
-            addEntityToNodeEntitySets(entity);
-        }
-    }
-
-
-    private void addEntityToGraph(RedactionEntity entity, DocumentTree documentTree) {
-
-        SemanticNode containingNode = documentTree.childNodes(Collections.emptyList())
-                .filter(node -> node.getTextBlock().containsBoundary(entity.getBoundary()))
-                .findFirst()
-                .orElseThrow(() -> new NoSuchElementException("No containing Node found!"));
-
-        containingNode.addThisToEntityIfIntersects(entity);
-
-        TextBlock textBlock = entity.getDeepestFullyContainingNode().getTextBlock();
-        entityEnrichmentService.enrichEntity(entity, textBlock);
-
-        addToPages(entity);
-        addEntityToNodeEntitySets(entity);
-    }
-
-
-    private static void addToPages(RedactionEntity entity) {
-
-        Set<Page> pages = entity.getDeepestFullyContainingNode().getPages(entity.getBoundary());
-        entity.getPages().addAll(pages);
-        pages.forEach(page -> page.getEntities().add(entity));
-    }
-
-
-    private static void addEntityToNodeEntitySets(RedactionEntity entity) {
-
-        entity.getIntersectingNodes().forEach(node -> node.getEntities().add(entity));
-    }
-
-
-    private static boolean allEntitiesIntersectAndHaveSameTypes(List<RedactionEntity> entitiesToMerge) {
-
-        if (entitiesToMerge.isEmpty()) {
-            return true;
-        }
-        RedactionEntity previousEntity = entitiesToMerge.get(0);
-        for (RedactionEntity redactionEntity : entitiesToMerge.subList(1, entitiesToMerge.size())) {
-            boolean typeMatches = redactionEntity.getType().equals(previousEntity.getType());
-            boolean entityTypeMatches = redactionEntity.getEntityType().equals(previousEntity.getEntityType());
-            boolean intersects = redactionEntity.intersects(previousEntity);
-            if (!typeMatches || !entityTypeMatches || !intersects) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    private static Boundary toLineAfterBoundary(TextBlock textBlock, Boundary boundary) {
-
-        return new Boundary(boundary.end(), textBlock.getNextLinebreak(boundary.end())).trim(textBlock);
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/document/services/ManualRedactionApplicationService.java

@@ -1,64 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.services;
-
-import java.awt.geom.Rectangle2D;
-import java.util.NoSuchElementException;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionPosition;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Image;
-import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
-
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public class ManualRedactionApplicationService {
-
-    private final EntityCreationService entityCreationService;
-
-
-    public void resizeEntityAndReinsert(RedactionEntity entityToBeResized, ManualResizeRedaction manualResizeRedaction) {
-
-        RedactionPosition redactionPositionToBeResized = entityToBeResized.getRedactionPositionsPerPage()
-                .stream()
-                .filter(redactionPosition -> redactionPosition.getId().equals(manualResizeRedaction.getAnnotationId()))
-                .findFirst()
-                .orElseThrow(() -> new NoSuchElementException("No redaction position with matching annotation id found!"));
-
-        redactionPositionToBeResized.setRectanglePerLine(manualResizeRedaction.getPositions().stream().map(ManualRedactionApplicationService::toRectangle2D).toList());
-
-        int newStartOffset;
-        if (manualResizeRedaction.getValue().length() > entityToBeResized.getValue().length()) {
-            newStartOffset = entityToBeResized.getBoundary().start() - manualResizeRedaction.getValue().indexOf(entityToBeResized.getValue());
-        } else {
-            newStartOffset = entityToBeResized.getBoundary().start() + entityToBeResized.getValue().indexOf(manualResizeRedaction.getValue());
-        }
-
-        SemanticNode nodeToInsertInto = entityToBeResized.getDeepestFullyContainingNode().getDocumentTree().getRoot().getNode();
-        entityToBeResized.removeFromGraph();
-        entityToBeResized.setResized(true);
-        entityToBeResized.setRemoved(false);
-        entityToBeResized.setIgnored(false);
-        entityToBeResized.getBoundary().setStart(newStartOffset);
-        entityToBeResized.getBoundary().setEnd(newStartOffset + manualResizeRedaction.getValue().length());
-        entityCreationService.addEntityToGraph(entityToBeResized, nodeToInsertInto);
-    }
-
-
-    public void resizeImage(Image image, ManualResizeRedaction manualResizeRedaction) {
-
-        if (manualResizeRedaction.getPositions().isEmpty() || manualResizeRedaction.getPositions() == null) {
-            return;
-        }
-        var bBox = RectangleTransformations.rectangle2DBBox(manualResizeRedaction.getPositions().stream().map(ManualRedactionApplicationService::toRectangle2D).toList());
-        image.setPosition(bBox);
-    }
-
-
-    private static Rectangle2D toRectangle2D(com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle rect) {
-
-        return new Rectangle2D.Double(rect.getTopLeftX() - rect.getWidth(), rect.getTopLeftY() - rect.getHeight(), rect.getWidth(), rect.getHeight());
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/document/utils/RedactionSearchUtility.java

@@ -1,182 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.utils;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.IntStream;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class RedactionSearchUtility {
-
-    public static boolean anyMatch(CharSequence charSequence, String regexPattern) {
-
-        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
-        return pattern.matcher(charSequence).find();
-    }
-
-
-    public static boolean anyMatchIgnoreCase(CharSequence charSequence, String regexPattern) {
-
-        Pattern pattern = Patterns.getCompiledPattern(regexPattern, true);
-        return pattern.matcher(charSequence).find();
-    }
-
-
-    public static boolean exactMatch(CharSequence charSequence, String regexPattern) {
-
-        return charSequence.toString().matches(regexPattern);
-    }
-
-
-    public static boolean anyMatchIgnoreCase(TextBlock textBlock, String regexPattern) {
-
-        return anyMatchIgnoreCase(textBlock.getSearchText(), regexPattern);
-    }
-
-
-    public static boolean anyMatch(TextBlock textBlock, String regexPattern) {
-
-        return anyMatch(textBlock.getSearchText(), regexPattern);
-    }
-
-
-    public static Boundary findFirstBoundary(String regexPattern, CharSequence searchText) {
-
-        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
-        Matcher matcher = pattern.matcher(searchText);
-        if (matcher.find()) {
-            return new Boundary(matcher.start(), matcher.end());
-        }
-        throw new IllegalArgumentException(format("Charsequence %s does not contain any matches for pattern %s", searchText, regexPattern));
-    }
-
-
-    public static int getExpandedEndByRegex(RedactionEntity entity, String regexPattern) {
-
-        int expandedEnd;
-        if (anyMatch(entity.getTextAfter(), regexPattern)) {
-            Boundary postfixBoundary = findFirstBoundary(regexPattern, entity.getTextAfter());
-            expandedEnd = postfixBoundary.end() + entity.getBoundary().end();
-        } else {
-            expandedEnd = entity.getBoundary().end();
-        }
-        return expandedEnd;
-    }
-
-
-    public static int getExpandedStartByRegex(RedactionEntity entity, String regexPattern) {
-
-        int expandedStart;
-        if (anyMatch(entity.getTextBefore(), regexPattern)) {
-            Boundary prefixBoundary = findFirstBoundary(regexPattern, entity.getTextBefore());
-            expandedStart = prefixBoundary.start() + entity.getBoundary().start() - entity.getTextBefore().length();
-        } else {
-            expandedStart = entity.getBoundary().start();
-        }
-        return expandedStart;
-    }
-
-    public static Boundary findBoundaryOfAllLinesInYRange(double maxY, double minY, TextBlock textBlock) {
-
-        List<Boundary> lineBoundaries = IntStream.range(0, textBlock.numberOfLines()).boxed().map(textBlock::getLineBoundary).filter(lineBoundary -> isWithinYRange(maxY, minY, textBlock, lineBoundary)).toList();
-        if (lineBoundaries.isEmpty()) {
-            return new Boundary(textBlock.getBoundary().start(), textBlock.getBoundary().start());
-        }
-        return Boundary.merge(lineBoundaries);
-    }
-
-
-    private static boolean isWithinYRange(double maxY, double minY, TextBlock textBlock, Boundary lineBoundary) {
-
-        Rectangle2D lineBBox = RectangleTransformations.rectangle2DBBox(textBlock.getPositions(lineBoundary));
-        return lineBBox.getMinY() < maxY && minY < lineBBox.getMaxY();
-    }
-
-
-    public static List<Boundary> findBoundariesByRegex(String regexPattern, TextBlock textBlock) {
-
-        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
-        return getBoundariesByPattern(textBlock, 0, pattern);
-
-    }
-
-
-    public static List<Boundary> findBoundariesByRegex(String regexPattern, int group, TextBlock textBlock) {
-
-        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
-        return getBoundariesByPattern(textBlock, group, pattern);
-    }
-
-
-    public static List<Boundary> findBoundariesByRegexWithLineBreaks(String regexPattern, int group, TextBlock textBlock) {
-
-        Pattern pattern = Patterns.getCompiledMultilinePattern(regexPattern, false);
-        return getBoundariesByPatternWithLineBreaks(textBlock, group, pattern);
-    }
-
-
-    public static List<Boundary> findBoundariesByRegexWithLineBreaksIgnoreCase(String regexPattern, int group, TextBlock textBlock) {
-
-        Pattern pattern = Patterns.getCompiledMultilinePattern(regexPattern, true);
-        return getBoundariesByPatternWithLineBreaks(textBlock, group, pattern);
-    }
-
-
-    public static List<Boundary> findBoundariesByRegexIgnoreCase(String regexPattern, int group, TextBlock textBlock) {
-
-        Pattern pattern = Patterns.getCompiledPattern(regexPattern, true);
-        return getBoundariesByPattern(textBlock, group, pattern);
-    }
-
-
-    private static List<Boundary> getBoundariesByPattern(TextBlock textBlock, int group, Pattern pattern) {
-
-        Matcher matcher = pattern.matcher(textBlock.subSequence(textBlock.getBoundary()));
-        List<Boundary> boundaries = new LinkedList<>();
-        while (matcher.find()) {
-            boundaries.add(new Boundary(matcher.start(group) + textBlock.getBoundary().start(), matcher.end(group) + textBlock.getBoundary().start()));
-        }
-        return boundaries;
-    }
-
-
-    private static List<Boundary> getBoundariesByPatternWithLineBreaks(TextBlock textBlock, int group, Pattern pattern) {
-
-        String searchTextWithLineBreaks = textBlock.searchTextWithLineBreaks();
-        Matcher matcher = pattern.matcher(searchTextWithLineBreaks);
-        List<Boundary> boundaries = new LinkedList<>();
-        while (matcher.find()) {
-            boundaries.add(new Boundary(matcher.start(group) + textBlock.getBoundary().start(), matcher.end(group) + textBlock.getBoundary().start()));
-        }
-        return boundaries;
-    }
-
-
-    public static List<Boundary> findBoundariesByString(String searchString, TextBlock textBlock) {
-
-        List<Boundary> boundaries = new LinkedList<>();
-        for (int index = textBlock.indexOf(searchString); index >= 0; index = textBlock.indexOf(searchString, index + 1)) {
-            boundaries.add(new Boundary(index, index + searchString.length()));
-        }
-        return boundaries;
-    }
-
-
-    public static List<Boundary> findBoundariesByStringIgnoreCase(String searchString, TextBlock textBlock) {
-
-        Pattern pattern = Pattern.compile(Pattern.quote(searchString), Pattern.CASE_INSENSITIVE);
-        return getBoundariesByPattern(textBlock, 0, pattern);
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/KieWrapper.java

@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.server.model;
+
+import org.kie.api.runtime.KieContainer;
+
+public record KieWrapper(KieContainer container, long rulesVersion) {
+
+    public static KieWrapper empty() {
+
+        return new KieWrapper(null, -1);
+    }
+
+
+    public boolean isPresent() {
+
+        return container != null && rulesVersion >= 0;
+    }
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/ManualEntity.java

@@ -0,0 +1,116 @@
+package com.iqser.red.service.redaction.v1.server.model;
+
+import java.util.List;
+import java.util.PriorityQueue;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.ManualChangeOverwrite;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ManualEntity implements IEntity {
+
+    // The id must be mapped into a TextEntity as is for comments to work correctly
+    String id;
+    String value;
+    List<RectangleWithPage> entityPosition;
+    String ruleIdentifier;
+    String reason;
+    String legalBasis;
+    String type;
+    String section;
+    EntityType entityType;
+    boolean applied;
+    boolean isDictionaryEntry;
+    boolean isDossierDictionaryEntry;
+    boolean rectangle;
+
+    @Builder.Default
+    PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
+    @Builder.Default
+    ManualChangeOverwrite manualOverwrite = new ManualChangeOverwrite();
+
+
+    public static ManualEntity fromRedactionLogEntry(RedactionLogEntry redactionLogEntry) {
+
+        String ruleIdentifier = redactionLogEntry.getType() + "." + redactionLogEntry.getMatchedRule() + ".0";
+        List<RectangleWithPage> rectangleWithPages = redactionLogEntry.getPositions().stream().map(RectangleWithPage::fromRedactionLogRectangle).toList();
+        return ManualEntity.builder()
+                .id(redactionLogEntry.getId())
+                .value(redactionLogEntry.getValue())
+                .entityPosition(rectangleWithPages)
+                .ruleIdentifier(ruleIdentifier)
+                .reason(redactionLogEntry.getReason())
+                .legalBasis(redactionLogEntry.getLegalBasis())
+                .type(redactionLogEntry.getType())
+                .section(redactionLogEntry.getSection()).entityType(getEntityType(redactionLogEntry))
+                .applied(redactionLogEntry.isRedacted())
+                .isDictionaryEntry(redactionLogEntry.isDictionaryEntry())
+                .isDossierDictionaryEntry(redactionLogEntry.isDossierDictionaryEntry())
+                .rectangle(redactionLogEntry.isRectangle())
+                .build();
+    }
+
+
+    private static EntityType getEntityType(RedactionLogEntry redactionLogEntry) {
+
+        if (redactionLogEntry.isRecommendation()) {
+            return EntityType.RECOMMENDATION;
+        }
+        if (redactionLogEntry.isHint()) {
+            return EntityType.HINT;
+        }
+        return EntityType.ENTITY;
+    }
+
+
+    public static ManualEntity fromManualRedactionEntry(ManualRedactionEntry manualRedactionEntry, boolean hint) {
+
+        List<RectangleWithPage> rectangleWithPages = manualRedactionEntry.getPositions().stream().map(RectangleWithPage::fromAnnotationRectangle).toList();
+        ManualChangeOverwrite manualChangeOverwrite = new ManualChangeOverwrite();
+        manualChangeOverwrite.addChange(manualRedactionEntry);
+        return ManualEntity.builder()
+                .id(manualRedactionEntry.getAnnotationId())
+                .value(manualRedactionEntry.getValue())
+                .entityPosition(rectangleWithPages)
+                .ruleIdentifier("MAN.0.0")
+                .reason(manualRedactionEntry.getReason())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
+                .type(manualRedactionEntry.getType())
+                .section(manualRedactionEntry.getSection()).entityType(hint ? EntityType.HINT : EntityType.ENTITY)
+                .applied(true)
+                .isDictionaryEntry(false)
+                .isDossierDictionaryEntry(false)
+                .rectangle(manualRedactionEntry.isRectangle())
+                .manualOverwrite(manualChangeOverwrite)
+                .build();
+    }
+
+
+    @Override
+    public TextRange getTextRange() {
+
+        return new TextRange(-1, -1);
+    }
+
+
+    @Override
+    public String type() {
+
+        return getManualOverwrite().getType().orElse(type);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/NerEntities.java

@@ -1,10 +1,10 @@
-package com.iqser.red.service.redaction.v1.server.redaction.adapter;
+package com.iqser.red.service.redaction.v1.server.model;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Stream;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -37,7 +37,7 @@ public class NerEntities {
     }
 
 
-    public record NerEntity(String value, Boundary boundary, String type) {
+    public record NerEntity(String value, TextRange textRange, String type) {
 
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/RectangleWithPage.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.model;
 
 import java.awt.geom.Rectangle2D;
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/component/Component.java

@@ -0,0 +1,41 @@
+package com.iqser.red.service.redaction.v1.server.model.component;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Component {
+
+    RuleIdentifier matchedRule;
+    String name;
+    String value;
+    String valueDescription;
+
+    List<Entity> references;
+
+
+    public boolean addReference(Entity entity) {
+
+        return references.add(entity);
+    }
+
+
+    public boolean addReferences(Collection<Entity> entities) {
+
+        return references.addAll(entities);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/component/Entity.java

@@ -0,0 +1,101 @@
+package com.iqser.red.service.redaction.v1.server.model.component;
+
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class Entity {
+
+    String id;
+    String type;
+    EntryType entryType;
+    EntryState state;
+    String value;
+    String reason;
+    String matchedRule;
+    String legalBasis;
+
+    boolean imported;
+
+    SemanticNode containingNode;
+    String section;
+    float[] color;
+
+    List<Position> positions;
+
+    String textBefore;
+    String textAfter;
+
+    int startOffset;
+    int endOffset;
+    int length;
+
+    boolean imageHasTransparency;
+
+    boolean isDictionaryEntry;
+    boolean isDossierDictionaryEntry;
+
+    boolean excluded;
+
+    List<Change> changes;
+
+    List<ManualChange> manualChanges;
+
+    Set<Engine> engines;
+
+    Set<String> reference;
+
+    Set<String> importedRedactionIntersections;
+
+
+    public static Entity fromEntityLogEntry(EntityLogEntry e, Document document) {
+
+        return Entity.builder()
+                .id(e.getId())
+                .type(e.getType())
+                .entryType(e.getEntryType())
+                .state(e.getState())
+                .value(e.getValue())
+                .reason(e.getReason())
+                .matchedRule(e.getMatchedRule())
+                .legalBasis(e.getLegalBasis())
+                .imported(e.isImported())
+                .section(e.getSection())
+                .color(e.getColor()).positions(e.getPositions()).containingNode(document.getDocumentTree().getEntryById(e.getContainingNodeId()).getNode())
+                .textBefore(e.getTextBefore())
+                .textAfter(e.getTextAfter())
+                .startOffset(e.getStartOffset())
+                .endOffset(e.getEndOffset())
+                .length(e.getValue().length())
+                .imageHasTransparency(e.isImageHasTransparency())
+                .isDictionaryEntry(e.isDictionaryEntry())
+                .isDossierDictionaryEntry(e.isDossierDictionaryEntry())
+                .excluded(e.isExcluded())
+                .changes(e.getChanges())
+                .manualChanges(e.getManualChanges())
+                .engines(e.getEngines())
+                .reference(e.getReference())
+                .importedRedactionIntersections(e.getImportedRedactionIntersections())
+                .build();
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/Dictionary.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import static java.lang.String.format;
 
@@ -15,10 +15,10 @@ import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.MatchedRule;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.utils.Patterns;
 
 import lombok.Data;
 import lombok.Getter;
@@ -116,28 +116,28 @@ public class Dictionary {
     }
 
 
-    public void recommendEverywhere(RedactionEntity redactionEntity) {
+    public void recommendEverywhere(TextEntity textEntity) {
 
-        addLocalDictionaryEntry(redactionEntity.getType(), redactionEntity.getValue(), redactionEntity.getMatchedRuleList(), false);
+        addLocalDictionaryEntry(textEntity.getType(), textEntity.getValue(), textEntity.getMatchedRuleList(), false);
     }
 
 
-    public void recommendEverywhereWithLastNameSeparately(RedactionEntity redactionEntity) {
+    public void recommendEverywhereWithLastNameSeparately(TextEntity textEntity) {
 
-        addLocalDictionaryEntry(redactionEntity.getType(), redactionEntity.getValue(), redactionEntity.getMatchedRuleList(), true);
+        addLocalDictionaryEntry(textEntity.getType(), textEntity.getValue(), textEntity.getMatchedRuleList(), true);
     }
 
 
-    public void addMultipleAuthorsAsRecommendation(RedactionEntity redactionEntity) {
+    public void addMultipleAuthorsAsRecommendation(TextEntity textEntity) {
 
-        String cleanedWord = redactionEntity.getValue().replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
+        String cleanedWord = textEntity.getValue().replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
         Pattern pattern = Patterns.AUTHOR_TABLE_SPLITTER;
         Matcher matcher = pattern.matcher(cleanedWord);
 
         while (matcher.find()) {
             String match = matcher.group().trim();
             if (match.length() >= 3) {
-                addLocalDictionaryEntry(redactionEntity.getType(), match, redactionEntity.getMatchedRuleList(), true);
+                addLocalDictionaryEntry(textEntity.getType(), match, textEntity.getMatchedRuleList(), true);
             }
         }
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryEntries.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import java.util.HashSet;
 import java.util.Set;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryIncrement.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import java.util.Set;
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryIncrementValue.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryModel.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -7,7 +7,7 @@ import java.util.stream.Collectors;
 
 import com.iqser.red.service.dictionarymerge.commons.DictionaryEntry;
 import com.iqser.red.service.dictionarymerge.commons.DictionaryEntryModel;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.MatchedRule;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryRepresentation.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import java.util.ArrayList;
 import java.util.HashMap;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryVersion.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/SearchImplementation.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,7 +9,7 @@ import java.util.stream.Collectors;
 
 import org.ahocorasick.trie.Trie;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
 
 import lombok.Data;
 
@@ -83,29 +83,29 @@ public class SearchImplementation {
     }
 
 
-    public List<Boundary> getBoundaries(CharSequence text) {
+    public List<TextRange> getBoundaries(CharSequence text) {
 
         if (this.values.isEmpty()) {
             return new ArrayList<>();
         }
         if (this.pattern != null) {
-            return this.pattern.matcher(text).results().map(r -> new Boundary(r.start(), r.end())).collect(Collectors.toList());
+            return this.pattern.matcher(text).results().map(r -> new TextRange(r.start(), r.end())).collect(Collectors.toList());
         } else {
-            return this.trie.parseText(text).stream().map(r -> new Boundary(r.getStart(), r.getEnd() + 1)).collect(Collectors.toList());
+            return this.trie.parseText(text).stream().map(r -> new TextRange(r.getStart(), r.getEnd() + 1)).collect(Collectors.toList());
         }
     }
 
 
-    public List<Boundary> getBoundaries(CharSequence text, Boundary region) {
+    public List<TextRange> getBoundaries(CharSequence text, TextRange region) {
 
         if (this.values.isEmpty()) {
             return new ArrayList<>();
         }
         CharSequence subSequence = text.subSequence(region.start(), region.end());
         if (this.pattern != null) {
-            return this.pattern.matcher(subSequence).results().map(r -> new Boundary(r.start() + region.start(), r.end() + region.start())).collect(Collectors.toList());
+            return this.pattern.matcher(subSequence).results().map(r -> new TextRange(r.start() + region.start(), r.end() + region.start())).collect(Collectors.toList());
         } else {
-            return this.trie.parseText(subSequence).stream().map(r -> new Boundary(r.getStart() + region.start(), r.getEnd() + region.start() + 1)).collect(Collectors.toList());
+            return this.trie.parseText(subSequence).stream().map(r -> new TextRange(r.getStart() + region.start(), r.getEnd() + region.start() + 1)).collect(Collectors.toList());
         }
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/TenantDictionary.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import java.util.HashMap;
 import java.util.Map;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/ConsecutiveBoundaryCollector.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph;
+package com.iqser.red.service.redaction.v1.server.model.document;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -11,17 +11,17 @@ import java.util.stream.Collector;
 
 import com.google.common.base.Functions;
 
-public class ConsecutiveBoundaryCollector implements Collector<Boundary, List<Boundary>, List<Boundary>> {
+public class ConsecutiveBoundaryCollector implements Collector<TextRange, List<TextRange>, List<TextRange>> {
 
     @Override
-    public Supplier<List<Boundary>> supplier() {
+    public Supplier<List<TextRange>> supplier() {
 
         return LinkedList::new;
     }
 
 
     @Override
-    public BiConsumer<List<Boundary>, Boundary> accumulator() {
+    public BiConsumer<List<TextRange>, TextRange> accumulator() {
 
         return (existingList, boundary) -> {
             if (existingList.isEmpty()) {
@@ -29,14 +29,14 @@ public class ConsecutiveBoundaryCollector implements Collector<Boundary, List<Bo
                 return;
             }
 
-            Boundary prevBoundary = existingList.get(existingList.size() - 1);
-            if (prevBoundary.end() > boundary.start()) {
-                throw new IllegalArgumentException(String.format("Can't concatenate %s and %s. Boundaries must be ordered!", prevBoundary, boundary));
+            TextRange prevTextRange = existingList.get(existingList.size() - 1);
+            if (prevTextRange.end() > boundary.start()) {
+                throw new IllegalArgumentException(String.format("Can't concatenate %s and %s. Boundaries must be ordered!", prevTextRange, boundary));
             }
 
-            if (prevBoundary.end() == boundary.start()) {
+            if (prevTextRange.end() == boundary.start()) {
                 existingList.remove(existingList.size() - 1);
-                existingList.add(Boundary.merge(List.of(prevBoundary, boundary)));
+                existingList.add(TextRange.merge(List.of(prevTextRange, boundary)));
             } else {
                 existingList.add(boundary);
             }
@@ -45,7 +45,7 @@ public class ConsecutiveBoundaryCollector implements Collector<Boundary, List<Bo
 
 
     @Override
-    public BinaryOperator<List<Boundary>> combiner() {
+    public BinaryOperator<List<TextRange>> combiner() {
 
         return (list1, list2) -> {
             list1.addAll(list2);
@@ -55,7 +55,7 @@ public class ConsecutiveBoundaryCollector implements Collector<Boundary, List<Bo
 
 
     @Override
-    public Function<List<Boundary>, List<Boundary>> finisher() {
+    public Function<List<TextRange>, List<TextRange>> finisher() {
 
         return Functions.identity();
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/DocumentData.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.data;
+package com.iqser.red.service.redaction.v1.server.model.document;
 
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/DocumentTree.java

@@ -1,20 +1,21 @@
-package com.iqser.red.service.redaction.v1.server.document.graph;
+package com.iqser.red.service.redaction.v1.server.model.document;
 
 import static java.lang.String.format;
 
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Stream;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.GenericSemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCell;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Table;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.GenericSemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -135,6 +136,48 @@ public class DocumentTree {
     }
 
 
+    public Optional<SemanticNode> getNextSibling(List<Integer> treeId) {
+
+        var siblingTreeId = getNextSiblingId(treeId);
+        if (!entryExists(siblingTreeId)) {
+            return Optional.empty();
+        }
+        return Optional.of(getEntryById(siblingTreeId).getNode());
+    }
+
+
+    public List<Integer> getNextSiblingId(List<Integer> treeId) {
+
+        List<Integer> siblingTreeId = new LinkedList<>();
+        for (int i = 0; i < treeId.size() - 1; i++) {
+            siblingTreeId.add(treeId.get(i));
+        }
+        siblingTreeId.add(treeId.get(treeId.size() - 1) + 1);
+        return siblingTreeId;
+    }
+
+
+    public Optional<SemanticNode> getPreviousSibling(List<Integer> treeId) {
+
+        var siblingTreeId = getPreviousSiblingId(treeId);
+        if (!entryExists(siblingTreeId)) {
+            return Optional.empty();
+        }
+        return Optional.of(getEntryById(siblingTreeId).getNode());
+    }
+
+
+    public List<Integer> getPreviousSiblingId(List<Integer> treeId) {
+
+        List<Integer> siblingTreeId = new LinkedList<>();
+        for (int i = 0; i < treeId.size() - 1; i++) {
+            siblingTreeId.add(treeId.get(i));
+        }
+        siblingTreeId.add(treeId.get(treeId.size() - 1) - 1);
+        return siblingTreeId;
+    }
+
+
     public Entry getEntryById(List<Integer> treeId) {
 
         if (treeId.isEmpty()) {

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/TextRange.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph;
+package com.iqser.red.service.redaction.v1.server.model.document;
 
 import static java.lang.String.format;
 
@@ -6,20 +6,20 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
 
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
 
 @Setter
 @EqualsAndHashCode
-public class Boundary implements Comparable<Boundary> {
+public class TextRange implements Comparable<TextRange> {
 
     private int start;
     private int end;
 
 
-    public Boundary(int start, int end) {
+    public TextRange(int start, int end) {
 
         if (start > end) {
             throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
@@ -47,15 +47,15 @@ public class Boundary implements Comparable<Boundary> {
     }
 
 
-    public boolean contains(Boundary boundary) {
+    public boolean contains(TextRange textRange) {
 
-        return start <= boundary.start() && boundary.end() <= end;
+        return start <= textRange.start() && textRange.end() <= end;
     }
 
 
-    public boolean containedBy(Boundary boundary) {
+    public boolean containedBy(TextRange textRange) {
 
-        return boundary.contains(this);
+        return textRange.contains(this);
     }
 
 
@@ -83,18 +83,18 @@ public class Boundary implements Comparable<Boundary> {
     }
 
 
-    public boolean intersects(Boundary boundary) {
+    public boolean intersects(TextRange textRange) {
 
-        return boundary.start() < this.end && this.start < boundary.end();
+        return textRange.start() < this.end && this.start < textRange.end();
     }
 
 
-    public List<Boundary> split(List<Integer> splitIndices) {
+    public List<TextRange> split(List<Integer> splitIndices) {
 
         if (splitIndices.stream().anyMatch(idx -> !this.contains(idx))) {
             throw new IndexOutOfBoundsException(format("%s splitting indices are out of range for %s", splitIndices.stream().filter(idx -> !this.contains(idx)).toList(), this));
         }
-        List<Boundary> splitBoundaries = new LinkedList<>();
+        List<TextRange> splitBoundaries = new LinkedList<>();
         int previousIndex = start;
         for (int splitIndex : splitIndices) {
 
@@ -102,19 +102,19 @@ public class Boundary implements Comparable<Boundary> {
             if (splitIndex == previousIndex) {
                 continue;
             }
-            splitBoundaries.add(new Boundary(previousIndex, splitIndex));
+            splitBoundaries.add(new TextRange(previousIndex, splitIndex));
             previousIndex = splitIndex;
         }
-        splitBoundaries.add(new Boundary(previousIndex, end));
+        splitBoundaries.add(new TextRange(previousIndex, end));
         return splitBoundaries;
     }
 
 
-    public static Boundary merge(Collection<Boundary> boundaries) {
+    public static TextRange merge(Collection<TextRange> boundaries) {
 
-        int minStart = boundaries.stream().mapToInt(Boundary::start).min().orElseThrow(IllegalArgumentException::new);
-        int maxEnd = boundaries.stream().mapToInt(Boundary::end).max().orElseThrow(IllegalArgumentException::new);
-        return new Boundary(minStart, maxEnd);
+        int minStart = boundaries.stream().mapToInt(TextRange::start).min().orElseThrow(IllegalArgumentException::new);
+        int maxEnd = boundaries.stream().mapToInt(TextRange::end).max().orElseThrow(IllegalArgumentException::new);
+        return new TextRange(minStart, maxEnd);
     }
 
 
@@ -126,12 +126,12 @@ public class Boundary implements Comparable<Boundary> {
 
 
     @Override
-    public int compareTo(Boundary boundary) {
+    public int compareTo(TextRange textRange) {
 
-        if (end < boundary.end() && start < boundary.start()) {
+        if (end < textRange.end() && start < textRange.start()) {
             return -1;
         }
-        if (start > boundary.start() && end > boundary.end()) {
+        if (start > textRange.start() && end > textRange.end()) {
             return 1;
         }
 
@@ -145,7 +145,7 @@ public class Boundary implements Comparable<Boundary> {
      * @param textBlock TextBlock to check whitespaces against
      * @return trimmed boundary
      */
-    public Boundary trim(TextBlock textBlock) {
+    public TextRange trim(TextBlock textBlock) {
 
         if (this.length() == 0) {
             return this;
@@ -160,7 +160,7 @@ public class Boundary implements Comparable<Boundary> {
             trimmedEnd--;
         }
 
-        return new Boundary(trimmedStart, Math.max(trimmedEnd, trimmedStart));
+        return new TextRange(trimmedStart, Math.max(trimmedEnd, trimmedStart));
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/EntityType.java

@@ -1,7 +1,8 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
 
 public enum EntityType {
     ENTITY,
+    HINT,
     RECOMMENDATION,
     FALSE_POSITIVE,
     FALSE_RECOMMENDATION

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/IEntity.java

@@ -1,64 +1,111 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.PriorityQueue;
 import java.util.Set;
 
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
+
 import lombok.NonNull;
 
-public interface MatchedRuleHolder {
+public interface IEntity {
 
     PriorityQueue<MatchedRule> getMatchedRuleList();
 
 
-    boolean isIgnored();
+    ManualChangeOverwrite getManualOverwrite();
 
 
-    boolean isRemoved();
+    String getValue();
 
 
-    void setIgnored(boolean ignored);
+    TextRange getTextRange();
 
 
-    void setRemoved(boolean ignored);
+    String type();
 
 
-    default boolean isApplied() {
+    default int length() {
 
-        return getMatchedRule().isApplied();
+        return value().length();
     }
 
 
-    default Set<RedactionEntity> getReferences() {
+    default String value() {
+
+        return getManualOverwrite().getValue().orElse(getValue() == null ? "" : getValue());
+    }
+
+
+    // Don't use default accessor pattern (e.g. isApplied()), as it might lead to errors in drools due to property-specific optimization of the drools planner.
+    default boolean applied() {
+
+        return getManualOverwrite().getApplied().orElse(getMatchedRule().isApplied());
+    }
+
+
+    default boolean skipped() {
+
+        return !applied();
+    }
+
+
+    default boolean ignored() {
+
+        return getManualOverwrite().getIgnored().orElse(getMatchedRule().isIgnored());
+    }
+
+
+    default boolean removed() {
+
+        return getManualOverwrite().getRemoved().orElse(getMatchedRule().isRemoved());
+    }
+
+
+    default boolean resized() {
+
+        return getManualOverwrite().getResized().orElse(false);
+    }
+
+
+    default boolean active() {
+
+        return !(removed() || ignored());
+    }
+
+
+    default boolean hasManualChanges() {
+
+        return !getManualOverwrite().getManualChangeLog().isEmpty();
+    }
+
+
+    default Set<TextEntity> references() {
 
         return getMatchedRule().getReferences();
     }
 
 
-    default boolean isActive() {
-
-        return !(isRemoved() || isIgnored());
-    }
-
-
-    default void apply(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis) {
+    default void redact(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis) {
 
         if (legalBasis.isBlank() || legalBasis.isEmpty()) {
             throw new IllegalArgumentException("legal basis cannot be empty when redacting an entity");
         }
+        apply(ruleIdentifier, reason, legalBasis);
+    }
+
+
+    default void apply(@NonNull String ruleIdentifier, String reason, String legalBasis) {
+
         addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).legalBasis(legalBasis).applied(true).build());
     }
 
 
-    default void force(@NonNull String ruleIdentifier, String reason, String legalBasis) {
+    default void apply(@NonNull String ruleIdentifier, String reason) {
 
-        addMatchedRule(MatchedRule.builder()
-                .ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier))
-                .reason(reason)
-                .legalBasis(getLegalBasisOrPreviousLegalBasisOrPlaceHolder(legalBasis))
-                .applied(true)
-                .build());
+        apply(ruleIdentifier, reason, "n-a");
     }
 
 
@@ -70,27 +117,13 @@ public interface MatchedRuleHolder {
 
     default void remove(String ruleIdentifier, String reason) {
 
-        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).build());
-        setRemoved(true);
+        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).removed(true).build());
     }
 
 
     default void ignore(String ruleIdentifier, String reason) {
 
-        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).build());
-        setIgnored(true);
-    }
-
-
-    private String getLegalBasisOrPreviousLegalBasisOrPlaceHolder(String legalBasis) {
-
-        if (legalBasis == null || legalBasis.isBlank() || legalBasis.isEmpty()) {
-            if (getMatchedRule() == null || !getMatchedRule().isApplied()) {
-                return "n-a";
-            }
-            return getMatchedRule().getLegalBasis();
-        }
-        return legalBasis;
+        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).ignored(true).build());
     }
 
 
@@ -109,7 +142,7 @@ public interface MatchedRuleHolder {
     }
 
 
-    default void applyWithReferences(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis, Collection<RedactionEntity> references) {
+    default void applyWithReferences(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis, Collection<TextEntity> references) {
 
         if (legalBasis.isBlank() || legalBasis.isEmpty()) {
             throw new IllegalArgumentException("legal basis cannot be empty when redacting an entity");
@@ -124,7 +157,7 @@ public interface MatchedRuleHolder {
     }
 
 
-    default void skipWithReferences(@NonNull String ruleIdentifier, String reason, Collection<RedactionEntity> references) {
+    default void skipWithReferences(@NonNull String ruleIdentifier, String reason, Collection<TextEntity> references) {
 
         getMatchedRuleList().add(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).references(new HashSet<>(references)).build());
     }
@@ -138,6 +171,9 @@ public interface MatchedRuleHolder {
 
     default void addMatchedRules(Collection<MatchedRule> matchedRules) {
 
+        if (getMatchedRuleList().equals(matchedRules)) {
+            return;
+        }
         getMatchedRuleList().addAll(matchedRules);
     }
 
@@ -156,4 +192,22 @@ public interface MatchedRuleHolder {
         return getMatchedRuleList().peek();
     }
 
+
+    default String buildReasonWithManualChangeDescriptions() {
+
+        if (getManualOverwrite().getDescriptions().isEmpty()) {
+            return getMatchedRule().getReason();
+        }
+        if (getMatchedRule().getReason().isEmpty()) {
+            return String.join(", ", getManualOverwrite().getDescriptions());
+        }
+        return getMatchedRule().getReason() + ", " + String.join(", ", getManualOverwrite().getDescriptions());
+    }
+
+
+    default String legalBasis() {
+
+        return getManualOverwrite().getLegalBasis().orElse(getMatchedRule().getLegalBasis());
+    }
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java

@@ -0,0 +1,200 @@
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ManualChangeOverwrite {
+
+    private static final Map<Class<? extends BaseAnnotation>, String> MANUAL_CHANGE_DESCRIPTIONS = Map.of(//
+            ManualRedactionEntry.class, "created by manual change", //
+            ManualLegalBasisChange.class, "legal basis was manually changed", //
+            ManualResizeRedaction.class, "resized by manual override", //
+            ManualForceRedaction.class, "forced by manual override", //
+            IdRemoval.class, "removed by manual override", //
+            ManualRecategorization.class, "recategorized by manual override");
+
+    List<BaseAnnotation> manualChanges = new LinkedList<>();
+    boolean changed;
+    List<String> descriptions;
+    String type;
+    String legalBasis;
+    String section;
+    String value;
+    Boolean applied;
+    Boolean removed;
+    Boolean ignored;
+    Boolean resized;
+    Boolean recategorized;
+
+
+    public void calculateCurrentOverride() {
+
+        if (!changed) {
+            return;
+        }
+        List<BaseAnnotation> sortedManualChanges = getManualChangeLog();
+        updateFields(sortedManualChanges);
+    }
+
+
+    public List<BaseAnnotation> getManualChangeLog() {
+
+        if (!changed) {
+            return manualChanges;
+        }
+        manualChanges.sort(Comparator.comparing(BaseAnnotation::getRequestDate));
+        updateFields(manualChanges);
+        // make list unmodifiable.
+        return manualChanges.stream().toList();
+    }
+
+
+    private void updateFields(List<BaseAnnotation> sortedManualChanges) {
+
+        descriptions = new LinkedList<>();
+
+        for (BaseAnnotation manualChange : sortedManualChanges) {
+            // ManualRedactionEntries are created prior to rule execution in analysis service.
+
+            if (manualChange instanceof IdRemoval) {
+                applied = false;
+                ignored = true;
+            }
+
+            if (manualChange instanceof ManualForceRedaction manualForceRedaction) {
+                removed = false;
+                ignored = false;
+                applied = true;
+                legalBasis = manualForceRedaction.getLegalBasis();
+            }
+
+            if (manualChange instanceof ManualLegalBasisChange manualLegalBasisChange) {
+                section = manualLegalBasisChange.getSection();
+                legalBasis = manualLegalBasisChange.getLegalBasis();
+                value = manualLegalBasisChange.getValue();
+            }
+
+            if (manualChange instanceof ManualResizeRedaction) {
+                // resizing logic happens in ManualChangesApplicationService.
+                resized = true;
+            }
+
+            if (manualChange instanceof ManualRecategorization recategorization) {
+                // recategorization logic happens in ManualChangesApplicationService.
+                recategorized = true;
+                // this is only relevant for ManualEntities. Image and TextEntity is recategorized in the ManualChangesApplicationService.
+                type = recategorization.getType();
+            }
+
+            descriptions.add(MANUAL_CHANGE_DESCRIPTIONS.get(manualChange.getClass()));
+        }
+        changed = false;
+    }
+
+
+    public void addChange(BaseAnnotation manualChange) {
+
+        changed = true;
+        manualChanges.add(manualChange);
+    }
+
+
+    public void addChanges(List<BaseAnnotation> manualChangeLog) {
+
+        changed = true;
+        manualChanges.addAll(manualChangeLog);
+    }
+
+
+    public Optional<String> getLegalBasis() {
+
+        calculateCurrentOverride();
+        return legalBasis == null ? Optional.empty() : Optional.of(legalBasis);
+    }
+
+
+    public Optional<String> getType() {
+
+        calculateCurrentOverride();
+        return type == null ? Optional.empty() : Optional.of(type);
+    }
+
+
+    public Optional<String> getSection() {
+
+        calculateCurrentOverride();
+        return section == null ? Optional.empty() : Optional.of(section);
+    }
+
+
+    public Optional<String> getValue() {
+
+        calculateCurrentOverride();
+        return value == null ? Optional.empty() : Optional.of(value);
+    }
+
+
+    public Optional<Boolean> getApplied() {
+
+        calculateCurrentOverride();
+        return applied == null ? Optional.empty() : Optional.of(applied);
+    }
+
+
+    public Optional<Boolean> getRemoved() {
+
+        calculateCurrentOverride();
+        return removed == null ? Optional.empty() : Optional.of(removed);
+    }
+
+
+    public Optional<Boolean> getIgnored() {
+
+        calculateCurrentOverride();
+        return ignored == null ? Optional.empty() : Optional.of(ignored);
+    }
+
+
+    public Optional<Boolean> getResized() {
+
+        calculateCurrentOverride();
+        return resized == null ? Optional.empty() : Optional.of(resized);
+    }
+
+
+    public Optional<Boolean> getRecategorized() {
+
+        calculateCurrentOverride();
+        return recategorized == null ? Optional.empty() : Optional.of(recategorized);
+    }
+
+
+    public List<String> getDescriptions() {
+
+        calculateCurrentOverride();
+        return descriptions == null ? Collections.emptyList() : descriptions;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/MatchedRule.java

@@ -0,0 +1,88 @@
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleType;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@EqualsAndHashCode
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public final class MatchedRule implements Comparable<MatchedRule> {
+
+    public static final RuleType FINAL_TYPE = RuleType.fromString("FINAL");
+    public static final RuleType ELIMINATION_RULE_TYPE = RuleType.fromString("X");
+    private static final List<RuleType> RULE_TYPE_PRIORITIES = List.of(FINAL_TYPE, ELIMINATION_RULE_TYPE);
+
+    RuleIdentifier ruleIdentifier;
+    @Builder.Default
+    String reason = "";
+    @Builder.Default
+    String legalBasis = "";
+    boolean applied;
+    boolean writeValueWithLineBreaks;
+    boolean removed;
+    boolean ignored;
+    boolean resized;
+    @Builder.Default
+    Set<TextEntity> references = Collections.emptySet();
+
+
+    public static MatchedRule empty() {
+
+        return MatchedRule.builder().ruleIdentifier(RuleIdentifier.empty()).build();
+    }
+
+
+    @Override
+    public int compareTo(MatchedRule matchedRule) {
+
+        // Only the highest ranked rule is actually applied, this method defines the highest order.
+        // First, it compares the Rule Type, RULE_TYPE_PRIORITIES defines the order of types.
+        // Types not in the list have the lowest priority.
+        // The ones in the list are technical exceptions and should override any other Rule.
+        // Aside from them Entities should never match from more than one type!
+        // E.g. a CBI_author entity should **always** only match CBI.*.* rules.
+        // Otherwise, something went wrong with the rules. :)
+        RuleIdentifier otherRuleIdentifier = matchedRule.getRuleIdentifier();
+        boolean thisInList = RULE_TYPE_PRIORITIES.contains(this.getRuleIdentifier().type());
+        boolean otherInList = RULE_TYPE_PRIORITIES.contains(otherRuleIdentifier.type());
+
+        // Compare the types
+        if (thisInList && !otherInList) {
+            return -1;
+        } else if (!thisInList && otherInList) {
+            return 1;
+        } else if (thisInList && otherInList) {
+            int thisIndex = RULE_TYPE_PRIORITIES.indexOf(this.getRuleIdentifier().type());
+            int otherIndex = RULE_TYPE_PRIORITIES.indexOf(otherRuleIdentifier.type());
+            return Integer.compare(thisIndex, otherIndex);
+        }
+        // Then compare the unit
+        if (!Objects.equals(otherRuleIdentifier.unit(), getRuleIdentifier().unit())) {
+            return Integer.compare(otherRuleIdentifier.unit(), ruleIdentifier.unit());
+        }
+        // Then compare the id inside the unit
+        return Integer.compare(otherRuleIdentifier.id(), ruleIdentifier.id());
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "MatchedRule[ruleIdentifier=" + ruleIdentifier + ", reason=" + reason + ", legalBasis=" + legalBasis + ", applied=" + applied + ", writeValueWithLineBreaks=" + writeValueWithLineBreaks + ", references=" + references + ']';
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/PositionOnPage.java

@@ -1,9 +1,9 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
 
 import java.awt.geom.Rectangle2D;
 import java.util.List;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -13,12 +13,13 @@ import lombok.experimental.FieldDefaults;
 @Data
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class RedactionPosition {
+public class PositionOnPage {
 
+    // Each entry in this list corresponds to an entry in the redaction log, this means:
+    // A single entity might be represented by multiple redaction log entries
+    // This is due to the RedactionLog only being able to handle a single page per entry.
     final String id;
     Page page;
-    // Each entry in this list corresponds to an entry in the redaction log, this means:
-    // An entity might be represented by multiple redaction log entries
     List<Rectangle2D> rectanglePerLine;
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/TextEntity.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
 
 import java.awt.geom.Rectangle2D;
 import java.util.Collection;
@@ -10,11 +10,11 @@ import java.util.Map;
 import java.util.PriorityQueue;
 import java.util.Set;
 
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.utils.IdBuilder;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -28,29 +28,27 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class RedactionEntity implements MatchedRuleHolder {
+public class TextEntity implements IEntity {
 
-    // initial values
+    // primary key
     @EqualsAndHashCode.Include
-    final Boundary boundary;
+    final TextRange textRange;
     @EqualsAndHashCode.Include
     final String type;
     @EqualsAndHashCode.Include
     final EntityType entityType;
+    // primary key end
 
-    // empty defaults
-    boolean removed;
-    boolean ignored;
+    @Builder.Default
+    final PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
+    @Builder.Default
+    final ManualChangeOverwrite manualOverwrite = new ManualChangeOverwrite();
 
-    boolean resized;
-    boolean skipRemoveEntitiesContainedInLarger;
     boolean dictionaryEntry;
     boolean dossierDictionaryEntry;
-    @Builder.Default
-    Set<Engine> engines = new HashSet<>();
 
     @Builder.Default
-    PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
+    Set<Engine> engines = new HashSet<>();
 
     // inferred on graph insertion
     String value;
@@ -58,15 +56,15 @@ public class RedactionEntity implements MatchedRuleHolder {
     String textAfter;
     @Builder.Default
     Set<Page> pages = new HashSet<>();
-    List<RedactionPosition> redactionPositionsPerPage;
+    List<PositionOnPage> positionsOnPagePerPage;
     @Builder.Default
     List<SemanticNode> intersectingNodes = new LinkedList<>();
     SemanticNode deepestFullyContainingNode;
 
 
-    public static RedactionEntity initialEntityNode(Boundary boundary, String type, EntityType entityType) {
+    public static TextEntity initialEntityNode(TextRange textRange, String type, EntityType entityType) {
 
-        return RedactionEntity.builder().type(type).entityType(entityType).boundary(boundary).build();
+        return TextEntity.builder().type(type).entityType(entityType).textRange(textRange).build();
     }
 
 
@@ -102,7 +100,7 @@ public class RedactionEntity implements MatchedRuleHolder {
 
     public String getValueWithLineBreaks() {
 
-        return getDeepestFullyContainingNode().getTextBlock().subSequenceWithLineBreaks(getBoundary());
+        return getDeepestFullyContainingNode().getTextBlock().subSequenceWithLineBreaks(getTextRange());
     }
 
 
@@ -113,14 +111,14 @@ public class RedactionEntity implements MatchedRuleHolder {
         intersectingNodes = new LinkedList<>();
         deepestFullyContainingNode = null;
         pages = new HashSet<>();
-        removed = true;
+        remove("FINAL.0.0", "removed completely");
     }
 
 
-    public List<RedactionPosition> getRedactionPositionsPerPage() {
+    public List<PositionOnPage> getPositionsOnPagePerPage() {
 
-        if (redactionPositionsPerPage == null || redactionPositionsPerPage.isEmpty()) {
-            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.getTextBlock().getPositionsPerPage(boundary);
+        if (positionsOnPagePerPage == null || positionsOnPagePerPage.isEmpty()) {
+            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.getTextBlock().getPositionsPerPage(textRange);
 
             Page firstPage = rectanglesPerLinePerPage.keySet()
                     .stream()
@@ -128,37 +126,37 @@ public class RedactionEntity implements MatchedRuleHolder {
                     .orElseThrow(() -> new RuntimeException("No Positions found on any page!"));
 
             String id = IdBuilder.buildId(pages, rectanglesPerLinePerPage.values().stream().flatMap(Collection::stream).toList(), type, entityType.name());
-            redactionPositionsPerPage = rectanglesPerLinePerPage.entrySet().stream().map(entry -> buildRedactionPosition(firstPage, id, entry)).toList();
+            positionsOnPagePerPage = rectanglesPerLinePerPage.entrySet().stream().map(entry -> buildPositionOnPage(firstPage, id, entry)).toList();
         }
-        return redactionPositionsPerPage;
+        return positionsOnPagePerPage;
     }
 
 
-    private static RedactionPosition buildRedactionPosition(Page firstPage, String id, Map.Entry<Page, List<Rectangle2D>> entry) {
+    private static PositionOnPage buildPositionOnPage(Page firstPage, String id, Map.Entry<Page, List<Rectangle2D>> entry) {
 
         if (entry.getKey().equals(firstPage)) {
-            return new RedactionPosition(id, entry.getKey(), entry.getValue());
+            return new PositionOnPage(id, entry.getKey(), entry.getValue());
         } else {
-            return new RedactionPosition(id + "-" + entry.getKey().getNumber(), entry.getKey(), entry.getValue());
+            return new PositionOnPage(id + "-" + entry.getKey().getNumber(), entry.getKey(), entry.getValue());
         }
     }
 
 
-    public boolean containedBy(RedactionEntity redactionEntity) {
+    public boolean containedBy(TextEntity textEntity) {
 
-        return this.boundary.containedBy(redactionEntity.getBoundary());
+        return this.textRange.containedBy(textEntity.getTextRange());
     }
 
 
-    public boolean contains(RedactionEntity redactionEntity) {
+    public boolean contains(TextEntity textEntity) {
 
-        return this.boundary.contains(redactionEntity.getBoundary());
+        return this.textRange.contains(textEntity.getTextRange());
     }
 
 
-    public boolean intersects(RedactionEntity redactionEntity) {
+    public boolean intersects(TextEntity textEntity) {
 
-        return this.boundary.intersects(redactionEntity.getBoundary());
+        return this.textRange.intersects(textEntity.getTextRange());
     }
 
 
@@ -176,7 +174,7 @@ public class RedactionEntity implements MatchedRuleHolder {
 
     public boolean matchesAnnotationId(String manualRedactionId) {
 
-        return getRedactionPositionsPerPage().stream().anyMatch(entityPosition -> entityPosition.getId().equals(manualRedactionId));
+        return getPositionsOnPagePerPage().stream().anyMatch(entityPosition -> entityPosition.getId().equals(manualRedactionId));
     }
 
 
@@ -187,7 +185,7 @@ public class RedactionEntity implements MatchedRuleHolder {
         sb.append("Entity[\"");
         sb.append(value);
         sb.append("\", ");
-        sb.append(boundary);
+        sb.append(textRange);
         sb.append(", pages[");
         pages.forEach(page -> {
             sb.append(page.getNumber());
@@ -202,4 +200,11 @@ public class RedactionEntity implements MatchedRuleHolder {
         return sb.toString();
     }
 
+
+    @Override
+    public String type() {
+
+        return getManualOverwrite().getType().orElse(type);
+    }
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Document.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.awt.geom.Rectangle2D;
 import java.util.Collections;
@@ -10,10 +10,10 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -34,7 +34,7 @@ public class Document implements GenericSemanticNode {
     Integer numberOfPages;
     TextBlock textBlock;
     @Builder.Default
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
     @Builder.Default
     static final SectionIdentifier sectionIdentifier = SectionIdentifier.document();
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Footer.java

@@ -1,12 +1,12 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -34,7 +34,7 @@ public class Footer implements GenericSemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
 
     @Override

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/GenericSemanticNode.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 public interface GenericSemanticNode extends SemanticNode {
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Header.java

@@ -1,12 +1,12 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -34,7 +34,7 @@ public class Header implements GenericSemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
 
     @Override

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Headline.java

@@ -1,13 +1,13 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -33,7 +33,7 @@ public class Headline implements GenericSemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
 
     @Override

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Image.java

@@ -1,20 +1,23 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.awt.geom.Rectangle2D;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.PriorityQueue;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.MatchedRule;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.MatchedRuleHolder;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.ManualChangeOverwrite;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -29,7 +32,7 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @NoArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class Image implements GenericSemanticNode, MatchedRuleHolder {
+public class Image implements GenericSemanticNode, IEntity {
 
     List<Integer> treeId;
     String id;
@@ -38,12 +41,12 @@ public class Image implements GenericSemanticNode, MatchedRuleHolder {
     boolean transparent;
     Rectangle2D position;
 
-    boolean removed;
-    boolean ignored;
-
     @Builder.Default
     PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
 
+    @Builder.Default
+    ManualChangeOverwrite manualOverwrite = new ManualChangeOverwrite();
+
     @EqualsAndHashCode.Exclude
     Page page;
 
@@ -52,7 +55,7 @@ public class Image implements GenericSemanticNode, MatchedRuleHolder {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
 
     @Override
@@ -76,6 +79,20 @@ public class Image implements GenericSemanticNode, MatchedRuleHolder {
     }
 
 
+    @Override
+    public TextRange getTextRange() {
+
+        return GenericSemanticNode.super.getTextRange();
+    }
+
+
+    @Override
+    public String type() {
+
+        return getManualOverwrite().getType().orElse(imageType.toString());
+    }
+
+
     @Override
     public String toString() {
 
@@ -91,4 +108,23 @@ public class Image implements GenericSemanticNode, MatchedRuleHolder {
         return bBoxPerPage;
     }
 
+
+    @Override
+    public String getValue() {
+
+        return NodeType.IMAGE + ":" + camelCase(imageType.toString());
+    }
+
+
+    private String camelCase(String name) {
+
+        return name.charAt(0) + name.substring(1).toLowerCase(Locale.ENGLISH);
+    }
+
+
+    public int length() {
+
+        return 0;
+    }
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/ImageType.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.Locale;
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/NodeType.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.Locale;
 
@@ -16,6 +16,6 @@ public enum NodeType {
 
     public String toString() {
 
-        return this.name().charAt(0) + this.name().substring(1).toLowerCase(Locale.ROOT);
+        return this.name().charAt(0) + this.name().substring(1).toLowerCase(Locale.ENGLISH);
     }
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Page.java

@@ -1,13 +1,12 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -40,7 +39,7 @@ public class Page {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
     @Builder.Default
     @EqualsAndHashCode.Exclude

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Paragraph.java

@@ -1,12 +1,12 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -29,7 +29,7 @@ public class Paragraph implements GenericSemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
 
     @Override

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Section.java

@@ -1,13 +1,13 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -32,7 +32,7 @@ public class Section implements GenericSemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
 
     @Override

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/SectionIdentifier.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.util.Collections;
 import java.util.LinkedList;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/SemanticNode.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import static java.lang.String.format;
 
@@ -9,17 +9,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
-import com.iqser.red.service.redaction.v1.server.document.utils.RedactionSearchUtility;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility;
 
 public interface SemanticNode {
 
@@ -43,11 +44,11 @@ public interface SemanticNode {
 
     /**
      * Any Node maintains its own Set of Entities.
-     * This Set contains all Entities whose boundary intersects the boundary of this node.
+     * This Set contains all Entities whose TextRange intersects the TextRange of this node.
      *
      * @return Set of all Entities associated with this Node
      */
-    Set<RedactionEntity> getEntities();
+    Set<TextEntity> getEntities();
 
 
     /**
@@ -72,16 +73,16 @@ public interface SemanticNode {
 
 
     /**
-     * Each AtomicTextBlock is assigned a page, so to get the pages for this boundary, it collects the PageNodes from each AtomicTextBlock belonging to this node's TextBlock.
+     * Each AtomicTextBlock is assigned a page, so to get the pages for this TextRange, it collects the PageNodes from each AtomicTextBlock belonging to this node's TextBlock.
      *
      * @return Set of PageNodes this node appears on.
      */
-    default Set<Page> getPages(Boundary boundary) {
+    default Set<Page> getPages(TextRange textRange) {
 
-        if (!getBoundary().contains(boundary)) {
-            throw new IllegalArgumentException(format("%s which was used to query for pages is not contained in the %s of this node!", boundary, getBoundary()));
+        if (!getTextRange().contains(textRange)) {
+            throw new IllegalArgumentException(format("%s which was used to query for pages is not contained in the %s of this node!", textRange, getTextRange()));
         }
-        return getTextBlock().getPages(boundary);
+        return getTextBlock().getPages(textRange);
     }
 
 
@@ -170,6 +171,30 @@ public interface SemanticNode {
     }
 
 
+    /**
+     * Returns the next sibling node of this SemanticNode in the document tree, if any.
+     * If there is no next sibling node, an empty Optional is returned.
+     *
+     * @return Optional containing the next sibling node, or empty if there is none
+     */
+    default Optional<SemanticNode> getNextSibling() {
+
+        return getDocumentTree().getNextSibling(getTreeId());
+    }
+
+
+    /**
+     * Returns the previous sibling node of this SemanticNode in the document tree, if any.
+     * If there is no previous sibling node, an empty Optional is returned.
+     *
+     * @return Optional containing the previous sibling node, or empty if there is none
+     */
+    default Optional<SemanticNode> getPreviousSibling() {
+
+        return getDocumentTree().getPreviousSibling(getTreeId());
+    }
+
+
     /**
      * Leaf means a SemanticNode has direct access to a TextBlock, by default this is false and must be overridden.
      * Currently only Sections, Images, and Tables are not leaves.
@@ -215,7 +240,7 @@ public interface SemanticNode {
      */
     default boolean hasEntitiesOfType(String type) {
 
-        return getEntities().stream().filter(RedactionEntity::isActive).anyMatch(redactionEntity -> redactionEntity.getType().equals(type));
+        return getEntities().stream().filter(TextEntity::active).anyMatch(redactionEntity -> redactionEntity.getType().equals(type));
     }
 
 
@@ -224,11 +249,11 @@ public interface SemanticNode {
      * Ignores Entity with ignored == true or removed == true.
      *
      * @param types an array of strings representing the types of entities to check for
-     * @return true, if this SemanticNode has at least one Entity of any of the provided types
+     * @return true, if this SemanticNode has at least one Entity of the provided types
      */
     default boolean hasEntitiesOfAnyType(String... types) {
 
-        return getEntities().stream().filter(RedactionEntity::isActive).anyMatch(redactionEntity -> Arrays.stream(types).anyMatch(type -> redactionEntity.getType().equals(type)));
+        return getEntities().stream().filter(TextEntity::active).anyMatch(redactionEntity -> Arrays.stream(types).anyMatch(type -> redactionEntity.getType().equals(type)));
     }
 
 
@@ -242,8 +267,8 @@ public interface SemanticNode {
     default boolean hasEntitiesOfAllTypes(String... types) {
 
         return getEntities().stream()
-                .filter(RedactionEntity::isActive)
-                .map(RedactionEntity::getType)
+                .filter(TextEntity::active)
+                .map(TextEntity::getType)
                 .collect(Collectors.toUnmodifiableSet())
                 .containsAll(Arrays.stream(types).toList());
     }
@@ -256,9 +281,9 @@ public interface SemanticNode {
      * @param type string representing the type of entities to return
      * @return List of RedactionEntities of any the type
      */
-    default List<RedactionEntity> getEntitiesOfType(String type) {
+    default List<TextEntity> getEntitiesOfType(String type) {
 
-        return getEntities().stream().filter(RedactionEntity::isActive).filter(redactionEntity -> redactionEntity.getType().equals(type)).toList();
+        return getEntities().stream().filter(TextEntity::active).filter(redactionEntity -> redactionEntity.getType().equals(type)).toList();
     }
 
 
@@ -269,9 +294,9 @@ public interface SemanticNode {
      * @param types A list of strings representing the types of entities to return
      * @return List of RedactionEntities of any provided type
      */
-    default List<RedactionEntity> getEntitiesOfType(List<String> types) {
+    default List<TextEntity> getEntitiesOfType(List<String> types) {
 
-        return getEntities().stream().filter(RedactionEntity::isActive).filter(redactionEntity -> redactionEntity.isAnyType(types)).toList();
+        return getEntities().stream().filter(TextEntity::active).filter(redactionEntity -> redactionEntity.isAnyType(types)).toList();
     }
 
 
@@ -282,9 +307,9 @@ public interface SemanticNode {
      * @param types A list of strings representing the types of entities to return
      * @return List of RedactionEntities that match any of the provided types
      */
-    default List<RedactionEntity> getEntitiesOfType(String... types) {
+    default List<TextEntity> getEntitiesOfType(String... types) {
 
-        return getEntities().stream().filter(RedactionEntity::isActive).filter(redactionEntity -> redactionEntity.isAnyType(Arrays.stream(types).toList())).toList();
+        return getEntities().stream().filter(TextEntity::active).filter(redactionEntity -> redactionEntity.isAnyType(Arrays.stream(types).toList())).toList();
     }
 
 
@@ -430,7 +455,7 @@ public interface SemanticNode {
      * @param y the lower left corner Y value
      * @param w width
      * @param h height
-     * @param pageNumber the pagenumber of the rectangle
+     * @param pageNumber the pageNumber of the rectangle
      * @return true if intersects, false otherwise
      */
     default boolean intersectsRectangle(int x, int y, int w, int h, int pageNumber) {
@@ -440,22 +465,22 @@ public interface SemanticNode {
 
 
     /**
-     * This function is used during insertion of EntityNodes into the graph, it checks if the boundary of the RedactionEntity intersects or even contains the RedactionEntity.
+     * This function is used during insertion of EntityNodes into the graph, it checks if the TextRange of the RedactionEntity intersects or even contains the RedactionEntity.
      * It sets the fields accordingly and recursively calls this function on all its children.
      *
-     * @param redactionEntity RedactionEntity, which is being inserted into the graph
+     * @param textEntity RedactionEntity, which is being inserted into the graph
      */
-    default void addThisToEntityIfIntersects(RedactionEntity redactionEntity) {
+    default void addThisToEntityIfIntersects(TextEntity textEntity) {
 
         TextBlock textBlock = getTextBlock();
-        if (textBlock.getBoundary().intersects(redactionEntity.getBoundary())) {
-            if (textBlock.containsBoundary(redactionEntity.getBoundary())) {
-                redactionEntity.setDeepestFullyContainingNode(this);
+        if (textBlock.getTextRange().intersects(textEntity.getTextRange())) {
+            if (textBlock.containsTextRange(textEntity.getTextRange())) {
+                textEntity.setDeepestFullyContainingNode(this);
             }
 
-            redactionEntity.addIntersectingNode(this);
-            streamChildren().filter(semanticNode -> semanticNode.getBoundary().intersects(redactionEntity.getBoundary()))
-                    .forEach(node -> node.addThisToEntityIfIntersects(redactionEntity));
+            textEntity.addIntersectingNode(this);
+            streamChildren().filter(semanticNode -> semanticNode.getTextRange().intersects(textEntity.getTextRange()))
+                    .forEach(node -> node.addThisToEntityIfIntersects(textEntity));
         }
     }
 
@@ -505,13 +530,13 @@ public interface SemanticNode {
 
 
     /**
-     * The Boundary is the start and end string offsets in the reading order of the document.
+     * The TextRange is the start and end string offsets in the reading order of the document.
      *
-     * @return Boundary of this Node's TextBlock
+     * @return TextRange of this Node's TextBlock
      */
-    default Boundary getBoundary() {
+    default TextRange getTextRange() {
 
-        return getTextBlock().getBoundary();
+        return getTextBlock().getTextRange();
     }
 
 
@@ -522,7 +547,7 @@ public interface SemanticNode {
      */
     default int length() {
 
-        return getBoundary().length();
+        return getTextRange().length();
     }
 
 
@@ -582,7 +607,7 @@ public interface SemanticNode {
     private Map<Page, Rectangle2D> getBBoxFromLeafTextBlock(Map<Page, Rectangle2D> bBoxPerPage) {
 
         Map<Page, List<AtomicTextBlock>> atomicTextBlockPerPage = getTextBlock().getAtomicTextBlocks().stream().collect(Collectors.groupingBy(AtomicTextBlock::getPage));
-        atomicTextBlockPerPage.forEach((page, atbs) -> bBoxPerPage.put(page, RectangleTransformations.atomicTextBlockBBox(atbs)));
+        atomicTextBlockPerPage.forEach((page, atomicTextBlocks) -> bBoxPerPage.put(page, RectangleTransformations.atomicTextBlockBBox(atomicTextBlocks)));
         return bBoxPerPage;
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Table.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import static java.lang.String.format;
 
@@ -10,10 +10,10 @@ import java.util.Set;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -38,7 +38,7 @@ public class Table implements SemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
 
     /**
@@ -47,7 +47,7 @@ public class Table implements SemanticNode {
      * @param strings Strings to check whether a row contains them
      * @return Stream of all entities in this table, that appear in a row, which contains any of the provided strings
      */
-    public Stream<RedactionEntity> streamEntitiesWhereRowContainsStringsIgnoreCase(List<String> strings) {
+    public Stream<TextEntity> streamEntitiesWhereRowContainsStringsIgnoreCase(List<String> strings) {
 
         return IntStream.range(0, numberOfRows)
                 .boxed()
@@ -79,7 +79,7 @@ public class Table implements SemanticNode {
      * @param value  the string which the table cell should contain
      * @return a stream of all entities, which appear in a row where at least one cell has the provided header and the provided value.
      */
-    public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndValue(String header, String value) {
+    public Stream<TextEntity> streamEntitiesWhereRowHasHeaderAndValue(String header, String value) {
 
         List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCell::getCol).toList();
         return streamTableCells().filter(tableCellNode -> vertebrateStudyCols.stream()
@@ -94,7 +94,7 @@ public class Table implements SemanticNode {
      * @param values the strings which the table cell should contain
      * @return a stream of all entities, which appear in a row where at least one cell has the provided header and any provided value.
      */
-    public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndAnyValue(String header, List<String> values) {
+    public Stream<TextEntity> streamEntitiesWhereRowHasHeaderAndAnyValue(String header, List<String> values) {
 
         List<Integer> colsWithHeader = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCell::getCol).toList();
         return streamTableCells().filter(tableCellNode -> colsWithHeader.stream()
@@ -109,12 +109,12 @@ public class Table implements SemanticNode {
      * @param types type strings to check whether a row contains an entity like them
      * @return Stream of all entities in this table, that appear in a row, which contains at least one entity with any of the provided types.
      */
-    public Stream<RedactionEntity> streamEntitiesWhereRowContainsEntitiesOfType(List<String> types) {
+    public Stream<TextEntity> streamEntitiesWhereRowContainsEntitiesOfType(List<String> types) {
 
         List<Integer> rowsWithEntityOfType = getEntities().stream()
-                .filter(RedactionEntity::isActive)
+                .filter(TextEntity::active)
                 .filter(redactionEntity -> types.stream().anyMatch(type -> type.equals(redactionEntity.getType())))
-                .map(RedactionEntity::getIntersectingNodes)
+                .map(TextEntity::getIntersectingNodes)
                 .filter(node -> node instanceof TableCell)
                 .map(node -> (TableCell) node)
                 .map(TableCell::getRow)
@@ -131,13 +131,13 @@ public class Table implements SemanticNode {
      * @param types type strings to check whether a row contains an entity like them
      * @return Stream of all entities in this table, that appear in a row, which contains at least one entity with any of the provided types.
      */
-    public Stream<RedactionEntity> streamEntitiesWhereRowContainsNoEntitiesOfType(List<String> types) {
+    public Stream<TextEntity> streamEntitiesWhereRowContainsNoEntitiesOfType(List<String> types) {
 
         return IntStream.range(0, numberOfRows)
                 .boxed()
                 .filter(rowNumber -> streamRow(rowNumber).map(TableCell::getEntities)
                         .flatMap(Collection::stream)
-                        .filter(RedactionEntity::isActive)
+                        .filter(TextEntity::active)
                         .noneMatch(entity -> types.contains(entity.getType())))
                 .flatMap(this::streamRow)
                 .map(TableCell::getEntities)
@@ -247,6 +247,18 @@ public class Table implements SemanticNode {
     }
 
 
+    /**
+     * Streams all Headers and checks if any equal the provided string.
+     *
+     * @param header string to check the headers for
+     * @return true, if at least one header equals the provided string
+     */
+    public boolean hasHeaderIgnoreCase(String header) {
+
+        return streamHeaders().anyMatch(tableCellNode -> tableCellNode.getTextBlock().getSearchText().strip().toLowerCase(Locale.ENGLISH).equals(header.toLowerCase(Locale.ENGLISH)));
+    }
+
+
     /**
      * Checks if this table has a column with the provided header and any of the table cells in that column contain the provided value.
      *
@@ -278,12 +290,12 @@ public class Table implements SemanticNode {
      * Ignores Entity with ignored == true or removed == true.
      *
      * @param type            the type of entities to search for
-     * @param redactionEntity the entity, which appears in the row to search
+     * @param textEntity the entity, which appears in the row to search
      * @return List of all entities of the provided type, which appear in the same row that the provided entity appears in.
      */
-    public List<RedactionEntity> getEntitiesOfTypeInSameRow(String type, RedactionEntity redactionEntity) {
+    public List<TextEntity> getEntitiesOfTypeInSameRow(String type, TextEntity textEntity) {
 
-        return redactionEntity.getIntersectingNodes()
+        return textEntity.getIntersectingNodes()
                 .stream()
                 .filter(node -> node instanceof TableCell)
                 .map(node -> (TableCell) node)

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/TableCell.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
 
 import java.awt.geom.Rectangle2D;
 import java.util.HashMap;
@@ -7,10 +7,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -41,7 +41,7 @@ public class TableCell implements GenericSemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<RedactionEntity> entities = new HashSet<>();
+    Set<TextEntity> entities = new HashSet<>();
 
 
     @Override

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/textblock/AtomicTextBlock.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+package com.iqser.red.service.redaction.v1.server.model.document.textblock;
 
 import static java.lang.String.format;
 
@@ -12,10 +12,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData;
 
@@ -38,7 +38,7 @@ public class AtomicTextBlock implements TextBlock {
     Page page;
 
     //string coordinates
-    Boundary boundary;
+    TextRange textRange;
     String searchText;
     List<Integer> lineBreaks;
 
@@ -61,7 +61,7 @@ public class AtomicTextBlock implements TextBlock {
 
         return AtomicTextBlock.builder()
                 .id(textBlockIdx)
-                .boundary(new Boundary(stringOffset, stringOffset))
+                .textRange(new TextRange(stringOffset, stringOffset))
                 .searchText("")
                 .lineBreaks(Collections.emptyList())
                 .page(page)
@@ -82,7 +82,7 @@ public class AtomicTextBlock implements TextBlock {
                 .id(atomicTextBlockData.getId())
                 .numberOnPage(atomicTextBlockData.getNumberOnPage())
                 .page(page)
-                .boundary(new Boundary(atomicTextBlockData.getStart(), atomicTextBlockData.getEnd()))
+                .textRange(new TextRange(atomicTextBlockData.getStart(), atomicTextBlockData.getEnd()))
                 .searchText(atomicTextBlockData.getSearchText())
                 .lineBreaks(Arrays.stream(atomicTextBlockData.getLineBreaks()).boxed().toList())
                 .stringIdxToPositionIdx(Arrays.stream(atomicPositionBlockData.getStringIdxToPositionIdx()).boxed().toList())
@@ -98,20 +98,20 @@ public class AtomicTextBlock implements TextBlock {
     }
 
 
-    public Boundary getLineBoundary(int lineNumber) {
+    public TextRange getLineTextRange(int lineNumber) {
 
         if (lineNumber >= numberOfLines() || lineNumber < 0) {
-            return new Boundary(boundary.start(), boundary.start());
+            return new TextRange(textRange.start(), textRange.start());
         }
         if (numberOfLines() == 1) {
-            return boundary;
+            return textRange;
         }
         if (lineNumber == 0) {
-            return new Boundary(boundary.start(), lineBreaks.get(0) + boundary.start());
+            return new TextRange(textRange.start(), lineBreaks.get(0) + textRange.start());
         } else if (lineNumber == numberOfLines() - 1) {
-            return new Boundary(lineBreaks.get(lineBreaks.size() - 1) + boundary.start(), boundary.end());
+            return new TextRange(lineBreaks.get(lineBreaks.size() - 1) + textRange.start(), textRange.end());
         }
-        return new Boundary(lineBreaks.get(lineNumber - 1) + boundary.start(), lineBreaks.get(lineNumber) + boundary.start());
+        return new TextRange(lineBreaks.get(lineNumber - 1) + textRange.start(), lineBreaks.get(lineNumber) + textRange.start());
     }
 
 
@@ -126,9 +126,9 @@ public class AtomicTextBlock implements TextBlock {
     public int getNextLinebreak(int fromIndex) {
 
         return lineBreaks.stream()//
-                .filter(linebreak -> linebreak > fromIndex - boundary.start()) //
+                .filter(linebreak -> linebreak > fromIndex - textRange.start()) //
                 .findFirst() //
-                .orElse(searchText.length()) + boundary.start();
+                .orElse(searchText.length()) + textRange.start();
     }
 
 
@@ -136,43 +136,43 @@ public class AtomicTextBlock implements TextBlock {
     public int getPreviousLinebreak(int fromIndex) {
 
         return lineBreaks.stream()//
-                .filter(linebreak -> linebreak <= fromIndex - boundary.start())//
+                .filter(linebreak -> linebreak <= fromIndex - textRange.start())//
                 .reduce((a, b) -> b)//
-                .orElse(0) + boundary.start();
+                .orElse(0) + textRange.start();
     }
 
 
     @Override
     public Rectangle2D getPosition(int stringIdx) {
 
-        return positions.get(stringIdxToPositionIdx.get(stringIdx - boundary.start()));
+        return positions.get(stringIdxToPositionIdx.get(stringIdx - textRange.start()));
     }
 
 
     @Override
-    public List<Rectangle2D> getPositions(Boundary stringBoundary) {
+    public List<Rectangle2D> getPositions(TextRange stringTextRange) {
 
-        if (!containsBoundary(stringBoundary)) {
-            throw new IndexOutOfBoundsException(format("%s is out of bounds for %s", stringBoundary, this.boundary));
+        if (!containsTextRange(stringTextRange)) {
+            throw new IndexOutOfBoundsException(format("%s is out of bounds for %s", stringTextRange, this.textRange));
         }
-        if (stringBoundary.length() == 0) {
+        if (stringTextRange.length() == 0) {
             return Collections.emptyList();
         }
 
-        int startPositionIdx = stringIdxToPositionIdx.get(stringBoundary.start() - this.boundary.start());
+        int startPositionIdx = stringIdxToPositionIdx.get(stringTextRange.start() - this.textRange.start());
 
-        if (stringBoundary.end() == this.boundary.end()) {
+        if (stringTextRange.end() == this.textRange.end()) {
             return positions.subList(startPositionIdx, positions.size());
         }
 
-        return positions.subList(startPositionIdx, stringIdxToPositionIdx.get(stringBoundary.end() - this.boundary.start()));
+        return positions.subList(startPositionIdx, stringIdxToPositionIdx.get(stringTextRange.end() - this.textRange.start()));
 
     }
 
 
-    public Map<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary) {
+    public Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange) {
 
-        List<Rectangle2D> rectanglesPerLine = stringBoundary.split(getAllLineBreaksInBoundary(stringBoundary))
+        List<Rectangle2D> rectanglesPerLine = stringTextRange.split(getAllLineBreaksInBoundary(stringTextRange))
                 .stream()
                 .map(this::getPositions)
                 .map(RectangleTransformations::rectangleBBoxWithGaps)
@@ -185,18 +185,18 @@ public class AtomicTextBlock implements TextBlock {
 
 
     @Override
-    public String subSequenceWithLineBreaks(Boundary boundary) {
+    public String subSequenceWithLineBreaks(TextRange textRange) {
 
-        if (boundary.length() == 0 || !getBoundary().contains(boundary)) {
+        if (textRange.length() == 0 || !getTextRange().contains(textRange)) {
             return "";
         }
 
-        Set<Integer> lbInBoundary = lineBreaks.stream().map(i -> i + boundary.start()).filter(boundary::contains).collect(Collectors.toSet());
-        if (boundary.end() == getBoundary().end()) {
-            lbInBoundary.add(getBoundary().end());
+        Set<Integer> lbInBoundary = lineBreaks.stream().map(i -> i + textRange.start()).filter(textRange::contains).collect(Collectors.toSet());
+        if (textRange.end() == getTextRange().end()) {
+            lbInBoundary.add(getTextRange().end());
         }
         StringBuilder sb = new StringBuilder();
-        for (int i = boundary.start(); i < boundary.end(); i++) {
+        for (int i = textRange.start(); i < textRange.end(); i++) {
             char character = this.charAt(i);
             if (lbInBoundary.contains(i + 1)) {
                 // always plus one, due to the linebreaks being an exclusive end index
@@ -215,9 +215,9 @@ public class AtomicTextBlock implements TextBlock {
     }
 
 
-    private List<Integer> getAllLineBreaksInBoundary(Boundary boundary) {
+    private List<Integer> getAllLineBreaksInBoundary(TextRange textRange) {
 
-        return getLineBreaks().stream().map(linebreak -> linebreak + this.boundary.start()).filter(boundary::contains).toList();
+        return getLineBreaks().stream().map(linebreak -> linebreak + this.textRange.start()).filter(textRange::contains).toList();
     }
 
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/textblock/ConcatenatedTextBlock.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+package com.iqser.red.service.redaction.v1.server.model.document.textblock;
 
 import static java.lang.String.format;
 
@@ -10,8 +10,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
 
 import lombok.AccessLevel;
 import lombok.Data;
@@ -23,7 +23,7 @@ public class ConcatenatedTextBlock implements TextBlock {
 
     List<AtomicTextBlock> atomicTextBlocks;
     String searchText;
-    Boundary boundary;
+    TextRange textRange;
 
 
     public static ConcatenatedTextBlock empty() {
@@ -36,12 +36,12 @@ public class ConcatenatedTextBlock implements TextBlock {
 
         this.atomicTextBlocks = new LinkedList<>();
         if (atomicTextBlocks.isEmpty()) {
-            boundary = new Boundary(-1, -1);
+            textRange = new TextRange(-1, -1);
             return;
         }
         var firstTextBlock = atomicTextBlocks.get(0);
         this.atomicTextBlocks.add(firstTextBlock);
-        boundary = new Boundary(firstTextBlock.getBoundary().start(), firstTextBlock.getBoundary().end());
+        textRange = new TextRange(firstTextBlock.getTextRange().start(), firstTextBlock.getTextRange().end());
 
         atomicTextBlocks.subList(1, atomicTextBlocks.size()).forEach(this::concat);
     }
@@ -50,13 +50,13 @@ public class ConcatenatedTextBlock implements TextBlock {
     public ConcatenatedTextBlock concat(TextBlock textBlock) {
 
         if (this.atomicTextBlocks.isEmpty()) {
-            boundary.setStart(textBlock.getBoundary().start());
-            boundary.setEnd(textBlock.getBoundary().end());
-        } else if (boundary.end() != textBlock.getBoundary().start()) {
-            throw new UnsupportedOperationException(format("Can only concat consecutive TextBlocks, trying to concat %s and %s", boundary, textBlock.getBoundary()));
+            textRange.setStart(textBlock.getTextRange().start());
+            textRange.setEnd(textBlock.getTextRange().end());
+        } else if (textRange.end() != textBlock.getTextRange().start()) {
+            throw new UnsupportedOperationException(format("Can only concat consecutive TextBlocks, trying to concat %s and %s", textRange, textBlock.getTextRange()));
         }
         this.atomicTextBlocks.addAll(textBlock.getAtomicTextBlocks());
-        boundary.setEnd(textBlock.getBoundary().end());
+        textRange.setEnd(textBlock.getTextRange().end());
         this.searchText = null;
         return this;
     }
@@ -64,13 +64,13 @@ public class ConcatenatedTextBlock implements TextBlock {
 
     private AtomicTextBlock getAtomicTextBlockByStringIndex(int stringIdx) {
 
-        return atomicTextBlocks.stream().filter(textBlock -> textBlock.getBoundary().contains(stringIdx)).findAny().orElseThrow(IndexOutOfBoundsException::new);
+        return atomicTextBlocks.stream().filter(textBlock -> textBlock.getTextRange().contains(stringIdx)).findAny().orElseThrow(IndexOutOfBoundsException::new);
     }
 
 
-    private List<AtomicTextBlock> getAllAtomicTextBlocksPartiallyInStringBoundary(Boundary boundary) {
+    private List<AtomicTextBlock> getAllAtomicTextBlocksPartiallyInStringBoundary(TextRange textRange) {
 
-        return atomicTextBlocks.stream().filter(tb -> tb.getBoundary().intersects(boundary)).toList();
+        return atomicTextBlocks.stream().filter(tb -> tb.getTextRange().intersects(textRange)).toList();
     }
 
 
@@ -121,99 +121,99 @@ public class ConcatenatedTextBlock implements TextBlock {
         return getAtomicTextBlockByStringIndex(stringIdx).getPosition(stringIdx);
     }
 
-    public Boundary getLineBoundary(int lineNumber) {
+    public TextRange getLineTextRange(int lineNumber) {
 
         if (atomicTextBlocks.size() == 1) {
-            return atomicTextBlocks.get(0).getLineBoundary(lineNumber);
+            return atomicTextBlocks.get(0).getLineTextRange(lineNumber);
         }
         int lineNumberInCurrentBlock = lineNumber;
         for (AtomicTextBlock atomicTextBlock : atomicTextBlocks) {
             if (lineNumberInCurrentBlock < atomicTextBlock.numberOfLines()) {
-                return atomicTextBlock.getLineBoundary(lineNumberInCurrentBlock);
+                return atomicTextBlock.getLineTextRange(lineNumberInCurrentBlock);
             }
             lineNumberInCurrentBlock -= atomicTextBlock.numberOfLines();
         }
-        return new Boundary(boundary.start(), boundary.start());
+        return new TextRange(textRange.start(), textRange.start());
     }
 
     @Override
-    public List<Rectangle2D> getPositions(Boundary stringBoundary) {
+    public List<Rectangle2D> getPositions(TextRange stringTextRange) {
 
 
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
 
         if (textBlocks.isEmpty()) {
             return Collections.emptyList();
         }
         if (textBlocks.size() == 1) {
-            return textBlocks.get(0).getPositions(stringBoundary);
+            return textBlocks.get(0).getPositions(stringTextRange);
         }
 
         AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        List<Rectangle2D> positions = new LinkedList<>(firstTextBlock.getPositions(new Boundary(stringBoundary.start(), firstTextBlock.getBoundary().end())));
+        List<Rectangle2D> positions = new LinkedList<>(firstTextBlock.getPositions(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().end())));
 
         for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
             positions.addAll(textBlock.getPositions());
         }
 
         var lastTextBlock = textBlocks.get(textBlocks.size() - 1);
-        positions.addAll(lastTextBlock.getPositions(new Boundary(lastTextBlock.getBoundary().start(), stringBoundary.end())));
+        positions.addAll(lastTextBlock.getPositions(new TextRange(lastTextBlock.getTextRange().start(), stringTextRange.end())));
 
         return positions;
     }
 
 
     @Override
-    public Map<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary) {
+    public Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange) {
 
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
 
         if (textBlocks.isEmpty()) {
             return new HashMap<>();
         }
 
         if (textBlocks.size() == 1) {
-            return textBlocks.get(0).getPositionsPerPage(stringBoundary);
+            return textBlocks.get(0).getPositionsPerPage(stringTextRange);
         }
 
         AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getPositionsPerPage(new Boundary(stringBoundary.start(), firstTextBlock.getBoundary().end()));
+        Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getPositionsPerPage(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().end()));
 
         for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
-            rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getPositionsPerPage(textBlock.getBoundary()));
+            rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getPositionsPerPage(textBlock.getTextRange()));
         }
 
         AtomicTextBlock lastTextBlock = textBlocks.get(textBlocks.size() - 1);
         rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage,
-                lastTextBlock.getPositionsPerPage(new Boundary(lastTextBlock.getBoundary().start(), stringBoundary.end())));
+                lastTextBlock.getPositionsPerPage(new TextRange(lastTextBlock.getTextRange().start(), stringTextRange.end())));
 
         return rectanglesPerLinePerPage;
     }
 
 
     @Override
-    public String subSequenceWithLineBreaks(Boundary boundary) {
+    public String subSequenceWithLineBreaks(TextRange textRange) {
 
-        if (boundary.length() == 0 || !getBoundary().contains(boundary)) {
+        if (textRange.length() == 0 || !getTextRange().contains(textRange)) {
             return "";
         }
 
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(boundary);
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(textRange);
 
         if (textBlocks.size() == 1) {
-            return textBlocks.get(0).subSequenceWithLineBreaks(boundary);
+            return textBlocks.get(0).subSequenceWithLineBreaks(textRange);
         }
 
         StringBuilder sb = new StringBuilder();
         AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        sb.append(firstTextBlock.subSequenceWithLineBreaks(new Boundary(boundary.start(), firstTextBlock.getBoundary().end())));
+        sb.append(firstTextBlock.subSequenceWithLineBreaks(new TextRange(textRange.start(), firstTextBlock.getTextRange().end())));
 
         for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
             sb.append(textBlock.searchTextWithLineBreaks());
         }
 
         var lastTextBlock = textBlocks.get(textBlocks.size() - 1);
-        sb.append(lastTextBlock.subSequenceWithLineBreaks(new Boundary(lastTextBlock.getBoundary().start(), boundary.end())));
+        sb.append(lastTextBlock.subSequenceWithLineBreaks(new TextRange(lastTextBlock.getTextRange().start(), textRange.end())));
 
         return sb.toString();
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/textblock/TextBlock.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+package com.iqser.red.service.redaction.v1.server.model.document.textblock;
 
 import static java.lang.String.format;
 
@@ -10,9 +10,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
-import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
 
 public interface TextBlock extends CharSequence {
 
@@ -22,7 +22,7 @@ public interface TextBlock extends CharSequence {
     List<AtomicTextBlock> getAtomicTextBlocks();
 
 
-    Boundary getBoundary();
+    TextRange getTextRange();
 
 
     int getNextLinebreak(int fromIndex);
@@ -31,7 +31,7 @@ public interface TextBlock extends CharSequence {
     int getPreviousLinebreak(int fromIndex);
 
 
-    Boundary getLineBoundary(int lineNumber);
+    TextRange getLineTextRange(int lineNumber);
 
 
 
@@ -41,13 +41,13 @@ public interface TextBlock extends CharSequence {
     Rectangle2D getPosition(int stringIdx);
 
 
-    List<Rectangle2D> getPositions(Boundary stringBoundary);
+    List<Rectangle2D> getPositions(TextRange stringTextRange);
 
 
-    Map<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary);
+    Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange);
 
 
-    String subSequenceWithLineBreaks(Boundary boundary);
+    String subSequenceWithLineBreaks(TextRange textRange);
 
 
     int numberOfLines();
@@ -55,13 +55,13 @@ public interface TextBlock extends CharSequence {
 
     default CharSequence getLine(int lineNumber) {
 
-        return subSequence(getLineBoundary(lineNumber));
+        return subSequence(getLineTextRange(lineNumber));
     }
 
 
     default List<Rectangle2D> getLinePositions(int lineNumber) {
 
-        return getPositions(getLineBoundary(lineNumber));
+        return getPositions(getLineTextRange(lineNumber));
     }
 
 
@@ -72,13 +72,13 @@ public interface TextBlock extends CharSequence {
 
     default String searchTextWithLineBreaks() {
 
-        return subSequenceWithLineBreaks(getBoundary());
+        return subSequenceWithLineBreaks(getTextRange());
     }
 
 
     default int indexOf(String searchTerm) {
 
-        return indexOf(searchTerm, getBoundary().start());
+        return indexOf(searchTerm, getTextRange().start());
     }
 
 
@@ -88,10 +88,10 @@ public interface TextBlock extends CharSequence {
     }
 
 
-    default Set<Page> getPages(Boundary boundary) {
+    default Set<Page> getPages(TextRange textRange) {
 
         return getAtomicTextBlocks().stream()
-                .filter(atomicTextBlock -> atomicTextBlock.getBoundary().intersects(boundary))
+                .filter(atomicTextBlock -> atomicTextBlock.getTextRange().intersects(textRange))
                 .map(AtomicTextBlock::getPage)
                 .collect(Collectors.toUnmodifiableSet());
     }
@@ -99,38 +99,38 @@ public interface TextBlock extends CharSequence {
 
     default int indexOf(String searchTerm, int startOffset) {
 
-        int start = getSearchText().indexOf(searchTerm, startOffset - getBoundary().start());
+        int start = getSearchText().indexOf(searchTerm, startOffset - getTextRange().start());
         if (start == -1) {
             return -1;
         }
-        return start + getBoundary().start();
+        return start + getTextRange().start();
     }
 
 
     default CharSequence getFirstLine() {
 
-        return subSequence(getBoundary().start(), getNextLinebreak(getBoundary().start()));
+        return subSequence(getTextRange().start(), getNextLinebreak(getTextRange().start()));
     }
 
 
-    default boolean containsBoundary(Boundary boundary) {
+    default boolean containsTextRange(TextRange textRange) {
 
-        if (boundary.end() < boundary.start()) {
-            throw new IllegalArgumentException(format("Invalid %s, StartIndex must be smaller than EndIndex", boundary));
+        if (textRange.end() < textRange.start()) {
+            throw new IllegalArgumentException(format("Invalid %s, StartIndex must be smaller than EndIndex", textRange));
         }
-        return getBoundary().contains(boundary);
+        return getTextRange().contains(textRange);
     }
 
 
     default boolean containsIndex(int stringIndex) {
 
-        return getBoundary().contains(stringIndex);
+        return getTextRange().contains(stringIndex);
     }
 
 
-    default CharSequence subSequence(Boundary boundary) {
+    default CharSequence subSequence(TextRange textRange) {
 
-        return subSequence(boundary.start(), boundary.end());
+        return subSequence(textRange.start(), textRange.end());
     }
 
 
@@ -147,21 +147,21 @@ public interface TextBlock extends CharSequence {
     @Override
     default CharSequence subSequence(int start, int end) {
 
-        return getSearchText().substring(start - getBoundary().start(), end - getBoundary().start());
+        return getSearchText().substring(start - getTextRange().start(), end - getTextRange().start());
     }
 
 
     @Override
     default int length() {
 
-        return getBoundary().length();
+        return getTextRange().length();
     }
 
 
     @Override
     default char charAt(int index) {
 
-        return getSearchText().charAt(index - getBoundary().start());
+        return getSearchText().charAt(index - getTextRange().start());
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/textblock/TextBlockCollector.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+package com.iqser.red.service.redaction.v1.server.model.document.textblock;
 
 import java.util.Set;
 import java.util.function.BiConsumer;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/BasicQuery.java

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class BasicQuery {
+
+    String name;
+    int line;
+    String code;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/BasicRule.java

@@ -0,0 +1,39 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import org.drools.drl.ast.descr.RuleDescr;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@AllArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class BasicRule {
+
+    @EqualsAndHashCode.Include
+    RuleIdentifier identifier;
+    String name;
+    String code;
+    int line;
+
+
+    public static BasicRule fromRuleDescr(RuleDescr rule, String rulesString) {
+
+        RuleIdentifier identifier = RuleIdentifier.fromName(rule.getName());
+        String nameWithoutIdentifier = rule.getName().replace(identifier + ":", "");
+        String code = rulesString.substring(rule.getStartCharacter(), rule.getEndCharacter());
+        return new BasicRule(identifier, nameWithoutIdentifier, code, rule.getLine());
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "BasicRule[identifier=" + identifier + ", name=" + name + ", code=" + code + ']';
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleClass.java

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+public record RuleClass(RuleType ruleType, List<RuleUnit> ruleUnits) {
+
+    public Optional<RuleUnit> findRuleUnitByInteger(Integer unit) {
+
+        return ruleUnits.stream()
+                .filter(ruleUnit -> Objects.equals(ruleUnit.unit(), unit)).findFirst();
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleFileBluePrint.java

@@ -0,0 +1,76 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public final class RuleFileBluePrint {
+
+    String imports;
+    int importLine;
+    String globals;
+    int globalsLine;
+    List<BasicQuery> queries;
+    List<RuleClass> ruleClasses;
+    DroolsSyntaxValidation droolsSyntaxValidation;
+
+
+    public Optional<RuleClass> findRuleClassByType(RuleType ruleType) {
+
+        return ruleClasses.stream().filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType)).findFirst();
+    }
+
+
+    public List<BasicRule> findRulesByIdentifier(RuleIdentifier ruleIdentifier) {
+
+        if (Objects.isNull(ruleIdentifier.unit())) {
+            return findRuleClassByType(ruleIdentifier.type()).map(RuleClass::ruleUnits)
+                    .orElse(Collections.emptyList())
+                    .stream()
+                    .flatMap(ruleUnit -> ruleUnit.rules().stream().filter(rule -> rule.getIdentifier().matches(ruleIdentifier)))
+                    .toList();
+        }
+        return findRuleClassByType(ruleIdentifier.type()).flatMap(ruleClass -> ruleClass.findRuleUnitByInteger(ruleIdentifier.unit()))
+                .map(ruleUnit -> ruleUnit.rules().stream().filter(rule -> rule.getIdentifier().matches(ruleIdentifier)))
+                .orElse(Stream.empty())
+                .toList();
+    }
+
+
+    public List<RuleIdentifier> getAllRuleIdentifiers() {
+
+        return streamAllRules().map(BasicRule::getIdentifier).collect(Collectors.toList());
+    }
+
+
+    public Stream<BasicRule> streamAllRules() {
+
+        return getRuleClasses().stream().map(RuleClass::ruleUnits).flatMap(Collection::stream).map(RuleUnit::rules).flatMap(Collection::stream);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "RuleFileBluePrint[imports=" + imports + ", globals=" + globals + ", queries=" + queries + ", ruleClasses=" + ruleClasses + ']';
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleIdentifier.java

@@ -0,0 +1,81 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import java.util.Objects;
+
+import lombok.NonNull;
+
+public record RuleIdentifier(@NonNull RuleType type, Integer unit, Integer id) {
+
+    public static RuleIdentifier fromName(String name) {
+
+        String identifier = name.split(":")[0];
+        return fromString(identifier);
+    }
+
+
+    public static RuleIdentifier fromString(String identifier) {
+
+        String[] values = identifier.split("\\.");
+        if (values.length != 3) {
+            throw new IllegalArgumentException(String.format("Identifier %s must conform to the pattern \"[a-zA-Z0-9]+.\\d+.\\d+\"", identifier));
+        }
+        RuleType type = RuleType.fromString(values[0]);
+        Integer group = Integer.parseInt(values[1]);
+        Integer id = Integer.parseInt(values[2]);
+        return new RuleIdentifier(type, group, id);
+    }
+
+
+    public static RuleIdentifier empty() {
+
+        return new RuleIdentifier(new RuleType(""), null, null);
+    }
+
+
+    /**
+     * This is used to filter rules, if the field Integer unit or Integer id is null, the field will match any other RuleIdentifier.
+     * Therefore, to compare RuleIdentifiers one should always use the function matches.
+     *
+     * @param ruleIdentifier RuleIdentifier to check if this one matches it.
+     * @return true, if all fields match. If a field is null, it matches any field.
+     */
+    public boolean matches(RuleIdentifier ruleIdentifier) {
+
+        return ruleIdentifier.type().equals(this.type()) && //
+                (Objects.isNull(ruleIdentifier.unit()) || Objects.isNull(this.unit()) || Objects.equals(this.unit(), ruleIdentifier.unit())) && //
+                (Objects.isNull(ruleIdentifier.id()) || Objects.isNull(this.id()) || Objects.equals(this.id(), ruleIdentifier.id()));
+
+    }
+
+
+    @Override
+    public String toString() {
+
+        if (type.name().isBlank() || type.name().isEmpty()) {
+            return "";
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append(type().name());
+        if (Objects.nonNull(unit())) {
+            sb.append(".");
+            sb.append(unit());
+        } else {
+            sb.append(".*");
+        }
+        if (Objects.nonNull(id())) {
+            sb.append(".");
+            sb.append(id());
+        } else {
+            sb.append(".*");
+        }
+        return sb.toString();
+    }
+
+
+    public String toRuleUnitString() {
+
+        return String.format("Rule unit: %s.%d", type.name(), unit);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleType.java

@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import java.util.regex.Pattern;
+
+
+public record RuleType(String name) {
+
+    static Pattern alphaNumeric = Pattern.compile("^[a-zA-Z0-9]+$");
+
+
+    public static RuleType fromString(String value) {
+
+        if (!alphaNumeric.matcher(value).matches()) {
+            throw new IllegalArgumentException(String.format("The rule type %s must only contain numbers and letters!", value));
+        }
+        return new RuleType(value);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleUnit.java

@@ -0,0 +1,7 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import java.util.List;
+
+public record RuleUnit(Integer unit, List<BasicRule> rules) {
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java

@@ -22,7 +22,9 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequ
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileErrorInfo;
 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.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.utils.exception.DroolsTimeoutException;
+import com.iqser.red.service.redaction.v1.server.service.AnalyzeService;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -36,6 +38,7 @@ public class RedactionMessageReceiver {
     private final ObjectMapper objectMapper;
     private final AnalyzeService analyzeService;
     private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
+    private final RulesClient rulesClient;
 
 
     @SneakyThrows
@@ -102,17 +105,27 @@ public class RedactionMessageReceiver {
             log.info("");
             result.setMessageType(analyzeRequest.getMessageType());
             fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
-
+        } catch (DroolsTimeoutException droolsTimeoutException) {
+            if (!droolsTimeoutException.isReported()) {
+                rulesClient.setRulesTimeoutDetected(analyzeRequest.getDossierTemplateId(), droolsTimeoutException.getRuleFileType());
+            }
+            sendAnalysisFailed(analyzeRequest, priority, droolsTimeoutException);
         } catch (Exception e) {
-            log.warn("Failed to process analyze request: {}", analyzeRequest, e);
-            var timestamp = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
-            fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(),
-                    analyzeRequest.getFileId(),
-                    new FileErrorInfo(e.getMessage(), priority ? REDACTION_PRIORITY_QUEUE : REDACTION_QUEUE, "redaction-service", timestamp));
+            sendAnalysisFailed(analyzeRequest, priority, e);
         }
     }
 
 
+    private void sendAnalysisFailed(AnalyzeRequest analyzeRequest, boolean priority, Exception e) {
+
+        log.warn("Failed to process analyze request: {}", analyzeRequest, e);
+        var timestamp = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
+        fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                new FileErrorInfo(e.getMessage(), priority ? REDACTION_PRIORITY_QUEUE : REDACTION_QUEUE, "redaction-service", timestamp));
+    }
+
+
     @RabbitHandler
     @RabbitListener(queues = REDACTION_DQL)
     public void receiveAnalyzeRequestDQL(Message in) throws IOException {

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/CustomEntityCreationAdapter.java

@@ -1,230 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.adapter;
-
-import static java.lang.String.format;
-import static java.util.stream.Collectors.groupingBy;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionPosition;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.document.services.EntityEnrichmentService;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityIdentifier;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RectangleWithPage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-public class CustomEntityCreationAdapter {
-
-    private static final double MATCH_THRESHOLD = 5; // sum of distances for each corner
-    private final EntityCreationService entityCreationService;
-
-
-    @Autowired
-    public CustomEntityCreationAdapter(EntityEnrichmentService entityEnrichmentService) {
-
-        entityCreationService = new EntityCreationService(entityEnrichmentService);
-    }
-
-
-    public List<EntityIdentifier> toRedactionEntity(RedactionLog redactionLog, SemanticNode node) {
-
-        List<EntityIdentifier> entityIdentifiers = redactionLog.getRedactionLogEntry().stream().map(EntityIdentifier::fromRedactionLogEntry).toList();
-        return toRedactionEntity(entityIdentifiers, node);
-    }
-
-
-    public List<EntityIdentifier> createRedactionEntitiesIfFoundAndReturnNotFoundEntries(Set<ManualRedactionEntry> manualRedactionEntries, SemanticNode node) {
-
-        List<EntityIdentifier> entityIdentifiers = manualRedactionEntries.stream()
-                .filter(manualRedactionEntry -> !(manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary()))
-                .map(EntityIdentifier::fromManualRedactionEntry)
-                .toList();
-
-        return toRedactionEntity(entityIdentifiers, node);
-    }
-
-
-    private List<EntityIdentifier> toRedactionEntity(List<EntityIdentifier> entityIdentifiers, SemanticNode node) {
-
-        Set<Integer> pageNumbers = entityIdentifiers.stream().flatMap(entry -> entry.getEntityPosition().stream().map(RectangleWithPage::pageNumber)).collect(Collectors.toSet());
-        Set<String> entryValues = entityIdentifiers.stream().map(EntityIdentifier::getValue).map(String::toLowerCase).collect(Collectors.toSet());
-
-        Map<String, List<RedactionEntity>> tempEntitiesByValue = findAllPossibleEntitiesAndGroupByValue(node, pageNumbers, entryValues);
-
-        List<EntityIdentifier> notFoundEntityIdentifiers = new LinkedList<>();
-        for (EntityIdentifier entityIdentifier : entityIdentifiers) {
-            Optional<RedactionEntity> optionalRedactionEntity = findClosestEntityAndReturnEmptyIfNotFound(entityIdentifier, tempEntitiesByValue);
-            if (optionalRedactionEntity.isEmpty()) {
-                notFoundEntityIdentifiers.add(entityIdentifier);
-                continue;
-            }
-            createCorrectEntity(entityIdentifier, node, optionalRedactionEntity.get().getBoundary());
-        }
-        tempEntitiesByValue.values().stream().flatMap(Collection::stream).forEach(RedactionEntity::removeFromGraph);
-        return notFoundEntityIdentifiers;
-    }
-
-
-    /**
-     * Deletes the temp Entity and creates a RedactionEntity with correct values, based on the given parameters.
-     *
-     * @param entityIdentifier The entity identifier for the RedactionEntity.
-     * @param node             The SemanticNode associated with the RedactionEntity.
-     * @param closestBoundary  The closest Boundary to the RedactionEntity.
-     */
-    private void createCorrectEntity(EntityIdentifier entityIdentifier, SemanticNode node, Boundary closestBoundary) {
-
-        RedactionEntity correctEntity = entityCreationService.forceByBoundary(closestBoundary, entityIdentifier.getType(), entityIdentifier.getEntityType(), node);
-
-        if (entityIdentifier.isApplied()) {
-            correctEntity.force(entityIdentifier.getRuleIdentifier(), entityIdentifier.getReason(), entityIdentifier.getLegalBasis());
-        } else {
-            correctEntity.skip(entityIdentifier.getRuleIdentifier(), entityIdentifier.getReason());
-        }
-        correctEntity.setDictionaryEntry(entityIdentifier.isDictionaryEntry());
-        correctEntity.setDossierDictionaryEntry(entityIdentifier.isDossierDictionaryEntry());
-    }
-
-
-    private Optional<RedactionEntity> findClosestEntityAndReturnEmptyIfNotFound(EntityIdentifier identifier, Map<String, List<RedactionEntity>> entitiesWithSameValue) {
-
-        List<RedactionEntity> possibleEntities = entitiesWithSameValue.get(identifier.getValue().toLowerCase(Locale.ROOT));
-
-        if (entityIdentifierValueNotFound(possibleEntities)) {
-            log.warn("Entity could not be created with identifier: {}, due to the value {} not being found anywhere.", identifier, identifier.getValue());
-            return Optional.empty();
-        }
-
-        Optional<RedactionEntity> optionalClosestEntity = possibleEntities.stream()
-                .filter(entity -> pagesMatch(entity, identifier.getEntityPosition()))
-                .min(Comparator.comparingDouble(entity -> calculateMinDistance(identifier.getEntityPosition(), entity)));
-
-        if (optionalClosestEntity.isEmpty()) {
-            log.warn("No Entity with value {} found on page {}", identifier.getValue(), identifier.getEntityPosition());
-            return Optional.empty();
-        }
-
-        RedactionEntity closestEntity = optionalClosestEntity.get();
-        double distance = calculateMinDistance(identifier.getEntityPosition(), closestEntity);
-        if (distance > MATCH_THRESHOLD) {
-            log.warn(format("Distance to closest found entity is %.2f and therefore higher than the threshold of %.2f for \n%s \n%s",
-                    distance,
-                    MATCH_THRESHOLD,
-                    identifier.getEntityPosition(),
-                    closestEntity.getRedactionPositionsPerPage()));
-            return Optional.empty();
-        }
-
-        return Optional.of(closestEntity);
-    }
-
-
-    private static boolean entityIdentifierValueNotFound(List<RedactionEntity> possibleEntities) {
-
-        return possibleEntities == null || possibleEntities.isEmpty();
-    }
-
-
-    private Map<String, List<RedactionEntity>> findAllPossibleEntitiesAndGroupByValue(SemanticNode node, Set<Integer> pageNumbers, Set<String> entryValues) {
-
-        if (!pageNumbers.stream().allMatch(node::onPage)) {
-            throw new IllegalArgumentException(format("SemanticNode \"%s\" does not contain these pages %s, it has pages: %s",
-                    node,
-                    pageNumbers.stream().filter(pageNumber -> !node.onPage(pageNumber)).toList(),
-                    node.getPages()));
-        }
-        SearchImplementation searchImplementation = new SearchImplementation(entryValues, true);
-
-        return searchImplementation.getBoundaries(node.getTextBlock(), node.getBoundary())
-                .stream()
-                .map(boundary -> entityCreationService.forceByBoundary(boundary, "temp", EntityType.ENTITY, node))
-                .collect(groupingBy(entity -> entity.getValue().toLowerCase(Locale.ROOT)));
-    }
-
-
-    private static boolean allValuesFound(Map<String, List<RedactionEntity>> entitiesByValue, Set<String> entryValues) {
-
-        return entitiesByValue.keySet().equals(entryValues);
-    }
-
-
-    private static boolean pagesMatch(RedactionEntity entity, List<RectangleWithPage> originalPositions) {
-
-        Set<Integer> entityPageNumbers = entity.getRedactionPositionsPerPage().stream().map(RedactionPosition::getPage).map(Page::getNumber).collect(Collectors.toSet());
-        Set<Integer> originalPageNumbers = originalPositions.stream().map(RectangleWithPage::pageNumber).collect(Collectors.toSet());
-        return entityPageNumbers.containsAll(originalPageNumbers);
-    }
-
-
-    private double calculateMinDistance(List<RectangleWithPage> originalPositions, RedactionEntity entity) {
-
-        if (originalPositions.size() != countRectangles(entity)) {
-            return Double.MAX_VALUE;
-        }
-        return originalPositions.stream()
-                .mapToDouble(rectangleWithPage -> calculateMinDistancePerRectangle(entity, rectangleWithPage.pageNumber(), rectangleWithPage.rectangle2D()))
-                .sum();
-    }
-
-
-    private static long countRectangles(RedactionEntity entity) {
-
-        return entity.getRedactionPositionsPerPage().stream().mapToLong(redactionPosition -> redactionPosition.getRectanglePerLine().size()).sum();
-    }
-
-
-    private double calculateMinDistancePerRectangle(RedactionEntity entity, int pageNumber, Rectangle2D originalRectangle) {
-
-        return entity.getRedactionPositionsPerPage()
-                .stream()
-                .filter(redactionPosition -> redactionPosition.getPage().getNumber() == pageNumber)
-                .map(RedactionPosition::getRectanglePerLine)
-                .flatMap(Collection::stream)
-                .mapToDouble(rectangle -> calculateDistance(rectangle, originalRectangle))
-                .min()
-                .orElse(Double.MAX_VALUE);
-    }
-
-
-    private double calculateDistance(Rectangle2D rectangle, Rectangle2D rectangle2D) {
-
-        // mirrored coordinates safe comparison
-        double minX1 = Math.min(rectangle.getMinX(), rectangle.getMaxX());
-        double minY1 = Math.min(rectangle.getMinY(), rectangle.getMaxY());
-        double maxX1 = Math.max(rectangle.getMinX(), rectangle.getMaxX());
-        double maxY1 = Math.max(rectangle.getMinY(), rectangle.getMaxY());
-
-        double minX2 = Math.min(rectangle2D.getMinX(), rectangle2D.getMaxX());
-        double minY2 = Math.min(rectangle2D.getMinY(), rectangle2D.getMaxY());
-        double maxX2 = Math.max(rectangle2D.getMinX(), rectangle2D.getMaxX());
-        double maxY2 = Math.max(rectangle2D.getMinY(), rectangle2D.getMaxY());
-
-        return Math.abs(minX1 - minX2) //
-                + Math.abs(minY1 - minY2) //
-                + Math.abs(maxX1 - maxX2) //
-                + Math.abs(maxY1 - maxY2);
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityIdentifier.java

@@ -1,68 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.List;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityType;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class EntityIdentifier {
-
-    String value;
-    List<RectangleWithPage> entityPosition;
-    String ruleIdentifier;
-    String reason;
-    String legalBasis;
-    String type;
-    String section;
-    EntityType entityType;
-    boolean applied;
-    boolean isDictionaryEntry;
-    boolean isDossierDictionaryEntry;
-
-
-    public static EntityIdentifier fromRedactionLogEntry(RedactionLogEntry redactionLogEntry) {
-
-        String ruleIdentifier = redactionLogEntry.getType() + "." + redactionLogEntry.getMatchedRule() + ".0";
-        List<RectangleWithPage> rectangleWithPages = redactionLogEntry.getPositions().stream().map(RectangleWithPage::fromRedactionLogRectangle).toList();
-        return new EntityIdentifier(redactionLogEntry.getValue(),
-                rectangleWithPages,
-                ruleIdentifier,
-                redactionLogEntry.getReason(),
-                redactionLogEntry.getLegalBasis(),
-                redactionLogEntry.getType(),
-                redactionLogEntry.getSection(),
-                redactionLogEntry.isRecommendation() ? EntityType.RECOMMENDATION : EntityType.ENTITY,
-                redactionLogEntry.isRedacted(),
-                redactionLogEntry.isDictionaryEntry(),
-                redactionLogEntry.isDossierDictionaryEntry());
-    }
-
-
-    public static EntityIdentifier fromManualRedactionEntry(ManualRedactionEntry manualRedactionEntry) {
-
-        List<RectangleWithPage> rectangleWithPages = manualRedactionEntry.getPositions().stream().map(RectangleWithPage::fromAnnotationRectangle).toList();
-        return new EntityIdentifier(manualRedactionEntry.getValue(),
-                rectangleWithPages,
-                "MAN.0.0",
-                manualRedactionEntry.getReason(),
-                manualRedactionEntry.getLegalBasis(),
-                manualRedactionEntry.getType(), manualRedactionEntry.getSection(),
-                EntityType.ENTITY,
-                true,
-                false,
-                false);
-    }
-
-
-
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/KieWrapper.java

@@ -1,7 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import org.kie.api.runtime.KieContainer;
-
-public record KieWrapper( KieContainer container,long rulesVersion) {
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java

@@ -1,224 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.toList;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collector;
-import java.util.stream.Stream;
-
-import org.apache.commons.lang3.StringUtils;
-import org.drools.compiler.kie.builder.impl.InternalKieServices;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.ReleaseId;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-import org.kie.api.runtime.rule.QueryResults;
-import org.kie.api.runtime.rule.QueryResultsRow;
-import org.springframework.stereotype.Service;
-
-import com.google.common.hash.HashFunction;
-import com.google.common.hash.Hasher;
-import com.google.common.hash.Hashing;
-import com.google.common.io.ByteStreams;
-import com.google.common.primitives.Bytes;
-import com.google.common.primitives.Longs;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.document.services.EntityEnrichmentService;
-import com.iqser.red.service.redaction.v1.server.document.services.ManualRedactionApplicationService;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.KieWrapper;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-import com.knecon.fforesight.tenantcommons.TenantContext;
-
-import io.micrometer.core.annotation.Timed;
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = false)
-public class DroolsExecutionService {
-
-    final RulesClient rulesClient;
-
-    final EntityEnrichmentService entityEnrichmentService;
-
-    @Timed("redactmanager_executeRules")
-    public List<FileAttribute> executeRules(KieContainer kieContainer,
-                                            Document document,
-                                            Dictionary dictionary,
-                                            List<FileAttribute> fileAttributes,
-                                            ManualRedactions manualRedactions,
-                                            NerEntities nerEntities) {
-
-        return executeRules(kieContainer, document, document.streamChildren().toList(), dictionary, fileAttributes, manualRedactions, nerEntities);
-    }
-
-
-    @Timed("redactmanager_executeRules")
-    public List<FileAttribute> executeRules(KieContainer kieContainer,
-                                            Document document,
-                                            List<SemanticNode> sectionsToAnalyze,
-                                            Dictionary dictionary,
-                                            List<FileAttribute> fileAttributes,
-                                            ManualRedactions manualRedactions,
-                                            NerEntities nerEntities) {
-
-        KieSession kieSession = kieContainer.newKieSession();
-        EntityCreationService entityCreationService = new EntityCreationService(entityEnrichmentService, kieSession);
-        ManualRedactionApplicationService manualRedactionApplicationService = new ManualRedactionApplicationService(entityCreationService);
-
-        kieSession.setGlobal("document", document);
-        kieSession.setGlobal("entityCreationService", entityCreationService);
-        kieSession.setGlobal("manualRedactionApplicationService", manualRedactionApplicationService);
-        kieSession.setGlobal("dictionary", dictionary);
-
-        kieSession.insert(document);
-        document.getEntities().forEach(kieSession::insert);
-        sectionsToAnalyze.forEach(kieSession::insert);
-        sectionsToAnalyze.stream().flatMap(SemanticNode::streamAllSubNodes).forEach(kieSession::insert);
-        document.getPages().forEach(kieSession::insert);
-        fileAttributes.stream().filter(f -> f.getValue() != null).forEach(kieSession::insert);
-
-        if (manualRedactions != null) {
-            manualRedactions.getResizeRedactions().forEach(kieSession::insert);
-            manualRedactions.getImageRecategorization().forEach(kieSession::insert);
-            manualRedactions.getEntriesToAdd().forEach(kieSession::insert);
-            insertLatestForceOrRemovalPerAnnotationId(manualRedactions.getForceRedactions(), manualRedactions.getIdsToRemove(), kieSession);
-        }
-
-        kieSession.insert(nerEntities);
-
-        kieSession.getAgenda().getAgendaGroup("LOCAL_DICTIONARY_ADDS").setFocus();
-        kieSession.fireAllRules();
-        List<FileAttribute> resultingFileAttributes = getFileAttributes(kieSession);
-        kieSession.dispose();
-        return resultingFileAttributes;
-    }
-
-
-    private static void insertLatestForceOrRemovalPerAnnotationId(Collection<ManualForceRedaction> forceRedactions, Collection<IdRemoval> idRemovals, KieSession kieSession) {
-
-        Stream.concat(forceRedactions.stream(), idRemovals.stream())
-                .filter(BaseAnnotation::isApproved)
-                .filter(baseAnnotation -> baseAnnotation.getRequestDate() != null)
-                .collect(groupingBy(BaseAnnotation::getAnnotationId, sortByRequestDate()))
-                .values()
-                .forEach(baseAnnotations -> kieSession.insert(baseAnnotations.get(0)));
-    }
-
-
-    private static Collector<BaseAnnotation, Object, List<BaseAnnotation>> sortByRequestDate() {
-
-        return collectingAndThen(toList(), originList -> originList.stream().sorted(Comparator.comparing(BaseAnnotation::getRequestDate).reversed()).toList());
-    }
-
-
-    public List<FileAttribute> getFileAttributes(KieSession kieSession) {
-
-        List<FileAttribute> fileAttributes = new LinkedList<>();
-        QueryResults entitiesResult = kieSession.getQueryResults("getFileAttributes");
-        for (QueryResultsRow resultsRow : entitiesResult) {
-            fileAttributes.add((FileAttribute) resultsRow.get("$fileAttribute"));
-        }
-        return fileAttributes;
-    }
-
-
-    public KieWrapper getLatestKieContainer(String dossierTemplateId) {
-
-        long version = rulesClient.getVersion(dossierTemplateId);
-
-        return new KieWrapper(getKieContainer(dossierTemplateId, version), version);
-
-    }
-
-
-    private ReleaseId getReleaseId(String dossierTemplate, long version) {
-
-        KieServices kieServices = KieServices.Factory.get();
-        return kieServices.newReleaseId("com.knecon.rules", TenantContext.getTenantId() + ":" + dossierTemplate, String.format("1.%d", version));
-    }
-
-
-    private KieContainer getKieContainer(String dossierTemplateId, long version) {
-
-        KieServices kieServices = KieServices.Factory.get();
-        try {
-            return kieServices.newKieContainer(getReleaseId(dossierTemplateId, version));
-        } catch (Exception e) {
-
-            registerNewKieContainerVersion(dossierTemplateId, version);
-            return kieServices.newKieContainer(getReleaseId(dossierTemplateId, version));
-        }
-
-    }
-
-
-    private void registerNewKieContainerVersion(String dossierTemplateId, long version) {
-
-        var rules = rulesClient.getRules(dossierTemplateId);
-        if (rules == null || StringUtils.isEmpty(rules.getValue())) {
-            throw new RuntimeException("Rules cannot be empty.");
-        }
-
-        registerNewKieContainerVersion(dossierTemplateId, version, rules.getValue());
-
-    }
-
-
-    private void registerNewKieContainerVersion(String dossierTemplateId, long version, String rules) {
-
-        KieServices kieServices = KieServices.Factory.get();
-        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-        kieFileSystem.generateAndWritePomXML(getReleaseId(dossierTemplateId, version));
-        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();
-    }
-
-
-    public void testRules(String rules) {
-
-        var versionId = System.currentTimeMillis();
-        var testRules = "test-rules";
-        registerNewKieContainerVersion(testRules, versionId, rules);
-        var releaseId = getReleaseId(testRules, versionId);
-        try {
-            KieServices kieServices = KieServices.Factory.get();
-            var containerId = UUID.randomUUID().toString();
-            var container = kieServices.newKieContainer(containerId, releaseId);
-            container.newKieSession();
-            container.dispose();
-
-        } catch (Exception e) {
-            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
-        }
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java

@@ -1,110 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.CustomEntityCreationAdapter;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.document.services.EntityEnrichmentService;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityIdentifier;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
-
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class EntityRedactionService {
-
-    DroolsExecutionService droolsExecutionService;
-    EntityEnrichmentService entityEnrichmentService;
-    CustomEntityCreationAdapter customEntityCreationAdapter;
-
-
-    public Set<FileAttribute> addRuleEntities(Dictionary dictionary, Document document, KieContainer kieContainer, AnalyzeRequest analyzeRequest, NerEntities nerEntities) {
-
-        log.debug("Starting Drools Execution");
-        long droolsStart = System.currentTimeMillis();
-        List<FileAttribute> allFileAttributes = droolsExecutionService.executeRules(kieContainer,
-                document,
-                dictionary,
-                analyzeRequest.getFileAttributes(),
-                analyzeRequest.getManualRedactions(),
-                nerEntities);
-        log.debug("Finished Drools Execution in {} ms", System.currentTimeMillis() - droolsStart);
-        return allFileAttributes.stream().filter(fileAttribute -> !analyzeRequest.getFileAttributes().contains(fileAttribute)).collect(Collectors.toUnmodifiableSet());
-    }
-
-
-    public Set<FileAttribute> addRuleEntities(Dictionary dictionary,
-                                              Document document,
-                                              List<SemanticNode> sectionsToReanalyze,
-                                              KieContainer kieContainer,
-                                              AnalyzeRequest analyzeRequest,
-                                              NerEntities nerEntities) {
-
-        log.debug("Starting Drools execution");
-        long ruleExecutionStart = System.currentTimeMillis();
-        List<FileAttribute> allFileAttributes = droolsExecutionService.executeRules(kieContainer,
-                document,
-                sectionsToReanalyze,
-                dictionary,
-                analyzeRequest.getFileAttributes(),
-                analyzeRequest.getManualRedactions(),
-                nerEntities);
-        log.debug("Finished Drools execution in {} ms", System.currentTimeMillis() - ruleExecutionStart);
-
-        return allFileAttributes.stream().filter(fileAttribute -> !analyzeRequest.getFileAttributes().contains(fileAttribute)).collect(Collectors.toUnmodifiableSet());
-    }
-
-    public List<EntityIdentifier> addManualAddRedactionEntities(Set<ManualRedactionEntry> manualRedactionEntries, Document document) {
-
-        // Entities are automatically added to the DocumentGraph and don't need to be inserted again.
-        return customEntityCreationAdapter.createRedactionEntitiesIfFoundAndReturnNotFoundEntries(manualRedactionEntries, document);
-    }
-
-
-    public void addDictionaryEntities(Dictionary dictionary, SemanticNode node) {
-
-        for (var model : dictionary.getDictionaryModels()) {
-            bySearchImplementationAsDictionary(model.getEntriesSearch(), model.getType(), EntityType.ENTITY, node, model.isDossierDictionary());
-            bySearchImplementationAsDictionary(model.getFalsePositiveSearch(), model.getType(), EntityType.FALSE_POSITIVE, node, model.isDossierDictionary());
-            bySearchImplementationAsDictionary(model.getFalseRecommendationsSearch(), model.getType(), EntityType.FALSE_RECOMMENDATION, node, model.isDossierDictionary());
-        }
-    }
-
-
-    public void bySearchImplementationAsDictionary(SearchImplementation searchImplementation,
-                                                   String type,
-                                                   EntityType entityType,
-                                                   SemanticNode node,
-                                                   boolean isDossierDictionaryEntry) {
-
-        EntityCreationService entityCreationService = new EntityCreationService(entityEnrichmentService);
-        searchImplementation.getBoundaries(node.getTextBlock(), node.getBoundary())
-                .stream()
-                .filter(boundary -> entityCreationService.isValidEntityBoundary(node.getTextBlock(), boundary))
-                .map(bounds -> entityCreationService.forceByBoundary(bounds, type, entityType, node))
-                .peek(entity -> entity.setDictionaryEntry(true))
-                .peek(entity -> entity.setDossierDictionaryEntry(isDossierDictionaryEntry))
-                .forEach(entity -> entity.addEngine(Engine.DICTIONARY));
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java

@@ -1,189 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionPosition;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Image;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ImageType;
-import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityIdentifier;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RectangleWithPage;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class RedactionLogCreatorService {
-
-    private final DictionaryService dictionaryService;
-
-
-    public List<RedactionLogEntry> createRedactionLog(Document document, String dossierTemplateId, List<EntityIdentifier> notFoundManualRedactionEntries) {
-
-        List<RedactionLogEntry> entries = new ArrayList<>();
-        Set<String> processedIds = new HashSet<>();
-        document.getEntities()
-                .stream()
-                .filter(RedactionLogCreatorService::isEntityOrRecommendationType)
-                .filter(entity -> !entity.isRemoved())
-                .forEach(entityNode -> entries.addAll(toRedactionLogEntries(entityNode, processedIds, dossierTemplateId)));
-        document.streamAllImages().filter(image -> !image.isRemoved()).forEach(imageNode -> entries.add(createRedactionLogEntry(imageNode, dossierTemplateId)));
-        notFoundManualRedactionEntries.forEach(entityIdentifier -> entries.add(createRedactionLogEntry(entityIdentifier, dossierTemplateId)));
-        return entries;
-    }
-
-
-    private static boolean isEntityOrRecommendationType(RedactionEntity redactionEntity) {
-
-        return redactionEntity.getEntityType() == EntityType.ENTITY || redactionEntity.getEntityType() == EntityType.RECOMMENDATION;
-    }
-
-
-    private List<RedactionLogEntry> toRedactionLogEntries(RedactionEntity redactionEntity, Set<String> processedIds, String dossierTemplateId) {
-
-        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
-
-        // Duplicates can exist due table extraction columns over multiple rows.
-
-        for (RedactionPosition redactionPosition : redactionEntity.getRedactionPositionsPerPage()) {
-
-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(redactionEntity, dossierTemplateId);
-
-            if (processedIds.contains(redactionPosition.getId())) {
-                continue;
-            }
-
-            processedIds.add(redactionPosition.getId());
-            redactionLogEntry.setId(redactionPosition.getId());
-
-            List<Rectangle> rectanglesPerLine = redactionPosition.getRectanglePerLine()
-                    .stream()
-                    .map(rectangle2D -> RectangleTransformations.toRedactionLogRectangle(rectangle2D, redactionPosition.getPage().getNumber()))
-                    .toList();
-
-            redactionLogEntry.setPositions(rectanglesPerLine);
-            redactionLogEntities.add(redactionLogEntry);
-        }
-
-        return redactionLogEntities;
-    }
-
-
-    private RedactionLogEntry createRedactionLogEntry(RedactionEntity entity, String dossierTemplateId) {
-
-        Set<String> referenceIds = new HashSet<>();
-        entity.getReferences().stream().filter(RedactionEntity::isActive).forEach(ref -> ref.getRedactionPositionsPerPage().forEach(pos -> referenceIds.add(pos.getId())));
-        int sectionNumber = entity.getDeepestFullyContainingNode().getTreeId().isEmpty() ? 0 : entity.getDeepestFullyContainingNode().getTreeId().get(0);
-
-        return RedactionLogEntry.builder()
-                .color(getColor(entity.getType(), dossierTemplateId, entity.isApplied()))
-                .reason(entity.getMatchedRule().getReason())
-                .legalBasis(entity.getMatchedRule().getLegalBasis())
-                .value(entity.getMatchedRule().isWriteValueWithLineBreaks() ? entity.getValueWithLineBreaks() : entity.getValue())
-                .type(entity.getType())
-                .redacted(entity.isApplied())
-                .isHint(isHint(entity.getType(), dossierTemplateId))
-                .isRecommendation(entity.getEntityType().equals(EntityType.RECOMMENDATION))
-                .isFalsePositive(entity.getEntityType().equals(EntityType.FALSE_POSITIVE) || entity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
-                .section(entity.getDeepestFullyContainingNode().toString())
-                .sectionNumber(sectionNumber)
-                .matchedRule(entity.getMatchedRule().getRuleIdentifier().toString())
-                .isDictionaryEntry(entity.isDictionaryEntry())
-                .textAfter(entity.getTextAfter())
-                .textBefore(entity.getTextBefore())
-                .startOffset(entity.getBoundary().start())
-                .endOffset(entity.getBoundary().end())
-                .isDossierDictionaryEntry(entity.isDossierDictionaryEntry())
-                .engines(entity.getEngines())
-                .reference(referenceIds)
-                .build();
-    }
-
-    public RedactionLogEntry createRedactionLogEntry(EntityIdentifier entityIdentifier, String dossierTemplateId) {
-        List<Integer> pageNumbers = entityIdentifier.getEntityPosition().stream().map(RectangleWithPage::pageNumber).toList();
-        List<Rectangle2D> rectanglesPerLine = entityIdentifier.getEntityPosition().stream().map(RectangleWithPage::rectangle2D).toList();
-        return RedactionLogEntry.builder()
-                .id(IdBuilder.buildId(pageNumbers, rectanglesPerLine, entityIdentifier.getType(), entityIdentifier.getEntityType().name()))
-                .color(getColor(entityIdentifier.getType(), dossierTemplateId, entityIdentifier.isApplied()))
-                .reason(entityIdentifier.getReason())
-                .legalBasis(entityIdentifier.getLegalBasis())
-                .value(entityIdentifier.getValue())
-                .type(entityIdentifier.getType())
-                .redacted(entityIdentifier.isApplied())
-                .isHint(isHint(entityIdentifier.getType(), dossierTemplateId))
-                .isRecommendation(entityIdentifier.getEntityType().equals(EntityType.RECOMMENDATION))
-                .isFalsePositive(entityIdentifier.getEntityType().equals(EntityType.FALSE_POSITIVE) || entityIdentifier.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
-                .section(entityIdentifier.getSection())
-                .sectionNumber(0)
-                .matchedRule("ManualRedaction")
-                .isDictionaryEntry(entityIdentifier.isDictionaryEntry())
-                .textAfter("")
-                .textBefore("")
-                .startOffset(-1)
-                .endOffset(-1)
-                .isDossierDictionaryEntry(entityIdentifier.isDossierDictionaryEntry())
-                .positions(entityIdentifier.getEntityPosition()
-                        .stream()
-                        .map(entityPosition -> RectangleTransformations.toRedactionLogRectangle(entityPosition.rectangle2D(), entityPosition.pageNumber()))
-                        .collect(Collectors.toList()))
-                .engines(Collections.emptySet())
-                .reference(Collections.emptySet())
-                .build();
-    }
-
-    public RedactionLogEntry createRedactionLogEntry(Image image, String dossierTemplateId) {
-
-        String imageType = image.getImageType().equals(ImageType.OTHER) ? "image" : image.getImageType().toString().toLowerCase(Locale.ROOT);
-        return RedactionLogEntry.builder()
-                .id(image.getId())
-                .color(getColor(image.getImageType().toString().toLowerCase(Locale.ROOT), dossierTemplateId, image.isApplied()))
-                .isImage(true)
-                .type(imageType)
-                .redacted(image.isApplied())
-                .reason(image.getMatchedRule().getReason())
-                .legalBasis(image.getMatchedRule().getLegalBasis())
-                .matchedRule(image.getMatchedRule().getRuleIdentifier().toString())
-                .isHint(dictionaryService.isHint(image.getImageType().toString().toLowerCase(Locale.ROOT), dossierTemplateId))
-                .isDictionaryEntry(false)
-                .isRecommendation(false)
-                .positions(List.of(RectangleTransformations.toRedactionLogRectangle(image.getPosition(), image.getPage().getNumber())))
-                .sectionNumber(image.getTreeId().get(0))
-                .section(image.getParent().toString())
-                .imageHasTransparency(image.isTransparent())
-                .build();
-
-    }
-
-
-    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction) {
-
-        if (!isRedaction && !isHint(type, dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return dictionaryService.getColor(type, dossierTemplateId);
-    }
-
-
-    private boolean isHint(String type, String dossierTemplateId) {
-
-        return dictionaryService.isHint(type, dossierTemplateId);
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RuleBuilderModelService.java

@@ -1,23 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.Collections;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-
-@Service
-public class RuleBuilderModelService {
-
-    // TODO: Evaluate if we need to implement this or remove it entirely.
-    public RuleBuilderModel getRuleBuilderModel() {
-
-        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
-
-        ruleBuilderModel.setWhenClauses(Collections.emptyList());
-        ruleBuilderModel.setThenConditions(Collections.emptyList());
-
-        return ruleBuilderModel;
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java

@@ -1,6 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
+package com.iqser.red.service.redaction.v1.server.service;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -16,24 +14,36 @@ import com.iqser.gin4.commons.metrics.meters.FunctionTimerValues;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLog;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogChanges;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Comment;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.legalbasis.LegalBasis;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogChanges;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogLegalBasis;
+import com.iqser.red.service.redaction.v1.server.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
-import com.iqser.red.service.redaction.v1.server.document.data.mapper.DocumentGraphMapper;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntitiesAdapter;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityIdentifier;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryVersion;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import com.iqser.red.service.redaction.v1.server.model.KieWrapper;
+import com.iqser.red.service.redaction.v1.server.model.ManualEntity;
+import com.iqser.red.service.redaction.v1.server.model.NerEntities;
+import com.iqser.red.service.redaction.v1.server.model.component.Component;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.service.document.DocumentGraphMapper;
+import com.iqser.red.service.redaction.v1.server.service.document.ManualRedactionEntryService;
+import com.iqser.red.service.redaction.v1.server.service.document.NerEntitiesAdapter;
+import com.iqser.red.service.redaction.v1.server.service.document.SectionFinderService;
+import com.iqser.red.service.redaction.v1.server.service.drools.ComponentDroolsExecutionService;
+import com.iqser.red.service.redaction.v1.server.service.drools.EntityDroolsExecutionService;
+import com.iqser.red.service.redaction.v1.server.service.drools.KieContainerCreationService;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
 import io.micrometer.core.annotation.Timed;
@@ -52,23 +62,119 @@ public class AnalyzeService {
     private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
 
     DictionaryService dictionaryService;
-    DroolsExecutionService droolsExecutionService;
-    EntityRedactionService entityRedactionService;
+    EntityDroolsExecutionService entityDroolsExecutionService;
+    ComponentDroolsExecutionService componentDroolsExecutionService;
+    KieContainerCreationService kieContainerCreationService;
+    DictionarySearchService dictionarySearchService;
     RedactionLogCreatorService redactionLogCreatorService;
+    EntityLogCreatorService entityLogCreatorService;
+    ComponentLogCreatorService componentLogCreatorService;
     RedactionStorageService redactionStorageService;
     RedactionChangeLogService redactionChangeLogService;
     LegalBasisClient legalBasisClient;
     RedactionServiceSettings redactionServiceSettings;
     ImportedRedactionService importedRedactionService;
     SectionFinderService sectionFinderService;
+    ManualRedactionEntryService manualRedactionEntryService;
 
     FunctionTimerValues redactmanagerAnalyzePagewiseValues;
 
 
+    @Timed("redactmanager_reanalyze")
+    @SneakyThrows
+    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+        RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        EntityLog previousEntityLog = redactionStorageService.getEntityLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        log.info("Loaded previous entity log for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        ComponentLog previousComponentLog = new ComponentLog();
+
+        Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
+        log.info("Loaded Document Graph for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        // not yet ready for reanalysis
+        if (previousEntityLog == null || document == null || document.getNumberOfPages() == 0) {
+            return analyze(analyzeRequest);
+        }
+
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(),
+                new DictionaryVersion(previousEntityLog.getDictionaryVersion(), previousEntityLog.getDossierDictionaryVersion()),
+                analyzeRequest.getDossierId());
+
+        Set<Integer> sectionsToReanalyseIds = getSectionsToReanalyseIds(analyzeRequest, previousEntityLog, document, dictionaryIncrement);
+        List<SemanticNode> sectionsToReAnalyse = getSectionsToReAnalyse(document, sectionsToReanalyseIds);
+        log.info("{} Sections to reanalyze found for file {} in dossier {}", sectionsToReanalyseIds.size(), analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        if (sectionsToReAnalyse.isEmpty()) {
+
+            return finalizeAnalysis(analyzeRequest,
+                    startTime,
+                    kieContainerCreationService.getLatestKieContainer(analyzeRequest.getDossierTemplateId(), RuleFileType.COMPONENT),
+                    entityLogCreatorService.updateVersionsAndReturnChanges(previousEntityLog,
+                            dictionaryIncrement.getDictionaryVersion(),
+                            analyzeRequest.getDossierTemplateId(), false), document,
+                    previousRedactionLog,
+                    document.getNumberOfPages(),
+                    dictionaryIncrement.getDictionaryVersion(),
+                    true,
+                    Collections.emptySet());
+        }
+        KieWrapper kieWrapperEntityRules = kieContainerCreationService.getLatestKieContainer(analyzeRequest.getDossierTemplateId(), RuleFileType.ENTITY);
+        log.info("Updated entity rules to version {} for file {} in dossier {}", kieWrapperEntityRules.rulesVersion(), analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        NerEntities nerEntities = getEntityRecognitionEntitiesFilteredBySectionIds(analyzeRequest, document, sectionsToReanalyseIds);
+        log.info("Loaded Ner Entities for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        List<ManualEntity> notFoundManualRedactionEntries = manualRedactionEntryService.addManualRedactionEntriesAndReturnNotFoundEntries(analyzeRequest,
+                document,
+                analyzeRequest.getDossierTemplateId());
+
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+        log.info("Updated Dictionaries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        sectionsToReAnalyse.forEach(node -> dictionarySearchService.addDictionaryEntities(dictionary, node));
+        log.info("Finished Dictionary Search for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        List<FileAttribute> allFileAttributes = entityDroolsExecutionService.executeRules(kieWrapperEntityRules.container(),
+                document,
+                sectionsToReAnalyse,
+                dictionary,
+                analyzeRequest.getFileAttributes(),
+                analyzeRequest.getManualRedactions(),
+                nerEntities);
+        log.info("Finished entity rule execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        RedactionLog redactionLog = updatePreviousRedactionLog(analyzeRequest, document, notFoundManualRedactionEntries, previousRedactionLog, sectionsToReanalyseIds);
+        EntityLogChanges entityLogChanges = entityLogCreatorService.updatePreviousEntityLog(analyzeRequest,
+                document,
+                notFoundManualRedactionEntries,
+                previousEntityLog,
+                sectionsToReanalyseIds,
+                dictionary.getVersion());
+
+        return finalizeAnalysis(analyzeRequest,
+                startTime,
+                kieContainerCreationService.getLatestKieContainer(analyzeRequest.getDossierTemplateId(), RuleFileType.COMPONENT), entityLogChanges, document,
+                redactionLog,
+                document.getNumberOfPages(),
+                dictionaryIncrement.getDictionaryVersion(),
+                true,
+                new HashSet<>(allFileAttributes));
+    }
+
+
     @Timed("redactmanager_analyze")
     public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
 
         long startTime = System.currentTimeMillis();
+
+        var kieWrapperEntityRules = kieContainerCreationService.getLatestKieContainer(analyzeRequest.getDossierTemplateId(), RuleFileType.ENTITY);
+        log.info("Updated Rules to Version {} for file {} in dossier {}", kieWrapperEntityRules.rulesVersion(), analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        var kieWrapperComponentRules = kieContainerCreationService.getLatestKieContainer(analyzeRequest.getDossierTemplateId(), RuleFileType.COMPONENT);
+        log.info("Updated Rules to Version {} for file {} in dossier {}", kieWrapperEntityRules.rulesVersion(), analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
         Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
         log.info("Loaded Document Graph for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
@@ -79,114 +185,48 @@ public class AnalyzeService {
         Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
         log.info("Updated Dictionaries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
-        var wrapper = droolsExecutionService.getLatestKieContainer(analyzeRequest.getDossierTemplateId());
-        log.info("Updated Rules to Version {} for file {} in dossier {}", wrapper.rulesVersion(), analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        List<ManualEntity> notFoundManualRedactionEntries = manualRedactionEntryService.addManualRedactionEntriesAndReturnNotFoundEntries(analyzeRequest,
+                document,
+                analyzeRequest.getDossierTemplateId());
 
-        List<EntityIdentifier> notFoundManualRedactionEntries = addManualRedactionEntriesAndReturnNotFoundEntries(analyzeRequest, document);
-
-        entityRedactionService.addDictionaryEntities(dictionary, document);
+        dictionarySearchService.addDictionaryEntities(dictionary, document);
         log.info("Finished Dictionary Search for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
-        Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary, document, wrapper.container(), analyzeRequest, nerEntities);
-        log.info("Finished Rule Execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        List<FileAttribute> allFileAttributes = entityDroolsExecutionService.executeRules(kieWrapperEntityRules.container(),
+                document,
+                dictionary,
+                analyzeRequest.getFileAttributes(),
+                analyzeRequest.getManualRedactions(),
+                nerEntities);
+        log.info("Finished entity rule execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
-        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(document, analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
+        RedactionLog redactionLog = createRedactionLog(analyzeRequest, document, notFoundManualRedactionEntries, dictionary, kieWrapperEntityRules);
+        EntityLog entityLog = entityLogCreatorService.createInitialEntityLog(analyzeRequest,
+                document,
+                notFoundManualRedactionEntries,
+                dictionary.getVersion(),
+                kieWrapperEntityRules.rulesVersion());
 
-        List<LegalBasis> legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        RedactionLog redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(),
-                analyzeRequest.getAnalysisNumber(),
-                redactionLogEntries,
-                toSimplifiedSectionText(legalBasis),
-                dictionary.getVersion().getDossierTemplateVersion(),
-                dictionary.getVersion().getDossierVersion(),
-                wrapper.rulesVersion(),
-                legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
-
-        List<RedactionLogEntry> importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(),
-                analyzeRequest.getDossierId(),
-                analyzeRequest.getFileId(),
-                redactionLog.getRedactionLogEntry(),
-                true);
-        redactionLog.setRedactionLogEntry(importedRedactionFilteredEntries);
-
-        return finalizeAnalysis(analyzeRequest,
-                startTime,
+        return finalizeAnalysis(analyzeRequest, startTime, kieWrapperComponentRules, new EntityLogChanges(entityLog, false), document,
                 redactionLog,
                 document.getNumberOfPages(),
                 dictionary.getVersion(),
                 false,
-                addedFileAttributes);
+                new HashSet<>(allFileAttributes));
     }
 
 
-    private List<EntityIdentifier> addManualRedactionEntriesAndReturnNotFoundEntries(AnalyzeRequest analyzeRequest, Document document) {
+    @Deprecated(forRemoval = true)
+    private RedactionLog updatePreviousRedactionLog(AnalyzeRequest analyzeRequest,
+                                                    Document document,
+                                                    List<ManualEntity> notFoundManualRedactionEntries,
+                                                    RedactionLog previousRedactionLog,
+                                                    Set<Integer> sectionsToReanalyseIds) {
 
-        List<EntityIdentifier> notFoundManualRedactionEntries = Collections.emptyList();
-        if (analyzeRequest.getManualRedactions() != null) {
-            notFoundManualRedactionEntries = entityRedactionService.addManualAddRedactionEntities(analyzeRequest.getManualRedactions().getEntriesToAdd(), document);
-            log.info("Added Manual redaction entries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-        }
-        return notFoundManualRedactionEntries;
-    }
-
-
-    @Timed("redactmanager_reanalyze")
-    @SneakyThrows
-    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-        RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        log.info("Loaded previous redaction log for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
-        log.info("Loaded Document Graph for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        // not yet ready for reanalysis
-        if (previousRedactionLog == null || document == null || document.getNumberOfPages() == 0) {
-            return analyze(analyzeRequest);
-        }
-
-        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(),
-                new DictionaryVersion(previousRedactionLog.getDictionaryVersion(), previousRedactionLog.getDossierDictionaryVersion()),
-                analyzeRequest.getDossierId());
-
-        Set<Integer> sectionsToReanalyseIds = getSectionsToReanalyseIds(analyzeRequest, previousRedactionLog, document, dictionaryIncrement);
-        List<SemanticNode> sectionsToReAnalyse = getSectionsToReAnalyse(document, sectionsToReanalyseIds);
-        log.info("{} Sections to reanalyze found for file {} in dossier {}", sectionsToReanalyseIds.size(), analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        if (sectionsToReAnalyse.isEmpty()) {
-            return finalizeAnalysis(analyzeRequest,
-                    startTime,
-                    previousRedactionLog,
-                    document.getNumberOfPages(),
-                    dictionaryIncrement.getDictionaryVersion(),
-                    true,
-                    new HashSet<>());
-        }
-
-        NerEntities nerEntities = getEntityRecognitionEntitiesFilteredBySectionIds(analyzeRequest, document, sectionsToReanalyseIds);
-        log.info("Loaded Ner Entities for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        var wrapper = droolsExecutionService.getLatestKieContainer(analyzeRequest.getDossierTemplateId());
-        log.info("Updated Rules to version {} for file {} in dossier {}", wrapper.rulesVersion(), analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        List<EntityIdentifier> notFoundManualRedactionEntries = addManualRedactionEntriesAndReturnNotFoundEntries(analyzeRequest, document);
-
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-        log.info("Updated Dictionaries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        sectionsToReAnalyse.forEach(node -> entityRedactionService.addDictionaryEntities(dictionary, node));
-        log.info("Finished Dictionary Search for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary,
-                document,
-                sectionsToReAnalyse,
-                wrapper.container(),
-                analyzeRequest,
-                nerEntities);
-        log.info("Finished Rule Execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        List<RedactionLogEntry> newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(document, analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
+        List<RedactionLogEntry> newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(document,
+                analyzeRequest.getDossierTemplateId(),
+                notFoundManualRedactionEntries,
+                getComments(analyzeRequest));
 
         var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(),
                 analyzeRequest.getDossierId(),
@@ -195,40 +235,30 @@ public class AnalyzeService {
                 false);
 
         previousRedactionLog.getRedactionLogEntry()
-                .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(IMPORTED_REDACTION_TYPE));
+                .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(ImportedRedactionService.IMPORTED_REDACTION_TYPE));
         previousRedactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
-
-        return finalizeAnalysis(analyzeRequest,
-                startTime,
-                previousRedactionLog,
-                document.getNumberOfPages(),
-                dictionaryIncrement.getDictionaryVersion(),
-                true,
-                addedFileAttributes);
+        return previousRedactionLog;
     }
 
 
-    private AnalyzeResult finalizeAnalysis(AnalyzeRequest analyzeRequest,
-                                           long startTime,
+    private AnalyzeResult finalizeAnalysis(AnalyzeRequest analyzeRequest, long startTime, KieWrapper kieWrapperComponentRules, EntityLogChanges entityLogChanges, Document document,
                                            RedactionLog redactionLog,
                                            int numberOfPages,
                                            DictionaryVersion dictionaryVersion,
                                            boolean isReanalysis,
                                            Set<FileAttribute> addedFileAttributes) {
 
-        redactionLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion());
-        redactionLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion());
+        finalizeRedactionLog(analyzeRequest, redactionLog, dictionaryVersion);
 
-        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+        EntityLog entityLog = entityLogChanges.getEntityLog();
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.ENTITY_LOG, entityLogChanges.getEntityLog());
 
-        RedactionLogChanges redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(),
-                analyzeRequest.getFileId(),
-                redactionLog,
-                analyzeRequest.getAnalysisNumber());
-        log.info("Created Redaction Log for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        log.info("Created entity log for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        if (entityLogChanges.isHasChanges() || !isReanalysis) {
+            computeComponentsWhenRulesArePresent(analyzeRequest, kieWrapperComponentRules, document, addedFileAttributes, entityLogChanges, dictionaryVersion);
+        }
 
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog());
-        log.info("Stored Redaction Log for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        log.info("Stored analysis logs for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
         long duration = System.currentTimeMillis() - startTime;
 
@@ -239,13 +269,14 @@ public class AnalyzeService {
                 .fileId(analyzeRequest.getFileId())
                 .duration(duration)
                 .numberOfPages(numberOfPages)
-                .hasUpdates(redactionLogChange.isHasChanges())
+                .hasUpdates(entityLogChanges.isHasChanges())
                 .analysisVersion(redactionServiceSettings.getAnalysisVersion())
                 .analysisNumber(analyzeRequest.getAnalysisNumber())
-                .rulesVersion(redactionLog.getRulesVersion())
-                .dictionaryVersion(redactionLog.getDictionaryVersion())
-                .legalBasisVersion(redactionLog.getLegalBasisVersion())
-                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
+                .rulesVersion(entityLog.getRulesVersion())
+                .componentRulesVersion(kieWrapperComponentRules.rulesVersion())
+                .dictionaryVersion(entityLog.getDictionaryVersion())
+                .legalBasisVersion(entityLog.getLegalBasisVersion())
+                .dossierDictionaryVersion(entityLog.getDossierDictionaryVersion())
                 .wasReanalyzed(isReanalysis)
                 .manualRedactions(analyzeRequest.getManualRedactions())
                 .addedFileAttributes(addedFileAttributes)
@@ -253,16 +284,53 @@ public class AnalyzeService {
     }
 
 
+    private void computeComponentsWhenRulesArePresent(AnalyzeRequest analyzeRequest, KieWrapper kieWrapperComponentRules, Document document,
+                                                      Set<FileAttribute> addedFileAttributes,
+                                                      EntityLogChanges entityLogChanges,
+                                                      DictionaryVersion dictionaryVersion) {
+
+        if (!kieWrapperComponentRules.isPresent()) {
+            return;
+        }
+
+        List<Component> components = componentDroolsExecutionService.executeRules(kieWrapperComponentRules.container(), entityLogChanges.getEntityLog(), document,
+                addedFileAttributes.stream().toList());
+        log.info("Finished component rule execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        ComponentLog componentLog = componentLogCreatorService.buildComponentLog(analyzeRequest.getAnalysisNumber(), components, kieWrapperComponentRules.rulesVersion());
+
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.COMPONENT_LOG, componentLog);
+
+    }
+
+
+    private RedactionLogChanges finalizeRedactionLog(AnalyzeRequest analyzeRequest, RedactionLog redactionLog, DictionaryVersion dictionaryVersion) {
+        // TODO: remove redactionLog related stuff
+
+        RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+
+        redactionLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion());
+        redactionLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion());
+
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+        RedactionLogChanges redactionLogChange = redactionChangeLogService.computeChanges(previousRedactionLog, redactionLog, analyzeRequest.getAnalysisNumber());
+
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog());
+
+        return redactionLogChange;
+    }
+
+
     private static List<SemanticNode> getSectionsToReAnalyse(Document document, Set<Integer> sectionsToReanalyseIds) {
 
         return document.streamChildren().filter(section -> sectionsToReanalyseIds.contains(section.getTreeId().get(0))).collect(Collectors.toList());
     }
 
 
-    private Set<Integer> getSectionsToReanalyseIds(AnalyzeRequest analyzeRequest, RedactionLog redactionLog, Document document, DictionaryIncrement dictionaryIncrement) {
+    private Set<Integer> getSectionsToReanalyseIds(AnalyzeRequest analyzeRequest, EntityLog entityLog, Document document, DictionaryIncrement dictionaryIncrement) {
 
         return analyzeRequest.getSectionsToReanalyse().isEmpty() //
-                ? sectionFinderService.findSectionsToReanalyse(dictionaryIncrement, redactionLog, document, analyzeRequest) //
+                ? sectionFinderService.findSectionsToReanalyse(dictionaryIncrement, entityLog, document, analyzeRequest) //
                 : analyzeRequest.getSectionsToReanalyse();
     }
 
@@ -301,7 +369,51 @@ public class AnalyzeService {
     }
 
 
-    public List<RedactionLogLegalBasis> toSimplifiedSectionText(List<LegalBasis> legalBasis) {
+    @Deprecated(forRemoval = true)
+    private RedactionLog createRedactionLog(AnalyzeRequest analyzeRequest,
+                                            Document document,
+                                            List<ManualEntity> notFoundManualRedactionEntries,
+                                            Dictionary dictionary,
+                                            KieWrapper wrapper) {
+
+        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(document,
+                analyzeRequest.getDossierTemplateId(),
+                notFoundManualRedactionEntries,
+                getComments(analyzeRequest));
+
+        List<LegalBasis> legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
+        RedactionLog redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(),
+                analyzeRequest.getAnalysisNumber(),
+                redactionLogEntries,
+                toRedactionLogLegalBasis(legalBasis),
+                dictionary.getVersion().getDossierTemplateVersion(),
+                dictionary.getVersion().getDossierVersion(),
+                wrapper.rulesVersion(),
+                legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        List<RedactionLogEntry> importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(),
+                analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                redactionLog.getRedactionLogEntry(),
+                true);
+        redactionLog.setRedactionLogEntry(importedRedactionFilteredEntries);
+        return redactionLog;
+    }
+
+
+    private static Map<String, List<Comment>> getComments(AnalyzeRequest analyzeRequest) {
+
+        if (analyzeRequest.getManualRedactions() == null) {
+            return Collections.emptyMap();
+        }
+        if (analyzeRequest.getManualRedactions().getComments() == null) {
+            return Collections.emptyMap();
+        }
+        return analyzeRequest.getManualRedactions().getComments();
+    }
+
+
+    public List<RedactionLogLegalBasis> toRedactionLogLegalBasis(List<LegalBasis> legalBasis) {
 
         return legalBasis.stream().map(l -> new RedactionLogLegalBasis(l.getName(), l.getDescription(), l.getReason())).collect(Collectors.toList());
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ComponentLogCreatorService.java

@@ -0,0 +1,63 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLog;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntityReference;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntryValue;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
+import com.iqser.red.service.redaction.v1.server.model.component.Component;
+import com.iqser.red.service.redaction.v1.server.model.component.Entity;
+import com.iqser.red.service.redaction.v1.server.service.document.ComponentComparator;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityComparators;
+
+@Service
+public class ComponentLogCreatorService {
+
+    public ComponentLog buildComponentLog(int analysisNumber, List<Component> components, long componentRulesVersion) {
+
+        Map<String, List<ComponentLogEntryValue>> map = new HashMap<>();
+        components.stream().sorted(ComponentComparator.first()).forEach(component -> {
+            ComponentLogEntryValue componentLogEntryValue = buildComponentLogEntry(component);
+            map.computeIfAbsent(component.getName(), k -> new ArrayList<>()).add(componentLogEntryValue);
+        });
+        List<ComponentLogEntry> componentLogComponents = map
+                .entrySet()
+                .stream().map(entry -> new ComponentLogEntry(entry.getKey(), entry.getValue()))
+                .toList();
+        return new ComponentLog(analysisNumber, componentRulesVersion, componentLogComponents);
+    }
+
+
+    private ComponentLogEntryValue buildComponentLogEntry(Component component) {
+
+        return ComponentLogEntryValue.builder()
+                .value(component.getValue()).originalValue(component.getValue())
+                .componentRuleId(component.getMatchedRule().toString())
+                .valueDescription(component.getValueDescription())
+                .componentLogEntityReferences(toComponentEntityReferences(component.getReferences().stream().sorted(EntityComparators.first()).toList()))
+                .build();
+    }
+
+
+    private List<ComponentLogEntityReference> toComponentEntityReferences(List<Entity> references) {
+
+        return references.stream().map(this::toComponentEntityReference).toList();
+    }
+
+
+    private ComponentLogEntityReference toComponentEntityReference(Entity entity) {
+
+        return ComponentLogEntityReference.builder().id(entity.getId())
+                .page(entity.getPositions().stream().findFirst().map(Position::getPageNumber).orElse(0)).entityRuleId(entity.getMatchedRule())
+                .type(entity.getType())
+                .build();
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/DictionarySearchService.java

@@ -0,0 +1,52 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.SearchImplementation;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityEnrichmentService;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class DictionarySearchService {
+
+    EntityEnrichmentService entityEnrichmentService;
+
+
+    public void addDictionaryEntities(Dictionary dictionary, SemanticNode node) {
+
+        for (var model : dictionary.getDictionaryModels()) {
+            bySearchImplementationAsDictionary(model.getEntriesSearch(), model.getType(), model.isHint() ? EntityType.HINT : EntityType.ENTITY, node, model.isDossierDictionary());
+            bySearchImplementationAsDictionary(model.getFalsePositiveSearch(), model.getType(), EntityType.FALSE_POSITIVE, node, model.isDossierDictionary());
+            bySearchImplementationAsDictionary(model.getFalseRecommendationsSearch(), model.getType(), EntityType.FALSE_RECOMMENDATION, node, model.isDossierDictionary());
+        }
+    }
+
+
+    public void bySearchImplementationAsDictionary(SearchImplementation searchImplementation,
+                                                   String type,
+                                                   EntityType entityType,
+                                                   SemanticNode node,
+                                                   boolean isDossierDictionaryEntry) {
+
+        EntityCreationService entityCreationService = new EntityCreationService(entityEnrichmentService);
+        searchImplementation.getBoundaries(node.getTextBlock(), node.getTextRange())
+                .stream().filter(boundary -> entityCreationService.isValidEntityTextRange(node.getTextBlock(), boundary))
+                .map(bounds -> entityCreationService.forceByTextRange(bounds, type, entityType, node))
+                .peek(entity -> entity.setDictionaryEntry(true))
+                .peek(entity -> entity.setDossierDictionaryEntry(isDossierDictionaryEntry))
+                .forEach(entity -> entity.addEngine(Engine.DICTIONARY));
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/DictionaryService.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
+package com.iqser.red.service.redaction.v1.server.service;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -24,15 +24,15 @@ import com.iqser.red.service.dictionarymerge.commons.DictionaryEntryModel;
 import com.iqser.red.service.dictionarymerge.commons.DictionaryMergeService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.Colors;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryEntries;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrementValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryModel;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryRepresentation;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryVersion;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.TenantDictionary;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.TenantDictionary;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryEntries;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryIncrementValue;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryRepresentation;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.RedactionServiceSettings;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 
 import feign.FeignException;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityChangeLogService.java

@@ -0,0 +1,93 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ChangeType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
+
+import io.micrometer.core.annotation.Timed;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class EntityChangeLogService {
+
+
+    @Timed("redactmanager_computeChanges")
+    public boolean computeChanges(List<EntityLogEntry> previousEntityLogEntries, List<EntityLogEntry> newEntityLogEntries, int analysisNumber) {
+
+        var now = OffsetDateTime.now();
+        if (previousEntityLogEntries.isEmpty()) {
+            newEntityLogEntries.forEach(entry -> entry.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, now)));
+            return true;
+        }
+
+        boolean hasChanges = false;
+
+        for (EntityLogEntry entityLogEntry : newEntityLogEntries) {
+            Optional<EntityLogEntry> optionalPreviousEntity = previousEntityLogEntries.stream().filter(entry -> entry.getId().equals(entityLogEntry.getId())).findAny();
+            if (optionalPreviousEntity.isEmpty()) {
+                hasChanges = true;
+                entityLogEntry.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, now));
+                continue;
+            }
+            var previousEntity = optionalPreviousEntity.get();
+            entityLogEntry.getChanges().addAll(previousEntity.getChanges());
+            if (!previousEntity.getState().equals(entityLogEntry.getState())) {
+                hasChanges = true;
+                ChangeType changeType = calculateChangeType(entityLogEntry.getState(), previousEntity.getState());
+                if (changeType != null) {
+                    entityLogEntry.getChanges().add(new Change(analysisNumber, changeType, now));
+                }
+            }
+        }
+        addRemovedEntriesAsRemoved(previousEntityLogEntries, newEntityLogEntries, analysisNumber, now);
+        return hasChanges;
+    }
+
+
+    private static void addRemovedEntriesAsRemoved(List<EntityLogEntry> previousEntityLogEntries,
+                                                   List<EntityLogEntry> newEntityLogEntries,
+                                                   int analysisNumber,
+                                                   OffsetDateTime now) {
+
+        Set<String> existingIds = newEntityLogEntries.stream().map(EntityLogEntry::getId).collect(Collectors.toSet());
+        List<EntityLogEntry> removedEntries = previousEntityLogEntries.stream().filter(entry -> !existingIds.contains(entry.getId())).toList();
+        removedEntries.forEach(entry -> entry.getChanges().add(new Change(analysisNumber, ChangeType.REMOVED, now)));
+        removedEntries.forEach(entry -> entry.setState(EntryState.REMOVED));
+        newEntityLogEntries.addAll(removedEntries);
+    }
+
+
+    private ChangeType calculateChangeType(EntryState state, EntryState previousState) {
+
+        if (state.equals(previousState)) {
+            throw new IllegalArgumentException("States are equal, can't calculate ChangeType.");
+        }
+        if (!isRemoved(previousState) && isRemoved(state)) {
+            return ChangeType.REMOVED;
+        }
+        if (isRemoved(previousState) && !isRemoved(state)) {
+            return ChangeType.ADDED;
+        }
+        return ChangeType.CHANGED;
+    }
+
+
+    private static boolean isRemoved(EntryState state) {
+
+        return (state.equals(EntryState.REMOVED) || state.equals(EntryState.IGNORED));
+    }
+
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java

@@ -0,0 +1,345 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogChanges;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogLegalBasis;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.legalbasis.LegalBasis;
+import com.iqser.red.service.redaction.v1.server.RedactionServiceSettings;
+import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.model.ManualEntity;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.PositionOnPage;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class EntityLogCreatorService {
+
+    DictionaryService dictionaryService;
+    ManualChangeFactory manualChangeFactory;
+    ImportedRedactionService importedRedactionService;
+    RedactionServiceSettings redactionServiceSettings;
+    LegalBasisClient legalBasisClient;
+    EntityChangeLogService entityChangeLogService;
+    RedactionStorageService redactionStorageService;
+
+
+    private static boolean notFalsePositiveOrFalseRecommendation(TextEntity textEntity) {
+
+        return !(textEntity.getEntityType().equals(EntityType.FALSE_POSITIVE) || textEntity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION));
+    }
+
+
+    public EntityLog createInitialEntityLog(AnalyzeRequest analyzeRequest,
+                                            Document document,
+                                            List<ManualEntity> notFoundManualRedactionEntries,
+                                            DictionaryVersion dictionaryVersion,
+                                            long rulesVersion) {
+
+        List<EntityLogEntry> entityLogEntries = createEntityLogEntries(document, analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
+
+        List<LegalBasis> legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
+        EntityLog entityLog = new EntityLog(redactionServiceSettings.getAnalysisVersion(),
+                analyzeRequest.getAnalysisNumber(),
+                entityLogEntries,
+                toEntityLogLegalBasis(legalBasis),
+                dictionaryVersion.getDossierTemplateVersion(),
+                dictionaryVersion.getDossierVersion(),
+                rulesVersion,
+                legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        List<EntityLogEntry> importedRedactionFilteredEntries = importedRedactionService.processImportedEntities(analyzeRequest.getDossierTemplateId(),
+                analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                entityLog.getEntityLogEntry(),
+                true);
+
+        entityLog.setEntityLogEntry(importedRedactionFilteredEntries);
+        List<EntityLogEntry> previousExistingEntityLogEntries = getPreviousEntityLogEntries(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        entityChangeLogService.computeChanges(previousExistingEntityLogEntries, entityLogEntries, analyzeRequest.getAnalysisNumber());
+        excludeExcludedPages(entityLog, analyzeRequest.getExcludedPages());
+        return entityLog;
+    }
+
+
+    private List<EntityLogEntry> getPreviousEntityLogEntries(String dossierId, String fileId) {
+
+        if (redactionStorageService.entityLogExists(dossierId, fileId)) {
+            return redactionStorageService.getEntityLog(dossierId, fileId).getEntityLogEntry();
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+
+    public EntityLogChanges updateVersionsAndReturnChanges(EntityLog entityLog, DictionaryVersion dictionaryVersion, String dossierTemplateId, boolean hasChanges) {
+
+        List<LegalBasis> legalBasis = legalBasisClient.getLegalBasisMapping(dossierTemplateId);
+        entityLog.setLegalBasisVersion(legalBasisClient.getVersion(dossierTemplateId));
+        entityLog.setLegalBasis(toEntityLogLegalBasis(legalBasis));
+        entityLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion());
+        entityLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion());
+
+        return new EntityLogChanges(entityLog, hasChanges);
+    }
+
+
+    public EntityLogChanges updatePreviousEntityLog(AnalyzeRequest analyzeRequest,
+                                                    Document document,
+                                                    List<ManualEntity> notFoundManualRedactionEntries,
+                                                    EntityLog previousEntityLog,
+                                                    Set<Integer> sectionsToReanalyseIds,
+                                                    DictionaryVersion dictionaryVersion) {
+
+        List<EntityLogEntry> newEntityLogEntries = createEntityLogEntries(document, analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
+        Set<String> newEntityIds = newEntityLogEntries.stream().map(EntityLogEntry::getId).collect(Collectors.toSet());
+        List<EntityLogEntry> previousEntriesFromReAnalyzedSections = previousEntityLog.getEntityLogEntry()
+                .stream()
+                .filter(entry -> (newEntityIds.contains(entry.getId()) || sectionsToReanalyseIds.contains(entry.getContainingNodeId().get(0))) && !entry.getType()
+                        .equals(ImportedRedactionService.IMPORTED_REDACTION_TYPE))
+                .toList();
+        previousEntityLog.getEntityLogEntry().removeAll(previousEntriesFromReAnalyzedSections);
+
+        boolean hasChanges = entityChangeLogService.computeChanges(previousEntriesFromReAnalyzedSections, newEntityLogEntries, analyzeRequest.getAnalysisNumber());
+
+        var newEntityLogWithImportedEntities = importedRedactionService.processImportedEntities(analyzeRequest.getDossierTemplateId(),
+                analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                newEntityLogEntries,
+                false);
+
+        previousEntityLog.getEntityLogEntry().addAll(newEntityLogWithImportedEntities);
+
+        excludeExcludedPages(previousEntityLog, analyzeRequest.getExcludedPages());
+
+        return updateVersionsAndReturnChanges(previousEntityLog, dictionaryVersion, analyzeRequest.getDossierTemplateId(), hasChanges);
+    }
+
+
+    private List<EntityLogEntry> createEntityLogEntries(Document document, String dossierTemplateId, List<ManualEntity> notFoundManualRedactionEntries) {
+
+        List<EntityLogEntry> entries = new ArrayList<>();
+        Set<String> processedIds = new HashSet<>();
+        document.getEntities()
+                .stream()
+                .filter(EntityLogCreatorService::notFalsePositiveOrFalseRecommendation)
+                .filter(entity -> !entity.removed())
+                .forEach(entityNode -> entries.addAll(toEntityLogEntries(entityNode, dossierTemplateId, processedIds)));
+        document.streamAllImages().filter(entity -> !entity.removed()).forEach(imageNode -> entries.add(createEntityLogEntry(imageNode, dossierTemplateId)));
+        notFoundManualRedactionEntries.stream().filter(entity -> !entity.removed()).forEach(manualEntity -> entries.add(createEntityLogEntry(manualEntity, dossierTemplateId)));
+        return entries;
+    }
+
+
+    private List<EntityLogEntry> toEntityLogEntries(TextEntity textEntity, String dossierTemplateId, Set<String> processedIds) {
+
+        List<EntityLogEntry> redactionLogEntities = new ArrayList<>();
+
+        for (PositionOnPage positionOnPage : textEntity.getPositionsOnPagePerPage()) {
+
+            // Duplicates should be removed. They might exist due to table extraction duplicating cells spanning multiple columns/rows.
+            if (processedIds.contains(positionOnPage.getId())) {
+                continue;
+            }
+            processedIds.add(positionOnPage.getId());
+
+            EntityLogEntry redactionLogEntry = createEntityLogEntry(textEntity, dossierTemplateId);
+            redactionLogEntry.setId(positionOnPage.getId());
+
+            List<Position> rectanglesPerLine = positionOnPage.getRectanglePerLine().stream().map(rectangle2D -> new Position(rectangle2D, positionOnPage.getPage().getNumber()))
+                    .toList();
+
+            redactionLogEntry.setPositions(rectanglesPerLine);
+            redactionLogEntities.add(redactionLogEntry);
+        }
+
+        return redactionLogEntities;
+    }
+
+
+    public EntityLogEntry createEntityLogEntry(Image image, String dossierTemplateId) {
+
+        String imageType = image.getImageType().equals(ImageType.OTHER) ? "image" : image.getImageType().toString().toLowerCase(Locale.ENGLISH);
+        boolean isHint = dictionaryService.isHint(imageType, dossierTemplateId);
+        return EntityLogEntry.builder()
+                .id(image.getId())
+                .value(image.value())
+                .color(getColor(imageType, dossierTemplateId, image.applied(), isHint))
+                .value(image.value())
+                .type(imageType)
+                .reason(image.buildReasonWithManualChangeDescriptions())
+                .legalBasis(image.legalBasis())
+                .matchedRule(image.getMatchedRule().getRuleIdentifier().toString())
+                .dictionaryEntry(false)
+                .positions(List.of(new Position(image.getPosition(), image.getPage().getNumber())))
+                .containingNodeId(image.getTreeId())
+                .closestHeadline(image.getHeadline().getTextBlock().getSearchText())
+                .section(image.getManualOverwrite().getSection().orElse(image.getParent().toString()))
+                .imageHasTransparency(image.isTransparent())
+                .manualChanges(manualChangeFactory.toManualChangeList(image.getManualOverwrite().getManualChangeLog(), isHint))
+                .state(buildEntryState(image))
+                .entryType(buildEntryType(image))
+                .build();
+
+    }
+
+
+    private EntityLogEntry createEntityLogEntry(ManualEntity manualEntity, String dossierTemplateId) {
+
+        String type = manualEntity.getManualOverwrite().getType().orElse(manualEntity.getType());
+        boolean isHint = isHint(manualEntity.getEntityType());
+        return EntityLogEntry.builder().id(manualEntity.getId()).color(getColor(type, dossierTemplateId, manualEntity.applied(), isHint))
+                .reason(manualEntity.buildReasonWithManualChangeDescriptions())
+                .legalBasis(manualEntity.legalBasis()).value(manualEntity.value()).type(type).state(buildEntryState(manualEntity)).entryType(buildEntryType(manualEntity))
+                .section(manualEntity.getManualOverwrite().getSection().orElse(manualEntity.getSection()))
+                .containingNodeId(Collections.emptyList())
+                .closestHeadline("")
+                .matchedRule(manualEntity.getMatchedRule().getRuleIdentifier().toString())
+                .dictionaryEntry(manualEntity.isDictionaryEntry())
+                .dossierDictionaryEntry(manualEntity.isDossierDictionaryEntry())
+                .textAfter("")
+                .textBefore("")
+                .startOffset(-1)
+                .endOffset(-1)
+                .positions(manualEntity.getEntityPosition().stream().map(entityPosition -> new Position(entityPosition.rectangle2D(), entityPosition.pageNumber())).toList())
+                .engines(Collections.emptySet())
+                .reference(Collections.emptySet())
+                .manualChanges(manualChangeFactory.toManualChangeList(manualEntity.getManualOverwrite().getManualChangeLog(), isHint))
+                .build();
+    }
+
+
+    private EntityLogEntry createEntityLogEntry(TextEntity entity, String dossierTemplateId) {
+
+        Set<String> referenceIds = new HashSet<>();
+        entity.references().stream().filter(TextEntity::active).forEach(ref -> ref.getPositionsOnPagePerPage().forEach(pos -> referenceIds.add(pos.getId())));
+        boolean isHint = isHint(entity.getEntityType());
+        return EntityLogEntry.builder()
+                .color(getColor(entity.getType(), dossierTemplateId, entity.applied(), isHint))
+                .reason(entity.buildReasonWithManualChangeDescriptions())
+                .legalBasis(entity.legalBasis())
+                .value(entity.getManualOverwrite().getValue().orElse(entity.getMatchedRule().isWriteValueWithLineBreaks() ? entity.getValueWithLineBreaks() : entity.getValue()))
+                .type(entity.getType())
+                .section(entity.getManualOverwrite().getSection().orElse(entity.getDeepestFullyContainingNode().toString()))
+                .containingNodeId(entity.getDeepestFullyContainingNode().getTreeId())
+                .closestHeadline(entity.getDeepestFullyContainingNode().getHeadline().getTextBlock().getSearchText())
+                .matchedRule(entity.getMatchedRule().getRuleIdentifier().toString())
+                .dictionaryEntry(entity.isDictionaryEntry())
+                .textAfter(entity.getTextAfter())
+                .textBefore(entity.getTextBefore())
+                .startOffset(entity.getTextRange().start())
+                .endOffset(entity.getTextRange().end())
+                .dossierDictionaryEntry(entity.isDossierDictionaryEntry())
+                .engines(entity.getEngines() != null ? entity.getEngines() : Collections.emptySet())
+                .reference(referenceIds)
+                .manualChanges(manualChangeFactory.toManualChangeList(entity.getManualOverwrite().getManualChangeLog(), isHint))
+                .state(buildEntryState(entity))
+                .entryType(buildEntryType(entity))
+                .build();
+    }
+
+
+    private boolean isHint(EntityType entityType) {
+
+        return entityType.equals(EntityType.HINT);
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId, boolean isApplied, boolean isHint) {
+
+        if (!isApplied && !isHint) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    private EntryState buildEntryState(IEntity entity) {
+
+        if (entity.applied() && entity.active()) {
+            return EntryState.APPLIED;
+        } else if (entity.skipped() && entity.active()) {
+            return EntryState.SKIPPED;
+        } else if (entity.ignored()) {
+            return EntryState.IGNORED;
+        } else {
+            return EntryState.REMOVED;
+        }
+    }
+
+
+    private EntryType buildEntryType(IEntity entity) {
+
+        if (entity instanceof TextEntity textEntity) {
+            return getEntryType(textEntity.getEntityType());
+        } else if (entity instanceof ManualEntity manualEntity) {
+            if (((ManualEntity) entity).isRectangle()) {
+                return EntryType.AREA;
+            }
+            return getEntryType(manualEntity.getEntityType());
+        } else if (entity instanceof Image) {
+            return EntryType.IMAGE;
+        }
+        throw new UnsupportedOperationException(String.format("Entity subclass %s is not implemented!", entity.getClass()));
+    }
+
+
+    private static EntryType getEntryType(EntityType entityType) {
+
+        return switch (entityType) {
+            case ENTITY -> EntryType.ENTITY;
+            case HINT -> EntryType.HINT;
+            case FALSE_POSITIVE -> EntryType.FALSE_POSITIVE;
+            case RECOMMENDATION -> EntryType.RECOMMENDATION;
+            case FALSE_RECOMMENDATION -> EntryType.FALSE_RECOMMENDATION;
+        };
+    }
+
+
+    private List<EntityLogLegalBasis> toEntityLogLegalBasis(List<LegalBasis> legalBasis) {
+
+        return legalBasis.stream().map(l -> new EntityLogLegalBasis(l.getName(), l.getDescription(), l.getReason())).collect(Collectors.toList());
+    }
+
+
+    private void excludeExcludedPages(EntityLog entityLog, Set<Integer> excludedPages) {
+
+        if (excludedPages != null && !excludedPages.isEmpty()) {
+            entityLog.getEntityLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> {
+                if (excludedPages.contains(pos.getPageNumber())) {
+                    entry.setExcluded(true);
+                }
+            }));
+        }
+
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ImportedRedactionService.java

@@ -1,10 +1,14 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
+package com.iqser.red.service.redaction.v1.server.service;
 
 import java.util.HashSet;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
@@ -25,6 +29,7 @@ public class ImportedRedactionService {
     private final RedactionStorageService redactionStorageService;
 
 
+    @Deprecated(forRemoval = true)
     @Timed("redactmanager_processImportedRedactions")
     public List<RedactionLogEntry> processImportedRedactions(String dossierTemplateId,
                                                              String dossierId,
@@ -47,6 +52,29 @@ public class ImportedRedactionService {
     }
 
 
+    @Timed("redactmanager_processImportedRedactions")
+    public List<EntityLogEntry> processImportedEntities(String dossierTemplateId,
+                                                        String dossierId,
+                                                        String fileId,
+                                                        List<EntityLogEntry> redactionLogEntries,
+                                                        boolean addImportedRedactions) {
+
+        ImportedRedactions importedRedactions = redactionStorageService.getImportedRedactions(dossierId, fileId);
+        if (importedRedactions == null) {
+            return redactionLogEntries;
+        }
+
+        redactionLogEntries.forEach(redactionLogEntry -> addIntersections(redactionLogEntry, importedRedactions));
+
+        if (addImportedRedactions) {
+            return addImportedRedactionsEntityLogEntries(dossierTemplateId, redactionLogEntries, importedRedactions);
+        }
+
+        return redactionLogEntries;
+    }
+
+
+    @Deprecated(forRemoval = true)
     private List<RedactionLogEntry> addImportedRedactionsRedactionLogEntries(String dossierTemplateId,
                                                                              List<RedactionLogEntry> redactionLogEntries,
                                                                              ImportedRedactions importedRedactions) {
@@ -70,6 +98,40 @@ public class ImportedRedactionService {
     }
 
 
+    private List<EntityLogEntry> addImportedRedactionsEntityLogEntries(String dossierTemplateId, List<EntityLogEntry> entityLogEntries, ImportedRedactions importedRedactions) {
+
+        for (var importedRedactionsValues : importedRedactions.getImportedRedactions().values()) {
+            for (var importedRedaction : importedRedactionsValues) {
+                EntityLogEntry redactionLogEntry = EntityLogEntry.builder()
+                        .id(importedRedaction.getId())
+                        .type(IMPORTED_REDACTION_TYPE).entryType(EntryType.ENTITY)
+                        .imported(true)
+                        .state(EntryState.APPLIED)
+                        .positions(toPositions(importedRedaction.getPositions()))
+                        .color(getColor(IMPORTED_REDACTION_TYPE, dossierTemplateId))
+                        .build();
+
+                entityLogEntries.add(redactionLogEntry);
+            }
+        }
+
+        return entityLogEntries;
+    }
+
+
+    private List<Position> toPositions(List<Rectangle> positions) {
+
+        return positions.stream().map(this::toPosition).toList();
+    }
+
+
+    private Position toPosition(Rectangle rectangle) {
+
+        return new Position(new float[]{rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(), rectangle.getWidth(), rectangle.getHeight()}, rectangle.getPage());
+    }
+
+
+    @Deprecated(forRemoval = true)
     private void addIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
 
         for (Rectangle rectangle : redactionLogEntry.getPositions()) {
@@ -91,6 +153,27 @@ public class ImportedRedactionService {
     }
 
 
+    private void addIntersections(EntityLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
+
+        for (Position rectangle : redactionLogEntry.getPositions()) {
+            var normalizedRectangle = normalize(rectangle);
+            if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPageNumber())) {
+                var importedRedactionsOnPage = importedRedactions.getImportedRedactions().get(rectangle.getPageNumber());
+                for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
+                    for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
+                        if (rectOverlap(normalizedRectangle, normalize(importedRedactionPosition))) {
+                            if (redactionLogEntry.getImportedRedactionIntersections() == null) {
+                                redactionLogEntry.setImportedRedactionIntersections(new HashSet<>());
+                            }
+                            redactionLogEntry.getImportedRedactionIntersections().add(importedRedaction.getId());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
     boolean valueInRange(float value, float min, float max) {
 
         return round(value) >= round(min) && round(value) <= round(max);
@@ -111,6 +194,7 @@ public class ImportedRedactionService {
     }
 
 
+    @Deprecated(forRemoval = true)
     private Rectangle normalize(Rectangle rectangle) {
 
         Rectangle r = new Rectangle();
@@ -138,6 +222,33 @@ public class ImportedRedactionService {
     }
 
 
+    private Rectangle normalize(Position position) {
+
+        Rectangle r = new Rectangle();
+        Point p = new Point();
+
+        if (position.getRectangle()[2] < 0) {
+            p.setX(position.getRectangle()[0] + position.getRectangle()[2]);
+            r.setWidth(Math.abs(position.getRectangle()[2]));
+        } else {
+            p.setX(position.getRectangle()[0]);
+            r.setWidth(position.getRectangle()[2]);
+        }
+
+        if (position.getRectangle()[3] < 0) {
+            p.setY(position.getRectangle()[1] + position.getRectangle()[3]);
+            r.setHeight(Math.abs(position.getRectangle()[3]));
+        } else {
+            p.setY(position.getRectangle()[1]);
+            r.setHeight(position.getRectangle()[3]);
+        }
+
+        r.setTopLeft(p);
+        r.setPage(position.getPageNumber());
+        return r;
+    }
+
+
     private float round(float value) {
 
         double d = Math.pow(10, 0);

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ManualChangeFactory.java

@@ -0,0 +1,51 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualRedactionType;
+
+@Service
+public class ManualChangeFactory {
+
+    public List<ManualChange> toManualChangeList(List<BaseAnnotation> manualChanges, boolean isHint) {
+
+        return manualChanges.stream().map(baseAnnotation -> toManualChange(baseAnnotation, isHint)).toList();
+    }
+
+
+    private ManualChange toManualChange(BaseAnnotation baseAnnotation, boolean isHint) {
+
+        ManualChange manualChange = ManualChange.from(baseAnnotation);
+        if (baseAnnotation instanceof ManualRecategorization imageRecategorization) {
+            manualChange.withManualRedactionType(ManualRedactionType.RECATEGORIZE).withChange("type", imageRecategorization.getType());
+        } else if (baseAnnotation instanceof IdRemoval manualRemoval) {
+            manualChange.withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY);
+        } else if (baseAnnotation instanceof ManualForceRedaction) {
+            manualChange.withManualRedactionType(isHint ? ManualRedactionType.FORCE_HINT : ManualRedactionType.FORCE_REDACT);
+        } else if (baseAnnotation instanceof ManualResizeRedaction manualResizeRedact) {
+            manualChange.withManualRedactionType(ManualRedactionType.RESIZE).withChange("value", manualResizeRedact.getValue());
+        } else if (baseAnnotation instanceof ManualRedactionEntry manualRedactionEntry) {
+            manualChange.withManualRedactionType(manualRedactionEntry.isAddToDictionary() ? ManualRedactionType.ADD_TO_DICTIONARY : ManualRedactionType.ADD_LOCALLY)
+                    .withChange("value", manualRedactionEntry.getValue());
+        } else if (baseAnnotation instanceof ManualLegalBasisChange manualLegalBasisChange) {
+            manualChange.withManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE)
+                    .withChange("section", manualLegalBasisChange.getSection())
+                    .withChange("value", manualLegalBasisChange.getValue())
+                    .withChange("legalBasis", manualLegalBasisChange.getLegalBasis());
+        }
+        manualChange.setProcessedDate(OffsetDateTime.now());
+        return manualChange;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ManualChangesApplicationService.java

@@ -0,0 +1,98 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.awt.geom.Rectangle2D;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.PositionOnPage;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ManualChangesApplicationService {
+
+    EntityCreationService entityCreationService;
+
+    public void recategorize(IEntity IEntityToBeReCategorized, ManualRecategorization manualRecategorization) {
+
+        if (IEntityToBeReCategorized instanceof Image image) {
+            image.setImageType(ImageType.fromString(manualRecategorization.getType()));
+            return;
+        }
+        // need to create a new entity and copy over all values, since type is part of the primary key for entities and should never be changed!
+        if (IEntityToBeReCategorized instanceof TextEntity textEntity) {
+            TextEntity recategorizedEntity = entityCreationService.copyEntityWithoutRules(textEntity, manualRecategorization.getType(), textEntity.getEntityType(), textEntity.getDeepestFullyContainingNode());
+            recategorizedEntity.setPositionsOnPagePerPage(textEntity.getPositionsOnPagePerPage());
+            recategorizedEntity.getManualOverwrite().addChange(manualRecategorization);
+            textEntity.remove("FINAL.0.0", "removed by manual recategorization");
+        }
+    }
+
+
+    public void resizeEntityAndReinsert(TextEntity entityToBeResized, ManualResizeRedaction manualResizeRedaction) {
+
+        PositionOnPage positionOnPageToBeResized = entityToBeResized.getPositionsOnPagePerPage()
+                .stream()
+                .filter(redactionPosition -> redactionPosition.getId().equals(manualResizeRedaction.getAnnotationId()))
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException("No redaction position with matching annotation id found!"));
+
+        positionOnPageToBeResized.setRectanglePerLine(manualResizeRedaction.getPositions().stream().map(ManualChangesApplicationService::toRectangle2D).toList());
+
+        int newStartOffset;
+        if (manualResizeRedaction.getValue().length() > entityToBeResized.getValue().length()) {
+            newStartOffset = entityToBeResized.getTextRange().start() - manualResizeRedaction.getValue().indexOf(entityToBeResized.getValue());
+        } else {
+            newStartOffset = entityToBeResized.getTextRange().start() + entityToBeResized.getValue().indexOf(manualResizeRedaction.getValue());
+        }
+
+        // need to reinsert the entity, due to the boundary having changed.
+        removeAndUpdateAndReInsertEntity(entityToBeResized, manualResizeRedaction, newStartOffset);
+        entityToBeResized.getManualOverwrite().addChange(manualResizeRedaction);
+    }
+
+
+    private void removeAndUpdateAndReInsertEntity(TextEntity entityToBeResized, ManualResizeRedaction manualResizeRedaction, int newStartOffset) {
+
+        SemanticNode nodeToInsertInto = entityToBeResized.getDeepestFullyContainingNode().getDocumentTree().getRoot().getNode();
+        entityToBeResized.getIntersectingNodes().forEach(node -> node.getEntities().remove(this));
+        entityToBeResized.getPages().forEach(page -> page.getEntities().remove(this));
+        entityToBeResized.setIntersectingNodes(new LinkedList<>());
+        entityToBeResized.setDeepestFullyContainingNode(null);
+        entityToBeResized.setPages(new HashSet<>());
+        entityToBeResized.getTextRange().setStart(newStartOffset);
+        entityToBeResized.getTextRange().setEnd(newStartOffset + manualResizeRedaction.getValue().length());
+        entityCreationService.addEntityToGraph(entityToBeResized, nodeToInsertInto);
+    }
+
+
+    public void resizeImage(Image image, ManualResizeRedaction manualResizeRedaction) {
+
+        if (manualResizeRedaction.getPositions().isEmpty() || manualResizeRedaction.getPositions() == null) {
+            return;
+        }
+        var bBox = RectangleTransformations.rectangle2DBBox(manualResizeRedaction.getPositions().stream().map(ManualChangesApplicationService::toRectangle2D).toList());
+        image.setPosition(bBox);
+        image.getManualOverwrite().addChange(manualResizeRedaction);
+    }
+
+
+    private static Rectangle2D toRectangle2D(com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle rect) {
+
+        return new Rectangle2D.Double(rect.getTopLeftX() - rect.getWidth(), rect.getTopLeftY() - rect.getHeight(), rect.getWidth(), rect.getHeight());
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionChangeLogService.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
+package com.iqser.red.service.redaction.v1.server.service;
 
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -22,6 +22,7 @@ import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+@Deprecated(forRemoval = true)
 @Slf4j
 @Service
 @RequiredArgsConstructor
@@ -31,12 +32,10 @@ public class RedactionChangeLogService {
 
 
     @Timed("redactmanager_computeChanges")
-    public RedactionLogChanges computeChanges(String dossierId, String fileId, RedactionLog currentRedactionLog, int analysisNumber) {
+    public RedactionLogChanges computeChanges(RedactionLog previousRedactionLog, RedactionLog currentRedactionLog, int analysisNumber) {
 
         long start = System.currentTimeMillis();
 
-        RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(dossierId, fileId);
-
         if (previousRedactionLog == null) {
             currentRedactionLog.getRedactionLogEntry().forEach(entry -> {
                 entry.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java

@@ -0,0 +1,291 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Comment;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ManualChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ManualRedactionType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogComment;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.model.ManualEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.ManualChangeOverwrite;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.PositionOnPage;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Deprecated(forRemoval = true)
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class RedactionLogCreatorService {
+
+    private final DictionaryService dictionaryService;
+    private final ManualChangeFactory manualChangeFactory;
+
+
+    public List<RedactionLogEntry> createRedactionLog(Document document,
+                                                      String dossierTemplateId,
+                                                      List<ManualEntity> notFoundManualRedactionEntries,
+                                                      Map<String, List<Comment>> comments) {
+
+        List<RedactionLogEntry> entries = new ArrayList<>();
+        Set<String> processIds = new HashSet<>();
+        document.getEntities()
+                .stream().filter(RedactionLogCreatorService::notFalsePositiveOrFalseRecommendation)
+                .filter(IEntity::active)
+                .forEach(entityNode -> entries.addAll(toRedactionLogEntries(entityNode, dossierTemplateId, comments, processIds)));
+        document.streamAllImages().filter(image -> !image.removed()).forEach(imageNode -> entries.add(createRedactionLogEntry(imageNode, dossierTemplateId, comments)));
+        notFoundManualRedactionEntries.forEach(entityIdentifier -> entries.add(createRedactionLogEntry(entityIdentifier, dossierTemplateId, comments)));
+        return entries;
+    }
+
+
+    private static boolean notFalsePositiveOrFalseRecommendation(TextEntity textEntity) {
+
+        return !(textEntity.getEntityType() == EntityType.FALSE_POSITIVE || textEntity.getEntityType() == EntityType.FALSE_RECOMMENDATION);
+    }
+
+
+    private List<RedactionLogEntry> toRedactionLogEntries(TextEntity textEntity, String dossierTemplateId, Map<String, List<Comment>> comments, Set<String> processedIds) {
+
+        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
+
+        for (PositionOnPage positionOnPage : textEntity.getPositionsOnPagePerPage()) {
+
+            // Duplicates should be removed. They might exist due to table extraction duplicating cells spanning multiple columns/rows.
+            if (processedIds.contains(positionOnPage.getId())) {
+                continue;
+            }
+            processedIds.add(positionOnPage.getId());
+
+            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(textEntity, dossierTemplateId);
+            redactionLogEntry.setId(positionOnPage.getId());
+            redactionLogEntry.setComments(buildRedactionLogComments(comments, positionOnPage.getId()));
+
+            List<Rectangle> rectanglesPerLine = positionOnPage.getRectanglePerLine()
+                    .stream()
+                    .map(rectangle2D -> toRedactionLogRectangle(rectangle2D, positionOnPage.getPage().getNumber()))
+                    .toList();
+
+            redactionLogEntry.setPositions(rectanglesPerLine);
+            redactionLogEntities.add(redactionLogEntry);
+        }
+
+        return redactionLogEntities;
+    }
+
+
+    private List<RedactionLogComment> buildRedactionLogComments(Map<String, List<Comment>> commentsPerId, String id) {
+
+        if (!commentsPerId.containsKey(id)) {
+            return Collections.emptyList();
+        }
+        List<Comment> comments = commentsPerId.get(id);
+        if (comments == null || comments.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return toRedactionLogComments(comments);
+    }
+
+
+    private List<RedactionLogComment> toRedactionLogComments(List<Comment> comments) {
+
+        return comments.stream().map(this::toRedactionLogComment).toList();
+    }
+
+
+    private RedactionLogComment toRedactionLogComment(Comment comment) {
+
+        return new RedactionLogComment(comment.getId(),
+                comment.getUser(),
+                comment.getText(),
+                comment.getAnnotationId(),
+                comment.getFileId(),
+                comment.getDate(),
+                comment.getSoftDeletedTime());
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(TextEntity entity, String dossierTemplateId) {
+
+        Set<String> referenceIds = new HashSet<>();
+        entity.references().stream().filter(TextEntity::active).forEach(ref -> ref.getPositionsOnPagePerPage().forEach(pos -> referenceIds.add(pos.getId())));
+        int sectionNumber = entity.getDeepestFullyContainingNode().getTreeId().isEmpty() ? 0 : entity.getDeepestFullyContainingNode().getTreeId().get(0);
+        boolean isHint = isHint(entity.getEntityType());
+        return RedactionLogEntry.builder().color(getColor(entity.getType(), dossierTemplateId, entity.applied(), isHint))
+                .reason(entity.buildReasonWithManualChangeDescriptions())
+                .legalBasis(entity.legalBasis())
+                .value(entity.getManualOverwrite().getValue().orElse(entity.getMatchedRule().isWriteValueWithLineBreaks() ? entity.getValueWithLineBreaks() : entity.getValue()))
+                .type(entity.getType())
+                .redacted(entity.applied())
+                .isHint(isHint)
+                .isRecommendation(entity.getEntityType().equals(EntityType.RECOMMENDATION))
+                .isFalsePositive(entity.getEntityType().equals(EntityType.FALSE_POSITIVE) || entity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
+                .section(entity.getManualOverwrite().getSection().orElse(entity.getDeepestFullyContainingNode().toString()))
+                .sectionNumber(sectionNumber)
+                .matchedRule(entity.getMatchedRule().getRuleIdentifier().toString())
+                .isDictionaryEntry(entity.isDictionaryEntry())
+                .textAfter(entity.getTextAfter())
+                .textBefore(entity.getTextBefore())
+                .startOffset(entity.getTextRange().start())
+                .endOffset(entity.getTextRange().end())
+                .isDossierDictionaryEntry(entity.isDossierDictionaryEntry())
+                .engines(getEngines(entity))
+                .reference(referenceIds)
+                .manualChanges(mapManualChanges(entity.getManualOverwrite(), isHint))
+                .build();
+    }
+
+
+    private Set<Engine> getEngines(TextEntity entity) {
+
+        return entity.getEngines() != null ? mapToEngines(entity.getEngines()) : Collections.emptySet();
+    }
+
+
+    private Set<Engine> mapToEngines(Set<com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine> engines) {
+
+        return engines.stream().map(engine -> switch (engine) {
+            case NER -> Engine.NER;
+            case RULE -> Engine.RULE;
+            case DICTIONARY -> Engine.DICTIONARY;
+            default -> null;
+        }).filter(Objects::nonNull).collect(Collectors.toSet());
+    }
+
+
+    private boolean isHint(EntityType entityType) {
+
+        return entityType.equals(EntityType.HINT);
+    }
+
+
+    private List<ManualChange> mapManualChanges(ManualChangeOverwrite manualEntity, boolean isHint) {
+
+        return manualChangeFactory.toManualChangeList(manualEntity.getManualChangeLog(), isHint).stream().map(this::mapManualChange).toList();
+    }
+
+
+    private ManualChange mapManualChange(com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange manualChange) {
+
+        ManualChange manualChange1 = new ManualChange();
+        BeanUtils.copyProperties(manualChange, manualChange1);
+        manualChange1.setManualRedactionType(switch (manualChange.getManualRedactionType()) {
+            case ADD_LOCALLY -> ManualRedactionType.ADD_LOCALLY;
+            case ADD_TO_DICTIONARY -> ManualRedactionType.ADD_TO_DICTIONARY;
+            case REMOVE_LOCALLY -> ManualRedactionType.REMOVE_LOCALLY;
+            case REMOVE_FROM_DICTIONARY -> ManualRedactionType.REMOVE_FROM_DICTIONARY;
+            case FORCE_REDACT -> ManualRedactionType.FORCE_REDACT;
+            case FORCE_HINT -> ManualRedactionType.FORCE_HINT;
+            case RECATEGORIZE -> ManualRedactionType.RECATEGORIZE;
+            case LEGAL_BASIS_CHANGE -> ManualRedactionType.LEGAL_BASIS_CHANGE;
+            case RESIZE -> ManualRedactionType.RESIZE;
+        });
+        manualChange1.setProcessedDate(manualChange.getProcessedDate());
+        manualChange1.setRequestedDate(manualChange.getRequestedDate());
+        manualChange1.setPropertyChanges(manualChange.getPropertyChanges());
+        return manualChange1;
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction, boolean isHint) {
+
+        if (!isRedaction && isHint) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    public RedactionLogEntry createRedactionLogEntry(ManualEntity manualEntity, String dossierTemplateId, Map<String, List<Comment>> comments) {
+
+        String type = manualEntity.getManualOverwrite().getType().orElse(manualEntity.getType());
+        boolean isHint = isHint(manualEntity.getEntityType());
+        return RedactionLogEntry.builder()
+                .id(manualEntity.getId())
+                .color(getColor(type, dossierTemplateId, manualEntity.applied(), isHint))
+                .reason(manualEntity.buildReasonWithManualChangeDescriptions())
+                .legalBasis(manualEntity.legalBasis())
+                .value(manualEntity.value())
+                .type(type)
+                .redacted(manualEntity.applied())
+                .isHint(isHint)
+                .isRecommendation(manualEntity.getEntityType().equals(EntityType.RECOMMENDATION))
+                .isFalsePositive(manualEntity.getEntityType().equals(EntityType.FALSE_POSITIVE) || manualEntity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
+                .section(manualEntity.getManualOverwrite().getSection().orElse(manualEntity.getSection()))
+                .sectionNumber(0)
+                .matchedRule(manualEntity.getMatchedRule().getRuleIdentifier().toString())
+                .rectangle(manualEntity.isRectangle())
+                .isDictionaryEntry(manualEntity.isDictionaryEntry())
+                .isDossierDictionaryEntry(manualEntity.isDossierDictionaryEntry())
+                .textAfter("")
+                .textBefore("")
+                .startOffset(-1)
+                .endOffset(-1)
+                .positions(manualEntity.getEntityPosition()
+                        .stream()
+                        .map(entityPosition -> toRedactionLogRectangle(entityPosition.rectangle2D(), entityPosition.pageNumber()))
+                        .collect(Collectors.toList()))
+                .engines(Collections.emptySet())
+                .reference(Collections.emptySet())
+                .manualChanges(mapManualChanges(manualEntity.getManualOverwrite(), isHint))
+                .comments(buildRedactionLogComments(comments, manualEntity.getId()))
+                .build();
+    }
+
+
+    private Rectangle toRedactionLogRectangle(Rectangle2D rectangle2D, int pageNumber) {
+
+        return new Rectangle(new Point((float) rectangle2D.getMinX(), (float) rectangle2D.getMinY()), (float) rectangle2D.getWidth(), (float) rectangle2D.getHeight(), pageNumber);
+    }
+
+
+    public RedactionLogEntry createRedactionLogEntry(Image image, String dossierTemplateId, Map<String, List<Comment>> comments) {
+
+        String imageType = image.getImageType().equals(ImageType.OTHER) ? "image" : image.getImageType().toString().toLowerCase(Locale.ENGLISH);
+        boolean isHint = dictionaryService.isHint(imageType, dossierTemplateId);
+        return RedactionLogEntry.builder()
+                .id(image.getId()).color(getColor(imageType, dossierTemplateId, image.applied(), isHint))
+                .isImage(true)
+                .value(image.value())
+                .type(imageType)
+                .redacted(image.applied())
+                .reason(image.buildReasonWithManualChangeDescriptions())
+                .legalBasis(image.legalBasis())
+                .matchedRule(image.getMatchedRule().getRuleIdentifier().toString())
+                .isHint(isHint)
+                .isDictionaryEntry(false)
+                .isRecommendation(false)
+                .positions(List.of(toRedactionLogRectangle(image.getPosition(), image.getPage().getNumber())))
+                .sectionNumber(image.getTreeId().get(0))
+                .section(image.getManualOverwrite().getSection().orElse(image.getParent().toString()))
+                .imageHasTransparency(image.isTransparent())
+                .manualChanges(mapManualChanges(image.getManualOverwrite(), isHint))
+                .comments(buildRedactionLogComments(comments, image.getId()))
+                .build();
+
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentComparator.java

@@ -0,0 +1,33 @@
+package com.iqser.red.service.redaction.v1.server.service.document;
+
+import java.util.Comparator;
+
+import com.iqser.red.service.redaction.v1.server.model.component.Component;
+
+public class ComponentComparator implements Comparator<Component> {
+
+    public static ComponentComparator first() {
+
+        return new ComponentComparator();
+    }
+
+
+    @Override
+    public int compare(Component component1, Component component2) {
+
+        var firstEntity1 = component1.getReferences().stream().min(EntityComparators.first());
+        var firstEntity2 = component2.getReferences().stream().min(EntityComparators.first());
+        if (firstEntity1.isEmpty() && firstEntity2.isEmpty()) {
+            return 0;
+        }
+        if (firstEntity1.isEmpty() && firstEntity2.isPresent()) {
+            return -1;
+        }
+        if (firstEntity1.isPresent() && firstEntity2.isEmpty()) {
+            return 1;
+        }
+
+        return new EntityComparators.FirstEntity().compare(firstEntity1.get(), firstEntity2.get());
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java

@@ -0,0 +1,489 @@
+package com.iqser.red.service.redaction.v1.server.service.document;
+
+import java.text.BreakIterator;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.kie.api.runtime.KieSession;
+
+import com.iqser.red.service.redaction.v1.server.model.component.Component;
+import com.iqser.red.service.redaction.v1.server.model.component.Entity;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
+import com.iqser.red.service.redaction.v1.server.utils.DateConverter;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ComponentCreationService {
+
+    KieSession kieSession;
+    Set<Entity> referencedEntities = new HashSet<>();
+
+
+    private static List<Entity> findEntitiesFromLongestSection(Collection<Entity> entities) {
+
+        var entitiesBySection = entities.stream().collect(Collectors.groupingBy(entity -> entity.getContainingNode().getHighestParent()));
+        Optional<SemanticNode> longestSection = entitiesBySection.entrySet()
+                .stream()
+                .sorted(Comparator.comparingInt(ComponentCreationService::getTotalLengthOfEntities).reversed())
+                .map(Map.Entry::getKey)
+                .findFirst();
+
+        if (longestSection.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        return entitiesBySection.get(longestSection.get());
+    }
+
+
+    /**
+     * Joins entity values, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joining(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        joining(ruleIdentifier, name, entities, ", ");
+    }
+
+
+    /**
+     * Finds the first value from the collection of entities and creates a component from it. If no value is found, the fallback value is used instead.
+     *
+     * @param ruleIdentifier the identifier for the rule
+     * @param name           the name of the operation
+     * @param entities       the collection of entities to search for the first value
+     * @param fallback       the value to be returned if no value is found in the collection
+     */
+    public void firstOrElse(String ruleIdentifier, String name, Collection<Entity> entities, String fallback) {
+
+        String valueDescription = String.format("First found value of type %s or else '%s'", joinTypes(entities), fallback);
+        String value = entities.stream().min(EntityComparators.first()).map(Entity::getValue).orElse(fallback);
+        create(ruleIdentifier, name, value, valueDescription, entities);
+    }
+
+
+    private static String joinTypes(Collection<Entity> entities) {
+
+        return entities.stream().map(Entity::getType).distinct().collect(Collectors.joining(", "));
+    }
+
+
+    /**
+     * Creates a new component with the given parameters and inserts it into the kieSession.
+     *
+     * @param ruleIdentifier   The rule identifier for the component.
+     * @param name             The name of the component.
+     * @param value            The value of the component.
+     * @param valueDescription The description of the value.
+     * @param references       A collection of Entity objects that the component references.
+     */
+    public void create(String ruleIdentifier, String name, String value, String valueDescription, Collection<Entity> references) {
+
+        referencedEntities.addAll(references);
+
+        kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name).value(value).valueDescription(valueDescription)
+                .references(new LinkedList<>(references))
+                .build());
+    }
+
+
+    /**
+     * Joins entity values from the first section entities appear in, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joiningFromFirstSectionOnly(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        joiningFromFirstSectionOnly(ruleIdentifier, name, entities, ", ");
+    }
+
+
+    /**
+     * Joins unique entity values from the first section entities appear in, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joiningFromFirstSectionOnly(String ruleIdentifier, String name, Collection<Entity> entities, String delimiter) {
+
+        List<Entity> entitiesFromFirstSection = findEntitiesFromFirstSection(entities);
+        joining(ruleIdentifier, name, entitiesFromFirstSection, delimiter);
+    }
+
+
+    private static List<Entity> findEntitiesFromFirstSection(Collection<Entity> entities) {
+
+        var entitiesBySection = entities.stream().collect(Collectors.groupingBy(entity -> entity.getContainingNode().getHighestParent()));
+        Optional<SemanticNode> firstSection = entitiesBySection.keySet().stream().min(SemanticNodeComparators.first());
+        if (firstSection.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return entitiesBySection.get(firstSection.get());
+    }
+
+
+    /**
+     * Joins unique entity values from the first section entities appear in, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joiningUniqueFromFirstSectionOnly(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        joiningUniqueFromFirstSectionOnly(ruleIdentifier, name, entities, ", ");
+    }
+
+
+    /**
+     * Joins entity values from the first section entities appear in, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joiningUniqueFromFirstSectionOnly(String ruleIdentifier, String name, Collection<Entity> entities, String delimiter) {
+
+        List<Entity> entitiesFromFirstSection = findEntitiesFromFirstSection(entities);
+        joiningUnique(ruleIdentifier, name, entitiesFromFirstSection, delimiter);
+    }
+
+
+    /**
+     * Joins entity values, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joining(String ruleIdentifier, String name, Collection<Entity> entities, String delimiter) {
+
+        String valueDescription = String.format("Joining all values of type %s with '%s'", joinTypes(entities), delimiter);
+        String value = entities.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(delimiter));
+        create(ruleIdentifier, name, value, valueDescription, entities);
+    }
+
+
+    /**
+     * Joins entity values with delimiter ', ' from the section with the longest combined entity values only, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joiningFromLongestSectionOnly(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        joiningFromLongestSectionOnly(ruleIdentifier, name, entities, ", ");
+    }
+
+
+    /**
+     * Joins entity values from the section with the longest combined entity values only, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joiningFromLongestSectionOnly(String ruleIdentifier, String name, Collection<Entity> entities, String delimiter) {
+
+        List<Entity> entitiesFromLongestSection = findEntitiesFromLongestSection(entities);
+        joining(ruleIdentifier, name, entitiesFromLongestSection, delimiter);
+    }
+
+
+    /**
+     * Joins all unique values from a collection of entities into a single string using a specified delimiter and creates a component from the result.
+     *
+     * @param ruleIdentifier the identifier of the rule
+     * @param name           the name of the joining operation
+     * @param entities       the collection of entities
+     * @param delimiter      the delimiter to use for joining the values
+     */
+    public void joiningUnique(String ruleIdentifier, String name, Collection<Entity> entities, String delimiter) {
+
+        String valueDescription = String.format("Joining all unique values of type %s with '%s'", joinTypes(entities), delimiter);
+        String value = entities.stream().sorted(EntityComparators.first()).map(Entity::getValue).distinct().collect(Collectors.joining(delimiter));
+        create(ruleIdentifier, name, value, valueDescription, entities);
+    }
+
+
+    private static int getTotalLengthOfEntities(Map.Entry<SemanticNode, List<Entity>> entry) {
+
+        return entry.getValue().stream().mapToInt(Entity::getLength).sum();
+    }
+
+
+    /**
+     * Joins unique entity values with delimiter ', ' from the section with the longest combined entity values only, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     */
+    public void joiningUniqueFromLongestSectionOnly(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        joiningUniqueFromLongestSectionOnly(ruleIdentifier, name, entities, ", ");
+    }
+
+
+    /**
+     * Joins unique entity values from the section with the longest combined entity values only, and creates a component from the result.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       The collection of entities to process.
+     * @param delimiter      The string delimiter to join the entities.
+     */
+    public void joiningUniqueFromLongestSectionOnly(String ruleIdentifier, String name, Collection<Entity> entities, String delimiter) {
+
+        List<Entity> entitiesFromLongestSection = findEntitiesFromLongestSection(entities);
+        joiningUnique(ruleIdentifier, name, entitiesFromLongestSection, delimiter);
+    }
+
+
+    /**
+     * Joins the names of the entities in the provided collection, separated by a comma,
+     * and creates a component from the result.
+     *
+     * @param ruleIdentifier The unique identifier of the rule being applied.
+     * @param name           The name to which the joined result will be set.
+     * @param entities       The collection of entities whose names will be joined.
+     */
+    public void joiningUnique(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        joiningUnique(ruleIdentifier, name, entities, ", ");
+    }
+
+
+    /**
+     * Computes the number of unique values in the collection of entities and creates a component with the result.
+     *
+     * @param ruleIdentifier the identifier of the rule
+     * @param name           the name of the record
+     * @param entities       the collection of entities to compute unique values from
+     */
+    public void uniqueValueCount(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        long count = entities.stream().map(Entity::getValue).distinct().count();
+        create(ruleIdentifier, name, String.valueOf(count), "Number of unique values in the entity references", entities);
+    }
+
+
+    /**
+     * Creates a component for each sentence in the collection of entities.
+     *
+     * @param ruleIdentifier The identifier of the rule.
+     * @param name           The name of the entity.
+     * @param entities       A collection of Entity objects.
+     */
+    public void asSentences(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        if (entities.isEmpty()) {
+            return;
+        }
+        entities.stream().sorted(EntityComparators.first()).forEach(entity -> {
+            BreakIterator iterator = BreakIterator.getSentenceInstance(Locale.ENGLISH);
+            iterator.setText(entity.getValue());
+            int start = iterator.first();
+            for (int end = iterator.next(); end != BreakIterator.DONE; start = end, end = iterator.next()) {
+                create(ruleIdentifier,
+                        name,
+                        entity.getValue().substring(start, end).replaceAll("\\n", "").trim(),
+                        String.format("Values of type '%s' as sentences", entity.getType()),
+                        entity);
+            }
+        });
+    }
+
+
+    /**
+     * Creates a new component with the given rule identifier, name, value, value description, and reference.
+     * The component is built using the provided parameters and inserted into the knowledge session.
+     * The reference is added to the referencedEntities list.
+     *
+     * @param ruleIdentifier   The identifier of the rule for the component.
+     * @param name             The name of the component.
+     * @param value            The value of the component.
+     * @param valueDescription The description of the value.
+     * @param reference        The reference entity for the component.
+     */
+    public void create(String ruleIdentifier, String name, String value, String valueDescription, Entity reference) {
+
+        referencedEntities.add(reference);
+        List<Entity> referenceList = new LinkedList<>();
+        referenceList.add(reference);
+        kieSession.insert(Component.builder()
+                .matchedRule(RuleIdentifier.fromString(ruleIdentifier))
+                .name(name)
+                .value(value)
+                .valueDescription(valueDescription)
+                .references(referenceList)
+                .build());
+    }
+
+
+    /**
+     * Creates components for unmapped entities.
+     *
+     * @param ruleIdentifier The identifier of the rule being applied.
+     * @param entities       The collection of entities to create components for.
+     */
+    public void createComponentsForUnMappedEntities(String ruleIdentifier, Collection<Entity> entities) {
+
+        entities.stream().filter(entity -> !referencedEntities.contains(entity)).sorted(EntityComparators.first())
+                .forEach(entity -> create(ruleIdentifier, entity.getType(), entity.getValue(), "Unmapped Entity", List.of(entity)));
+    }
+
+
+    /**
+     * Converts entity values to the 'dd/MM/yyyy' format and joins them with ', '. If the value could not be parsed as a date, it will be created as is.
+     *
+     * @param ruleIdentifier the identifier of the rule
+     * @param name           the name of the entity
+     * @param entities       the collection of entities
+     */
+    public void convertDates(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        convertDates(ruleIdentifier, name, entities, "dd/MM/yyyy");
+    }
+
+
+    /**
+     * Converts entity values to provided format and joins them with ', '. If the value could not be parsed as a date, it will be created as is.
+     *
+     * @param ruleIdentifier the identifier of the rule
+     * @param name           the name of the entity
+     * @param entities       the collection of entities
+     * @param resultFormat   the desired format for the converted dates
+     */
+    public void convertDates(String ruleIdentifier, String name, Collection<Entity> entities, String resultFormat) {
+
+        String valueDescription = String.format("Convert values of type '%s' to %s joined with ', '", joinTypes(entities), resultFormat);
+        List<String> unparsedDates = new LinkedList<>();
+        List<Date> dates = new LinkedList<>();
+
+        for (Entity entity : entities) {
+            String value = entity.getValue();
+            Optional<Date> optionalDate = DateConverter.parseDate(value);
+            if (optionalDate.isPresent()) {
+                dates.add(optionalDate.get());
+            } else {
+                unparsedDates.add(value);
+            }
+        }
+
+        String formattedDateStrings = Stream.concat(//
+                        dates.stream().sorted().map(date -> DateConverter.convertDate(date, resultFormat)), //
+                        unparsedDates.stream())//
+                .collect(Collectors.joining(", "));
+
+        create(ruleIdentifier, name, formattedDateStrings, valueDescription, entities);
+    }
+
+
+    /**
+     * Joins values from entities that are in the same table row. If entities are not in a table cell they are added as a single component.
+     *
+     * @param ruleIdentifier the identifier of the rule
+     * @param name           the name of the entity
+     * @param entities       the collection of entities
+     */
+    public void joiningFromSameTableRow(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        String types = entities.stream().map(Entity::getType).sorted(Comparator.reverseOrder()).distinct().collect(Collectors.joining(", "));
+        String valueDescription = String.format("Combine values of %s that are in same table row", types);
+        entities.stream().collect(Collectors.groupingBy(this::getFirstTable)).forEach((optionalTable, groupedEntities) -> {
+            if (optionalTable.isEmpty()) {
+                groupedEntities.forEach(entity -> create(ruleIdentifier, name, entity.getValue(), valueDescription, entity));
+            }
+
+            groupedEntities.stream()
+                    .filter(entity -> !(entity.getContainingNode() instanceof TableCell))
+                    .forEach(entity -> create(ruleIdentifier, name, entity.getValue(), valueDescription, entity));
+
+            groupedEntities.stream()
+                    .filter(entity -> entity.getContainingNode() instanceof TableCell)
+                    .collect(Collectors.groupingBy(entity -> ((TableCell) entity.getContainingNode()).getRow()))
+                    .entrySet()
+                    .stream()
+                    .sorted(Comparator.comparingInt(Map.Entry::getKey))
+                    .map(Map.Entry::getValue)
+                    .forEach(entitiesInSameRow -> create(ruleIdentifier,
+                            name,
+                            entitiesInSameRow.stream().sorted(Comparator.comparing(Entity::getType).reversed()).map(Entity::getValue).collect(Collectors.joining(", ")),
+                            valueDescription,
+                            entitiesInSameRow));
+        });
+    }
+
+
+    private Optional<Table> getFirstTable(Entity entity) {
+
+        SemanticNode node = entity.getContainingNode();
+        while (!(node instanceof Table)) {
+            if (!node.hasParent()) {
+                return Optional.empty();
+            }
+            node = node.getParent();
+        }
+
+        return Optional.of((Table) node);
+    }
+
+
+    /**
+     * Creates a new component with the given rule identifier, name, value, and value description.
+     * If the component is part of a table, it also takes a list of entities that belong to the same table row.
+     *
+     * @param ruleIdentifier   the identifier of the rule
+     * @param name             the name of the entity
+     * @param value            the value of the component
+     * @param valueDescription the description of the value
+     */
+    public void create(String ruleIdentifier, String name, String value, String valueDescription) {
+
+        create(ruleIdentifier, name, value, valueDescription, Collections.emptyList());
+    }
+
+
+    /**
+     * Creates a new component with the given rule identifier, name, and value.
+     *
+     * @param ruleIdentifier the identifier of the rule
+     * @param name           the name of the entity
+     * @param value          the value of the component
+     */
+    public void create(String ruleIdentifier, String name, String value) {
+
+        kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name)
+                .value(value)
+                .valueDescription("")
+                .references(Collections.emptyList())
+                .build());
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/DocumentGraphMapper.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.data.mapper;
+package com.iqser.red.service.redaction.v1.server.service.document;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -7,22 +7,22 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Footer;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Header;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Image;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Paragraph;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Section;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCell;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
-import com.iqser.red.service.redaction.v1.server.document.data.DocumentData;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Headline;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Footer;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Header;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Paragraph;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Section;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentData;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Headline;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/EntityComparators.java

@@ -0,0 +1,40 @@
+package com.iqser.red.service.redaction.v1.server.service.document;
+
+import java.util.Comparator;
+
+import com.iqser.red.service.redaction.v1.server.model.component.Entity;
+
+public abstract class EntityComparators implements Comparator<Entity> {
+
+    public static Comparator<Entity> first() {
+
+        return new FirstEntity();
+    }
+
+    public static class LongestEntity implements Comparator<Entity> {
+
+        @Override
+        public int compare(Entity Entity, Entity otherEntity) {
+
+            return Integer.compare(Entity.getLength(), otherEntity.getLength());
+        }
+
+    }
+
+
+    public static Comparator<Entity> length() {
+
+        return new LongestEntity();
+    }
+
+    public static class FirstEntity implements Comparator<Entity> {
+
+        @Override
+        public int compare(Entity Entity, Entity otherEntity) {
+
+            return Integer.compare(Entity.getStartOffset(), otherEntity.getStartOffset());
+        }
+
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/EntityCreationService.java

@@ -0,0 +1,770 @@
+package com.iqser.red.service.redaction.v1.server.service.document;
+
+import static com.iqser.red.service.redaction.v1.server.utils.SeparatorUtils.boundaryIsSurroundedBySeparators;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.kie.api.runtime.KieSession;
+
+import com.google.common.base.Functions;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.ConsecutiveBoundaryCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.ManualChangeOverwrite;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.PositionOnPage;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility;
+import com.iqser.red.service.redaction.v1.server.model.NerEntities;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.SearchImplementation;
+import com.iqser.red.service.redaction.v1.server.utils.IdBuilder;
+import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+public class EntityCreationService {
+
+    private final EntityEnrichmentService entityEnrichmentService;
+    private final KieSession kieSession;
+
+
+    public EntityCreationService(EntityEnrichmentService entityEnrichmentService) {
+
+        this.entityEnrichmentService = entityEnrichmentService;
+        this.kieSession = null;
+    }
+
+
+    public Stream<TextEntity> betweenStrings(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startTextRanges = RedactionSearchUtility.findTextRangesByString(start, node.getTextBlock());
+        List<TextRange> stopTextRanges = RedactionSearchUtility.findTextRangesByString(stop, node.getTextBlock());
+
+        return betweenTextRanges(startTextRanges, stopTextRanges, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> betweenStringsIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(stop, node.getTextBlock());
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> betweenStringsIncludeStart(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByString(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByString(stop, node.getTextBlock());
+
+        startBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() - start.length());
+            textRange.setEnd(textRange.end() - start.length());
+        });
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> betweenStringsIncludeStartIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(stop, node.getTextBlock());
+
+        startBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() - start.length());
+            textRange.setEnd(textRange.end() - start.length());
+        });
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> betweenStringsIncludeEnd(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByString(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByString(stop, node.getTextBlock());
+
+        stopBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() + stop.length());
+            textRange.setEnd(textRange.end() + stop.length());
+        });
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> betweenStringsIncludeEndIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(stop, node.getTextBlock());
+
+        stopBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() + stop.length());
+            textRange.setEnd(textRange.end() + stop.length());
+        });
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> betweenStringsIncludeStartAndEnd(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByString(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByString(stop, node.getTextBlock());
+
+        startBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() - start.length());
+            textRange.setEnd(textRange.end() - start.length());
+        });
+        stopBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() + stop.length());
+            textRange.setEnd(textRange.end() + stop.length());
+        });
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> betweenStringsIncludeStartAndEndIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(stop, node.getTextBlock());
+
+        startBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() - start.length());
+            textRange.setEnd(textRange.end() - start.length());
+        });
+        stopBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() + stop.length());
+            textRange.setEnd(textRange.end() + stop.length());
+        });
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> shortestBetweenAnyString(List<String> starts, List<String> stops, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startTextRanges = RedactionSearchUtility.findTextRangesByList(starts, node.getTextBlock());
+        List<TextRange> stopTextRanges = RedactionSearchUtility.findTextRangesByList(stops, node.getTextBlock());
+
+        return betweenTextRanges(startTextRanges, stopTextRanges, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> shortestBetweenAnyStringIgnoreCase(List<String> starts, List<String> stops, String type, EntityType entityType, SemanticNode node) {
+
+        List<TextRange> startTextRanges = RedactionSearchUtility.findTextRangesByListIgnoreCase(starts, node.getTextBlock());
+        List<TextRange> stopTextRanges = RedactionSearchUtility.findTextRangesByListIgnoreCase(stops, node.getTextBlock());
+
+        return betweenTextRanges(startTextRanges, stopTextRanges, type, entityType, node);
+    }
+
+    public Stream<TextEntity> shortestBetweenAnyStringIgnoreCase(List<String> starts, List<String> stops, String type, EntityType entityType, SemanticNode node, int limit) {
+
+        List<TextRange> startTextRanges = RedactionSearchUtility.findTextRangesByListIgnoreCase(starts, node.getTextBlock());
+        List<TextRange> stopTextRanges = RedactionSearchUtility.findTextRangesByListIgnoreCase(stops, node.getTextBlock());
+
+        return betweenTextRanges(startTextRanges, stopTextRanges, type, entityType, node, limit);
+    }
+
+
+    public Stream<TextEntity> betweenRegexes(String regexStart, String regexStop, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByRegex(regexStart, textBlock);
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByRegex(regexStop, textBlock);
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<TextEntity> betweenRegexesIgnoreCase(String regexStart, String regexStop, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByRegexIgnoreCase(regexStart, 0, textBlock);
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByRegexIgnoreCase(regexStop, 0, textBlock);
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+    public Stream<TextEntity> betweenTextRanges(List<TextRange> startBoundaries, List<TextRange> stopBoundaries, String type, EntityType entityType, SemanticNode node) {
+
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node,0);
+    }
+
+
+    public Stream<TextEntity> betweenTextRanges(List<TextRange> startBoundaries, List<TextRange> stopBoundaries, String type, EntityType entityType, SemanticNode node, int limit) {
+
+        if (startBoundaries.isEmpty() || stopBoundaries.isEmpty()) {
+            return Stream.empty();
+        }
+        List<TextRange> entityBoundaries = findNonOverlappingBoundariesBetweenBoundariesWithMinimalDistances(startBoundaries, stopBoundaries);
+        return entityBoundaries.stream()
+                .filter(range -> (limit == 0 || range.length() <= limit))
+                .map(textRange -> textRange.trim(node.getTextBlock()))
+                .filter(textRange -> isValidEntityTextRange(node.getTextBlock(), textRange))
+                .map(textRange -> byTextRange(textRange, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    private static List<TextRange> findNonOverlappingBoundariesBetweenBoundariesWithMinimalDistances(List<TextRange> startBoundaries, List<TextRange> stopBoundaries) {
+
+        List<TextRange> entityBoundaries = new LinkedList<>();
+        for (TextRange startTextRange : startBoundaries) {
+            Optional<TextRange> optionalStopTextRangeWithMinimalDistance = stopBoundaries.stream()
+                    .filter(stopBoundary -> stopBoundary.start() > startTextRange.end())
+                    .min(Comparator.comparingInt(TextRange::start));
+            if (optionalStopTextRangeWithMinimalDistance.isEmpty()) {
+                continue;
+            }
+            entityBoundaries.add(new TextRange(startTextRange.end(), optionalStopTextRangeWithMinimalDistance.get().start()));
+        }
+        return removeOuterOverlappingBoundaries(entityBoundaries);
+    }
+
+
+    private static List<TextRange> removeOuterOverlappingBoundaries(List<TextRange> entityTextRanges) {
+        /*
+        In some cases we get boundaries, where one contains the other. This happens for Example when we have two start boundaries and one stop boundary after the two start boundaries.
+        Then we get two boundaries where one is entirely contained in the other. So we want to remove the outer boundary.
+        For Example consider the text: "a this is some text. a here is more text b". If "a" is the start string and "b" is the stop string, there are two possibilities.
+        "this is some text. a here is more text" and "here is more text". We only want to keep the latter.
+         */
+        return entityTextRanges.stream()
+                .filter(boundary -> entityTextRanges.stream().noneMatch(innerBoundary -> !innerBoundary.equals(boundary) && innerBoundary.containedBy(boundary)))
+                .toList();
+
+    }
+
+
+    public Stream<TextEntity> bySearchImplementation(SearchImplementation searchImplementation, String type, EntityType entityType, SemanticNode node) {
+
+        return searchImplementation.getBoundaries(node.getTextBlock(), node.getTextRange())
+                .stream().filter(boundary -> isValidEntityTextRange(node.getTextBlock(), boundary))
+                .map(bounds -> byTextRange(bounds, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> lineAfterStrings(List<String> strings, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        SearchImplementation searchImplementation = new SearchImplementation(strings, false);
+        return searchImplementation.getBoundaries(textBlock, node.getTextRange())
+                .stream().map(boundary -> toLineAfterTextRange(textBlock, boundary)).filter(boundary -> isValidEntityTextRange(textBlock, boundary))
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> lineAfterStringsIgnoreCase(List<String> strings, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        SearchImplementation searchImplementation = new SearchImplementation(strings, true);
+        return searchImplementation.getBoundaries(textBlock, node.getTextRange())
+                .stream().map(boundary -> toLineAfterTextRange(textBlock, boundary)).filter(boundary -> isValidEntityTextRange(textBlock, boundary))
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> lineAfterString(String string, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        return RedactionSearchUtility.findTextRangesByString(string, textBlock)
+                .stream().map(boundary -> toLineAfterTextRange(textBlock, boundary)).filter(boundary -> isValidEntityTextRange(textBlock, boundary))
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> lineAfterStringIgnoreCase(String string, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        return RedactionSearchUtility.findTextRangesByStringIgnoreCase(string, textBlock)
+                .stream().map(boundary -> toLineAfterTextRange(textBlock, boundary)).filter(boundary -> isValidEntityTextRange(textBlock, boundary))
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> lineAfterStringAcrossColumns(String string, String type, EntityType entityType, Table tableNode) {
+
+        return tableNode.streamTableCells().flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findTextRangesByString(string, tableCell.getTextBlock()),
+                        tableCell,
+                        type,
+                        entityType,
+                        tableNode));
+    }
+
+
+    public Stream<TextEntity> lineAfterStringAcrossColumnsIgnoreCase(String string, String type, EntityType entityType, Table tableNode) {
+
+        return tableNode.streamTableCells()
+                .flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findTextRangesByStringIgnoreCase(string, tableCell.getTextBlock()),
+                        tableCell,
+                        type,
+                        entityType,
+                        tableNode));
+    }
+
+
+    /**
+     * Looks across the remaining table row to the right of the provided TableCell if any line intersects the y coordinates of the found text.
+     *
+     * @param TextRanges a list of textRanges
+     * @param tableCell  the table cell
+     * @param type       the type
+     * @param entityType the entity type
+     * @param tableNode  the table node
+     * @return a stream of RedactionEntities
+     */
+    private Stream<TextEntity> lineAfterBoundariesAcrossColumns(List<TextRange> TextRanges, TableCell tableCell, String type, EntityType entityType, Table tableNode) {
+
+        return TextRanges.stream()
+                .map(boundary -> RectangleTransformations.rectangle2DBBox(tableCell.getTextBlock().getPositions(boundary)))
+                .map(bBox -> Pair.of(bBox.getMaxY(), bBox.getMinY()))
+                .map(maxMinPair -> tableNode.streamRow(tableCell.getRow())
+                        .filter(nextTableCell -> nextTableCell.getCol() > tableCell.getCol())
+                        .map(nextTableCell -> RedactionSearchUtility.findTextRangesOfAllLinesInYRange(maxMinPair.getLeft(), maxMinPair.getRight(), nextTableCell.getTextBlock()))
+                        .map(b -> b.trim(tableNode.getTextBlock()))
+                        .filter(boundary -> isValidEntityTextRange(tableNode.getTextBlock(), boundary))
+                        .map(boundary -> byTextRange(boundary, type, entityType, tableNode))
+                        .filter(Optional::isPresent)
+                        .map(Optional::get))
+                .flatMap(Functions.identity());
+    }
+
+
+    public Optional<TextEntity> semanticNodeAfterString(SemanticNode semanticNode, String string, String type, EntityType entityType) {
+
+        var textBlock = semanticNode.getTextBlock();
+        int startIndex = textBlock.indexOf(string);
+        if (startIndex == -1) {
+            return Optional.empty();
+        }
+        var boundary = new TextRange(startIndex, semanticNode.getTextRange().end());
+        if (boundary.length() > 0) {
+            boundary = new TextRange(boundary.start(), boundary.end() - 1);
+        }
+        if (!isValidEntityTextRange(textBlock, boundary)) {
+            return Optional.empty();
+        }
+        return byTextRange(boundary, type, entityType, semanticNode);
+    }
+
+
+    public Stream<TextEntity> byRegexWithLineBreaks(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        return byRegexWithLineBreaks(regexPattern, type, entityType, 0, node);
+    }
+
+
+    public Stream<TextEntity> byRegexWithLineBreaksIgnoreCase(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        return byRegexWithLineBreaksIgnoreCase(regexPattern, type, entityType, 0, node);
+    }
+
+
+    public Stream<TextEntity> byRegex(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        return byRegex(regexPattern, type, entityType, 0, node);
+    }
+
+
+    public Stream<TextEntity> byRegexIgnoreCase(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        return byRegexIgnoreCase(regexPattern, type, entityType, 0, node);
+    }
+
+
+    public Stream<TextEntity> byRegexWithLineBreaks(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
+
+        return RedactionSearchUtility.findTextRangesByRegexWithLineBreaks(regexPattern, group, node.getTextBlock())
+                .stream()
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> byRegexWithLineBreaksIgnoreCase(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
+
+        return RedactionSearchUtility.findTextRangesByRegexWithLineBreaksIgnoreCase(regexPattern, group, node.getTextBlock())
+                .stream()
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> byRegex(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
+
+        return RedactionSearchUtility.findTextRangesByRegex(regexPattern, group, node.getTextBlock())
+                .stream()
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> byRegexIgnoreCase(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
+
+        return RedactionSearchUtility.findTextRangesByRegexIgnoreCase(regexPattern, group, node.getTextBlock())
+                .stream()
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> byString(String keyword, String type, EntityType entityType, SemanticNode node) {
+
+        return RedactionSearchUtility.findTextRangesByString(keyword, node.getTextBlock())
+                .stream()
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> byStringIgnoreCase(String keyword, String type, EntityType entityType, SemanticNode node) {
+
+        return RedactionSearchUtility.findTextRangesByStringIgnoreCase(keyword, node.getTextBlock())
+                .stream()
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> bySemanticNodeParagraphsOnly(SemanticNode node, String type, EntityType entityType) {
+
+        return node.streamAllSubNodesOfType(NodeType.PARAGRAPH).map(semanticNode -> bySemanticNode(semanticNode, type, entityType)).filter(Optional::isPresent).map(Optional::get);
+    }
+
+
+    public Stream<TextEntity> bySemanticNodeParagraphsOnlyMergeConsecutive(SemanticNode node, String type, EntityType entityType) {
+
+        return node.streamAllSubNodesOfType(NodeType.PARAGRAPH)
+                .map(SemanticNode::getTextRange)
+                .collect(new ConsecutiveBoundaryCollector())
+                .stream()
+                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Optional<TextEntity> semanticNodeAfterString(String string, String type, EntityType entityType, SemanticNode node) {
+
+        if (!node.containsString(string)) {
+            return Optional.empty();
+        }
+        TextRange textRange = new TextRange(node.getTextBlock().indexOf(string) + string.length(), node.getTextRange().end());
+        return byTextRange(textRange, type, entityType, node);
+    }
+
+
+    public Optional<TextEntity> bySemanticNode(SemanticNode node, String type, EntityType entityType) {
+
+        TextRange textRange = node.getTextBlock().getTextRange();
+
+        if (textRange.length() > 0) {
+            textRange = new TextRange(textRange.start(), textRange.end() - 1);
+        }
+        if (!isValidEntityTextRange(node.getTextBlock(), textRange)) {
+            return Optional.empty();
+        }
+        return byTextRange(textRange, type, entityType, node);
+    }
+
+
+    public Optional<TextEntity> byPrefixExpansionRegex(TextEntity entity, String regexPattern) {
+
+        int expandedStart = RedactionSearchUtility.getExpandedStartByRegex(entity, regexPattern);
+        return byTextRange(new TextRange(expandedStart, entity.getTextRange().end()), entity.getType(), entity.getEntityType(), entity.getDeepestFullyContainingNode());
+    }
+
+
+    public Optional<TextEntity> bySuffixExpansionRegex(TextEntity entity, String regexPattern) {
+
+        int expandedEnd = RedactionSearchUtility.getExpandedEndByRegex(entity, regexPattern);
+        expandedEnd = truncateEndIfLineBreakIsBetween(entity.getTextRange().end(), expandedEnd, entity.getDeepestFullyContainingNode().getTextBlock());
+        return byTextRange(new TextRange(entity.getTextRange().start(), expandedEnd), entity.getType(), entity.getEntityType(), entity.getDeepestFullyContainingNode());
+    }
+
+
+    private int truncateEndIfLineBreakIsBetween(int end, int expandedEnd, TextBlock textBlock) {
+
+        if (textBlock.getNextLinebreak(end) < expandedEnd) {
+            return end;
+        }
+        return expandedEnd;
+    }
+
+    /**
+     * Creates a redaction entity based on the given boundary, type, entity type, and semantic node.
+     * If the document already contains an equal redaction entity, then the original Entity is returned.
+     * Also inserts the Entity into the kieSession.
+     *
+     * @param textRange  The boundary of the redaction entity.
+     * @param type       The type of the redaction entity.
+     * @param entityType The entity type of the redaction entity.
+     * @param node       The semantic node to associate with the redaction entity.
+     * @return An Optional containing the redaction entity, or the previous entity if the entity already exists.
+     */
+    public Optional<TextEntity> byTextRange(TextRange textRange, String type, EntityType entityType, SemanticNode node) {
+
+        return byTextRangeWithEngine(textRange, type, entityType, node, Set.of(Engine.RULE));
+    }
+
+    /**
+     * Creates a redaction entity based on the given boundary, type, entity type, and semantic node.
+     * If the document already contains an equal redaction entity, then the original Entity is returned.
+     * Also inserts the Entity into the kieSession.
+     *
+     * @param textRange  The boundary of the redaction entity.
+     * @param type       The type of the redaction entity.
+     * @param entityType The entity type of the redaction entity.
+     * @param node       The semantic node to associate with the redaction entity.
+     * @param engines    Set of engines to be used.
+     * @return An Optional containing the redaction entity, or the previous entity if the entity already exists.
+     */
+    public Optional<TextEntity> byTextRangeWithEngine(TextRange textRange, String type, EntityType entityType, SemanticNode node, Set<Engine> engines) {
+
+        if (!node.getTextRange().contains(textRange)) {
+            throw new IllegalArgumentException(String.format("%s is not in the %s of the provided semantic node %s", textRange, node.getTextRange(), node));
+        }
+        TextRange trimmedTextRange = textRange.trim(node.getTextBlock());
+        TextEntity entity = TextEntity.initialEntityNode(trimmedTextRange, type, entityType);
+        if (node.getEntities().contains(entity)) {
+            return node.getEntities().stream().filter(entity::equals).peek(e -> e.addEngines(engines)).findAny();
+        }
+        addEntityToGraph(entity, node);
+        entity.addEngines(engines);
+        insertToKieSession(entity);
+        return Optional.of(entity);
+    }
+
+
+    public TextEntity forceByTextRange(TextRange textRange, String type, EntityType entityType, SemanticNode node) {
+
+        TextRange trimmedTextRange = textRange.trim(node.getTextBlock());
+        TextEntity entity = TextEntity.initialEntityNode(trimmedTextRange, type, entityType);
+        addEntityToGraph(entity, node);
+        return entity;
+    }
+
+
+    public TextEntity mergeEntitiesOfSameType(List<TextEntity> entitiesToMerge, String type, EntityType entityType, SemanticNode node) {
+
+        if (!allEntitiesIntersectAndHaveSameTypes(entitiesToMerge)) {
+            throw new IllegalArgumentException("Provided entities can not be merged, since they do not intersect or are not the same type!" + entitiesToMerge);
+        }
+        if (entitiesToMerge.isEmpty()) {
+            throw new IllegalArgumentException("No Entities to merge!");
+        }
+        if (entitiesToMerge.size() == 1) {
+            return entitiesToMerge.get(0);
+        }
+
+        TextEntity mergedEntity = TextEntity.initialEntityNode(TextRange.merge(entitiesToMerge.stream().map(TextEntity::getTextRange).toList()), type, entityType);
+        mergedEntity.addEngines(entitiesToMerge.stream().flatMap(entityNode -> entityNode.getEngines().stream()).collect(Collectors.toSet()));
+        entitiesToMerge.stream().map(TextEntity::getMatchedRuleList).flatMap(Collection::stream).forEach(matchedRule -> mergedEntity.getMatchedRuleList().add(matchedRule));
+        entitiesToMerge.stream()
+                .map(TextEntity::getManualOverwrite)
+                .map(ManualChangeOverwrite::getManualChangeLog)
+                .flatMap(Collection::stream)
+                .forEach(manualChange -> mergedEntity.getManualOverwrite().addChange(manualChange));
+
+        mergedEntity.setDictionaryEntry(entitiesToMerge.stream().anyMatch(TextEntity::isDictionaryEntry));
+        mergedEntity.setDossierDictionaryEntry(entitiesToMerge.stream().anyMatch(TextEntity::isDossierDictionaryEntry));
+
+        addEntityToGraph(mergedEntity, node);
+        insertToKieSession(mergedEntity);
+        return mergedEntity;
+    }
+
+
+    public Stream<TextEntity> copyEntities(List<TextEntity> entities, String type, EntityType entityType, SemanticNode node) {
+
+        return entities.stream().map(entity -> copyEntity(entity, type, entityType, node));
+    }
+
+
+    public TextEntity copyEntity(TextEntity entity, String type, EntityType entityType, SemanticNode node) {
+
+        var newEntity = copyEntityWithoutRules(entity, type, entityType, node);
+        newEntity.addMatchedRules(entity.getMatchedRuleList());
+        return newEntity;
+    }
+
+    public TextEntity copyEntityWithoutRules(TextEntity entity, String type, EntityType entityType, SemanticNode node) {
+
+        TextEntity newEntity = byTextRangeWithEngine(entity.getTextRange(), type, entityType, node, entity.getEngines()).orElseThrow(() -> new NotFoundException(
+                "No entity present!"));
+        newEntity.getManualOverwrite().addChanges(entity.getManualOverwrite().getManualChangeLog());
+        newEntity.setDictionaryEntry(entity.isDictionaryEntry());
+        newEntity.setDossierDictionaryEntry(entity.isDossierDictionaryEntry());
+        return newEntity;
+    }
+
+
+    public void insertToKieSession(TextEntity mergedEntity) {
+
+        if (kieSession != null) {
+            kieSession.insert(mergedEntity);
+        }
+    }
+
+
+    public TextEntity byNerEntity(NerEntities.NerEntity nerEntity, EntityType entityType, SemanticNode semanticNode) {
+
+        return byTextRangeWithEngine(nerEntity.textRange(), nerEntity.type(), entityType, semanticNode, Set.of(Engine.NER)).orElseThrow(() -> new NotFoundException("No entity present!"));
+    }
+
+
+    public TextEntity byNerEntity(NerEntities.NerEntity nerEntity, String type, EntityType entityType, SemanticNode semanticNode) {
+
+        return byTextRangeWithEngine(nerEntity.textRange(), type, entityType, semanticNode, Set.of(Engine.NER)).orElseThrow(() -> new NotFoundException("No entity present!"));
+    }
+
+
+    public Stream<TextEntity> combineNerEntitiesToCbiAddressDefaults(NerEntities nerEntities, String type, EntityType entityType, SemanticNode semanticNode) {
+
+        return NerEntitiesAdapter.combineNerEntitiesToCbiAddressDefaults(nerEntities)
+                .map(boundary -> byTextRangeWithEngine(boundary, type, entityType, semanticNode, Set.of(Engine.NER)))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public TextEntity byTableCellAsHighlight(TableCell tableCell, String type, EntityType entityType) {
+
+        TextEntity highlightEntity = TextEntity.initialEntityNode(new TextRange(tableCell.getTextRange().start(), tableCell.getTextRange().start()), type, entityType);
+
+        String positionId = IdBuilder.buildId(tableCell.getBBox().keySet(), tableCell.getBBox().values().stream().toList(), type, entityType.name());
+        highlightEntity.setPositionsOnPagePerPage(tableCell.getBBox()
+                .entrySet()
+                .stream()
+                .map(entry -> new PositionOnPage(positionId, entry.getKey(), List.of(entry.getValue())))
+                .toList());
+        addEntityToGraph(highlightEntity, tableCell);
+        return highlightEntity;
+    }
+
+
+    public boolean isValidEntityTextRange(TextBlock textBlock, TextRange textRange) {
+
+        return textRange.length() > 0 && boundaryIsSurroundedBySeparators(textBlock, textRange);
+    }
+
+
+    public void addEntityToGraph(TextEntity entity, SemanticNode node) {
+
+        DocumentTree documentTree = node.getDocumentTree();
+        try {
+            addEntityToGraph(entity, documentTree);
+            entity.addIntersectingNode(documentTree.getRoot().getNode());
+            documentTree.getRoot().getNode().getEntities().add(entity);
+        } catch (NoSuchElementException e) {
+            entity.setDeepestFullyContainingNode(documentTree.getRoot().getNode());
+            entityEnrichmentService.enrichEntity(entity, entity.getDeepestFullyContainingNode().getTextBlock());
+            entity.addIntersectingNode(documentTree.getRoot().getNode());
+            addToPages(entity);
+            addEntityToNodeEntitySets(entity);
+        }
+    }
+
+
+    private void addEntityToGraph(TextEntity entity, DocumentTree documentTree) {
+
+        SemanticNode containingNode = documentTree.childNodes(Collections.emptyList())
+                .filter(node -> node.getTextBlock().containsTextRange(entity.getTextRange()))
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException("No containing Node found!"));
+
+        containingNode.addThisToEntityIfIntersects(entity);
+
+        TextBlock textBlock = entity.getDeepestFullyContainingNode().getTextBlock();
+        entityEnrichmentService.enrichEntity(entity, textBlock);
+
+        addToPages(entity);
+        addEntityToNodeEntitySets(entity);
+    }
+
+
+    private static void addToPages(TextEntity entity) {
+
+        Set<Page> pages = entity.getDeepestFullyContainingNode().getPages(entity.getTextRange());
+        entity.getPages().addAll(pages);
+        pages.forEach(page -> page.getEntities().add(entity));
+    }
+
+
+    private static void addEntityToNodeEntitySets(TextEntity entity) {
+
+        entity.getIntersectingNodes().forEach(node -> node.getEntities().add(entity));
+    }
+
+
+    private static boolean allEntitiesIntersectAndHaveSameTypes(List<TextEntity> entitiesToMerge) {
+
+        if (entitiesToMerge.isEmpty()) {
+            return true;
+        }
+        TextEntity previousEntity = entitiesToMerge.get(0);
+        for (TextEntity textEntity : entitiesToMerge.subList(1, entitiesToMerge.size())) {
+            boolean typeMatches = textEntity.getType().equals(previousEntity.getType());
+            boolean entityTypeMatches = textEntity.getEntityType().equals(previousEntity.getEntityType());
+            boolean intersects = textEntity.intersects(previousEntity);
+            if (!typeMatches || !entityTypeMatches || !intersects) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    private static TextRange toLineAfterTextRange(TextBlock textBlock, TextRange textRange) {
+
+        if (textBlock.getTextRange().end() == textRange.end()) {
+            return new TextRange(textRange.end(), textRange.end());
+        }
+
+        return new TextRange(textRange.end(), textBlock.getNextLinebreak(textRange.end())).trim(textBlock);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/EntityEnrichmentService.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.services;
+package com.iqser.red.service.redaction.v1.server.service.document;
 
 import java.util.Arrays;
 import java.util.List;
@@ -6,9 +6,9 @@ import java.util.Objects;
 
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.RedactionServiceSettings;
 
 import lombok.RequiredArgsConstructor;
 
@@ -19,17 +19,17 @@ public class EntityEnrichmentService {
     private final RedactionServiceSettings redactionServiceSettings;
 
 
-    public void enrichEntity(RedactionEntity entity, TextBlock textBlock) {
+    public void enrichEntity(TextEntity entity, TextBlock textBlock) {
 
-        entity.setValue(textBlock.subSequence(entity.getBoundary()).toString());
-        entity.setTextAfter(findTextAfter(entity.getBoundary().end(), textBlock));
-        entity.setTextBefore(findTextBefore(entity.getBoundary().start(), textBlock));
+        entity.setValue(textBlock.subSequence(entity.getTextRange()).toString());
+        entity.setTextAfter(findTextAfter(entity.getTextRange().end(), textBlock));
+        entity.setTextBefore(findTextBefore(entity.getTextRange().start(), textBlock));
     }
 
 
     private String findTextAfter(int index, TextBlock textBlock) {
 
-        int endOffset = Math.min(index + redactionServiceSettings.getSurroundingWordsOffsetWindow(), textBlock.getBoundary().end());
+        int endOffset = Math.min(index + redactionServiceSettings.getSurroundingWordsOffsetWindow(), textBlock.getTextRange().end());
         String textAfter = textBlock.subSequence(index, endOffset).toString();
         if (!textAfter.isBlank()) {
             List<String> wordsAfter = splitToWordsAndRemoveEmptyWords(textAfter);
@@ -44,7 +44,7 @@ public class EntityEnrichmentService {
 
     private String findTextBefore(int index, TextBlock textBlock) {
 
-        int offsetBefore = Math.max(index - redactionServiceSettings.getSurroundingWordsOffsetWindow(), textBlock.getBoundary().start());
+        int offsetBefore = Math.max(index - redactionServiceSettings.getSurroundingWordsOffsetWindow(), textBlock.getTextRange().start());
         String textBefore = textBlock.subSequence(offsetBefore, index).toString();
         if (!textBefore.isBlank()) {
             List<String> wordsBefore = splitToWordsAndRemoveEmptyWords(textBefore);

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ManualEntityCreationService.java

@@ -0,0 +1,249 @@
+package com.iqser.red.service.redaction.v1.server.service.document;
+
+import static java.lang.String.format;
+import static java.util.stream.Collectors.groupingBy;
+
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
+import com.iqser.red.service.redaction.v1.server.model.ManualEntity;
+import com.iqser.red.service.redaction.v1.server.model.RectangleWithPage;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.SearchImplementation;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.PositionOnPage;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.service.DictionaryService;
+
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ManualEntityCreationService {
+
+    static double MATCH_THRESHOLD = 5; // Is compared to the sum of distances in pdf coordinates for each corner of the bounding box of the entities
+    EntityCreationService entityCreationService;
+    DictionaryService dictionaryService;
+
+
+    @Autowired
+    public ManualEntityCreationService(EntityEnrichmentService entityEnrichmentService, DictionaryService dictionaryService) {
+
+        entityCreationService = new EntityCreationService(entityEnrichmentService);
+        this.dictionaryService = dictionaryService;
+    }
+
+
+    public List<ManualEntity> toRedactionEntity(RedactionLog redactionLog, SemanticNode node) {
+
+        List<ManualEntity> manualEntities = redactionLog.getRedactionLogEntry().stream().map(ManualEntity::fromRedactionLogEntry).peek(manualEntity -> {
+            if (manualEntity.isApplied()) {
+                manualEntity.apply(manualEntity.getRuleIdentifier(), manualEntity.getReason(), manualEntity.getLegalBasis());
+            } else {
+                manualEntity.skip(manualEntity.getRuleIdentifier(), manualEntity.getReason());
+            }
+        }).toList();
+        return toRedactionEntity(manualEntities, node);
+    }
+
+
+    public List<ManualEntity> createRedactionEntitiesIfFoundAndReturnNotFoundEntries(Set<ManualRedactionEntry> manualRedactionEntries,
+                                                                                     SemanticNode node,
+                                                                                     String dossierTemplateId) {
+
+        List<ManualEntity> manualEntities = manualRedactionEntries.stream()
+                .filter(manualRedactionEntry -> !(manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary()))
+                .map(manualRedactionEntry -> ManualEntity.fromManualRedactionEntry(manualRedactionEntry,
+                        dictionaryService.isHint(manualRedactionEntry.getType(), dossierTemplateId)))
+                .peek(manualEntity -> manualEntity.apply("MAN.5.0", "manual entries are applied by default", manualEntity.getLegalBasis()))
+                .toList();
+
+        return toRedactionEntity(manualEntities, node);
+    }
+
+
+    private List<ManualEntity> toRedactionEntity(List<ManualEntity> manualEntities, SemanticNode node) {
+
+        Set<Integer> pageNumbers = manualEntities.stream().flatMap(entry -> entry.getEntityPosition().stream().map(RectangleWithPage::pageNumber)).collect(Collectors.toSet());
+        Set<String> entryValues = manualEntities.stream().map(ManualEntity::getValue).map(String::toLowerCase).collect(Collectors.toSet());
+
+        Map<String, List<TextEntity>> tempEntitiesByValue = findAllPossibleEntitiesAndGroupByValue(node, pageNumbers, entryValues);
+
+        List<ManualEntity> notFoundManualEntities = new LinkedList<>();
+        for (ManualEntity manualEntity : manualEntities) {
+            Optional<TextEntity> optionalRedactionEntity = findClosestEntityAndReturnEmptyIfNotFound(manualEntity, tempEntitiesByValue);
+            if (optionalRedactionEntity.isEmpty()) {
+                notFoundManualEntities.add(manualEntity);
+                continue;
+            }
+            createCorrectEntity(manualEntity, node, optionalRedactionEntity.get().getTextRange());
+        }
+        tempEntitiesByValue.values().stream().flatMap(Collection::stream).forEach(TextEntity::removeFromGraph);
+        return notFoundManualEntities;
+    }
+
+
+    /**
+     * Deletes the temp Entity and creates a RedactionEntity with correct values, based on the given parameters.
+     *
+     * @param manualEntity The entity identifier for the RedactionEntity.
+     * @param node             The SemanticNode associated with the RedactionEntity.
+     * @param closestTextRange  The closest Boundary to the RedactionEntity.
+     */
+    private void createCorrectEntity(ManualEntity manualEntity, SemanticNode node, TextRange closestTextRange) {
+
+        TextEntity correctEntity = entityCreationService.forceByTextRange(closestTextRange, manualEntity.getType(), manualEntity.getEntityType(), node);
+
+        correctEntity.addMatchedRules(manualEntity.getMatchedRuleList());
+        correctEntity.setDictionaryEntry(manualEntity.isDictionaryEntry());
+        correctEntity.setDossierDictionaryEntry(manualEntity.isDossierDictionaryEntry());
+        correctEntity.getManualOverwrite().addChanges(manualEntity.getManualOverwrite().getManualChangeLog());
+
+
+        // AnnotationIds must match the IDs in the add requests, or comments break. Maybe think about migrating IDs on the fly!
+        List<PositionOnPage> redactionPositionsWithIdOfManualOnPage = new ArrayList<>(correctEntity.getPositionsOnPagePerPage().size());
+        for (PositionOnPage positionOnPage : correctEntity.getPositionsOnPagePerPage()) {
+            redactionPositionsWithIdOfManualOnPage.add(new PositionOnPage(manualEntity.getId(), positionOnPage.getPage(), positionOnPage.getRectanglePerLine()));
+        }
+        correctEntity.setPositionsOnPagePerPage(redactionPositionsWithIdOfManualOnPage);
+    }
+
+
+    private Optional<TextEntity> findClosestEntityAndReturnEmptyIfNotFound(ManualEntity identifier, Map<String, List<TextEntity>> entitiesWithSameValue) {
+
+        List<TextEntity> possibleEntities = entitiesWithSameValue.get(identifier.getValue().toLowerCase(Locale.ENGLISH));
+
+        if (entityIdentifierValueNotFound(possibleEntities)) {
+            log.warn("Entity could not be created with identifier: {}, due to the value {} not being found anywhere.", identifier, identifier.getValue());
+            return Optional.empty();
+        }
+
+        Optional<TextEntity> optionalClosestEntity = possibleEntities.stream()
+                .filter(entity -> pagesMatch(entity, identifier.getEntityPosition()))
+                .min(Comparator.comparingDouble(entity -> calculateMinDistance(identifier.getEntityPosition(), entity)));
+
+        if (optionalClosestEntity.isEmpty()) {
+            log.warn("No Entity with value {} found on page {}", identifier.getValue(), identifier.getEntityPosition());
+            return Optional.empty();
+        }
+
+        TextEntity closestEntity = optionalClosestEntity.get();
+        double distance = calculateMinDistance(identifier.getEntityPosition(), closestEntity);
+        if (distance > MATCH_THRESHOLD) {
+            log.warn(format("Distance to closest found entity is %.2f and therefore higher than the threshold of %.2f for \n%s \n%s",
+                    distance,
+                    MATCH_THRESHOLD,
+                    identifier.getEntityPosition(),
+                    closestEntity.getPositionsOnPagePerPage()));
+            return Optional.empty();
+        }
+
+        return Optional.of(closestEntity);
+    }
+
+
+    private static boolean entityIdentifierValueNotFound(List<TextEntity> possibleEntities) {
+
+        return possibleEntities == null || possibleEntities.isEmpty();
+    }
+
+
+    private Map<String, List<TextEntity>> findAllPossibleEntitiesAndGroupByValue(SemanticNode node, Set<Integer> pageNumbers, Set<String> entryValues) {
+
+        if (!pageNumbers.stream().allMatch(node::onPage)) {
+            throw new IllegalArgumentException(format("SemanticNode \"%s\" does not contain these pages %s, it has pages: %s",
+                    node,
+                    pageNumbers.stream().filter(pageNumber -> !node.onPage(pageNumber)).toList(),
+                    node.getPages()));
+        }
+        SearchImplementation searchImplementation = new SearchImplementation(entryValues, true);
+
+        return searchImplementation.getBoundaries(node.getTextBlock(), node.getTextRange())
+                .stream().map(boundary -> entityCreationService.forceByTextRange(boundary, "temp", EntityType.ENTITY, node))
+                .collect(groupingBy(entity -> entity.getValue().toLowerCase(Locale.ROOT)));
+    }
+
+
+    private static boolean allValuesFound(Map<String, List<TextEntity>> entitiesByValue, Set<String> entryValues) {
+
+        return entitiesByValue.keySet().equals(entryValues);
+    }
+
+
+    private static boolean pagesMatch(TextEntity entity, List<RectangleWithPage> originalPositions) {
+
+        Set<Integer> entityPageNumbers = entity.getPositionsOnPagePerPage().stream().map(PositionOnPage::getPage).map(Page::getNumber).collect(Collectors.toSet());
+        Set<Integer> originalPageNumbers = originalPositions.stream().map(RectangleWithPage::pageNumber).collect(Collectors.toSet());
+        return entityPageNumbers.containsAll(originalPageNumbers);
+    }
+
+
+    private double calculateMinDistance(List<RectangleWithPage> originalPositions, TextEntity entity) {
+
+        if (originalPositions.size() != countRectangles(entity)) {
+            return Double.MAX_VALUE;
+        }
+        return originalPositions.stream()
+                .mapToDouble(rectangleWithPage -> calculateMinDistancePerRectangle(entity, rectangleWithPage.pageNumber(), rectangleWithPage.rectangle2D()))
+                .sum();
+    }
+
+
+    private static long countRectangles(TextEntity entity) {
+
+        return entity.getPositionsOnPagePerPage().stream().mapToLong(redactionPosition -> redactionPosition.getRectanglePerLine().size()).sum();
+    }
+
+
+    private double calculateMinDistancePerRectangle(TextEntity entity, int pageNumber, Rectangle2D originalRectangle) {
+
+        return entity.getPositionsOnPagePerPage()
+                .stream()
+                .filter(redactionPosition -> redactionPosition.getPage().getNumber() == pageNumber)
+                .map(PositionOnPage::getRectanglePerLine)
+                .flatMap(Collection::stream)
+                .mapToDouble(rectangle -> calculateDistance(rectangle, originalRectangle))
+                .min()
+                .orElse(Double.MAX_VALUE);
+    }
+
+
+    private double calculateDistance(Rectangle2D rectangle, Rectangle2D rectangle2D) {
+
+        // mirrored coordinates safe comparison
+        double minX1 = Math.min(rectangle.getMinX(), rectangle.getMaxX());
+        double minY1 = Math.min(rectangle.getMinY(), rectangle.getMaxY());
+        double maxX1 = Math.max(rectangle.getMinX(), rectangle.getMaxX());
+        double maxY1 = Math.max(rectangle.getMinY(), rectangle.getMaxY());
+
+        double minX2 = Math.min(rectangle2D.getMinX(), rectangle2D.getMaxX());
+        double minY2 = Math.min(rectangle2D.getMinY(), rectangle2D.getMaxY());
+        double maxX2 = Math.max(rectangle2D.getMinX(), rectangle2D.getMaxX());
+        double maxY2 = Math.max(rectangle2D.getMinY(), rectangle2D.getMaxY());
+
+        return Math.abs(minX1 - minX2) //
+                + Math.abs(minY1 - minY2) //
+                + Math.abs(maxX1 - maxX2) //
+                + Math.abs(maxY1 - maxY2);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ManualRedactionEntryService.java

@@ -0,0 +1,57 @@
+package com.iqser.red.service.redaction.v1.server.service.document;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.ManualEntity;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ManualRedactionEntryService {
+
+    private final ManualEntityCreationService manualEntityCreationService;
+
+
+    public List<ManualEntity> addManualRedactionEntriesAndReturnNotFoundEntries(AnalyzeRequest analyzeRequest, Document document, String dossierTemplateId) {
+
+        List<ManualEntity> notFoundManualRedactionEntries = Collections.emptyList();
+        if (analyzeRequest.getManualRedactions() != null) {
+            notFoundManualRedactionEntries = manualEntityCreationService.createRedactionEntitiesIfFoundAndReturnNotFoundEntries(analyzeRequest.getManualRedactions()
+                    .getEntriesToAdd(), document, dossierTemplateId);
+            log.info("Added Manual redaction entries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        }
+        if (notFoundManualRedactionEntries.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<BaseAnnotation> manualChanges = allManualChangesExceptAdd(analyzeRequest.getManualRedactions());
+        for (ManualEntity notFoundManualRedactionEntry : notFoundManualRedactionEntries) {
+            manualChanges.stream()
+                    .filter(change -> change.getAnnotationId().equals(notFoundManualRedactionEntry.getId()))
+                    .forEach(change -> notFoundManualRedactionEntry.getManualOverwrite().addChange(change));
+        }
+        return notFoundManualRedactionEntries;
+    }
+
+
+    private List<BaseAnnotation> allManualChangesExceptAdd(ManualRedactions manualRedactions) {
+
+        return Stream.of(manualRedactions.getForceRedactions(),
+                manualRedactions.getResizeRedactions(),
+                manualRedactions.getRecategorizations(),
+                manualRedactions.getIdsToRemove(),
+                manualRedactions.getLegalBasisChanges()).flatMap(Collection::stream).map(baseAnnotation -> (BaseAnnotation) baseAnnotation).toList();
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/NerEntitiesAdapter.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.adapter;
+package com.iqser.red.service.redaction.v1.server.service.document;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -9,10 +9,11 @@ import java.util.stream.Stream;
 
 import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionEntity;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Section;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.NerEntities;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Section;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
 
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
@@ -44,7 +45,7 @@ public class NerEntitiesAdapter {
 
         return new NerEntities(addOffsetsAndFlatten(getStringStartOffsetsForMainSections(document),
                 nerEntitiesModel).map(nerEntityModel -> new NerEntities.NerEntity(nerEntityModel.getValue(),
-                new Boundary(nerEntityModel.getStartOffset(), nerEntityModel.getEndOffset()),
+                new TextRange(nerEntityModel.getStartOffset(), nerEntityModel.getEndOffset()),
                 nerEntityModel.getType())).toList());
     }
 
@@ -63,17 +64,17 @@ public class NerEntitiesAdapter {
      * @param allowDuplicates         allow combining multiple parts of same type
      * @return A Stream of the combined boundaries
      */
-    public Stream<Boundary> combineNerEntities(NerEntities nerEntities,
-                                               Set<String> essentialTypes,
-                                               Set<String> typesToCombine,
-                                               int maxDistanceBetweenParts,
-                                               int minPartsToCombine,
-                                               boolean allowDuplicates) {
+    public Stream<TextRange> combineNerEntities(NerEntities nerEntities,
+                                                Set<String> essentialTypes,
+                                                Set<String> typesToCombine,
+                                                int maxDistanceBetweenParts,
+                                                int minPartsToCombine,
+                                                boolean allowDuplicates) {
 
         List<NerEntities.NerEntity> sortedEntities = nerEntities.getNerEntityList()
                 .stream()
                 .filter(entity -> typesToCombine.contains(entity.type()))
-                .sorted(Comparator.comparingInt(entity -> entity.boundary().start()))
+                .sorted(Comparator.comparingInt(entity -> entity.textRange().start()))
                 .toList();
 
         if (sortedEntities.isEmpty()) {
@@ -86,20 +87,20 @@ public class NerEntitiesAdapter {
         for (NerEntities.NerEntity startEntity : startEntitiesOfEssentialType) {
             List<NerEntities.NerEntity> currentCluster = new LinkedList<>();
             entityClusters.add(currentCluster);
-            int lastEndOffset = startEntity.boundary().end();
+            int lastEndOffset = startEntity.textRange().end();
 
             for (NerEntities.NerEntity entity : sortedEntities) {
-                if (entity.boundary().start() < lastEndOffset) {
+                if (entity.textRange().start() < lastEndOffset) {
                     continue;
                 }
                 if (distanceIsLargerThanMaxDistance(lastEndOffset, entity, maxDistanceBetweenParts) || isDuplicate(currentCluster, entity, allowDuplicates)) {
                     currentCluster = new LinkedList<>();
                     entityClusters.add(currentCluster);
                     currentCluster.add(entity);
-                    lastEndOffset = entity.boundary().end();
+                    lastEndOffset = entity.textRange().end();
                 } else {
                     currentCluster.add(entity);
-                    lastEndOffset = entity.boundary().end();
+                    lastEndOffset = entity.textRange().end();
                 }
             }
         }
@@ -120,7 +121,7 @@ public class NerEntitiesAdapter {
      *
      * @return A Stream of the combined entities of type "CBI_address"
      */
-    public Stream<Boundary> combineNerEntitiesToCbiAddressDefaults(NerEntities entityRecognitionEntities) {
+    public Stream<TextRange> combineNerEntitiesToCbiAddressDefaults(NerEntities entityRecognitionEntities) {
 
         return combineNerEntities(entityRecognitionEntities,
                 CBI_ADDRESS_ESSENTIAL_TYPES,
@@ -139,13 +140,13 @@ public class NerEntitiesAdapter {
 
     private static boolean distanceIsLargerThanMaxDistance(int lastEndOffset, NerEntities.NerEntity entity, int maxDistance) {
 
-        return (entity.boundary().start() - lastEndOffset) > maxDistance;
+        return (entity.textRange().start() - lastEndOffset) > maxDistance;
     }
 
 
-    private static Boundary toContainingBoundary(List<NerEntities.NerEntity> nerEntities) {
+    private static TextRange toContainingBoundary(List<NerEntities.NerEntity> nerEntities) {
 
-        return Boundary.merge(nerEntities.stream().map(NerEntities.NerEntity::boundary).toList());
+        return TextRange.merge(nerEntities.stream().map(NerEntities.NerEntity::textRange).toList());
     }
 
 
@@ -162,7 +163,7 @@ public class NerEntitiesAdapter {
 
     private static List<Integer> getStringStartOffsetsForMainSections(Document document) {
 
-        return document.getMainSections().stream().map(Section::getTextBlock).map(TextBlock::getBoundary).map(Boundary::start).toList();
+        return document.getMainSections().stream().map(Section::getTextBlock).map(TextBlock::getTextRange).map(TextRange::start).toList();
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/PropertiesMapper.java

@@ -1,18 +1,16 @@
-package com.iqser.red.service.redaction.v1.server.document.data.mapper;
+package com.iqser.red.service.redaction.v1.server.service.document;
 
 import java.awt.geom.Rectangle2D;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Image;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ImageType;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Table;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
 
-import lombok.AccessLevel;
-import lombok.experimental.FieldDefaults;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/SectionFinderService.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
+package com.iqser.red.service.redaction.v1.server.service.document;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -8,24 +8,24 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrementValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryIncrementValue;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.SearchImplementation;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
 
 import io.micrometer.core.annotation.Timed;
 import lombok.AccessLevel;
@@ -34,20 +34,23 @@ import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Component
+@Service
 @RequiredArgsConstructor
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-class SectionFinderService {
+public class SectionFinderService {
 
     @Timed("redactmanager_findSectionsToReanalyse")
-    public Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog, Document document, AnalyzeRequest analyzeRequest) {
+    public Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, EntityLog entityLog, Document document, AnalyzeRequest analyzeRequest) {
 
         long start = System.currentTimeMillis();
         Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
         Set<Integer> sectionsToReanalyse = new HashSet<>();
-        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+        for (EntityLogEntry entry : entityLog.getEntityLogEntry()) {
             if (relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
-                sectionsToReanalyse.add(entry.getSectionNumber());
+                if (entry.getContainingNodeId().isEmpty()) {
+                    continue; // Empty list means either Entity has not been found or it is between main sections. Thus, this might lead to wrong reanalysis.
+                }
+                sectionsToReanalyse.add(entry.getContainingNodeId().get(0));
             }
         }
 
@@ -107,7 +110,7 @@ class SectionFinderService {
 
         return Stream.concat(manualRedactions.getResizeRedactions().stream().map(ManualResizeRedaction::getAnnotationId),
                 Stream.concat(manualRedactions.getLegalBasisChanges().stream().map(ManualLegalBasisChange::getAnnotationId),
-                        Stream.concat(manualRedactions.getImageRecategorization().stream().map(ManualImageRecategorization::getAnnotationId),
+                        Stream.concat(manualRedactions.getRecategorizations().stream().map(ManualRecategorization::getAnnotationId),
                                 Stream.concat(manualRedactions.getIdsToRemove().stream().map(IdRemoval::getAnnotationId),
                                         manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId))))).collect(Collectors.toSet());
     }