DM-285: Entity to component mappings with new ruleset

* refactoring structure
* added custom syntax validation, such that rule files may not be corrupted

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/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

@@ -5,8 +5,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
 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 +16,14 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class RedactionController implements RedactionResource {
 
-    private final DroolsExecutionService droolsExecutionService;
+    private final DroolsSyntaxValidationService droolsSyntaxValidationService;
 
 
     @Override
     public DroolsSyntaxValidation testRules(@RequestBody String rules) {
 
         try {
-            return droolsExecutionService.testRules(rules);
+            return droolsSyntaxValidationService.testRules(rules);
         } 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/model/KieWrapper.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 org.kie.api.runtime.KieContainer;
 

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

@@ -1,14 +1,14 @@
-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.entity.Entity;
+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;

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/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,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;
 
@@ -7,14 +7,14 @@ import java.util.LinkedList;
 import java.util.List;
 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.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.TableCell;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
+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/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/Entity.java

@@ -1,10 +1,12 @@
-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.drools.RuleIdentifier;
+
 import lombok.NonNull;
 
 public interface Entity {
@@ -15,7 +17,19 @@ 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.
+    // 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 +48,9 @@ public interface Entity {
     }
 
 
-    default boolean applied() {
+    default boolean active() {
 
-        return getManualOverwrite().getApplied().orElse(getMatchedRule().isApplied());
+        return !(removed() || ignored());
     }
 
 
@@ -52,12 +66,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 +87,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 +105,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/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/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;
@@ -11,10 +11,10 @@ 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.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;

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,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;
@@ -9,13 +9,13 @@ 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.entity.Entity;
+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;

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;
 

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;
 
@@ -13,13 +13,13 @@ 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.TextRange;
+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 com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility;
 
 public interface SemanticNode {
 

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/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,22 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import java.util.List;
+import java.util.Objects;
+
+public record RuleClass(RuleType ruleType, List<RuleUnit> ruleUnits) {
+
+    public RuleUnit findRuleUnitByInteger(Integer unit) {
+
+        return ruleUnits.stream()
+                .filter(ruleUnit -> Objects.equals(ruleUnit.unit(), unit))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException(String.format("RuleUnit %d does not exist in class %s", unit, this)));
+    }
+
+
+    public boolean ruleUnitExists(Integer unit) {
+
+        return ruleUnits.stream().anyMatch(ruleUnit -> Objects.equals(ruleUnit.unit(), unit));
+    }
+
+}

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

@@ -0,0 +1,78 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
+import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
+
+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;
+    String queries;
+    int queriesLine;
+    List<RuleClass> ruleClasses;
+    DroolsSyntaxValidation droolsSyntaxValidation;
+
+
+    public RuleClass findRuleClassByType(RuleType ruleType) {
+
+        return ruleClasses.stream()
+                .filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType))
+                .findFirst()
+                .orElseThrow(() -> new NotFoundException(String.format("RuleType %s does not exist in this BluePrint %s", ruleType.name(), this)));
+    }
+
+
+
+    public List<BasicRule> findRulesByIdentifier(RuleIdentifier ruleIdentifier) {
+
+        if (Objects.isNull(ruleIdentifier.unit())) {
+            return findRuleClassByType(ruleIdentifier.type()).ruleUnits().stream().map(RuleUnit::rules).flatMap(Collection::stream).toList();
+        }
+        return findRuleClassByType(ruleIdentifier.type()).findRuleUnitByInteger(ruleIdentifier.unit())
+                .rules()
+                .stream()
+                .filter(rule -> rule.getIdentifier().matches(ruleIdentifier))
+                .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,89 @@
+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("\\.");
+        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,17 @@
+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) {
+
+        assert alphaNumeric.matcher(value).matches();
+        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

@@ -7,7 +7,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 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.service.AnalyzeService;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,6 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
+package com.iqser.red.service.redaction.v1.server.service;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -23,18 +21,21 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlo
 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.model.NerEntities;
 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.service.graph.DocumentGraphMapper;
+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.drools.EntityDroolsExecutionService;
+import com.iqser.red.service.redaction.v1.server.service.drools.KieContainerCreationService;
+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.ManualEntity;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.service.graph.ManualRedactionEntryService;
+import com.iqser.red.service.redaction.v1.server.service.graph.NerEntitiesAdapter;
+import com.iqser.red.service.redaction.v1.server.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
 import io.micrometer.core.annotation.Timed;
@@ -53,9 +54,10 @@ public class AnalyzeService {
     private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
 
     DictionaryService dictionaryService;
-    DroolsExecutionService droolsExecutionService;
-    EntityRedactionService entityRedactionService;
-    RedactionLogCreatorService redactionLogCreatorService;
+    EntityDroolsExecutionService entityDroolsExecutionService;
+    KieContainerCreationService kieContainerCreationService;
+    DictionarySearchService dictionarySearchService;
+    EntityLogCreatorService entityLogCreatorService;
     RedactionStorageService redactionStorageService;
     RedactionChangeLogService redactionChangeLogService;
     LegalBasisClient legalBasisClient;
@@ -85,16 +87,23 @@ public class AnalyzeService {
         Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
         log.info("Updated Dictionaries for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
+        var wrapper = kieContainerCreationService.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);
 
-        entityRedactionService.addDictionaryEntities(dictionary, document);
+        dictionarySearchService.addDictionaryEntities(dictionary, document);
         log.info("Finished Dictionary Search for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
-        Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary, document, wrapper.container(), analyzeRequest, nerEntities);
+        List<FileAttribute> addedFileAttributes = entityDroolsExecutionService.executeRules(wrapper.container(),
+                document,
+                dictionary,
+                analyzeRequest.getFileAttributes(),
+                analyzeRequest.getManualRedactions(),
+                nerEntities);
         log.info("Finished Rule Execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
-        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(document,
+        List<RedactionLogEntry> redactionLogEntries = entityLogCreatorService.createRedactionLog(document,
                 analyzeRequest.getDossierTemplateId(),
                 notFoundManualRedactionEntries,
                 getComments(analyzeRequest));
@@ -116,7 +125,7 @@ public class AnalyzeService {
                 true);
         redactionLog.setRedactionLogEntry(importedRedactionFilteredEntries);
 
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, document.getNumberOfPages(), dictionary.getVersion(), false, addedFileAttributes);
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, document.getNumberOfPages(), dictionary.getVersion(), false, new HashSet<>(addedFileAttributes));
     }
 
 
@@ -163,13 +172,13 @@ public class AnalyzeService {
                     document.getNumberOfPages(),
                     dictionaryIncrement.getDictionaryVersion(),
                     true,
-                    new HashSet<>());
+                    Collections.emptySet());
         }
 
         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());
