DM-285: Entity to component mappings with new ruleset

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

@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.model;
 
+import java.util.LinkedList;
 import java.util.List;
 
 import lombok.AccessLevel;
@@ -16,6 +17,18 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class DroolsSyntaxValidation {
 
-    boolean compiled;
-    List<DroolsSyntaxErrorMessage> droolsSyntaxErrorMessages;
+    @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-server-v1/build.gradle.kts

@@ -12,11 +12,11 @@ plugins {
 description = "redaction-service-server-v1"
 
 
-val layoutParserVersion = "0.25.0"
+val layoutParserVersion = "0.70.0"
 val jacksonVersion = "2.15.2"
 val droolsVersion = "8.43.0.Final"
-val pdfBoxVersion = "3.0.0-alpha2"
-val persistenceServiceVersion = "2.160.0"
+val pdfBoxVersion = "3.0.0"
+val persistenceServiceVersion = "2.168.0"
 
 configurations {
     all {

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;
 

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

@@ -1,12 +1,13 @@
 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;
@@ -16,14 +17,14 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class RedactionController implements RedactionResource {
 
-    private final DroolsExecutionService droolsExecutionService;
+    private final DroolsSyntaxValidationService droolsSyntaxValidationService;
 
 
     @Override
-    public DroolsSyntaxValidation testRules(RuleValidationModel rulesValidationModel) {
+    public DroolsSyntaxValidation testRules(@RequestBody RuleValidationModel rulesValidationModel) {
 
         try {
-            return droolsExecutionService.testRules(rulesValidationModel.getRulesString());
+            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/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/exception/DroolsTimeoutException.java

@@ -1,24 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.exception;
-
-import lombok.Data;
-
-@Data
-public class DroolsTimeoutException extends RuntimeException {
-
-    private static final String DROOLS_TIMEOUT_MESSAGE = "Timeout during rules execution. Possible endless loop?";
-
-    private boolean reported;
-
-    public DroolsTimeoutException(Throwable cause,  boolean reported) {
-
-        super(DROOLS_TIMEOUT_MESSAGE, cause);
-        this.reported = reported;
-    }
-
-    public DroolsTimeoutException(boolean reported) {
-
-        super(DROOLS_TIMEOUT_MESSAGE);
-        this.reported = reported;
-    }
-
-}

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

@@ -1,14 +1,15 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+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.document.graph.entity.Entity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.ManualChangeOverwrite;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.MatchedRule;
+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;
@@ -20,9 +21,9 @@ import lombok.experimental.FieldDefaults;
 @Builder
 @AllArgsConstructor
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class ManualEntity implements Entity {
+public class ManualEntity implements IEntity {
 
-    // must be mapped into a TextEntity as is for comments to work correctly
+    // The id must be mapped into a TextEntity as is for comments to work correctly
     String id;
     String value;
     List<RectangleWithPage> entityPosition;
@@ -88,4 +89,18 @@ public class ManualEntity implements Entity {
                 .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.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

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 category;
+    String value;
+    String transformation;
+
+    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 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;
+
+    String section;
+    float[] color;
+
+    List<Position> positions;
+    int sectionNumber;
+
+    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) {
+
+        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())
+                .sectionNumber(e.getSectionNumber())
+                .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.TextEntity;
-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;

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.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
 
 import lombok.Data;
 

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;

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,7 +6,7 @@ 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;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/EntityType.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;
 
 public enum EntityType {
     ENTITY,

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

@@ -1,13 +1,16 @@
-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 Entity {
+public interface IEntity {
 
     PriorityQueue<MatchedRule> getMatchedRuleList();
 
@@ -15,7 +18,40 @@ public interface Entity {
     ManualChangeOverwrite getManualOverwrite();
 
 
-    // Don't use default accessor pattern (e.g. isIgnored()), as it might lead to errors in drools due to property-specific optimization of the drools planner.
+    String getValue();
+
+
+    TextRange getTextRange();
+
+
+    String type();
+
+
+    default int length() {
+
+        return value().length();
+    }
+
+
+    default String value() {
+
+        return getManualOverwrite().getValue().orElse(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());
@@ -34,9 +70,9 @@ public interface Entity {
     }
 
 
-    default boolean applied() {
+    default boolean active() {
 
-        return getManualOverwrite().getApplied().orElse(getMatchedRule().isApplied());
+        return !(removed() || ignored());
     }
 
 
@@ -52,12 +88,6 @@ public interface Entity {
     }
 
 
-    default boolean active() {
-
-        return !(removed() || ignored());
-    }
-
-
     default void redact(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis) {
 
         if (legalBasis.isBlank() || legalBasis.isEmpty()) {
@@ -79,17 +109,6 @@ public interface Entity {
     }
 
 
-    default void force(@NonNull String ruleIdentifier, String reason, String legalBasis) {
-
-        addMatchedRule(MatchedRule.builder()
-                .ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier))
-                .reason(reason)
-                .legalBasis(getLegalBasisOrPreviousLegalBasisOrPlaceHolder(legalBasis))
-                .applied(true)
-                .build());
-    }
-
-
     default void skip(@NonNull String ruleIdentifier, String reason) {
 
         addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).build());
@@ -108,18 +127,6 @@ public interface Entity {
     }
 
 
-    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;
-    }
-
-
     default void applyWithLineBreaks(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis) {
 
         if (legalBasis.isBlank() || legalBasis.isEmpty()) {

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.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.util.Collections;
 import java.util.Comparator;

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

@@ -1,10 +1,13 @@
-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.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;
@@ -19,12 +22,11 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 public final class MatchedRule implements Comparable<MatchedRule> {
 
-    public static final String FINAL_TYPE = "FINAL";
-    public static final String ELIMINATION_RULE_TYPE = "X";
-    private static final List<String> RULE_TYPE_PRIORITIES = List.of(FINAL_TYPE, ELIMINATION_RULE_TYPE);
+    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);
 
-    @Builder.Default
-    RuleIdentifier ruleIdentifier = RuleIdentifier.empty();
+    RuleIdentifier ruleIdentifier;
     @Builder.Default
     String reason = "";
     @Builder.Default
@@ -40,7 +42,7 @@ public final class MatchedRule implements Comparable<MatchedRule> {
 
     public static MatchedRule empty() {
 
-        return MatchedRule.builder().build();
+        return MatchedRule.builder().ruleIdentifier(RuleIdentifier.empty()).build();
     }
 
 

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;

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.TextRange;
-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.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,7 +28,7 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class TextEntity implements Entity {
+public class TextEntity implements IEntity {
 
     // primary key
     @EqualsAndHashCode.Include
@@ -50,7 +50,6 @@ public class TextEntity implements Entity {
     @Builder.Default
     Set<Engine> engines = new HashSet<>();
 
-
     // inferred on graph insertion
     String value;
     String textBefore;
@@ -201,4 +200,11 @@ public class TextEntity implements Entity {
         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.TextEntity;
-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;

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.TextEntity;
-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;

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.TextEntity;
-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;

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.TextEntity;
-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;

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

@@ -1,21 +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.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.Entity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.ManualChangeOverwrite;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.MatchedRule;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.TextEntity;
-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;
@@ -30,7 +32,7 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @NoArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class Image implements GenericSemanticNode, Entity {
+public class Image implements GenericSemanticNode, IEntity {
 
     List<Integer> treeId;
     String id;
@@ -77,6 +79,20 @@ public class Image implements GenericSemanticNode, Entity {
     }
 
 
+    @Override
+    public TextRange getTextRange() {
+
+        return GenericSemanticNode.super.getTextRange();
+    }
+
+
+    @Override
+    public String type() {
+
+        return getManualOverwrite().getType().orElse(imageType.toString());
+    }
+
+
     @Override
     public String toString() {
 
@@ -92,4 +108,23 @@ public class Image implements GenericSemanticNode, Entity {
         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,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.TextEntity;
-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;

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.TextEntity;
-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;

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.TextEntity;
-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;

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.TextRange;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.TextEntity;
-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 {
 
@@ -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.

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.TextEntity;
-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;

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.TextEntity;
-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;

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.TextRange;
-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;
 

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.TextRange;
-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;

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.TextRange;
-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 {
 

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,92 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+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);
+    }
+
+
+    public static Set<RuleIdentifier> fromListOfIdentifiersString(String input) {
+
+        return Arrays.stream(input.split(",")).map(String::trim).map(RuleIdentifier::fromString).collect(Collectors.toSet());
+    }
+
+
+    private static Integer parseIntOrStar(String value) {
+
+        return !value.equals("*") ? Integer.parseInt(value) : 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() {
+
+        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

@@ -1,28 +1,34 @@
 package com.iqser.red.service.redaction.v1.server.queue;
 
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_PRIORITY_QUEUE;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.X_ERROR_INFO_HEADER;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.X_ERROR_INFO_TIMESTAMP_HEADER;
+import static java.lang.String.format;
+
+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;
+
+import org.springframework.amqp.AmqpRejectAndDontRequeueException;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 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.dossiertemplate.dossier.file.FileErrorInfo;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.exception.DroolsTimeoutException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
+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;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.AmqpRejectAndDontRequeueException;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.time.OffsetDateTime;
-import java.time.temporal.ChronoUnit;
-
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.*;
-import static java.lang.String.format;
 
 @Slf4j
 @Service
@@ -99,22 +105,27 @@ public class RedactionMessageReceiver {
             log.info("");
             result.setMessageType(analyzeRequest.getMessageType());
             fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
-
-        } catch (Exception e) {
-
-            if (e instanceof DroolsTimeoutException && !((DroolsTimeoutException) e).isReported()) {
-                rulesClient.setRulesTimeoutDetected(analyzeRequest.getDossierTemplateId());
+        } catch (DroolsTimeoutException droolsTimeoutException) {
+            if (!droolsTimeoutException.isReported()) {
+                rulesClient.setRulesTimeoutDetected(analyzeRequest.getDossierTemplateId(), droolsTimeoutException.getRuleFileType());
             }
-
-            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, droolsTimeoutException);
+        } catch (Exception e) {
+            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/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/AnalyzeService.java

@@ -1,326 +0,0 @@
-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;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-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.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.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.ManualEntity;
-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.storage.RedactionStorageService;
-
-import io.micrometer.core.annotation.Timed;
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-@RequiredArgsConstructor
-public class AnalyzeService {
-
-    private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
-
-    DictionaryService dictionaryService;
-    DroolsExecutionService droolsExecutionService;
-    EntityRedactionService entityRedactionService;
-    RedactionLogCreatorService redactionLogCreatorService;
-    RedactionStorageService redactionStorageService;
-    RedactionChangeLogService redactionChangeLogService;
-    LegalBasisClient legalBasisClient;
-    RedactionServiceSettings redactionServiceSettings;
-    ImportedRedactionService importedRedactionService;
-    SectionFinderService sectionFinderService;
-    ManualRedactionEntryService manualRedactionEntryService;
-
-    FunctionTimerValues redactmanagerAnalyzePagewiseValues;
-
-
-    @Timed("redactmanager_analyze")
-    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-
-        var wrapper = droolsExecutionService.getLatestKieContainer(analyzeRequest.getDossierTemplateId());
-        log.info("Updated Rules to Version {} for file {} in dossier {}", wrapper.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());
-
-        NerEntities nerEntities = getEntityRecognitionEntities(analyzeRequest, document);
-        log.info("Loaded Ner Entities for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-        log.info("Updated Dictionaries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-
-        List<ManualEntity> notFoundManualRedactionEntries = manualRedactionEntryService.addManualRedactionEntriesAndReturnNotFoundEntries(analyzeRequest, document);
-
-        entityRedactionService.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<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,
-                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, redactionLog, document.getNumberOfPages(), dictionary.getVersion(), false, addedFileAttributes);
-    }
-
-
-    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();
-    }
-
-
-    @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<ManualEntity> notFoundManualRedactionEntries = manualRedactionEntryService.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,
-                getComments(analyzeRequest));
-
-        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(),
-                analyzeRequest.getDossierId(),
-                analyzeRequest.getFileId(),
-                newRedactionLogEntries,
-                false);
-
-        previousRedactionLog.getRedactionLogEntry()
-                .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(IMPORTED_REDACTION_TYPE));
-        previousRedactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
-
-        return finalizeAnalysis(analyzeRequest,
-                startTime,
-                previousRedactionLog,
-                document.getNumberOfPages(),
-                dictionaryIncrement.getDictionaryVersion(),
-                true,
-                addedFileAttributes);
-    }
-
-
-    private AnalyzeResult finalizeAnalysis(AnalyzeRequest analyzeRequest,
-                                           long startTime,
-                                           RedactionLog redactionLog,
-                                           int numberOfPages,
-                                           DictionaryVersion dictionaryVersion,
-                                           boolean isReanalysis,
-                                           Set<FileAttribute> addedFileAttributes) {
-
-        redactionLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion());
-        redactionLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion());
-
-        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
-
-        RedactionLogChanges redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(),
-                analyzeRequest.getFileId(),
-                redactionLog,
-                analyzeRequest.getAnalysisNumber());
-        log.info("Created Redaction Log for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog());
-        log.info("Stored Redaction Log for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-
-        long duration = System.currentTimeMillis() - startTime;
-
-        redactmanagerAnalyzePagewiseValues.increase(numberOfPages, duration);
-
-        return AnalyzeResult.builder()
-                .dossierId(analyzeRequest.getDossierId())
-                .fileId(analyzeRequest.getFileId())
-                .duration(duration)
-                .numberOfPages(numberOfPages)
-                .hasUpdates(redactionLogChange.isHasChanges())
-                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
-                .analysisNumber(analyzeRequest.getAnalysisNumber())
-                .rulesVersion(redactionLog.getRulesVersion())
-                .dictionaryVersion(redactionLog.getDictionaryVersion())
-                .legalBasisVersion(redactionLog.getLegalBasisVersion())
-                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
-                .wasReanalyzed(isReanalysis)
-                .manualRedactions(analyzeRequest.getManualRedactions())
-                .addedFileAttributes(addedFileAttributes)
-                .build();
-    }
-
-
-    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) {
-
-        return analyzeRequest.getSectionsToReanalyse().isEmpty() //
-                ? sectionFinderService.findSectionsToReanalyse(dictionaryIncrement, redactionLog, document, analyzeRequest) //
-                : analyzeRequest.getSectionsToReanalyse();
-    }
-
-
-    private NerEntities getEntityRecognitionEntitiesFilteredBySectionIds(AnalyzeRequest analyzeRequest, Document document, Set<Integer> sectionsToReanalyseIds) {
-
-        NerEntities nerEntities;
-        if (redactionServiceSettings.isNerServiceEnabled()) {
-            NerEntitiesModel nerEntitiesModel = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-            nerEntitiesModel = filterNerEntitiesModelBySectionIds(sectionsToReanalyseIds, nerEntitiesModel);
-            nerEntities = NerEntitiesAdapter.toNerEntities(nerEntitiesModel, document);
-        } else {
-            nerEntities = new NerEntities(Collections.emptyList());
-        }
-        return nerEntities;
-    }
-
-
-    private static NerEntitiesModel filterNerEntitiesModelBySectionIds(Set<Integer> sectionsToReanalyseIds, NerEntitiesModel nerEntitiesModel) {
-
-        return new NerEntitiesModel(nerEntitiesModel.getData().entrySet().stream() //
-                .filter(entry -> sectionsToReanalyseIds.contains(entry.getKey())) //
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
-    }
-
-
-    private NerEntities getEntityRecognitionEntities(AnalyzeRequest analyzeRequest, Document document) {
-
-        NerEntities nerEntities;
-        if (redactionServiceSettings.isNerServiceEnabled()) {
-            nerEntities = NerEntitiesAdapter.toNerEntities(redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId()), document);
-        } else {
-            nerEntities = new NerEntities(Collections.emptyList());
-        }
-        return nerEntities;
-    }
-
-
-    public List<RedactionLogLegalBasis> toSimplifiedSectionText(List<LegalBasis> legalBasis) {
-
-        return legalBasis.stream().map(l -> new RedactionLogLegalBasis(l.getName(), l.getDescription(), l.getReason())).collect(Collectors.toList());
-    }
-
-
-    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {
-
-        if (excludedPages != null && !excludedPages.isEmpty()) {
-            redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> {
-                if (excludedPages.contains(pos.getPage())) {
-                    entry.setExcluded(true);
-                }
-            }));
-        }
-    }
-
-}

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

@@ -1,28 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.List;
-
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.Message;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.model.DroolsSyntaxErrorMessage;
-import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
-
-@Service
-public class DroolsSyntaxValidationFactory {
-
-    public DroolsSyntaxValidation buildDroolsSyntaxValidation(KieBuilder kieBuilder) {
-
-        List<Message> errorMessages = kieBuilder.getResults().getMessages(Message.Level.ERROR);
-        List<DroolsSyntaxErrorMessage> droolsSyntaxErrorMessages = errorMessages.stream().map(this::buildDroolsSyntaxErrorMessage).toList();
-        return DroolsSyntaxValidation.builder().compiled(droolsSyntaxErrorMessages.isEmpty()).droolsSyntaxErrorMessages(droolsSyntaxErrorMessages).build();
-    }
-
-
-    public DroolsSyntaxErrorMessage buildDroolsSyntaxErrorMessage(Message message) {
-
-        return DroolsSyntaxErrorMessage.builder().line(message.getLine()).column(message.getColumn()).message(message.getText()).build();
-    }
-
-}

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

@@ -1,102 +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.redactionlog.Engine;
-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.CustomEntityCreationAdapter;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
-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 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.getTextRange())
-                .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/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

@@ -0,0 +1,496 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+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.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.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.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.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.component.Component;
+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;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@RequiredArgsConstructor
+public class AnalyzeService {
+
+    private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
+
+    DictionaryService dictionaryService;
+    EntityDroolsExecutionService entityDroolsExecutionService;
+    ComponentDroolsExecutionService componentDroolsExecutionService;
+    KieContainerCreationService kieContainerCreationService;
+    DictionarySearchService dictionarySearchService;
+    RedactionLogCreatorService redactionLogCreatorService;
+    EntityLogCreatorService entityLogCreatorService;
+    ComponentLogCreatorService componentLogCreatorService;
+    RedactionStorageService redactionStorageService;
+    RedactionChangeLogService redactionChangeLogService;
+    EntityChangeLogService entityChangeLogService;
+    LegalBasisClient legalBasisClient;
+    RedactionServiceSettings redactionServiceSettings;
+    ImportedRedactionService importedRedactionService;
+    SectionFinderService sectionFinderService;
+    ManualRedactionEntryService manualRedactionEntryService;
+
+    FunctionTimerValues redactmanagerAnalyzePagewiseValues;
+
+
+    @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());
+
+        NerEntities nerEntities = getEntityRecognitionEntities(analyzeRequest, document);
+        log.info("Loaded Ner Entities for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+        log.info("Updated Dictionaries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        List<ManualEntity> notFoundManualRedactionEntries = manualRedactionEntryService.addManualRedactionEntriesAndReturnNotFoundEntries(analyzeRequest, document);
+
+        dictionarySearchService.addDictionaryEntities(dictionary, document);
+        log.info("Finished Dictionary Search 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());
+
+        RedactionLog redactionLog = createRedactionLog(analyzeRequest, document, notFoundManualRedactionEntries, dictionary, kieWrapperEntityRules);
+        EntityLog entityLog = createEntityLog(analyzeRequest, document, notFoundManualRedactionEntries, dictionary, kieWrapperEntityRules);
+
+        return finalizeAnalysis(analyzeRequest, startTime, kieWrapperComponentRules, entityLog,
+                redactionLog,
+                document.getNumberOfPages(), dictionary.getVersion(), false, new HashSet<>(allFileAttributes));
+    }
+
+
+    private EntityLog createEntityLog(AnalyzeRequest analyzeRequest,
+                                      Document document,
+                                      List<ManualEntity> notFoundManualRedactionEntries,
+                                      Dictionary dictionary,
+                                      KieWrapper wrapper) {
+
+        List<EntityLogEntry> entityLogEntries = entityLogCreatorService.createEntityLogEntries(document, analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
+
+        List<LegalBasis> legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
+
+        EntityLog entityLog = new EntityLog(redactionServiceSettings.getAnalysisVersion(),
+                analyzeRequest.getAnalysisNumber(),
+                entityLogEntries,
+                toEntityLogLegalBasis(legalBasis),
+                dictionary.getVersion().getDossierTemplateVersion(),
+                dictionary.getVersion().getDossierVersion(),
+                wrapper.rulesVersion(),
+                legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        List<EntityLogEntry> importedRedactionFilteredEntries = importedRedactionService.processImportedEntities(analyzeRequest.getDossierTemplateId(),
+                analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                entityLog.getEntityLogEntry(),
+                true);
+
+        entityLog.setEntityLogEntry(importedRedactionFilteredEntries);
+        return entityLog;
+    }
+
+
+    private List<EntityLogLegalBasis> toEntityLogLegalBasis(List<LegalBasis> legalBasis) {
+
+        return legalBasis.stream().map(l -> new EntityLogLegalBasis(l.getName(), l.getDescription(), l.getReason())).collect(Collectors.toList());
+    }
+
+
+    @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),
+                    previousEntityLog,
+                    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);
+
+        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);
+        EntityLog entityLog = updatePreviousEntityLog(analyzeRequest, document, notFoundManualRedactionEntries, previousEntityLog, sectionsToReanalyseIds);
+
+        return finalizeAnalysis(analyzeRequest,
+                startTime,
+                kieContainerCreationService.getLatestKieContainer(analyzeRequest.getDossierTemplateId(), RuleFileType.COMPONENT),
+                entityLog,
+                redactionLog,
+                document.getNumberOfPages(),
+                dictionaryIncrement.getDictionaryVersion(),
+                true,
+                new HashSet<>(allFileAttributes));
+    }
+
+
+    @Deprecated(forRemoval = true)
+    private RedactionLog updatePreviousRedactionLog(AnalyzeRequest analyzeRequest,
+                                                    Document document,
+                                                    List<ManualEntity> notFoundManualRedactionEntries,
+                                                    RedactionLog previousRedactionLog,
+                                                    Set<Integer> sectionsToReanalyseIds) {
+
+        List<RedactionLogEntry> newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(document,
+                analyzeRequest.getDossierTemplateId(),
+                notFoundManualRedactionEntries,
+                getComments(analyzeRequest));
+
+        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(),
+                analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                newRedactionLogEntries,
+                false);
+
+        previousRedactionLog.getRedactionLogEntry()
+                .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(ImportedRedactionService.IMPORTED_REDACTION_TYPE));
+        previousRedactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
+        return previousRedactionLog;
+    }
+
+
+    private EntityLog updatePreviousEntityLog(AnalyzeRequest analyzeRequest,
+                                              Document document,
+                                              List<ManualEntity> notFoundManualRedactionEntries,
+                                              EntityLog previousEntityLog,
+                                              Set<Integer> sectionsToReanalyseIds) {
+
+        List<EntityLogEntry> newEntityLogEntries = entityLogCreatorService.createEntityLogEntries(document, analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
+
+        var importedRedactionFilteredEntries = importedRedactionService.processImportedEntities(analyzeRequest.getDossierTemplateId(),
+                analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                newEntityLogEntries,
+                false);
+
+        previousEntityLog.getEntityLogEntry()
+                .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(ImportedRedactionService.IMPORTED_REDACTION_TYPE));
+        previousEntityLog.getEntityLogEntry().addAll(importedRedactionFilteredEntries);
+        return previousEntityLog;
+    }
+
+
+    private AnalyzeResult finalizeAnalysis(AnalyzeRequest analyzeRequest, long startTime, KieWrapper kieWrapperComponentRules, EntityLog entityLog,
+                                           RedactionLog redactionLog,
+                                           int numberOfPages,
+                                           DictionaryVersion dictionaryVersion,
+                                           boolean isReanalysis,
+                                           Set<FileAttribute> addedFileAttributes) {
+
+        EntityLogChanges entityLogChanges = finalizeEntityLog(analyzeRequest, entityLog, redactionLog, dictionaryVersion);
+
+        if (entityLogChanges.isHasChanges()) {
+            computeComponentsWhenRulesArePresent(analyzeRequest, kieWrapperComponentRules, addedFileAttributes, entityLogChanges);
+        }
+
+        log.info("Stored analysis logs for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        long duration = System.currentTimeMillis() - startTime;
+
+        redactmanagerAnalyzePagewiseValues.increase(numberOfPages, duration);
+
+        return AnalyzeResult.builder()
+                .dossierId(analyzeRequest.getDossierId())
+                .fileId(analyzeRequest.getFileId())
+                .duration(duration)
+                .numberOfPages(numberOfPages)
+                .hasUpdates(entityLogChanges.isHasChanges())
+                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
+                .analysisNumber(analyzeRequest.getAnalysisNumber())
+                .rulesVersion(entityLog.getRulesVersion()).componentRulesVersion(kieWrapperComponentRules.rulesVersion())
+                .dictionaryVersion(entityLog.getDictionaryVersion())
+                .legalBasisVersion(entityLog.getLegalBasisVersion())
+                .dossierDictionaryVersion(entityLog.getDossierDictionaryVersion())
+                .wasReanalyzed(isReanalysis)
+                .manualRedactions(analyzeRequest.getManualRedactions())
+                .addedFileAttributes(addedFileAttributes)
+                .build();
+    }
+
+
+    private void computeComponentsWhenRulesArePresent(AnalyzeRequest analyzeRequest,
+                                                      KieWrapper kieWrapperComponentRules,
+                                                      Set<FileAttribute> addedFileAttributes,
+                                                      EntityLogChanges entityLogChanges) {
+
+        if (!kieWrapperComponentRules.isPresent()) {
+            return;
+        }
+
+        List<Component> components = componentDroolsExecutionService.executeRules(kieWrapperComponentRules.container(),
+                entityLogChanges.getEntityLog(),
+                addedFileAttributes.stream().toList());
+        log.info("Finished component rule execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        ComponentLog componentLog = componentLogCreatorService.buildComponentLog(analyzeRequest.getAnalysisNumber(), components);
+
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.COMPONENT_LOG, componentLog);
+
+    }
+
+
+    private EntityLogChanges finalizeEntityLog(AnalyzeRequest analyzeRequest, EntityLog entityLog, RedactionLog redactionLog, DictionaryVersion dictionaryVersion) {
+
+        // TODO: remove redactionLog related stuff
+        redactionLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion());
+        redactionLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion());
+
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+        RedactionLogChanges redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                redactionLog,
+                analyzeRequest.getAnalysisNumber());
+
+        entityLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion());
+        entityLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion());
+
+        excludeExcludedPages(entityLog, analyzeRequest.getExcludedPages());
+
+        EntityLogChanges entityLogChanges = entityChangeLogService.computeChanges(analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                entityLog,
+                analyzeRequest.getAnalysisNumber());
+        log.info("Created entity log for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog());
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.ENTITY_LOG, entityLogChanges.getEntityLog());
+        return entityLogChanges;
+    }
+
+
+    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, EntityLog entityLog, Document document, DictionaryIncrement dictionaryIncrement) {
+
+        return analyzeRequest.getSectionsToReanalyse().isEmpty() //
+                ? sectionFinderService.findSectionsToReanalyse(dictionaryIncrement, entityLog, document, analyzeRequest) //
+                : analyzeRequest.getSectionsToReanalyse();
+    }
+
+
+    private NerEntities getEntityRecognitionEntitiesFilteredBySectionIds(AnalyzeRequest analyzeRequest, Document document, Set<Integer> sectionsToReanalyseIds) {
+
+        NerEntities nerEntities;
+        if (redactionServiceSettings.isNerServiceEnabled()) {
+            NerEntitiesModel nerEntitiesModel = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+            nerEntitiesModel = filterNerEntitiesModelBySectionIds(sectionsToReanalyseIds, nerEntitiesModel);
+            nerEntities = NerEntitiesAdapter.toNerEntities(nerEntitiesModel, document);
+        } else {
+            nerEntities = new NerEntities(Collections.emptyList());
+        }
+        return nerEntities;
+    }
+
+
+    private static NerEntitiesModel filterNerEntitiesModelBySectionIds(Set<Integer> sectionsToReanalyseIds, NerEntitiesModel nerEntitiesModel) {
+
+        return new NerEntitiesModel(nerEntitiesModel.getData().entrySet().stream() //
+                .filter(entry -> sectionsToReanalyseIds.contains(entry.getKey())) //
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+    }
+
+
+    private NerEntities getEntityRecognitionEntities(AnalyzeRequest analyzeRequest, Document document) {
+
+        NerEntities nerEntities;
+        if (redactionServiceSettings.isNerServiceEnabled()) {
+            nerEntities = NerEntitiesAdapter.toNerEntities(redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId()), document);
+        } else {
+            nerEntities = new NerEntities(Collections.emptyList());
+        }
+        return nerEntities;
+    }
+
+
+    @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());
+    }
+
+
+    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {
+
+        if (excludedPages != null && !excludedPages.isEmpty()) {
+            redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> {
+                if (excludedPages.contains(pos.getPage())) {
+                    entry.setExcluded(true);
+                }
+            }));
+        }
+    }
+
+
+    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/ComponentLogCreatorService.java

@@ -0,0 +1,59 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentEntityReference;
+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.ComponentLogCategory;
+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.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.EntityComparators;
+
+@Service
+public class ComponentLogCreatorService {
+
+    public ComponentLog buildComponentLog(int analysisNumber, List<Component> components) {
+
+        List<ComponentLogCategory> componentLogCategories = components.stream()
+                .collect(Collectors.groupingBy(Component::getCategory, Collectors.mapping(this::buildComponentLogEntry, Collectors.toList())))
+                .entrySet()
+                .stream()
+                .map(entry -> new ComponentLogCategory(entry.getKey(), entry.getValue()))
+                .toList();
+        return new ComponentLog(analysisNumber, componentLogCategories, -1, -1, -1);
+    }
+
+
+    private ComponentLogEntry buildComponentLogEntry(Component component) {
+
+        return ComponentLogEntry.builder()
+                .value(component.getValue())
+                .transformation(component.getTransformation()).originalValue(component.getReferences().stream().sorted(EntityComparators.start()).map(Entity::getValue).toList())
+                .componentEntityReferences(toComponentEntityReferences(component.getReferences()))
+                .build();
+    }
+
+
+    private List<ComponentEntityReference> toComponentEntityReferences(List<Entity> references) {
+
+        return references.stream().map(this::toComponentEntityReference).toList();
+    }
+
+
+    private ComponentEntityReference toComponentEntityReference(Entity entity) {
+
+        return ComponentEntityReference.builder()
+                .id(entity.getId())
+                .page(entity.getPositions().stream().findFirst().map(Position::getPageNumber).orElse(0))
+                .reason(entity.getReason())
+                .ruleIdentifier(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(), 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.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/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,119 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.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.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.redaction.v1.server.storage.RedactionStorageService;
+
+import io.micrometer.core.annotation.Timed;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class EntityChangeLogService {
+
+    private final RedactionStorageService redactionStorageService;
+
+
+    @Timed("redactmanager_computeChanges")
+    public EntityLogChanges computeChanges(String dossierId, String fileId, EntityLog currentEntityLog, int analysisNumber) {
+
+        long start = System.currentTimeMillis();
+
+        EntityLog previousEntityLog = redactionStorageService.getEntityLog(dossierId, fileId);
+
+        if (previousEntityLog == null) {
+            currentEntityLog.getEntityLogEntry().forEach(entry -> {
+                entry.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+            });
+            return new EntityLogChanges(currentEntityLog, false);
+        }
+
+        List<EntityLogEntry> previouslyExistingEntries = previousEntityLog.getEntityLogEntry().stream().filter(entry -> !lastChangeIsRemoved(entry)).toList();
+
+        Map<String, EntityLogEntry> addedEntryIds = getEntriesThatExistInCurrentButNotInPreviousEntityLog(currentEntityLog, previouslyExistingEntries);
+        Set<String> removedIds = getEntryIdsThatExistInPreviousButNotInCurrentEntityLog(currentEntityLog, previouslyExistingEntries);
+
+        List<EntityLogEntry> newEntityLogEntries = previousEntityLog.getEntityLogEntry();
+
+        List<EntityLogEntry> toRemove = new ArrayList<>();
+        newEntityLogEntries.forEach(entry -> {
+            if (removedIds.contains(entry.getId()) && addedEntryIds.containsKey(entry.getId())) {
+                List<Change> changes = entry.getChanges();
+                changes.add(new Change(analysisNumber, ChangeType.CHANGED, OffsetDateTime.now()));
+                var newEntry = addedEntryIds.get(entry.getId());
+                newEntry.setChanges(changes);
+                addedEntryIds.put(entry.getId(), newEntry);
+                toRemove.add(entry);
+            } else if (removedIds.contains(entry.getId())) {
+                entry.getChanges().add(new Change(analysisNumber, ChangeType.REMOVED, OffsetDateTime.now()));
+            } else if (addedEntryIds.containsKey(entry.getId())) {
+                List<Change> changes = entry.getChanges();
+                changes.add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+                var newEntry = addedEntryIds.get(entry.getId());
+                newEntry.setChanges(changes);
+                addedEntryIds.put(entry.getId(), newEntry);
+                toRemove.add(entry);
+            }
+        });
+
+        newEntityLogEntries.removeAll(toRemove);
+
+        addedEntryIds.forEach((k, v) -> {
+            if (v.getChanges().isEmpty()) {
+                v.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+            }
+            newEntityLogEntries.add(v);
+        });
+
+        currentEntityLog.setEntityLogEntry(newEntityLogEntries);
+
+        log.debug("Change computation took: {}", System.currentTimeMillis() - start);
+        return new EntityLogChanges(currentEntityLog, !addedEntryIds.isEmpty() || !removedIds.isEmpty());
+    }
+
+
+    private static Set<String> getEntryIdsThatExistInPreviousButNotInCurrentEntityLog(EntityLog currentEntityLog, List<EntityLogEntry> previouslyExistingEntries) {
+
+        Set<EntityLogEntry> removed = new HashSet<>(previouslyExistingEntries);
+        currentEntityLog.getEntityLogEntry().forEach(removed::remove);
+
+        Set<String> removedIds = removed.stream().map(EntityLogEntry::getId).collect(Collectors.toSet());
+        return removedIds;
+    }
+
+
+    private static Map<String, EntityLogEntry> getEntriesThatExistInCurrentButNotInPreviousEntityLog(EntityLog currentEntityLog, List<EntityLogEntry> previouslyExistingEntries) {
+
+        Set<EntityLogEntry> currentExistingEntries = currentEntityLog.getEntityLogEntry().stream().filter(entry -> !lastChangeIsRemoved(entry)).collect(Collectors.toSet());
+
+        previouslyExistingEntries.forEach(currentExistingEntries::remove);
+        Map<String, EntityLogEntry> addedIds = new HashMap<>();
+        currentExistingEntries.forEach(entry -> {
+            addedIds.put(entry.getId(), entry);
+        });
+        return addedIds;
+    }
+
+
+    private static boolean lastChangeIsRemoved(EntityLogEntry entry) {
+
+        return entry.getChanges().stream().reduce((a, b) -> b).map(change -> change.getType().equals(ChangeType.REMOVED)).orElse(false);
+    }
+
+}

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

@@ -0,0 +1,221 @@
+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 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.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.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;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class EntityLogCreatorService {
+
+    private final DictionaryService dictionaryService;
+    private final ManualChangeFactory manualChangeFactory;
+
+
+    public List<EntityLogEntry> createEntityLogEntries(Document document, String dossierTemplateId, List<ManualEntity> notFoundManualRedactionEntries) {
+
+        List<EntityLogEntry> entries = new ArrayList<>();
+        document.getEntities()
+                .stream()
+                .filter(EntityLogCreatorService::isEntityOrRecommendationType)
+                .filter(entity -> !entity.removed())
+                .forEach(entityNode -> entries.addAll(toEntityLogEntries(entityNode, dossierTemplateId)));
+        document.streamAllImages().filter(image -> !image.removed()).forEach(imageNode -> entries.add(createEntityLogEntry(imageNode, dossierTemplateId)));
+        notFoundManualRedactionEntries.forEach(entityIdentifier -> entries.add(createEntityLogEntry(entityIdentifier, dossierTemplateId)));
+        return entries;
+    }
+
+
+    private static boolean isEntityOrRecommendationType(TextEntity textEntity) {
+
+        return textEntity.getEntityType() == EntityType.ENTITY || textEntity.getEntityType() == EntityType.RECOMMENDATION;
+    }
+
+
+    private List<EntityLogEntry> toEntityLogEntries(TextEntity textEntity, String dossierTemplateId) {
+
+        Set<String> processedIds = new HashSet<>();
+        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;
+    }
+
+
+    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())));
+        int sectionNumber = entity.getDeepestFullyContainingNode().getTreeId().isEmpty() ? 0 : entity.getDeepestFullyContainingNode().getTreeId().get(0);
+        boolean isHint = isHint(entity.getType(), dossierTemplateId);
+        return EntityLogEntry.builder()
+                .color(getColor(entity.getType(), dossierTemplateId, entity.applied()))
+                .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()))
+                .sectionNumber(sectionNumber)
+                .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, isHint))
+                .build();
+    }
+
+
+    public EntityLogEntry createEntityLogEntry(ManualEntity manualEntity, String dossierTemplateId) {
+
+        String type = manualEntity.getManualOverwrite().getType().orElse(manualEntity.getType());
+        boolean isHint = isHint(type, dossierTemplateId);
+        return EntityLogEntry.builder()
+                .id(manualEntity.getId())
+                .color(getColor(type, dossierTemplateId, manualEntity.applied()))
+                .reason(manualEntity.buildReasonWithManualChangeDescriptions())
+                .legalBasis(manualEntity.legalBasis())
+                .value(manualEntity.getManualOverwrite().getValue().orElse(manualEntity.getValue()))
+                .type(type)
+                .state(buildEntryState(manualEntity))
+                .entryType(buildEntryType(manualEntity, isHint))
+                .section(manualEntity.getManualOverwrite().getSection().orElse(manualEntity.getSection()))
+                .sectionNumber(0)
+                .matchedRule("ManualRedaction")
+                .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();
+    }
+
+
+    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())
+                .color(getColor(imageType, dossierTemplateId, image.applied()))
+                .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())))
+                .sectionNumber(image.getTreeId().get(0))
+                .section(image.getManualOverwrite().getSection().orElse(image.getParent().toString()))
+                .imageHasTransparency(image.isTransparent())
+                .manualChanges(manualChangeFactory.toManualChangeList(image.getManualOverwrite().getManualChangeLog(), isHint))
+                .state(buildEntryState(image))
+                .entryType(buildEntryType(image, isHint))
+                .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);
+    }
+
+
+    private EntryState buildEntryState(IEntity entity) {
+
+        if (entity.applied()) {
+            return EntryState.APPLIED;
+        } else if (entity.skipped()) {
+            return EntryState.SKIPPED;
+        } else if (entity.ignored()) {
+            return EntryState.IGNORED;
+        } else {
+            return EntryState.REMOVED;
+        }
+    }
+
+
+    private EntryType buildEntryType(IEntity entity, boolean isHint) {
+
+        if (entity instanceof TextEntity textEntity) {
+            return getEntryType(isHint, textEntity.getEntityType());
+        } else if (entity instanceof ManualEntity manualEntity) {
+            if (((ManualEntity) entity).isRectangle()) {
+                return EntryType.AREA;
+            }
+            return getEntryType(isHint, manualEntity.getEntityType());
+        } else if (entity instanceof Image) {
+            return EntryType.IMAGE;
+        }
+        throw new UnsupportedOperationException("Entity subclass %s not implemented!");
+    }
+
+
+    private static EntryType getEntryType(boolean isHint, EntityType entityType) {
+
+        return switch (entityType) {
+            case ENTITY -> isHint ? EntryType.HINT : EntryType.ENTITY;
+            case FALSE_POSITIVE -> EntryType.FALSE_POSITIVE;
+            case RECOMMENDATION -> EntryType.RECOMMENDATION;
+            case FALSE_RECOMMENDATION -> EntryType.FALSE_RECOMMENDATION;
+        };
+    }
+
+}

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