+        var wrapper = kieContainerCreationService.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);
@@ -177,18 +186,19 @@ public class AnalyzeService {
         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));
+        sectionsToReAnalyse.forEach(node -> dictionarySearchService.addDictionaryEntities(dictionary, node));
         log.info("Finished Dictionary Search for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
-        Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary,
+        List<FileAttribute> allFileAttributes = entityDroolsExecutionService.executeRules(wrapper.container(),
                 document,
                 sectionsToReAnalyse,
-                wrapper.container(),
-                analyzeRequest,
+                dictionary,
+                analyzeRequest.getFileAttributes(),
+                analyzeRequest.getManualRedactions(),
                 nerEntities);
         log.info("Finished Rule Execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
-        List<RedactionLogEntry> newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(document,
+        List<RedactionLogEntry> newRedactionLogEntries = entityLogCreatorService.createRedactionLog(document,
                 analyzeRequest.getDossierTemplateId(),
                 notFoundManualRedactionEntries,
                 getComments(analyzeRequest));
@@ -200,7 +210,7 @@ public class AnalyzeService {
                 false);
 
         previousRedactionLog.getRedactionLogEntry()
-                .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(IMPORTED_REDACTION_TYPE));
+                .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(ImportedRedactionService.IMPORTED_REDACTION_TYPE));
         previousRedactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
 
         return finalizeAnalysis(analyzeRequest,
@@ -209,7 +219,7 @@ public class AnalyzeService {
                 document.getNumberOfPages(),
                 dictionaryIncrement.getDictionaryVersion(),
                 true,
-                addedFileAttributes);
+                new HashSet<>(allFileAttributes));
     }
 
 

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

@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.server.service;
+
+public class ComponentCreationService {
+
+}

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

@@ -0,0 +1,53 @@
+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.redactionlog.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.graph.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.service.graph.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.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/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/EntityLogCreatorService.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;
@@ -17,13 +17,13 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlo
 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.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;
@@ -31,7 +31,7 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class RedactionLogCreatorService {
+public class EntityLogCreatorService {
 
     private final DictionaryService dictionaryService;
     private final ManualChangeFactory manualChangeFactory;
@@ -45,7 +45,7 @@ public class RedactionLogCreatorService {
         List<RedactionLogEntry> entries = new ArrayList<>();
         document.getEntities()
                 .stream()
-                .filter(RedactionLogCreatorService::isEntityOrRecommendationType)
+                .filter(EntityLogCreatorService::isEntityOrRecommendationType)
                 .filter(entity -> !entity.removed())
                 .forEach(entityNode -> entries.addAll(toRedactionLogEntries(entityNode, dossierTemplateId, comments)));
         document.streamAllImages().filter(image -> !image.removed()).forEach(imageNode -> entries.add(createRedactionLogEntry(imageNode, dossierTemplateId, comments)));

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ImportedRedactionService.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.util.HashSet;
 import java.util.List;

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;

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.Entity;
+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.graph.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
 
 import lombok.RequiredArgsConstructor;
 

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/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;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -21,11 +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.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.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
+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 io.micrometer.core.annotation.Timed;
 import lombok.AccessLevel;

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

@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.server.service.drools;
+
+import org.springframework.stereotype.Service;
+
+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 {
+
+
+}

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

@@ -0,0 +1,107 @@
+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.redaction.v1.model.DroolsSyntaxErrorMessage;
+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
+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(String rules) {
+
+        DroolsSyntaxValidation customDroolsSyntaxValidation = buildCustomDroolsSyntaxValidation(rules);
+        DroolsSyntaxValidation droolsCompilerSyntaxValidation = buildDroolsCompilerSyntaxValidation(rules);
+        droolsCompilerSyntaxValidation.getDroolsSyntaxErrorMessages().addAll(customDroolsSyntaxValidation.getDroolsSyntaxErrorMessages());
+        return droolsCompilerSyntaxValidation;
+    }
+
+
+    private DroolsSyntaxValidation buildCustomDroolsSyntaxValidation(String ruleString) {
+
+        RuleFileBluePrint ruleFileBluePrint = RuleFileParser.buildBluePrintFromRulesString(ruleString);
+        DroolsSyntaxValidation customSyntaxValidation = ruleFileBluePrint.getDroolsSyntaxValidation();
+        RuleFileBluePrint baseRuleFileBluePrint = RuleFileParser.buildBluePrintFromRulesString(RuleManagementResources.getBaseRuleFileInputStreamString());
+        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.getQueries().equals(baseRuleFileBluePrint.getQueries())) {
+            customSyntaxValidation.getDroolsSyntaxErrorMessages()
+                    .add(DroolsSyntaxErrorMessage.builder()
+                            .line(ruleFileBluePrint.getQueriesLine())
+                            .column(0)
+                            .message(String.format("Changing the queries is not allowed! Must be: %n%s", baseRuleFileBluePrint.getQueries()))
+                            .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.streamAllRules().forEach(basicRule -> {
+            if (!validateBaseRulesArePresent(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 validateBaseRulesArePresent(BasicRule basicRule, RuleFileBluePrint ruleFileBluePrint) {
+
+        return ruleFileBluePrint.findRulesByIdentifier(basicRule.getIdentifier()).stream().allMatch(otherRule -> otherRule.getCode().equals(basicRule.getCode()));
+    }
+
+
+    private DroolsSyntaxValidation buildDroolsCompilerSyntaxValidation(String rules) {
+
+        var versionId = System.currentTimeMillis();
+        var testRules = "test-rules";
+        KieBuilder kieBuilder = kieContainerCreationService.registerNewKieContainerVersion(testRules, versionId, rules);
+        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,8 +1,5 @@
-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.CompletableFuture;
@@ -27,17 +24,13 @@ 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.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.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.graph.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.service.graph.EntityEnrichmentService;
+import com.iqser.red.service.redaction.v1.server.service.ManualChangesApplicationService;
+import com.iqser.red.service.redaction.v1.server.model.NerEntities;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
 
 import io.micrometer.core.annotation.Timed;
 import lombok.AccessLevel;
@@ -49,9 +42,7 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 @RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-public class DroolsExecutionService {
-
-    RulesClient rulesClient;
+public class EntityDroolsExecutionService {
 
     EntityEnrichmentService entityEnrichmentService;
 

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

@@ -0,0 +1,77 @@
+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.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.model.KieWrapper;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class KieContainerCreationService {
+
+    private final RulesClient rulesClient;
+
+    public KieWrapper getLatestKieContainer(String dossierTemplateId) {
+
+        long version = rulesClient.getVersion(dossierTemplateId);
+
+        return new KieWrapper(getKieContainer(dossierTemplateId, version), version);
+
+    }
+
+
+    private ReleaseId getReleaseId(String dossierTemplate, long version) {
+
+        KieServices kieServices = KieServices.Factory.get();
+        return kieServices.newReleaseId("com.knecon.rules", TenantContext.getTenantId() + ":" + dossierTemplate, String.format("1.%d", version));
+    }
+    public 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());
+    }
+
+
+    public 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();
+    }
+
+}

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.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);
+        StringBuilder queryBuilder = new StringBuilder();
+        List<BasicRule> allRules = new LinkedList<>();
+        for (RuleDescr rule : packageDescr.getRules()) {
+            if (rule.isQuery()) {
+                queryBuilder.append(ruleString, rule.getStartCharacter(), rule.getEndCharacter());
+                queryBuilder.append("\n\n");
+                continue;
+            }
+            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),
+                queryBuilder.toString().trim(),
+                packageDescr.getRules().stream().filter(RuleDescr::isQuery).findFirst().map(RuleDescr::getLine).orElse(0),
+                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/service/graph/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.graph;
 
 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/graph/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.graph;
 
-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;
@@ -18,25 +18,24 @@ 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.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;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/graph/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.graph;
 
 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/graph/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.graph;
 
 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/graph/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.graph;
 
 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/graph/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.graph;
 
 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/graph/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.graph;
 
 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/storage/RedactionStorageService.java

@@ -11,8 +11,8 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlo
 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;

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

@@ -0,0 +1,29 @@
+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 getBaseRuleFileInputStreamString() {
+
+        try (var in = getBaseRuleFileInputStream()) {
+            return new String(in.readAllBytes());
+        }
+    }
+
+}

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;
 

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;

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

@@ -1,10 +1,10 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
+package com.iqser.red.service.redaction.v1.server.utils;
 
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import com.iqser.red.service.redaction.v1.server.document.graph.TextRange;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
 
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/TextNormalizationUtilities.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 lombok.experimental.UtilityClass;
 

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.exception;
+package com.iqser.red.service.redaction.v1.server.utils.exception;
 
 public class NotFoundException extends RuntimeException {
 

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.exception;
+package com.iqser.red.service.redaction.v1.server.utils.exception;
 
 public class RedactionException extends RuntimeException {
 

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.exception;
+package com.iqser.red.service.redaction.v1.server.utils.exception;
 
 public class RulesValidationException extends RuntimeException {
 

redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_rules.drl

@@ -0,0 +1,89 @@
+package drools
+
+import static java.lang.String.format;
+import static com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility.anyMatch;
+import static com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility.exactMatch;
+
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.stream.Stream;
+import java.util.Optional;
+
+import com.iqser.red.service.redaction.v1.server.model.document.*;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.*;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+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.entity.MatchedRule
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.*;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Section;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Paragraph;
+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.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Headline;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SectionIdentifier;
+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.NodeType;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.*;
+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.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.ConcatenatedTextBlock;
+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.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.service.graph.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.service.ManualChangesApplicationService;
+import com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility;
+
+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.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
+global Document document
+global EntityCreationService entityCreationService
+global ManualChangesApplicationService manualChangesApplicationService
+global Dictionary dictionary
+
+/**
+This file contains all the rules that are in the templates.
+The Imports from this file are all that are possible and will be imported for all entity files.
+Since customers may edit their rules we need to ensure they can't change the imports to prevent malicious code execution!
+*/
+
+//------------------------------------ queries ------------------------------------
+
+query "getFileAttributes"
+    $fileAttribute: FileAttribute()
+    end
+
+//------------------------------------ Local dictionary search rules ------------------------------------
+
+// Rule unit: LocalDictionarySearch.0
+rule "LDS.0.0: run local dictionary search"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
+    salience -999
+    when
+        $dictionaryModel: DictionaryModel(!localEntriesWithMatchedRules.isEmpty()) from dictionary.getDictionaryModels()
+    then
+        entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
+            .forEach(entity ->  {
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
+                entity.addMatchedRules(matchedRules);
+            });
+    end
+
+// Everything above this comment will be prepended to any entity rule file before execution.

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java

@@ -11,9 +11,9 @@ import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.service.AnalyzeService;
+import com.iqser.red.service.redaction.v1.server.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.utils.LayoutParsingRequestProvider;
 import com.iqser.red.storage.commons.service.StorageService;

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java

@@ -33,8 +33,8 @@ import com.iqser.red.service.dictionarymerge.commons.DictionaryEntryModel;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.Colors;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryVersion;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.service.DictionaryService;
 import com.iqser.red.storage.commons.service.StorageService;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 import com.knecon.fforesight.tenantcommons.TenantsClient;

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java

@@ -61,9 +61,9 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlo
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.server.annotate.AnnotateRequest;
 import com.iqser.red.service.redaction.v1.server.annotate.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.server.document.data.mapper.DocumentGraphMapper;
-import com.iqser.red.service.redaction.v1.server.document.graph.TextRange;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Section;
+import com.iqser.red.service.redaction.v1.server.service.graph.DocumentGraphMapper;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Section;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.OsUtils;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java

@@ -14,9 +14,9 @@ import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.service.AnalyzeService;
+import com.iqser.red.service.redaction.v1.server.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.utils.LayoutParsingRequestProvider;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java

@@ -36,9 +36,9 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlo
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.CellRectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionRectangle;
-import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.utils.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
 import lombok.RequiredArgsConstructor;