@@ -1,10 +1,13 @@
-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.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 +28,7 @@ public class ImportedRedactionService {
     private final RedactionStorageService redactionStorageService;
 
 
+    @Deprecated(forRemoval = true)
     @Timed("redactmanager_processImportedRedactions")
     public List<RedactionLogEntry> processImportedRedactions(String dossierTemplateId,
                                                              String dossierId,
@@ -47,6 +51,29 @@ public class ImportedRedactionService {
     }
 
 
+    @Timed("redactmanager_processImportedRedactions")
+    public List<EntityLogEntry> processImportedEntities(String dossierTemplateId,
+                                                        String dossierId,
+                                                        String fileId,
+                                                        List<EntityLogEntry> redactionLogEntries,
+                                                        boolean addImportedRedactions) {
+
+        var 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 +97,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)
+                        .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 +152,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 +193,7 @@ public class ImportedRedactionService {
     }
 
 
+    @Deprecated(forRemoval = true)
     private Rectangle normalize(Rectangle rectangle) {
 
         Rectangle r = new Rectangle();
@@ -138,6 +221,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

@@ -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.List;
@@ -12,8 +12,8 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 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.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.analysislog.entitylog.ManualChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualRedactionType;
 
 @Service
 public class ManualChangeFactory {

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.services;
+package com.iqser.red.service.redaction.v1.server.service;
 
 import java.awt.geom.Rectangle2D;
 import java.util.HashSet;
@@ -7,13 +7,14 @@ 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.document.graph.entity.Entity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.PositionOnPage;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.TextEntity;
-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.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
+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.RequiredArgsConstructor;
 
@@ -23,14 +24,14 @@ public class ManualChangesApplicationService {
     private final EntityCreationService entityCreationService;
 
 
-    public void recategorize(Entity entityToBeReCategorized, ManualRecategorization manualRecategorization) {
+    public void recategorize(IEntity IEntityToBeReCategorized, ManualRecategorization manualRecategorization) {
 
-        if (entityToBeReCategorized instanceof Image image) {
+        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 (entityToBeReCategorized instanceof TextEntity textEntity) {
+        if (IEntityToBeReCategorized instanceof TextEntity textEntity) {
             TextEntity recategorizedEntity = entityCreationService.copyEntity(textEntity, manualRecategorization.getType(), textEntity.getEntityType(), textEntity.getDeepestFullyContainingNode());
             recategorizedEntity.setPositionsOnPagePerPage(textEntity.getPositionsOnPagePerPage());
             recategorizedEntity.getManualOverwrite().addChange(manualRecategorization);

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;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.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.geom.Rectangle2D;
 import java.util.ArrayList;
@@ -7,23 +7,28 @@ 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.redactionlog.ManualChange;
 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.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.document.graph.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.PositionOnPage;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.TextEntity;
-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.redaction.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.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 com.iqser.red.service.redaction.v1.server.model.ManualEntity;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -146,13 +151,30 @@ public class RedactionLogCreatorService {
                 .startOffset(entity.getTextRange().start())
                 .endOffset(entity.getTextRange().end())
                 .isDossierDictionaryEntry(entity.isDossierDictionaryEntry())
-                .engines(entity.getEngines() != null ? entity.getEngines() : Collections.emptySet())
+                .engines(getEngines(entity))
                 .reference(referenceIds)
-                .manualChanges(manualChangeFactory.toManualChangeList(entity.getManualOverwrite().getManualChangeLog(), isHint))
+                .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());
+    }
+
+
     public RedactionLogEntry createRedactionLogEntry(ManualEntity manualEntity, String dossierTemplateId, Map<String, List<Comment>> comments) {
 
         String type = manualEntity.getManualOverwrite().getType().orElse(manualEntity.getType());
@@ -184,12 +206,26 @@ public class RedactionLogCreatorService {
                         .collect(Collectors.toList()))
                 .engines(Collections.emptySet())
                 .reference(Collections.emptySet())
-                .manualChanges(manualChangeFactory.toManualChangeList(manualEntity.getManualOverwrite().getManualChangeLog(), isHint))
+                .manualChanges(mapManualChanges(manualEntity.getManualOverwrite(), isHint))
                 .comments(buildRedactionLogComments(comments, manualEntity.getId()))
                 .build();
     }
 
 
+    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);
+        return manualChange1;
+    }
+
+
     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);
@@ -210,7 +246,7 @@ public class RedactionLogCreatorService {
                 .sectionNumber(image.getTreeId().get(0))
                 .section(image.getManualOverwrite().getSection().orElse(image.getParent().toString()))
                 .imageHasTransparency(image.isTransparent())
-                .manualChanges(manualChangeFactory.toManualChangeList(image.getManualOverwrite().getManualChangeLog(), isHint))
+                .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/ComponentCreationService.java

@@ -0,0 +1,131 @@
+package com.iqser.red.service.redaction.v1.server.service.document;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+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.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<>();
+
+
+    public void firstOrElse(String ruleIdentifier, String category, Collection<Entity> entities, String fallback) {
+
+        String transformation = String.format("First found value or else '%s'", fallback);
+        String value = entities.stream().min(EntityComparators.start()).map(Entity::getValue).orElse(fallback);
+        create(ruleIdentifier, category, value, transformation, entities);
+    }
+
+
+    public void joining(String ruleIdentifier, String category, Collection<Entity> entities) {
+
+        joining(ruleIdentifier, category, entities, ", ");
+    }
+
+
+    public void joining(String ruleIdentifier, String category, Collection<Entity> entities, String delimiter) {
+
+        String transformation = String.format("Joining all values with '%s'", delimiter);
+        String value = entities.stream().sorted(EntityComparators.start()).map(Entity::getValue).collect(Collectors.joining(delimiter));
+        create(ruleIdentifier, category, value, transformation, entities);
+    }
+
+
+    public void joiningUnique(String ruleIdentifier, String category, Collection<Entity> entities) {
+
+        joining(ruleIdentifier, category, entities, ", ");
+    }
+
+
+    public void joiningUnique(String ruleIdentifier, String category, Collection<Entity> entities, String delimiter) {
+
+        String transformation = String.format("Joining all values with '%s'", delimiter);
+        String value = entities.stream().sorted(EntityComparators.start()).map(Entity::getValue).distinct().collect(Collectors.joining(delimiter));
+        create(ruleIdentifier, category, value, transformation, entities);
+    }
+
+
+    public void convertDates(String ruleIdentifier, String category, Collection<Entity> entities) {
+
+        convertDates(ruleIdentifier, category, entities, "dd/MM/yyyy");
+    }
+
+
+    public void convertDates(String ruleIdentifier, String category, Collection<Entity> entities, String resultFormat) {
+
+        String transformation = "Convert values of type to dd/MM/yyyy joined with ', '";
+        String date = entities.stream().map(Entity::getValue).map(value -> DateConverter.convertDate(value, resultFormat)).collect(Collectors.joining(", "));
+        create(ruleIdentifier, category, date, transformation, entities);
+    }
+
+
+    public void createComponentsForUnMappedEntities(String ruleIdentifier, Collection<Entity> entities) {
+
+        entities.forEach(entity -> create(ruleIdentifier, entity.getType(), entity.getValue(), "Unmapped Entity", List.of(entity)));
+    }
+
+
+    public void create(String ruleIdentifier, String category, String value, String transformation, Collection<Entity> references) {
+
+        referencedEntities.addAll(references);
+
+        kieSession.insert(Component.builder()
+                .matchedRule(RuleIdentifier.fromString(ruleIdentifier))
+                .category(category)
+                .value(value)
+                .transformation(transformation)
+                .references(new LinkedList<>(references)));
+    }
+
+
+    public void create(String ruleIdentifier, String category, String value, String transformation, Entity reference) {
+
+        referencedEntities.add(reference);
+        List<Entity> referenceList = new LinkedList<>();
+        referenceList.add(reference);
+        kieSession.insert(Component.builder()
+                .matchedRule(RuleIdentifier.fromString(ruleIdentifier))
+                .category(category)
+                .value(value)
+                .transformation(transformation)
+                .references(referenceList)
+                .build());
+    }
+
+
+    public void create(String ruleIdentifier, String category, String value, String transformation) {
+
+        create(ruleIdentifier, category, value, transformation, Collections.emptyList());
+    }
+
+
+    public void create(String ruleIdentifier, String category, String value) {
+
+        kieSession.insert(Component.builder()
+                .matchedRule(RuleIdentifier.fromString(ruleIdentifier))
+                .category(category)
+                .value(value)
+                .transformation("")
+                .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,41 @@
+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> {
+
+    private static class LongestEntity implements Comparator<Entity> {
+
+        @Override
+        public int compare(Entity Entity, Entity otherEntity) {
+
+            return Integer.compare(Entity.getLength(), otherEntity.getLength());
+        }
+
+    }
+
+    private static class FirstEntity implements Comparator<Entity> {
+
+        @Override
+        public int compare(Entity Entity, Entity otherEntity) {
+
+            return Integer.compare(Entity.getStartOffset(), otherEntity.getStartOffset());
+        }
+
+    }
+
+
+    public static Comparator<Entity> length() {
+
+        return new LongestEntity();
+    }
+
+
+    public static Comparator<Entity> start() {
+
+        return new FirstEntity();
+    }
+
+}

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

@@ -1,6 +1,6 @@
-package com.iqser.red.service.redaction.v1.server.document.services;
+package com.iqser.red.service.redaction.v1.server.service.document;
 
-import static com.iqser.red.service.redaction.v1.server.redaction.utils.SeparatorUtils.boundaryIsSurroundedBySeparators;
+import static com.iqser.red.service.redaction.v1.server.utils.SeparatorUtils.boundaryIsSurroundedBySeparators;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -17,26 +17,25 @@ 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.TextRange;
-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.ManualChangeOverwrite;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.TextEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.PositionOnPage;
-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 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 lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -58,144 +57,144 @@ public class EntityCreationService {
 
     public Stream<TextEntity> betweenStrings(String start, String stop, String type, EntityType entityType, SemanticNode node) {
 
-        List<TextRange> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
+        List<TextRange> startTextRanges = RedactionSearchUtility.findTextRangesByString(start, node.getTextBlock());
+        List<TextRange> stopTextRanges = RedactionSearchUtility.findTextRangesByString(stop, node.getTextBlock());
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        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.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(stop, node.getTextBlock());
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        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.findBoundariesByString(start, node.getTextBlock());
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByString(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByString(stop, node.getTextBlock());
 
-        startBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() - start.length());
-            boundary.setEnd(boundary.end() - start.length());
+        startBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() - start.length());
+            textRange.setEnd(textRange.end() - start.length());
         });
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        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.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(stop, node.getTextBlock());
 
-        startBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() - start.length());
-            boundary.setEnd(boundary.end() - start.length());
+        startBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() - start.length());
+            textRange.setEnd(textRange.end() - start.length());
         });
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        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.findBoundariesByString(start, node.getTextBlock());
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByString(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByString(stop, node.getTextBlock());
 
-        stopBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() + stop.length());
-            boundary.setEnd(boundary.end() + stop.length());
+        stopBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() + stop.length());
+            textRange.setEnd(textRange.end() + stop.length());
         });
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        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.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(stop, node.getTextBlock());
 
-        stopBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() + stop.length());
-            boundary.setEnd(boundary.end() + stop.length());
+        stopBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() + stop.length());
+            textRange.setEnd(textRange.end() + stop.length());
         });
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        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.findBoundariesByString(start, node.getTextBlock());
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByString(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByString(stop, node.getTextBlock());
 
-        startBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() - start.length());
-            boundary.setEnd(boundary.end() - start.length());
+        startBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() - start.length());
+            textRange.setEnd(textRange.end() - start.length());
         });
-        stopBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() + stop.length());
-            boundary.setEnd(boundary.end() + stop.length());
+        stopBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() + stop.length());
+            textRange.setEnd(textRange.end() + stop.length());
         });
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        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.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(start, node.getTextBlock());
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByStringIgnoreCase(stop, node.getTextBlock());
 
-        startBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() - start.length());
-            boundary.setEnd(boundary.end() - start.length());
+        startBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() - start.length());
+            textRange.setEnd(textRange.end() - start.length());
         });
-        stopBoundaries.forEach(boundary -> {
-            boundary.setStart(boundary.start() + stop.length());
-            boundary.setEnd(boundary.end() + stop.length());
+        stopBoundaries.forEach(textRange -> {
+            textRange.setStart(textRange.start() + stop.length());
+            textRange.setEnd(textRange.end() + stop.length());
         });
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
     }
 
 
     public Stream<TextEntity> betweenRegexes(String regexStart, String regexStop, String type, EntityType entityType, SemanticNode node) {
 
         TextBlock textBlock = node.getTextBlock();
-        List<TextRange> startBoundaries = RedactionSearchUtility.findBoundariesByRegex(regexStart, textBlock);
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByRegex(regexStop, textBlock);
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByRegex(regexStart, textBlock);
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByRegex(regexStop, textBlock);
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        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.findBoundariesByRegexIgnoreCase(regexStart, 0, textBlock);
-        List<TextRange> stopBoundaries = RedactionSearchUtility.findBoundariesByRegexIgnoreCase(regexStop, 0, textBlock);
+        List<TextRange> startBoundaries = RedactionSearchUtility.findTextRangesByRegexIgnoreCase(regexStart, 0, textBlock);
+        List<TextRange> stopBoundaries = RedactionSearchUtility.findTextRangesByRegexIgnoreCase(regexStop, 0, textBlock);
 
-        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+        return betweenTextRanges(startBoundaries, stopBoundaries, type, entityType, node);
     }
 
 
-    public Stream<TextEntity> betweenBoundaries(List<TextRange> startBoundaries, List<TextRange> stopBoundaries, String type, EntityType entityType, SemanticNode node) {
+    public Stream<TextEntity> betweenTextRanges(List<TextRange> startBoundaries, List<TextRange> stopBoundaries, String type, EntityType entityType, SemanticNode node) {
 
         if (startBoundaries.isEmpty() || stopBoundaries.isEmpty()) {
             return Stream.empty();
         }
         List<TextRange> entityBoundaries = findNonOverlappingBoundariesBetweenBoundariesWithMinimalDistances(startBoundaries, stopBoundaries);
         return entityBoundaries.stream()
-                .map(boundary -> boundary.trim(node.getTextBlock()))
-                .filter(boundary -> isValidEntityBoundary(node.getTextBlock(), boundary))
-                .map(boundary -> byTextRange(boundary, type, entityType, node))
+                .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);
     }
@@ -205,27 +204,26 @@ public class EntityCreationService {
 
         List<TextRange> entityBoundaries = new LinkedList<>();
         for (TextRange startTextRange : startBoundaries) {
-            Optional<TextRange> optionalStopBoundaryWithMinimalDistance = stopBoundaries.stream()
+            Optional<TextRange> optionalStopTextRangeWithMinimalDistance = stopBoundaries.stream()
                     .filter(stopBoundary -> stopBoundary.start() > startTextRange.end())
                     .min(Comparator.comparingInt(TextRange::start));
-            if (optionalStopBoundaryWithMinimalDistance.isEmpty()) {
+            if (optionalStopTextRangeWithMinimalDistance.isEmpty()) {
                 break;
             }
-            entityBoundaries.add(new TextRange(startTextRange.end(), optionalStopBoundaryWithMinimalDistance.get().start()));
+            entityBoundaries.add(new TextRange(startTextRange.end(), optionalStopTextRangeWithMinimalDistance.get().start()));
         }
         return removeOuterOverlappingBoundaries(entityBoundaries);
     }
 
 
-    private static List<TextRange> removeOuterOverlappingBoundaries(List<TextRange> 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 entityBoundaries.stream()
-                .filter(boundary -> entityBoundaries.stream().noneMatch(innerBoundary -> innerBoundary != boundary && innerBoundary.containedBy(boundary)))
+        return entityTextRanges.stream().filter(boundary -> entityTextRanges.stream().noneMatch(innerBoundary -> innerBoundary != boundary && innerBoundary.containedBy(boundary)))
                 .toList();
 
     }
@@ -234,8 +232,7 @@ public class EntityCreationService {
     public Stream<TextEntity> bySearchImplementation(SearchImplementation searchImplementation, String type, EntityType entityType, SemanticNode node) {
 
         return searchImplementation.getBoundaries(node.getTextBlock(), node.getTextRange())
-                .stream()
-                .filter(boundary -> isValidEntityBoundary(node.getTextBlock(), boundary))
+                .stream().filter(boundary -> isValidEntityTextRange(node.getTextBlock(), boundary))
                 .map(bounds -> byTextRange(bounds, type, entityType, node))
                 .filter(Optional::isPresent)
                 .map(Optional::get);
@@ -247,9 +244,7 @@ public class EntityCreationService {
         TextBlock textBlock = node.getTextBlock();
         SearchImplementation searchImplementation = new SearchImplementation(strings, false);
         return searchImplementation.getBoundaries(textBlock, node.getTextRange())
-                .stream()
-                .map(boundary -> toLineAfterBoundary(textBlock, boundary))
-                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
+                .stream().map(boundary -> toLineAfterTextRange(textBlock, boundary)).filter(boundary -> isValidEntityTextRange(textBlock, boundary))
                 .map(boundary -> byTextRange(boundary, type, entityType, node))
                 .filter(Optional::isPresent)
                 .map(Optional::get);
@@ -261,9 +256,7 @@ public class EntityCreationService {
         TextBlock textBlock = node.getTextBlock();
         SearchImplementation searchImplementation = new SearchImplementation(strings, true);
         return searchImplementation.getBoundaries(textBlock, node.getTextRange())
-                .stream()
-                .map(boundary -> toLineAfterBoundary(textBlock, boundary))
-                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
+                .stream().map(boundary -> toLineAfterTextRange(textBlock, boundary)).filter(boundary -> isValidEntityTextRange(textBlock, boundary))
                 .map(boundary -> byTextRange(boundary, type, entityType, node))
                 .filter(Optional::isPresent)
                 .map(Optional::get);
@@ -273,10 +266,8 @@ public class EntityCreationService {
     public Stream<TextEntity> 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))
+        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);
@@ -286,10 +277,8 @@ public class EntityCreationService {
     public Stream<TextEntity> lineAfterStringIgnoreCase(String string, String type, EntityType entityType, SemanticNode node) {
 
         TextBlock textBlock = node.getTextBlock();
-        return RedactionSearchUtility.findBoundariesByStringIgnoreCase(string, textBlock)
-                .stream()
-                .map(boundary -> toLineAfterBoundary(textBlock, boundary))
-                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
+        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);
@@ -298,8 +287,7 @@ public class EntityCreationService {
 
     public Stream<TextEntity> lineAfterStringAcrossColumns(String string, String type, EntityType entityType, Table tableNode) {
 
-        return tableNode.streamTableCells()
-                .flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findBoundariesByString(string, tableCell.getTextBlock()),
+        return tableNode.streamTableCells().flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findTextRangesByString(string, tableCell.getTextBlock()),
                         tableCell,
                         type,
                         entityType,
@@ -310,7 +298,7 @@ public class EntityCreationService {
     public Stream<TextEntity> lineAfterStringAcrossColumnsIgnoreCase(String string, String type, EntityType entityType, Table tableNode) {
 
         return tableNode.streamTableCells()
-                .flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findBoundariesByStringIgnoreCase(string, tableCell.getTextBlock()),
+                .flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findTextRangesByStringIgnoreCase(string, tableCell.getTextBlock()),
                         tableCell,
                         type,
                         entityType,
@@ -321,23 +309,23 @@ public class EntityCreationService {
     /**
      * 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 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> boundaries, TableCell tableCell, String type, EntityType entityType, Table tableNode) {
+    private Stream<TextEntity> lineAfterBoundariesAcrossColumns(List<TextRange> TextRanges, TableCell tableCell, String type, EntityType entityType, Table tableNode) {
 
-        return boundaries.stream()
+        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.findBoundaryOfAllLinesInYRange(maxMinPair.getLeft(), maxMinPair.getRight(), nextTableCell.getTextBlock()))
+                        .map(nextTableCell -> RedactionSearchUtility.findTextRangesOfAllLinesInYRange(maxMinPair.getLeft(), maxMinPair.getRight(), nextTableCell.getTextBlock()))
                         .map(b -> b.trim(tableNode.getTextBlock()))
-                        .filter(boundary -> isValidEntityBoundary(tableNode.getTextBlock(), boundary))
+                        .filter(boundary -> isValidEntityTextRange(tableNode.getTextBlock(), boundary))
                         .map(boundary -> byTextRange(boundary, type, entityType, tableNode))
                         .filter(Optional::isPresent)
                         .map(Optional::get))
@@ -348,12 +336,15 @@ public class EntityCreationService {
     public Optional<TextEntity> semanticNodeAfterString(SemanticNode semanticNode, String string, String type, EntityType entityType) {
 
         var textBlock = semanticNode.getTextBlock();
-        int startIndex = Math.min(textBlock.indexOf(string), 0);
+        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 (!isValidEntityBoundary(textBlock, boundary)) {
+        if (!isValidEntityTextRange(textBlock, boundary)) {
             return Optional.empty();
         }
         return byTextRange(boundary, type, entityType, semanticNode);
@@ -386,7 +377,7 @@ public class EntityCreationService {
 
     public Stream<TextEntity> byRegexWithLineBreaks(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
 
-        return RedactionSearchUtility.findBoundariesByRegexWithLineBreaks(regexPattern, group, node.getTextBlock())
+        return RedactionSearchUtility.findTextRangesByRegexWithLineBreaks(regexPattern, group, node.getTextBlock())
                 .stream()
                 .map(boundary -> byTextRange(boundary, type, entityType, node))
                 .filter(Optional::isPresent)
@@ -396,7 +387,7 @@ public class EntityCreationService {
 
     public Stream<TextEntity> byRegexWithLineBreaksIgnoreCase(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
 
-        return RedactionSearchUtility.findBoundariesByRegexWithLineBreaksIgnoreCase(regexPattern, group, node.getTextBlock())
+        return RedactionSearchUtility.findTextRangesByRegexWithLineBreaksIgnoreCase(regexPattern, group, node.getTextBlock())
                 .stream()
                 .map(boundary -> byTextRange(boundary, type, entityType, node))
                 .filter(Optional::isPresent)
@@ -406,7 +397,7 @@ public class EntityCreationService {
 
     public Stream<TextEntity> byRegex(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
 
-        return RedactionSearchUtility.findBoundariesByRegex(regexPattern, group, node.getTextBlock())
+        return RedactionSearchUtility.findTextRangesByRegex(regexPattern, group, node.getTextBlock())
                 .stream()
                 .map(boundary -> byTextRange(boundary, type, entityType, node))
                 .filter(Optional::isPresent)
@@ -416,7 +407,7 @@ public class EntityCreationService {
 
     public Stream<TextEntity> byRegexIgnoreCase(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
 
-        return RedactionSearchUtility.findBoundariesByRegexIgnoreCase(regexPattern, group, node.getTextBlock())
+        return RedactionSearchUtility.findTextRangesByRegexIgnoreCase(regexPattern, group, node.getTextBlock())
                 .stream()
                 .map(boundary -> byTextRange(boundary, type, entityType, node))
                 .filter(Optional::isPresent)
@@ -426,7 +417,7 @@ public class EntityCreationService {
 
     public Stream<TextEntity> byString(String keyword, String type, EntityType entityType, SemanticNode node) {
 
-        return RedactionSearchUtility.findBoundariesByString(keyword, node.getTextBlock())
+        return RedactionSearchUtility.findTextRangesByString(keyword, node.getTextBlock())
                 .stream()
                 .map(boundary -> byTextRange(boundary, type, entityType, node))
                 .filter(Optional::isPresent)
@@ -436,7 +427,7 @@ public class EntityCreationService {
 
     public Stream<TextEntity> byStringIgnoreCase(String keyword, String type, EntityType entityType, SemanticNode node) {
 
-        return RedactionSearchUtility.findBoundariesByStringIgnoreCase(keyword, node.getTextBlock())
+        return RedactionSearchUtility.findTextRangesByStringIgnoreCase(keyword, node.getTextBlock())
                 .stream()
                 .map(boundary -> byTextRange(boundary, type, entityType, node))
                 .filter(Optional::isPresent)
@@ -479,7 +470,7 @@ public class EntityCreationService {
         if (textRange.length() > 0) {
             textRange = new TextRange(textRange.start(), textRange.end() - 1);
         }
-        if (!isValidEntityBoundary(node.getTextBlock(), textRange)) {
+        if (!isValidEntityTextRange(node.getTextBlock(), textRange)) {
             return Optional.empty();
         }
         return byTextRange(textRange, type, entityType, node);
@@ -647,7 +638,7 @@ public class EntityCreationService {
     }
 
 
-    public boolean isValidEntityBoundary(TextBlock textBlock, TextRange textRange) {
+    public boolean isValidEntityTextRange(TextBlock textBlock, TextRange textRange) {
 
         return textRange.length() > 0 && boundaryIsSurroundedBySeparators(textBlock, textRange);
     }
@@ -719,7 +710,11 @@ public class EntityCreationService {
     }
 
 
-    private static TextRange toLineAfterBoundary(TextBlock textBlock, TextRange textRange) {
+    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.TextEntity;
-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;
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ManualEntityCreationService.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 static java.lang.String.format;
 import static java.util.stream.Collectors.groupingBy;
@@ -20,30 +20,28 @@ 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.TextRange;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.TextEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.PositionOnPage;
-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.ManualEntity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RectangleWithPage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
+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 lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Service
-public class CustomEntityCreationAdapter {
+public class ManualEntityCreationService {
 
-    private static final double MATCH_THRESHOLD = 5; // sum of distances for each corner
+    private static final double MATCH_THRESHOLD = 5; // Is compared to the sum of distances in pdf coordinates for each corner of the bounding box of the entities
     private final EntityCreationService entityCreationService;
 
 
     @Autowired
-    public CustomEntityCreationAdapter(EntityEnrichmentService entityEnrichmentService) {
+    public ManualEntityCreationService(EntityEnrichmentService entityEnrichmentService) {
 
         entityCreationService = new EntityCreationService(entityEnrichmentService);
     }
@@ -100,7 +98,7 @@ public class CustomEntityCreationAdapter {
         TextEntity correctEntity = entityCreationService.forceByBoundary(closestTextRange, manualEntity.getType(), manualEntity.getEntityType(), node);
 
         if (manualEntity.isApplied()) {
-            correctEntity.force(manualEntity.getRuleIdentifier(), manualEntity.getReason(), manualEntity.getLegalBasis());
+            correctEntity.apply(manualEntity.getRuleIdentifier(), manualEntity.getReason(), manualEntity.getLegalBasis());
         } else {
             correctEntity.skip(manualEntity.getRuleIdentifier(), manualEntity.getReason());
         }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ManualRedactionEntryService.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;
@@ -10,9 +10,8 @@ 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.document.graph.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.redaction.adapter.CustomEntityCreationAdapter;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ManualEntity;
+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;
@@ -22,14 +21,14 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class ManualRedactionEntryService {
 
-    private final CustomEntityCreationAdapter customEntityCreationAdapter;
+    private final ManualEntityCreationService manualEntityCreationService;
 
 
     public List<ManualEntity> addManualRedactionEntriesAndReturnNotFoundEntries(AnalyzeRequest analyzeRequest, Document document) {
 
         List<ManualEntity> notFoundManualRedactionEntries = Collections.emptyList();
         if (analyzeRequest.getManualRedactions() != null) {
-            notFoundManualRedactionEntries = customEntityCreationAdapter.createRedactionEntitiesIfFoundAndReturnNotFoundEntries(analyzeRequest.getManualRedactions()
+            notFoundManualRedactionEntries = manualEntityCreationService.createRedactionEntitiesIfFoundAndReturnNotFoundEntries(analyzeRequest.getManualRedactions()
                     .getEntriesToAdd(), document);
             log.info("Added Manual redaction entries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
         }

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.TextRange;
-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;

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,9 +8,11 @@ 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;
@@ -19,13 +21,11 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 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,18 +34,18 @@ 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());
             }

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

@@ -0,0 +1,93 @@
+package com.iqser.red.service.redaction.v1.server.service.drools;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+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.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.entitylog.EntityLog;
+import com.iqser.red.service.redaction.v1.server.RedactionServiceSettings;
+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.ComponentCreationService;
+import com.iqser.red.service.redaction.v1.server.utils.exception.DroolsTimeoutException;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+public class ComponentDroolsExecutionService {
+
+    RedactionServiceSettings settings;
+
+
+    public List<Component> executeRules(KieContainer kieContainer, EntityLog entityLog, List<FileAttribute> fileAttributes) {
+
+        KieSession kieSession = kieContainer.newKieSession();
+        ComponentCreationService componentCreationService = new ComponentCreationService(kieSession);
+
+        kieSession.setGlobal("componentCreationService", componentCreationService);
+        entityLog.getEntityLogEntry().stream().map(Entity::fromEntityLogEntry).forEach(kieSession::insert);
+        fileAttributes.stream().filter(f -> f.getValue() != null).forEach(kieSession::insert);
+
+        CompletableFuture<Void> completableFuture = CompletableFuture.supplyAsync(() -> {
+            kieSession.fireAllRules();
+            return null;
+        });
+        kieSession.halt();
+        try {
+            completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(), TimeUnit.SECONDS).get();
+        } catch (ExecutionException e) {
+            kieSession.dispose();
+            if (e.getCause() instanceof TimeoutException) {
+                throw new DroolsTimeoutException(e, false, RuleFileType.COMPONENT);
+            }
+            throw new RuntimeException(e);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        List<FileAttribute> resultingFileAttributes = getFileAttributes(kieSession);
+        List<Component> components = getComponents(kieSession);
+        kieSession.dispose();
+        return components;
+    }
+
+
+    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 List<Component> getComponents(KieSession kieSession) {
+
+        List<Component> components = new LinkedList<>();
+        QueryResults entitiesResult = kieSession.getQueryResults("getComponents");
+        for (QueryResultsRow resultsRow : entitiesResult) {
+            components.add((Component) resultsRow.get("$component"));
+        }
+        return components;
+    }
+
+}

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

@@ -0,0 +1,122 @@
+package com.iqser.red.service.redaction.v1.server.service.drools;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.Message;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxErrorMessage;
+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.server.model.drools.BasicQuery;
+import com.iqser.red.service.redaction.v1.server.model.drools.BasicRule;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleFileBluePrint;
+import com.iqser.red.service.redaction.v1.server.storage.RuleManagementResources;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+@Service
+@RequiredArgsConstructor
+public class DroolsSyntaxValidationService {
+
+    private final KieContainerCreationService kieContainerCreationService;
+
+
+    @SneakyThrows
+    public DroolsSyntaxValidation testRules(RuleValidationModel rules) {
+
+        DroolsSyntaxValidation customDroolsSyntaxValidation = buildCustomDroolsSyntaxValidation(rules.getRulesString(), RuleFileType.valueOf(rules.getRuleFileType()));
+        DroolsSyntaxValidation droolsCompilerSyntaxValidation = buildDroolsCompilerSyntaxValidation(rules);
+        droolsCompilerSyntaxValidation.getDroolsSyntaxErrorMessages().addAll(customDroolsSyntaxValidation.getDroolsSyntaxErrorMessages());
+        return droolsCompilerSyntaxValidation;
+    }
+
+
+    private DroolsSyntaxValidation buildCustomDroolsSyntaxValidation(String ruleString, RuleFileType ruleFileType) {
+
+        RuleFileBluePrint ruleFileBluePrint = RuleFileParser.buildBluePrintFromRulesString(ruleString);
+        DroolsSyntaxValidation customSyntaxValidation = ruleFileBluePrint.getDroolsSyntaxValidation();
+
+        RuleFileBluePrint baseRuleFileBluePrint = switch (ruleFileType) {
+            case ENTITY -> RuleFileParser.buildBluePrintFromRulesString(RuleManagementResources.getBaseRuleFileString());
+            case COMPONENT -> RuleFileParser.buildBluePrintFromRulesString(RuleManagementResources.getBaseComponentRuleFileString());
+        };
+
+        if (!ruleFileBluePrint.getImports().equals(baseRuleFileBluePrint.getImports())) {
+            customSyntaxValidation.getDroolsSyntaxErrorMessages()
+                    .add(DroolsSyntaxErrorMessage.builder()
+                            .line(ruleFileBluePrint.getImportLine())
+                            .column(0)
+                            .message(String.format("Changing the imports is not allowed! Must be: %n%s", baseRuleFileBluePrint.getImports()))
+                            .build());
+        }
+        if (!ruleFileBluePrint.getGlobals().equals(baseRuleFileBluePrint.getGlobals())) {
+            customSyntaxValidation.getDroolsSyntaxErrorMessages()
+                    .add(DroolsSyntaxErrorMessage.builder().line(ruleFileBluePrint.getGlobalsLine())
+                            .column(0).message(String.format("Changing the globals is not allowed! Must be: %n%s", baseRuleFileBluePrint.getGlobals()))
+                            .build());
+        }
+        baseRuleFileBluePrint.getQueries().forEach(basicQuery -> {
+            if (!validateQueryIsPresent(basicQuery, ruleFileBluePrint)) {
+                customSyntaxValidation.getDroolsSyntaxErrorMessages()
+                        .add(DroolsSyntaxErrorMessage.builder()
+                                .line(basicQuery.getLine())
+                                .column(0)
+                                .message(String.format("Changing or removing the query %s is not allowed! Must be: %n%s", basicQuery.getName(), basicQuery.getCode()))
+                                .build());
+            }
+        });
+        baseRuleFileBluePrint.streamAllRules().forEach(basicRule -> {
+            if (!validateRuleIsPresent(basicRule, ruleFileBluePrint)) {
+                customSyntaxValidation.getDroolsSyntaxErrorMessages()
+                        .add(DroolsSyntaxErrorMessage.builder()
+                                .line(basicRule.getLine())
+                                .column(0)
+                                .message(String.format("Changing or removing the rule %s is not allowed! Must be: %n%s", basicRule.getName(), basicRule.getCode()))
+                                .build());
+            }
+        });
+        return customSyntaxValidation;
+    }
+
+
+    private static boolean validateRuleIsPresent(BasicRule basicRule, RuleFileBluePrint ruleFileBluePrint) {
+
+        return ruleFileBluePrint.findRulesByIdentifier(basicRule.getIdentifier()).stream().anyMatch(otherRule -> otherRule.getCode().equals(basicRule.getCode()));
+    }
+
+
+    private static boolean validateQueryIsPresent(BasicQuery queryToCheckFor, RuleFileBluePrint ruleFileBluePrint) {
+
+        return ruleFileBluePrint.getQueries().stream().anyMatch(query -> query.getName().equals(queryToCheckFor.getName()) && query.getCode().equals(queryToCheckFor.getCode()));
+    }
+
+
+    private DroolsSyntaxValidation buildDroolsCompilerSyntaxValidation(RuleValidationModel rules) {
+
+        var versionId = System.currentTimeMillis();
+        var testRules = "test-rules";
+        KieBuilder kieBuilder = kieContainerCreationService.registerNewKieContainerVersion(testRules,
+                versionId, rules.getRulesString(), RuleFileType.valueOf(rules.getRuleFileType()));
+        return buildDroolsCompilerSyntaxValidation(kieBuilder);
+    }
+
+
+    private DroolsSyntaxValidation buildDroolsCompilerSyntaxValidation(KieBuilder kieBuilder) {
+
+        List<Message> errorMessages = kieBuilder.getResults().getMessages(Message.Level.ERROR);
+        List<DroolsSyntaxErrorMessage> droolsSyntaxErrorMessages = errorMessages.stream().map(this::buildDroolsSyntaxErrorMessage).collect(Collectors.toList());
+        return DroolsSyntaxValidation.builder().droolsSyntaxErrorMessages(droolsSyntaxErrorMessages).build();
+    }
+
+
+    private DroolsSyntaxErrorMessage buildDroolsSyntaxErrorMessage(Message message) {
+
+        return DroolsSyntaxErrorMessage.builder().line(message.getLine()).column(message.getColumn()).message(message.getText()).build();
+    }
+
+}

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

@@ -1,41 +1,30 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
+package com.iqser.red.service.redaction.v1.server.service.drools;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
-import com.google.common.util.concurrent.SimpleTimeLimiter;
-import com.iqser.red.service.redaction.v1.server.exception.DroolsTimeoutException;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-import feign.FeignException;
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.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.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
+import com.google.common.util.concurrent.SimpleTimeLimiter;
 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.annotations.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
-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.ManualChangesApplicationService;
-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 com.iqser.red.service.redaction.v1.server.RedactionServiceSettings;
+import com.iqser.red.service.redaction.v1.server.model.NerEntities;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
+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.ManualChangesApplicationService;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityEnrichmentService;
+import com.iqser.red.service.redaction.v1.server.utils.exception.DroolsTimeoutException;
 
 import io.micrometer.core.annotation.Timed;
 import lombok.AccessLevel;
@@ -47,14 +36,10 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 @RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-public class DroolsExecutionService {
-
-    RulesClient rulesClient;
+public class EntityDroolsExecutionService {
 
     EntityEnrichmentService entityEnrichmentService;
 
-    DroolsSyntaxValidationFactory droolsSyntaxValidationFactory;
-
     RedactionServiceSettings settings;
 
     @Timed("redactmanager_executeRules")
@@ -115,7 +100,7 @@ public class DroolsExecutionService {
 
         } catch (TimeoutException e) {
             kieSession.dispose();
-            throw new DroolsTimeoutException(e, false);
+            throw new DroolsTimeoutException(e, false, RuleFileType.ENTITY);
         } catch (InterruptedException e) {
             kieSession.dispose();
             throw new RuntimeException(e);
@@ -138,73 +123,4 @@ public class DroolsExecutionService {
         return fileAttributes;
     }
 
-
-    public KieWrapper getLatestKieContainer(String dossierTemplateId) {
-
-        long version = -1;
-        try {
-            version = rulesClient.getVersion(dossierTemplateId);
-        } catch (FeignException fe) {
-            if (fe.status() == HttpStatus.UNPROCESSABLE_ENTITY.value()) {
-                throw new DroolsTimeoutException(fe.getCause(), true);
-            }
-        }
-
-        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 KieBuilder 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);
-        return kieBuilder.buildAll();
-    }
-
-
-    public DroolsSyntaxValidation testRules(String rules) {
-
-        var versionId = System.currentTimeMillis();
-        var testRules = "test-rules";
-        KieBuilder kieBuilder = registerNewKieContainerVersion(testRules, versionId, rules);
-        return droolsSyntaxValidationFactory.buildDroolsSyntaxValidation(kieBuilder);
-    }
-
 }

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

@@ -0,0 +1,97 @@
+package com.iqser.red.service.redaction.v1.server.service.drools;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.lang3.StringUtils;
+import org.kie.api.KieServices;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.KieFileSystem;
+import org.kie.api.builder.ReleaseId;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.model.KieWrapper;
+import com.iqser.red.service.redaction.v1.server.utils.exception.DroolsTimeoutException;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+
+import feign.FeignException;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class KieContainerCreationService {
+
+    private final RulesClient rulesClient;
+
+
+    public KieWrapper getLatestKieContainer(String dossierTemplateId, RuleFileType ruleFileType) {
+
+        long version = -1;
+        try {
+            version = rulesClient.getVersion(dossierTemplateId, ruleFileType);
+        } catch (FeignException fe) {
+            if (fe.status() == HttpStatus.UNPROCESSABLE_ENTITY.value()) {
+                throw new DroolsTimeoutException(fe.getCause(), true, ruleFileType);
+            }
+            if (fe.status() == HttpStatus.NOT_FOUND.value()) {
+                return new KieWrapper(null, -1);
+            }
+        }
+        if (version == -1) {
+            return new KieWrapper(null, version);
+        }
+
+        return new KieWrapper(getKieContainer(dossierTemplateId, version, ruleFileType), version);
+
+    }
+
+
+    private ReleaseId getReleaseId(String dossierTemplate, long version, RuleFileType ruleFileType) {
+
+        KieServices kieServices = KieServices.Factory.get();
+        return kieServices.newReleaseId("com.knecon.rules", TenantContext.getTenantId() + ":" + dossierTemplate + ":" + ruleFileType.name(), String.format("1.%d", version));
+    }
+
+
+    public KieContainer getKieContainer(String dossierTemplateId, long version, RuleFileType ruleFileType) {
+
+        KieServices kieServices = KieServices.Factory.get();
+        try {
+            return kieServices.newKieContainer(getReleaseId(dossierTemplateId, version, ruleFileType));
+        } catch (Exception e) {
+
+            registerNewKieContainerVersion(dossierTemplateId, version, ruleFileType);
+            return kieServices.newKieContainer(getReleaseId(dossierTemplateId, version, ruleFileType));
+        }
+
+    }
+
+
+    private void registerNewKieContainerVersion(String dossierTemplateId, long version, RuleFileType ruleFileType) {
+
+        var rules = rulesClient.getRules(dossierTemplateId, ruleFileType);
+        if (rules == null || StringUtils.isEmpty(rules.getValue())) {
+            throw new IllegalArgumentException(ruleFileType.name() + " rules cannot be empty.");
+        }
+
+        registerNewKieContainerVersion(dossierTemplateId, version, rules.getValue(), ruleFileType);
+    }
+
+
+    public KieBuilder registerNewKieContainerVersion(String dossierTemplateId, long version, String rules, RuleFileType ruleFileType) {
+
+        KieServices kieServices = KieServices.Factory.get();
+        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+        kieFileSystem.generateAndWritePomXML(getReleaseId(dossierTemplateId, version, ruleFileType));
+        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);
+        return kieBuilder.buildAll();
+    }
+
+}

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

@@ -0,0 +1,126 @@
+package com.iqser.red.service.redaction.v1.server.service.drools;
+
+import static java.util.stream.Collectors.groupingBy;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.drools.drl.ast.descr.GlobalDescr;
+import org.drools.drl.ast.descr.ImportDescr;
+import org.drools.drl.ast.descr.PackageDescr;
+import org.drools.drl.ast.descr.RuleDescr;
+import org.drools.drl.parser.DrlParser;
+import org.kie.internal.builder.conf.LanguageLevelOption;
+
+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
+import com.iqser.red.service.redaction.v1.server.model.drools.BasicQuery;
+import com.iqser.red.service.redaction.v1.server.model.drools.BasicRule;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleClass;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleFileBluePrint;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleType;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleUnit;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class RuleFileParser {
+
+    private final static Pattern ruleIdentifierInCodeFinder = Pattern.compile(
+            "\\b(?:redact|apply|skip|remove|ignore|applyWithLineBreaks|applyWithReferences|skipWithReferences)\\s*\\(\"([a-zA-Z0-9]+.\\d+.\\d+)\",.*(?:, .*)?\\)");
+
+
+    @SneakyThrows
+    public RuleFileBluePrint buildBluePrintFromRulesString(String ruleString) {
+
+        DroolsSyntaxValidation customDroolsSyntaxValidation = DroolsSyntaxValidation.builder().build();
+        DrlParser parser = new DrlParser(LanguageLevelOption.DRL6);
+        PackageDescr packageDescr = parser.parse(false, ruleString);
+        List<BasicRule> allRules = new LinkedList<>();
+        List<BasicQuery> allQueries = new LinkedList<>();
+
+        for (RuleDescr rule : packageDescr.getRules()) {
+            if (rule.isQuery()) {
+                allQueries.add(new BasicQuery(rule.getName(), rule.getLine(), ruleString.substring(rule.getStartCharacter(), rule.getEndCharacter())));
+            } else {
+                validateRule(ruleString, rule, customDroolsSyntaxValidation, allRules);
+            }
+        }
+
+        String imports = ruleString.substring(0, packageDescr.getImports().stream().mapToInt(ImportDescr::getEndCharacter).max().orElseThrow() + 1);
+        String globals = packageDescr.getGlobals()
+                .stream()
+                .map(globalDescr -> ruleString.substring(globalDescr.getStartCharacter(), globalDescr.getEndCharacter()))
+                .collect(Collectors.joining("\n"));
+
+        List<RuleClass> ruleClasses = buildRuleClasses(allRules);
+
+        return new RuleFileBluePrint(imports.trim(),
+                packageDescr.getImports().stream().findFirst().map(ImportDescr::getLine).orElse(0),
+                globals.trim(),
+                packageDescr.getGlobals().stream().findFirst().map(GlobalDescr::getLine).orElse(0), allQueries,
+                ruleClasses,
+                customDroolsSyntaxValidation);
+    }
+
+
+    private static void validateRule(String ruleString, RuleDescr rule, DroolsSyntaxValidation customDroolsSyntaxValidation, List<BasicRule> allRules) {
+
+        BasicRule basicRule;
+        try {
+            basicRule = BasicRule.fromRuleDescr(rule, ruleString);
+        } catch (Exception e) {
+            customDroolsSyntaxValidation.addErrorMessage(rule.getLine(), rule.getColumn(), "Malformed rule name, correct format is \"\\w+.\\d+.\\d+: <rule description>\"");
+            return;
+        }
+        if (allRules.contains(basicRule)) {
+            addDuplicateRuleIdentifierErrorMessage(rule, basicRule, customDroolsSyntaxValidation);
+        }
+        validateRuleIdentifierInCodeIsSame(basicRule.getCode(), basicRule.getIdentifier().toString(), rule.getLine(), customDroolsSyntaxValidation);
+        allRules.add(BasicRule.fromRuleDescr(rule, ruleString));
+    }
+
+
+    private static void validateRuleIdentifierInCodeIsSame(String code, String identifier, int lineOffset, DroolsSyntaxValidation customDroolsSyntaxValidation) {
+
+        Matcher matcher = ruleIdentifierInCodeFinder.matcher(code);
+        while (matcher.find()) {
+            String identifierInCode = code.substring(matcher.start(1), matcher.end(1));
+            long line = code.substring(0, matcher.start(1)).lines().count() + lineOffset - 1;
+            if (!identifier.equals(identifierInCode)) {
+                customDroolsSyntaxValidation.addErrorMessage((int) line,
+                        0,
+                        String.format("Rule identifier %s is not equal to rule identifier %s in rule name!", identifierInCode, identifier));
+            }
+        }
+    }
+
+
+    private void addDuplicateRuleIdentifierErrorMessage(RuleDescr rule, BasicRule basicRule, DroolsSyntaxValidation customDroolsSyntaxValidation) {
+
+        customDroolsSyntaxValidation.addErrorMessage(rule.getLine(),
+                rule.getColumn(),
+                String.format("RuleIdentifier: %s is a duplicate, duplicates are not allowed!", basicRule.getIdentifier()));
+    }
+
+
+    private List<RuleClass> buildRuleClasses(List<BasicRule> allRules) {
+
+        List<RuleType> ruleTypeOrder = allRules.stream().map(BasicRule::getIdentifier).map(RuleIdentifier::type).distinct().toList();
+        Map<RuleType, List<BasicRule>> rulesPerType = allRules.stream().collect(groupingBy(rule -> rule.getIdentifier().type()));
+        return ruleTypeOrder.stream().map(type -> new RuleClass(type, groupingByGroup(rulesPerType.get(type)))).collect(Collectors.toList());
+    }
+
+
+    private List<RuleUnit> groupingByGroup(List<BasicRule> rules) {
+
+        Map<Integer, List<BasicRule>> rulesPerUnit = rules.stream().collect(groupingBy(rule -> rule.getIdentifier().unit()));
+        return rulesPerUnit.keySet().stream().sorted().map(unit -> new RuleUnit(unit, rulesPerUnit.get(unit))).collect(Collectors.toList());
+    }
+
+}

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

@@ -6,13 +6,15 @@ import java.io.InputStream;
 
 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.entitylog.EntityLog;
 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.redactionlog.RedactionLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.imported.ImportedRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.document.data.DocumentData;
+import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentData;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 import com.iqser.red.storage.commons.service.StorageService;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage;
@@ -45,6 +47,16 @@ public class RedactionStorageService {
     }
 
 
+    @SneakyThrows
+    public File getStoredObjectFile(String storageId) {
+
+        File tempFile = File.createTempFile("temp", "data");
+        tempFile.deleteOnExit();
+        storageService.downloadTo(TenantContext.getTenantId(), storageId, tempFile);
+        return tempFile;
+    }
+
+
     @SneakyThrows
     public void storeObject(String dossierId, String fileId, FileType fileType, InputStream inputStream) {
 
@@ -86,6 +98,18 @@ public class RedactionStorageService {
 
     }
 
+    @Timed("redactmanager_getRedactionLog")
+    public EntityLog getEntityLog(String dossierId, String fileId) {
+
+        try {
+            return storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.ENTITY_LOG), EntityLog.class);
+        } catch (StorageObjectDoesNotExist e) {
+            log.debug("RedactionLog not available.");
+            return null;
+        }
+
+    }
+
 
     @Timed("redactmanager_getDocumentGraph")
     public DocumentData getDocumentData(String dossierId, String fileId) {
@@ -126,6 +150,16 @@ public class RedactionStorageService {
     }
 
 
+    public ComponentLog getComponentLog(String dossierId, String fileId) {
+
+        try {
+            return storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.COMPONENT_LOG), ComponentLog.class);
+        } catch (StorageObjectDoesNotExist e) {
+            throw new NotFoundException("Component Log is not available.");
+        }
+    }
+
+
     @RequiredArgsConstructor
     public enum StorageType {
         PARSED_DOCUMENT(".json");

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

@@ -0,0 +1,44 @@
+package com.iqser.red.service.redaction.v1.server.storage;
+
+import java.io.InputStream;
+import java.nio.file.Path;
+
+import org.springframework.core.io.ClassPathResource;
+
+import lombok.SneakyThrows;
+
+public class RuleManagementResources {
+
+    private static final String folderPrefix = "drools";
+
+    @SneakyThrows
+    public static InputStream getBaseRuleFileInputStream() {
+
+        return new ClassPathResource(Path.of(folderPrefix, "base_rules.drl").toString()).getInputStream();
+    }
+
+
+    @SneakyThrows
+    public static String getBaseRuleFileString() {
+
+        try (var in = getBaseRuleFileInputStream()) {
+            return new String(in.readAllBytes());
+        }
+    }
+
+    @SneakyThrows
+    public static InputStream getBaseComponentRuleFileInputStream() {
+
+        return new ClassPathResource(Path.of(folderPrefix, "base_component_rules.drl").toString()).getInputStream();
+    }
+
+
+    @SneakyThrows
+    public static String getBaseComponentRuleFileString() {
+
+        try (var in = getBaseComponentRuleFileInputStream()) {
+            return new String(in.readAllBytes());
+        }
+    }
+
+}

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

@@ -0,0 +1,49 @@
+package com.iqser.red.service.redaction.v1.server.utils;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@UtilityClass
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class DateConverter {
+
+    static List<SimpleDateFormat> formats = List.of(new SimpleDateFormat("dd MMM yy", Locale.ENGLISH),
+            new SimpleDateFormat("dd MM yyyy", Locale.ENGLISH),
+            new SimpleDateFormat("dd MM yyyy.", Locale.ENGLISH),
+            new SimpleDateFormat("dd MMMM yyyy", Locale.ENGLISH),
+            new SimpleDateFormat("MMMM dd, yyyy", Locale.ENGLISH),
+            new SimpleDateFormat("dd-MMM-yyyy", Locale.ENGLISH));
+
+
+    public String convertDate(String dateAsString, String resultFormat) {
+
+        DateFormat resultDateFormat = new SimpleDateFormat(resultFormat, Locale.ENGLISH);
+        Date date = null;
+        for (SimpleDateFormat format : formats) {
+
+            try {
+                date = format.parse(dateAsString);
+                break;
+            } catch (Exception e) {
+                log.warn("Failed to parse date from string {}. \n{}", dateAsString, e.getMessage());
+                // ignore, try next...
+            }
+        }
+
+        if (date == null) {
+            return dateAsString;
+        }
+
+        return resultDateFormat.format(date);
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
+package com.iqser.red.service.redaction.v1.server.utils;
 
 import java.awt.geom.Rectangle2D;
 import java.nio.charset.StandardCharsets;
@@ -9,7 +9,7 @@ import java.util.stream.Collectors;
 
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
-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.experimental.UtilityClass;
 

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
+package com.iqser.red.service.redaction.v1.server.utils;
 
 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/utils/RectangleTransformations.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.utils;
+package com.iqser.red.service.redaction.v1.server.utils;
 
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RectangularShape;
@@ -13,7 +13,7 @@ import java.util.function.Supplier;
 import java.util.stream.Collector;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.AtomicTextBlock;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.document.utils;
+package com.iqser.red.service.redaction.v1.server.utils;
 
 import static java.lang.String.format;
 
@@ -9,10 +9,9 @@ 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.TextRange;
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.TextEntity;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+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.TextBlock;
 
 import lombok.experimental.UtilityClass;
 
@@ -51,7 +50,7 @@ public class RedactionSearchUtility {
     }
 
 
-    public static TextRange findFirstBoundary(String regexPattern, CharSequence searchText) {
+    public static TextRange findFirstTextRange(String regexPattern, CharSequence searchText) {
 
         Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
         Matcher matcher = pattern.matcher(searchText);
@@ -66,7 +65,7 @@ public class RedactionSearchUtility {
 
         int expandedEnd;
         if (anyMatch(entity.getTextAfter(), regexPattern)) {
-            TextRange postfixTextRange = findFirstBoundary(regexPattern, entity.getTextAfter());
+            TextRange postfixTextRange = findFirstTextRange(regexPattern, entity.getTextAfter());
             expandedEnd = postfixTextRange.end() + entity.getTextRange().end();
         } else {
             expandedEnd = entity.getTextRange().end();
@@ -79,7 +78,7 @@ public class RedactionSearchUtility {
 
         int expandedStart;
         if (anyMatch(entity.getTextBefore(), regexPattern)) {
-            TextRange prefixTextRange = findFirstBoundary(regexPattern, entity.getTextBefore());
+            TextRange prefixTextRange = findFirstTextRange(regexPattern, entity.getTextBefore());
             expandedStart = prefixTextRange.start() + entity.getTextRange().start() - entity.getTextBefore().length();
         } else {
             expandedStart = entity.getTextRange().start();
@@ -87,7 +86,8 @@ public class RedactionSearchUtility {
         return expandedStart;
     }
 
-    public static TextRange findBoundaryOfAllLinesInYRange(double maxY, double minY, TextBlock textBlock) {
+
+    public static TextRange findTextRangesOfAllLinesInYRange(double maxY, double minY, TextBlock textBlock) {
 
         List<TextRange> lineBoundaries = IntStream.range(0, textBlock.numberOfLines()).boxed().map(textBlock::getLineTextRange).filter(lineBoundary -> isWithinYRange(maxY, minY, textBlock, lineBoundary)).toList();
         if (lineBoundaries.isEmpty()) {
@@ -104,43 +104,43 @@ public class RedactionSearchUtility {
     }
 
 
-    public static List<TextRange> findBoundariesByRegex(String regexPattern, TextBlock textBlock) {
+    public static List<TextRange> findTextRangesByRegex(String regexPattern, TextBlock textBlock) {
 
         Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
-        return getBoundariesByPattern(textBlock, 0, pattern);
+        return getTextRangesByPattern(textBlock, 0, pattern);
 
     }
 
 
-    public static List<TextRange> findBoundariesByRegex(String regexPattern, int group, TextBlock textBlock) {
+    public static List<TextRange> findTextRangesByRegex(String regexPattern, int group, TextBlock textBlock) {
 
         Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
-        return getBoundariesByPattern(textBlock, group, pattern);
+        return getTextRangesByPattern(textBlock, group, pattern);
     }
 
 
-    public static List<TextRange> findBoundariesByRegexWithLineBreaks(String regexPattern, int group, TextBlock textBlock) {
+    public static List<TextRange> findTextRangesByRegexWithLineBreaks(String regexPattern, int group, TextBlock textBlock) {
 
         Pattern pattern = Patterns.getCompiledMultilinePattern(regexPattern, false);
-        return getBoundariesByPatternWithLineBreaks(textBlock, group, pattern);
+        return getTextRangesByPatternWithLineBreaks(textBlock, group, pattern);
     }
 
 
-    public static List<TextRange> findBoundariesByRegexWithLineBreaksIgnoreCase(String regexPattern, int group, TextBlock textBlock) {
+    public static List<TextRange> findTextRangesByRegexWithLineBreaksIgnoreCase(String regexPattern, int group, TextBlock textBlock) {
 
         Pattern pattern = Patterns.getCompiledMultilinePattern(regexPattern, true);
-        return getBoundariesByPatternWithLineBreaks(textBlock, group, pattern);
+        return getTextRangesByPatternWithLineBreaks(textBlock, group, pattern);
     }
 
 
-    public static List<TextRange> findBoundariesByRegexIgnoreCase(String regexPattern, int group, TextBlock textBlock) {
+    public static List<TextRange> findTextRangesByRegexIgnoreCase(String regexPattern, int group, TextBlock textBlock) {
 
         Pattern pattern = Patterns.getCompiledPattern(regexPattern, true);
-        return getBoundariesByPattern(textBlock, group, pattern);
+        return getTextRangesByPattern(textBlock, group, pattern);
     }
 
 
-    private static List<TextRange> getBoundariesByPattern(TextBlock textBlock, int group, Pattern pattern) {
+    private static List<TextRange> getTextRangesByPattern(TextBlock textBlock, int group, Pattern pattern) {
 
         Matcher matcher = pattern.matcher(textBlock.subSequence(textBlock.getTextRange()));
         List<TextRange> boundaries = new LinkedList<>();
@@ -151,7 +151,7 @@ public class RedactionSearchUtility {
     }
 
 
-    private static List<TextRange> getBoundariesByPatternWithLineBreaks(TextBlock textBlock, int group, Pattern pattern) {
+    private static List<TextRange> getTextRangesByPatternWithLineBreaks(TextBlock textBlock, int group, Pattern pattern) {
 
         String searchTextWithLineBreaks = textBlock.searchTextWithLineBreaks();
         Matcher matcher = pattern.matcher(searchTextWithLineBreaks);
@@ -163,7 +163,7 @@ public class RedactionSearchUtility {
     }
 
 
-    public static List<TextRange> findBoundariesByString(String searchString, TextBlock textBlock) {
+    public static List<TextRange> findTextRangesByString(String searchString, TextBlock textBlock) {
 
         List<TextRange> boundaries = new LinkedList<>();
         for (int index = textBlock.indexOf(searchString); index >= 0; index = textBlock.indexOf(searchString, index + 1)) {
@@ -173,10 +173,10 @@ public class RedactionSearchUtility {
     }
 
 
-    public static List<TextRange> findBoundariesByStringIgnoreCase(String searchString, TextBlock textBlock) {
+    public static List<TextRange> findTextRangesByStringIgnoreCase(String searchString, TextBlock textBlock) {
 
         Pattern pattern = Pattern.compile(Pattern.quote(searchString), Pattern.CASE_INSENSITIVE);
-        return getBoundariesByPattern(textBlock, 0, pattern);
+        return getTextRangesByPattern(textBlock, 0, pattern);
     }
 
 }

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
+package com.iqser.red.service.redaction.v1.server.utils;
 
 import java.io.BufferedReader;
 import java.io.IOException;