Merge branch 'RED-8615-bp' into 'release/4.244.x'

RED-8615: backport See merge request redactmanager/redaction-service!292
RED-8615: backport
2024-02-28 13:12:54 +01:00 · 2024-02-28 13:12:54 +01:00 · 2024-02-27 10:04:38 +01:00 · 2024-02-27 10:04:38 +01:00 · 2024-02-26 17:55:40 +01:00 · 2024-02-26 17:55:40 +01:00
44 changed files with 251 additions and 2545 deletions
@@ -21,16 +21,3 @@ deploy:
    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
    - if: $CI_COMMIT_BRANCH =~ /^release/
    - if: $CI_COMMIT_TAG
-
-pages:
-  stage: build
-  tags:
-    - dind
-  script:
-    - echo "Generating Javadoc..."
-    - gradle generateJavaDoc -PjavadocDestinationDir="javadoc"
-    - mkdir public
-    - mv redaction-service-v1/redaction-service-server-v1/javadoc/* public/
-  artifacts:
-    paths:
-      - public
@@ -7,7 +7,7 @@ description = "redaction-service-api-v1"

 dependencies {
    implementation("org.springframework:spring-web:6.0.12")
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.351.0")
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.338.0")
 }

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

    @Builder.Default
    List<DroolsSyntaxErrorMessage> droolsSyntaxErrorMessages = new LinkedList<>();
-    @Builder.Default
-    List<DroolsSyntaxDeprecatedWarnings> droolsSyntaxDeprecatedWarnings = new LinkedList<>();


    public void addErrorMessage(int line, int column, String message) {
@@ -12,11 +12,11 @@ plugins {
 description = "redaction-service-server-v1"


-val layoutParserVersion = "0.94.0"
+val layoutParserVersion = "0.91.0"
 val jacksonVersion = "2.15.2"
 val droolsVersion = "9.44.0.Final"
 val pdfBoxVersion = "3.0.0"
-val persistenceServiceVersion = "2.360.0"
+val persistenceServiceVersion = "2.349.3"
 val springBootStarterVersion = "3.1.5"

 configurations {
@@ -60,8 +60,6 @@ dependencies {
    implementation("net.logstash.logback:logstash-logback-encoder:7.4")
    implementation("ch.qos.logback:logback-classic")

-    implementation("org.reflections:reflections:0.10.2")
-
    testImplementation(project(":rules-management"))
    testImplementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
    testImplementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
@@ -84,6 +82,9 @@ tasks.test {
    maxHeapSize = "1024m"
 }

+
+
+
 tasks.named<BootBuildImage>("bootBuildImage") {

    environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
@@ -110,40 +111,3 @@ tasks.named<BootBuildImage>("bootBuildImage") {
        tags.set(listOf(dockerTag))
    }
 }
-
-fun parseDroolsImports(droolsFilePath: String): List<String> {
-    val imports = mutableListOf<String>()
-    val importPattern = Regex("^import\\s+(com\\.iqser\\.red\\.service\\.redaction\\.v1\\.[\\w.]+);")
-    val desiredPrefix = "com.iqser.red.service.redaction.v1"
-
-    File(droolsFilePath).forEachLine { line ->
-        importPattern.find(line)?.let { matchResult ->
-            val importPath = matchResult.groupValues[1].trim()
-            if (importPath.startsWith(desiredPrefix)) {
-                val formattedPath = importPath.replace('.', '/')
-                imports.add("$formattedPath.java")
-            }
-        }
-    }
-
-    return imports
-}
-
-val droolsImports = parseDroolsImports("redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/all_rules_documine.drl")
-
-tasks.register("generateJavaDoc", Javadoc::class) {
-    dependsOn("compileJava")
-    dependsOn("delombok")
-    classpath = project.sourceSets["main"].runtimeClasspath
-    source = fileTree("${buildDir}/generated/sources/delombok/java/main") {
-        include(droolsImports)
-    }
-    destinationDir = file(project.findProperty("javadocDestinationDir")?.toString() ?: "")
-
-    options.memberLevel = JavadocMemberLevel.PUBLIC
-    (options as StandardJavadocDocletOptions).apply {
-        header = "Redaction Service ${project.version}"
-        footer = "Redaction Service ${project.version}"
-        title = "API Documentation for Redaction Service ${project.version}"
-    }
-}
@@ -46,18 +46,10 @@ public class Application {
        return new TimedAspect(registry);
    }

-
    @Bean
    public DictionaryMergeService dictionaryMergeService() {

        return new DictionaryMergeService();
    }

-
-    @Bean(initMethod = "findDeprecatedMethods")
-    public DeprecatedElementsFinder deprecatedElementsFinder() {
-
-        return new DeprecatedElementsFinder();
-    }
-
 }
@@ -1,108 +0,0 @@
-package com.iqser.red.service.redaction.v1.server;
-
-import static java.util.stream.Collectors.groupingBy;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.reflections.Reflections;
-import org.reflections.scanners.Scanners;
-import org.reflections.util.ConfigurationBuilder;
-
-import com.iqser.red.service.redaction.v1.server.model.dictionary.SearchImplementation;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class DeprecatedElementsFinder {
-
-    public static final String PACKAGE_NAME = "com.iqser.red.service.redaction.v1.server";
-    private Set<Method> deprecatedMethods;
-    @Getter
-    private Map<String, String> deprecatedMethodsSignaturesMap;
-    private Set<Class<?>> deprecatedClasses;
-    @Getter
-    private SearchImplementation classesSearchImplementation;
-    @Getter
-    private SearchImplementation methodsSearchImplementation;
-
-
-    public void findDeprecatedMethods() {
-
-        deprecatedMethods = new HashSet<>();
-        deprecatedClasses = new HashSet<>();
-        deprecatedMethodsSignaturesMap = new HashMap<>();
-
-        Reflections reflections = new Reflections(new ConfigurationBuilder().forPackage(PACKAGE_NAME)
-                                                          .setExpandSuperTypes(true)
-                                                          .setScanners(Scanners.MethodsAnnotated, Scanners.TypesAnnotated, Scanners.SubTypes));
-
-        deprecatedMethods = reflections.get(Scanners.MethodsAnnotated.with(Deprecated.class).as(Method.class));
-
-        deprecatedClasses = reflections.get(Scanners.TypesAnnotated.with(Deprecated.class).asClass());
-
-        if (!deprecatedClasses.isEmpty()) {
-            deprecatedClasses.forEach(deprecatedType -> deprecatedMethods.addAll(Arrays.stream(deprecatedType.getDeclaredMethods())
-                                                                                         .collect(Collectors.toSet())));
-            classesSearchImplementation = new SearchImplementation(deprecatedClasses.stream()
-                                                                           .map(Class::getName)
-                                                                           .collect(Collectors.toSet()), false);
-        }
-
-        if (!deprecatedMethods.isEmpty()) {
-            methodsSearchImplementation = new SearchImplementation(deprecatedMethods.stream()
-                                                                           .map(Method::getName)
-                                                                           .collect(Collectors.toSet()), false);
-            deprecatedMethodsSignaturesMap = new HashMap<>();
-            Map<String, List<Method>> deprecatedMethodsNameMap = deprecatedMethods.stream()
-                    .collect(groupingBy(Method::getName));
-            for (String deprecatedMethod : deprecatedMethodsNameMap.keySet()) {
-                deprecatedMethodsSignaturesMap.computeIfAbsent(deprecatedMethod,
-                                                               key -> deprecatedMethodsNameMap.get(deprecatedMethod)
-                                                                       .stream()
-                                                                       .map(this::getMethodSignature)
-                                                                       .collect(Collectors.joining("\n")));
-            }
-
-        }
-
-        log.info("For package: {} found deprecated classes {} deprecated methods {}", PACKAGE_NAME, deprecatedClasses.size(), deprecatedMethods.size());
-    }
-
-
-    public Set<Method> getDeprecatedMethods() {
-
-        if (this.deprecatedMethods == null) {
-            findDeprecatedMethods();
-        }
-        return this.deprecatedMethods;
-    }
-
-
-    public Set<Class<?>> getDeprecatedClasses() {
-
-        if (this.deprecatedClasses == null) {
-            findDeprecatedMethods();
-        }
-        return this.deprecatedClasses;
-    }
-
-    private String getMethodSignature(Method method) {
-
-        String methodName = method.getName();
-        String parameterTypes = Arrays.stream(method.getGenericParameterTypes())
-                .map(Type::getTypeName)
-                .collect(Collectors.joining(", "));
-
-        return method.getGenericReturnType() + " " + methodName + "(" + parameterTypes + ")";
-    }
-
-}
@@ -27,12 +27,12 @@ import lombok.experimental.FieldDefaults;
 public class ManualChangeOverwrite {

    private static final Map<Class<? extends BaseAnnotation>, String> MANUAL_CHANGE_DESCRIPTIONS = Map.of(//
-                                                                                                          ManualRedactionEntry.class, "created by manual change", //
-                                                                                                          ManualLegalBasisChange.class, "legal basis was manually changed", //
-                                                                                                          ManualResizeRedaction.class, "resized by manual override", //
-                                                                                                          ManualForceRedaction.class, "forced by manual override", //
-                                                                                                          IdRemoval.class, "removed by manual override", //
-                                                                                                          ManualRecategorization.class, "recategorized by manual override");
+            ManualRedactionEntry.class, "created by manual change", //
+            ManualLegalBasisChange.class, "legal basis was manually changed", //
+            ManualResizeRedaction.class, "resized by manual override", //
+            ManualForceRedaction.class, "forced by manual override", //
+            IdRemoval.class, "removed by manual override", //
+            ManualRecategorization.class, "recategorized by manual override");

    List<BaseAnnotation> manualChanges = new LinkedList<>();
    boolean changed;
@@ -80,8 +80,7 @@ public class ManualChangeOverwrite {
        manualChanges.sort(Comparator.comparing(BaseAnnotation::getRequestDate));
        updateFields(manualChanges);
        // make list unmodifiable.
-        return manualChanges.stream()
-                .toList();
+        return manualChanges.stream().toList();
    }


@@ -122,18 +121,14 @@ public class ManualChangeOverwrite {
                resized = true;
                // This is only for not found Manual Entities.
                value = manualResizeRedaction.getValue();
-                positions = manualResizeRedaction.getPositions()
-                        .stream()
-                        .map(RectangleWithPage::fromAnnotationRectangle)
-                        .toList();
+                positions = manualResizeRedaction.getPositions().stream().map(RectangleWithPage::fromAnnotationRectangle).toList();
            }

            if (manualChange instanceof ManualRecategorization recategorization) {
+                // recategorization logic happens in ManualChangesApplicationService.
                recategorized = true;
+                // this is only relevant for ManualEntities. Image and TextEntity is recategorized in the ManualChangesApplicationService.
                type = recategorization.getType();
-                if (recategorization.getLegalBasis() != null && !recategorization.getLegalBasis().isEmpty()) {
-                    legalBasis = recategorization.getLegalBasis();
-                }
            }

            descriptions.add(MANUAL_CHANGE_DESCRIPTIONS.get(manualChange.getClass()));
@@ -14,7 +14,6 @@ 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 com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -34,8 +33,6 @@ public class Document implements GenericSemanticNode {

    @EqualsAndHashCode.Include
    List<Integer> treeId = Collections.emptyList();
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));

    Set<Page> pages;
    DocumentTree documentTree;
@@ -9,7 +9,6 @@ import java.util.Set;
 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.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -28,8 +27,6 @@ import lombok.experimental.FieldDefaults;
 public class Footer implements GenericSemanticNode {

    final static SectionIdentifier sectionIdentifier = SectionIdentifier.empty();
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));

    @EqualsAndHashCode.Include
    List<Integer> treeId;
@@ -9,7 +9,6 @@ import java.util.Set;
 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.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -28,8 +27,6 @@ import lombok.experimental.FieldDefaults;
 public class Header implements GenericSemanticNode {

    final static SectionIdentifier sectionIdentifier = SectionIdentifier.empty();
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));

    @EqualsAndHashCode.Include
    List<Integer> treeId;
@@ -10,7 +10,6 @@ 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.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -28,8 +27,6 @@ import lombok.experimental.FieldDefaults;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Headline implements GenericSemanticNode {

-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
    @EqualsAndHashCode.Include
    List<Integer> treeId;
    TextBlock leafTextBlock;
@@ -18,7 +18,6 @@ import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRu
 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 com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -36,9 +35,6 @@ import lombok.experimental.FieldDefaults;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Image implements GenericSemanticNode, IEntity {

-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-
    @EqualsAndHashCode.Include
    List<Integer> treeId;
    String id;
@@ -74,9 +70,7 @@ public class Image implements GenericSemanticNode, IEntity {
    @Override
    public TextBlock getTextBlock() {

-        return streamAllSubNodes().filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getLeafTextBlock)
-                .collect(new TextBlockCollector());
+        return streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
    }


@@ -97,8 +91,7 @@ public class Image implements GenericSemanticNode, IEntity {
    @Override
    public String type() {

-        return getManualOverwrite().getType()
-                .orElse(imageType.toString());
+        return getManualOverwrite().getType().orElse(imageType.toString());
    }


@@ -131,32 +124,6 @@ public class Image implements GenericSemanticNode, IEntity {
    }


-    public boolean mostlyContainedBy(Image image, double containmentThreshold) {
-
-        Map<Page, Rectangle2D> bboxImage = image.getBBox();
-        Map<Page, Rectangle2D> bbox = this.getBBox();
-        //image needs to be on the same page
-        if(bboxImage.get(this.page) != null) {
-            Rectangle2D intersection = bboxImage.get(this.page).createIntersection(bbox.get(this.page));
-            double calculatedIntersection = intersection.getWidth() * intersection.getHeight();
-            double area = bbox.get(this.page).getWidth() * bbox.get(this.page).getHeight();
-            return (calculatedIntersection / area) > containmentThreshold;
-        }
-        return false;
-    }
-
-
-    public boolean mostlyContains(Image image, double containmentThreshold) {
-
-        Map<Page, Rectangle2D> bboxImage = image.getBBox();
-        Map<Page, Rectangle2D> bbox = this.getBBox();
-        Rectangle2D intersection = bbox.get(this.page).createIntersection(bboxImage.get(this.page));
-        double calculatedIntersection = intersection.getWidth() * intersection.getHeight();
-        double area = bbox.get(this.page).getWidth() * bbox.get(this.page).getHeight();
-        return (area / calculatedIntersection) > containmentThreshold;
-    }
-
-
    public int length() {

        return 0;
@@ -9,7 +9,6 @@ import java.util.Set;
 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.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -25,9 +24,6 @@ import lombok.experimental.FieldDefaults;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Paragraph implements GenericSemanticNode {

-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-
    @EqualsAndHashCode.Include
    List<Integer> treeId;
    TextBlock leafTextBlock;
@@ -10,14 +10,12 @@ import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntit
 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 com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;

@@ -28,7 +26,6 @@ import lombok.extern.slf4j.Slf4j;
@FieldDefaults(level = AccessLevel.PRIVATE)
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Section implements GenericSemanticNode {
-
    @EqualsAndHashCode.Include
    List<Integer> treeId;

@@ -40,9 +37,6 @@ public class Section implements GenericSemanticNode {

    Map<Page, Rectangle2D> bBoxCache;

-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-

    @Override
    public NodeType getType() {
@@ -22,7 +22,6 @@ import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBl
 import com.iqser.red.service.redaction.v1.server.service.document.NodeVisitor;
 import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
 import com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 public interface SemanticNode {

@@ -357,13 +356,6 @@ public interface SemanticNode {
        return getTextBlock().getSearchText().contains(string);
    }

-    Set<LayoutEngine> getEngines();
-
-    default void addEngine(LayoutEngine engine) {
-        getEngines().add(engine);
-    }
-
-

    /**
     * Checks whether this SemanticNode contains all the provided Strings.
@@ -562,6 +554,7 @@ public interface SemanticNode {
            if (textBlock.containsTextRange(textEntity.getTextRange())) {
                textEntity.setDeepestFullyContainingNode(this);
            }
+
            textEntity.addIntersectingNode(this);
            streamChildren().filter(semanticNode -> semanticNode.getTextRange().intersects(textEntity.getTextRange()))
                    .forEach(node -> node.addThisToEntityIfIntersects(textEntity));
@@ -17,7 +17,6 @@ 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 com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -33,8 +32,6 @@ import lombok.experimental.FieldDefaults;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Table implements SemanticNode {

-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
    @EqualsAndHashCode.Include
    List<Integer> treeId;
    DocumentTree documentTree;
@@ -11,7 +11,6 @@ import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntit
 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 com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;

 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -27,9 +26,6 @@ import lombok.experimental.FieldDefaults;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class TableCell implements GenericSemanticNode {

-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-
    @EqualsAndHashCode.Include
    List<Integer> treeId;
    int row;
@@ -26,9 +26,10 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
@RequiredArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@FieldDefaults(makeFinal=true, level= AccessLevel.PRIVATE)
 public class EntityChangeLogService {

+
    @Timed("redactmanager_computeChanges")
    public boolean computeChanges(List<EntityLogEntry> previousEntityLogEntries, List<EntityLogEntry> newEntityLogEntries, ManualRedactions manualRedactions, int analysisNumber) {

@@ -41,9 +42,7 @@ public class EntityChangeLogService {
        boolean hasChanges = false;

        for (EntityLogEntry entityLogEntry : newEntityLogEntries) {
-            Optional<EntityLogEntry> optionalPreviousEntity = previousEntityLogEntries.stream()
-                    .filter(entry -> entry.getId().equals(entityLogEntry.getId()))
-                    .findAny();
+            Optional<EntityLogEntry> optionalPreviousEntity = previousEntityLogEntries.stream().filter(entry -> entry.getId().equals(entityLogEntry.getId())).findAny();
            if (optionalPreviousEntity.isEmpty()) {
                hasChanges = true;
                entityLogEntry.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, now));
@@ -57,29 +56,45 @@ public class EntityChangeLogService {
                ChangeType changeType = calculateChangeType(entityLogEntry.getState(), previousEntity.getState());
                entityLogEntry.getChanges().add(new Change(analysisNumber, changeType, now));
            }
+
+            addManualChanges(entityLogEntry, previousEntity);
        }
        addRemovedEntriesAsRemoved(previousEntityLogEntries, newEntityLogEntries, manualRedactions, analysisNumber, now);
        return hasChanges;
    }


-    private void addRemovedEntriesAsRemoved(List<EntityLogEntry> previousEntityLogEntries,
-                                            List<EntityLogEntry> newEntityLogEntries,
-                                            ManualRedactions manualRedactions,
-                                            int analysisNumber,
-                                            OffsetDateTime now) {
+    // If a manual change is present in the previous entity but not in the new entity, add it to the new one and
+    // sort them, so they are displayed in the correct order.
+    private void addManualChanges(EntityLogEntry entityLogEntry, EntityLogEntry previousEntity) {

-        Set<String> existingIds = newEntityLogEntries.stream()
-                .map(EntityLogEntry::getId)
-                .collect(Collectors.toSet());
+        Comparator<ManualChange> manualChangeComparator =
+                Comparator.comparing(ManualChange::getManualRedactionType)
+                        .thenComparing(ManualChange::getRequestedDate);
+
+        previousEntity.getManualChanges().forEach(manualChange -> {
+            boolean contains = entityLogEntry.getManualChanges()
+                    .stream()
+                    .anyMatch(existingChange -> manualChangeComparator.compare(existingChange, manualChange) == 0);
+
+            if (!contains) {
+                entityLogEntry.getManualChanges().add(manualChange);
+                entityLogEntry.getManualChanges().sort(Comparator.comparing(ManualChange::getRequestedDate));
+            }
+        });
+    }
+
+
+    private void addRemovedEntriesAsRemoved(List<EntityLogEntry> previousEntityLogEntries,
+                                                   List<EntityLogEntry> newEntityLogEntries,
+                                                   ManualRedactions manualRedactions,
+                                                   int analysisNumber,
+                                                   OffsetDateTime now) {
+
+        Set<String> existingIds = newEntityLogEntries.stream().map(EntityLogEntry::getId).collect(Collectors.toSet());
        List<EntityLogEntry> removedEntries = previousEntityLogEntries.stream()
                .filter(entry -> !existingIds.contains(entry.getId()))
-                .collect(Collectors.toList());
-        List<EntityLogEntry> removedDossierRedaction = removedEntries.stream()
-                .filter(e -> e.getState() == EntryState.REMOVED && e.getType().equals("dossier_redaction"))
                .toList();
-        previousEntityLogEntries.removeAll(removedDossierRedaction);
-        removedEntries.removeAll(removedDossierRedaction);
        removedEntries.forEach(entry -> entry.getChanges().add(new Change(analysisNumber, ChangeType.REMOVED, now)));
        removedEntries.forEach(entry -> entry.setState(EntryState.REMOVED));
        removedEntries.forEach(entry -> addManualChangeForDictionaryRemovals(entry, manualRedactions));
@@ -93,15 +108,13 @@ public class EntityChangeLogService {
            return;
        }

-        manualRedactions.getIdsToRemove()
-                .stream()
+        manualRedactions.getIdsToRemove().stream()
                .filter(IdRemoval::isRemoveFromDictionary)//
                .filter(removed -> removed.getAnnotationId().equals(entry.getId()))//
                .findFirst()//
                .ifPresent(idRemove -> entry.getManualChanges().add(ManualChangeFactory.toManualChange(idRemove, false)));
    }

-
    private ChangeType calculateChangeType(EntryState state, EntryState previousState) {

        if (state.equals(previousState)) {
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;

@@ -31,7 +30,6 @@ import com.iqser.red.service.redaction.v1.server.model.document.entity.PositionO
 import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;

 import lombok.AccessLevel;
@@ -125,7 +123,7 @@ public class EntityLogCreatorService {
                .stream()
                .filter(entry -> (newEntityIds.contains(entry.getId()) || entry.getContainingNodeId().isEmpty() || sectionsToReanalyseIds.contains(entry.getContainingNodeId()
                                                                                                                                                           .get(0))))
-                .collect(Collectors.toList());
+                .toList();
        previousEntityLog.getEntityLogEntry().removeAll(previousEntriesFromReAnalyzedSections);

        boolean hasChanges = entityChangeLogService.computeChanges(previousEntriesFromReAnalyzedSections,
@@ -4,8 +4,8 @@ import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.stream.Collectors;

-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualRedactionType;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
@@ -13,6 +13,8 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualRedactionType;

 import lombok.experimental.UtilityClass;

@@ -21,9 +23,7 @@ public class ManualChangeFactory {

    public List<ManualChange> toManualChangeList(List<BaseAnnotation> manualChanges, boolean isHint) {

-        return manualChanges.stream()
-                .map(baseAnnotation -> toManualChange(baseAnnotation, isHint))
-                .collect(Collectors.toList());
+        return manualChanges.stream().map(baseAnnotation -> toManualChange(baseAnnotation, isHint)).collect(Collectors.toList());
    }


@@ -37,8 +37,7 @@ public class ManualChangeFactory {
        } else if (baseAnnotation instanceof ManualForceRedaction manualForceRedaction) {
            manualChange.withManualRedactionType(ManualRedactionType.FORCE).withChange("legalBasis", manualForceRedaction.getLegalBasis());
        } else if (baseAnnotation instanceof ManualResizeRedaction manualResizeRedact) {
-            manualChange.withManualRedactionType(manualResizeRedact.getUpdateDictionary() ? ManualRedactionType.RESIZE_IN_DICTIONARY : ManualRedactionType.RESIZE)
-                    .withChange("value", manualResizeRedact.getValue());
+            manualChange.withManualRedactionType(manualResizeRedact.getUpdateDictionary() ? ManualRedactionType.RESIZE_IN_DICTIONARY : ManualRedactionType.RESIZE).withChange("value", manualResizeRedact.getValue());
        } else if (baseAnnotation instanceof ManualRedactionEntry manualRedactionEntry) {
            manualChange.withManualRedactionType(manualRedactionEntry.isAddToDictionary() ? ManualRedactionType.ADD_TO_DICTIONARY : ManualRedactionType.ADD)
                    .withChange("value", manualRedactionEntry.getValue());
@@ -6,7 +6,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Set;

 import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.Footer;
@@ -77,7 +76,6 @@ public class DocumentGraphMapper {
                node.setLeafTextBlock(textBlock);
            }
            List<Integer> treeId = Arrays.stream(entryData.getTreeId()).boxed().toList();
-            entryData.getEngines().forEach(engine -> node.addEngine(engine));
            node.setTreeId(treeId);

            switch (entryData.getType()) {
@@ -57,23 +57,18 @@ public class SectionFinderService {
                if (entry.getContainingNodeId().isEmpty()) {
                    continue; // Empty list means either Entity has not been found or it is between main sections. Thus, this might lead to wrong reanalysis.
                }
-                sectionsToReanalyse.add(entry.getContainingNodeId()
-                                                .get(0));
+                sectionsToReanalyse.add(entry.getContainingNodeId().get(0));
            }
        }

-        var dictionaryIncrementsSearch = new SearchImplementation(dictionaryIncrement.getValues()
-                                                                          .stream()
-                                                                          .map(DictionaryIncrementValue::getValue)
-                                                                          .toList(), true);
+        var dictionaryIncrementsSearch = new SearchImplementation(dictionaryIncrement.getValues().stream().map(DictionaryIncrementValue::getValue).collect(Collectors.toList()),
+                true);

-        document.streamChildren()
-                .forEach(mainNode -> {
-                    if (dictionaryIncrementsSearch.atLeastOneMatches(mainNode.getTextBlock().getSearchText())) {
-                        sectionsToReanalyse.add(mainNode.getTreeId()
-                                                        .get(0));
-                    }
-                });
+        document.streamChildren().forEach(mainNode -> {
+            if (dictionaryIncrementsSearch.atLeastOneMatches(mainNode.getTextBlock().getSearchText())) {
+                sectionsToReanalyse.add(mainNode.getTreeId().get(0));
+            }
+        });

        Set<Integer> relevantPagesForReanalysis = getRelevantPageNumbersForAddRedactions(analyzeRequest);
        relevantPagesForReanalysis.addAll(getRelevantPageNumbersForImportedRedactions(importedRedactions, relevantManuallyModifiedAnnotationIds));
@@ -92,11 +87,8 @@ public class SectionFinderService {
        return document.getPages()
                .stream()
                .filter(page -> relevantPagesForReanalysis.contains(page.getNumber()))
-                .flatMap(page -> Stream.concat(page.getMainBody()
-                                                       .stream()
-                                                       .filter(node -> node.getType().equals(NodeType.SECTION)), Stream.of(page.getHeader(), page.getFooter())))
-                .map(node -> node.getTreeId()
-                        .get(0))
+                .flatMap(page -> Stream.concat(page.getMainBody().stream().filter(node -> node.getType().equals(NodeType.SECTION)), Stream.of(page.getHeader(), page.getFooter())))
+                .map(node -> node.getTreeId().get(0))
                .toList();
    }

@@ -107,7 +99,8 @@ public class SectionFinderService {
            return Collections.emptySet();
        }

-        return analyzeRequest.getManualRedactions().getEntriesToAdd()
+        return analyzeRequest.getManualRedactions()
+                .getEntriesToAdd()
                .stream()
                .filter(addRedaction -> !(addRedaction.isAddToDictionary() || addRedaction.isAddToDossierDictionary()))
                .map(ManualRedactionEntry::getPositions)
@@ -139,22 +132,11 @@ public class SectionFinderService {
            return new HashSet<>();
        }

-        return Stream.concat(manualRedactions.getResizeRedactions()
-                                     .stream()
-                                     .map(ManualResizeRedaction::getAnnotationId),
-                             Stream.concat(manualRedactions.getLegalBasisChanges()
-                                                   .stream()
-                                                   .map(ManualLegalBasisChange::getAnnotationId),
-                                           Stream.concat(manualRedactions.getRecategorizations()
-                                                                 .stream()
-                                                                 .map(ManualRecategorization::getAnnotationId),
-                                                         Stream.concat(manualRedactions.getIdsToRemove()
-                                                                               .stream()
-                                                                               .map(IdRemoval::getAnnotationId),
-                                                                       manualRedactions.getForceRedactions()
-                                                                               .stream()
-                                                                               .map(ManualForceRedaction::getAnnotationId)))))
-                .collect(Collectors.toSet());
+        return Stream.concat(manualRedactions.getResizeRedactions().stream().map(ManualResizeRedaction::getAnnotationId),
+                Stream.concat(manualRedactions.getLegalBasisChanges().stream().map(ManualLegalBasisChange::getAnnotationId),
+                        Stream.concat(manualRedactions.getRecategorizations().stream().map(ManualRecategorization::getAnnotationId),
+                                Stream.concat(manualRedactions.getIdsToRemove().stream().map(IdRemoval::getAnnotationId),
+                                        manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId))))).collect(Collectors.toSet());
    }

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

-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -15,34 +12,24 @@ import org.springframework.stereotype.Service;

 import com.google.common.collect.Sets;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
-import com.iqser.red.service.redaction.v1.model.DroolsSyntaxDeprecatedWarnings;
 import com.iqser.red.service.redaction.v1.model.DroolsSyntaxErrorMessage;
 import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
 import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
-import com.iqser.red.service.redaction.v1.server.DeprecatedElementsFinder;
-import com.iqser.red.service.redaction.v1.server.model.dictionary.SearchImplementation;
 import com.iqser.red.service.redaction.v1.server.model.drools.BasicQuery;
-import com.iqser.red.service.redaction.v1.server.model.drools.BasicRule;
-import com.iqser.red.service.redaction.v1.server.model.drools.RuleClass;
 import com.iqser.red.service.redaction.v1.server.model.drools.RuleFileBluePrint;
-import com.iqser.red.service.redaction.v1.server.model.drools.RuleUnit;
 import com.iqser.red.service.redaction.v1.server.storage.RuleManagementResources;

 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;

@Service
@RequiredArgsConstructor
-@Slf4j
 public class DroolsSyntaxValidationService {
-
+    
    private static final Pattern allowedImportsPattern = Pattern.compile("^(?:import\\s+static\\s+)?(?:import\\s+)?(?:com\\.knecon\\.fforesight|com\\.iqser\\.red)\\..*;$");

    private final KieContainerCreationService kieContainerCreationService;

-    private final DeprecatedElementsFinder deprecatedElementsFinder;
-

    @SneakyThrows
    public DroolsSyntaxValidation testRules(RuleValidationModel rules) {
@@ -56,74 +43,15 @@ public class DroolsSyntaxValidationService {
        }
        DroolsSyntaxValidation droolsCompilerSyntaxValidation = buildDroolsCompilerSyntaxValidation(rules);
        droolsCompilerSyntaxValidation.getDroolsSyntaxErrorMessages().addAll(customDroolsSyntaxValidation.getDroolsSyntaxErrorMessages());
-        droolsCompilerSyntaxValidation.getDroolsSyntaxDeprecatedWarnings().addAll(customDroolsSyntaxValidation.getDroolsSyntaxDeprecatedWarnings());
        return droolsCompilerSyntaxValidation;
    }

-    private DroolsSyntaxDeprecatedWarnings getWarningsForDeprecatedImports(RuleFileBluePrint ruleFileBluePrint) {
-
-        if (!deprecatedElementsFinder.getDeprecatedClasses().isEmpty()) {
-            String imports = ruleFileBluePrint.getImports();
-            SearchImplementation classesSearchImplementation = deprecatedElementsFinder.getClassesSearchImplementation();
-            List<SearchImplementation.MatchPosition> matches = classesSearchImplementation.getMatches(imports);
-            if (!matches.isEmpty()) {
-                String sb = "Following imports are deprecated: \n" + matches.stream()
-                        .map(m -> imports.substring(m.startIndex(), m.endIndex()))
-                        .collect(Collectors.joining("\n"));
-                return DroolsSyntaxDeprecatedWarnings.builder().line(ruleFileBluePrint.getImportLine()).column(0).message(sb)
-                                            .build();
-            }
-        }
-        return null;
-    }
-
-    private List<DroolsSyntaxDeprecatedWarnings> getWarningsForDeprecatedRules(RuleFileBluePrint ruleFileBluePrint) {
-
-        List<DroolsSyntaxDeprecatedWarnings> warningMessages = new ArrayList<>();
-
-        // checks the rules for deprecateMethods
-        if (!deprecatedElementsFinder.getDeprecatedMethods().isEmpty()) {
-            SearchImplementation methodsSearchImplementation = deprecatedElementsFinder.getMethodsSearchImplementation();
-            Map<String, String> deprecatedMethodsSignatureMap = deprecatedElementsFinder.getDeprecatedMethodsSignaturesMap();
-
-            for (RuleClass ruleClass : ruleFileBluePrint.getRuleClasses()) {
-                for (RuleUnit ruleUnit : ruleClass.ruleUnits()) {
-                    for (BasicRule basicRule : ruleUnit.rules()) {
-                        List<SearchImplementation.MatchPosition> matches = methodsSearchImplementation.getMatches(basicRule.getCode());
-                        if (!matches.isEmpty()) {
-                            String warningMessage = matches.stream()
-                                    .map(m -> basicRule.getCode().substring(m.startIndex(), m.endIndex()))
-                                    .distinct()
-                                    .map(dm -> String.format("Method %s might be deprecated because of \n %s \n", dm, deprecatedMethodsSignatureMap.get(dm)))
-                                    .collect(Collectors.joining("\n"));
-                            warningMessages.add(DroolsSyntaxDeprecatedWarnings.builder().line(basicRule.getLine()).column(0).message(warningMessage)
-                                                        .build());
-                        }
-                    }
-                }
-            }
-
-        }
-
-        return warningMessages.stream()
-                .sorted(Comparator.comparingInt(DroolsSyntaxDeprecatedWarnings::getLine))
-                .collect(Collectors.toList());
-    }
-

    private DroolsSyntaxValidation buildCustomDroolsSyntaxValidation(String ruleString, RuleFileType ruleFileType) throws DroolsParserException {

        RuleFileBluePrint ruleFileBluePrint = RuleFileParser.buildBluePrintFromRulesString(ruleString);
-
        DroolsSyntaxValidation customSyntaxValidation = ruleFileBluePrint.getDroolsSyntaxValidation();

-        // find deprecated elements in the ruleFileBluePrint
-        DroolsSyntaxDeprecatedWarnings warningMessageForImports = getWarningsForDeprecatedImports(ruleFileBluePrint);
-        if (warningMessageForImports != null) {
-            customSyntaxValidation.getDroolsSyntaxDeprecatedWarnings().add(warningMessageForImports);
-        }
-        customSyntaxValidation.getDroolsSyntaxDeprecatedWarnings().addAll(getWarningsForDeprecatedRules(ruleFileBluePrint));
-
        RuleFileBluePrint baseRuleFileBluePrint = switch (ruleFileType) {
            case ENTITY -> RuleFileParser.buildBluePrintFromRulesString(RuleManagementResources.getBaseRuleFileString());
            case COMPONENT -> RuleFileParser.buildBluePrintFromRulesString(RuleManagementResources.getBaseComponentRuleFileString());
@@ -132,36 +60,35 @@ public class DroolsSyntaxValidationService {
        if (!importsAreValid(baseRuleFileBluePrint, ruleFileBluePrint)) {
            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());
+                            .line(ruleFileBluePrint.getImportLine())
+                            .column(0)
+                            .message(String.format("Changing the imports is not allowed! Must be: %n%s", baseRuleFileBluePrint.getImports()))
+                            .build());
        }
        if (!ruleFileBluePrint.getGlobals().equals(baseRuleFileBluePrint.getGlobals())) {
            customSyntaxValidation.getDroolsSyntaxErrorMessages()
                    .add(DroolsSyntaxErrorMessage.builder()
-                                 .line(ruleFileBluePrint.getGlobalsLine())
-                                 .column(0)
-                                 .message(String.format("Changing the globals is not allowed! Must be: %n%s", baseRuleFileBluePrint.getGlobals()))
-                                 .build());
+                            .line(ruleFileBluePrint.getGlobalsLine())
+                            .column(0)
+                            .message(String.format("Changing the globals is not allowed! Must be: %n%s", baseRuleFileBluePrint.getGlobals()))
+                            .build());
        }
-        baseRuleFileBluePrint.getQueries()
-                .forEach(basicQuery -> {
-                    if (!validateQueryIsPresent(basicQuery, ruleFileBluePrint)) {
-                        customSyntaxValidation.getDroolsSyntaxErrorMessages()
-                                .add(DroolsSyntaxErrorMessage.builder()
-                                             .line(basicQuery.getLine())
-                                             .column(0)
-                                             .message(String.format("Changing or removing the query %s is not allowed! Must be: %n%s", basicQuery.getName(), basicQuery.getCode()))
-                                             .build());
-                    }
-                });
+        baseRuleFileBluePrint.getQueries().forEach(basicQuery -> {
+            if (!validateQueryIsPresent(basicQuery, ruleFileBluePrint)) {
+                customSyntaxValidation.getDroolsSyntaxErrorMessages()
+                        .add(DroolsSyntaxErrorMessage.builder()
+                                .line(basicQuery.getLine())
+                                .column(0)
+                                .message(String.format("Changing or removing the query %s is not allowed! Must be: %n%s", basicQuery.getName(), basicQuery.getCode()))
+                                .build());
+            }
+        });
        if (ruleFileType.equals(RuleFileType.ENTITY)) {
            String requiredAgendaGroup = "LOCAL_DICTIONARY_ADDS";
            if (!validateAgendaGroupIsPresent(ruleFileBluePrint, requiredAgendaGroup)) {
-                customSyntaxValidation.getDroolsSyntaxErrorMessages()
-                        .add(DroolsSyntaxErrorMessage.builder().line(0).column(0).message(String.format("At least one rule with Agenda-Group '%s' required!", requiredAgendaGroup))
-                                     .build());
+                customSyntaxValidation.getDroolsSyntaxErrorMessages().add(DroolsSyntaxErrorMessage.builder().line(0)
+                                .column(0).message(String.format("At least one rule with Agenda-Group '%s' required!", requiredAgendaGroup))
+                                .build());
            }
        }
        return customSyntaxValidation;
@@ -170,8 +97,7 @@ public class DroolsSyntaxValidationService {

    private boolean validateAgendaGroupIsPresent(RuleFileBluePrint ruleFileBluePrint, String agendaGroupName) {

-        return ruleFileBluePrint.streamAllRules()
-                .anyMatch(basicRule -> basicRule.getAgendaGroup().equals(agendaGroupName));
+        return ruleFileBluePrint.streamAllRules().anyMatch(basicRule -> basicRule.getAgendaGroup().equals(agendaGroupName));
    }


@@ -183,16 +109,13 @@ public class DroolsSyntaxValidationService {

        Set<String> additionalImports = Sets.difference(imports, baseImports);

-        return additionalImports.stream()
-                .allMatch(additionalImport -> allowedImportsPattern.matcher(additionalImport).matches());
+        return additionalImports.stream().allMatch(additionalImport -> allowedImportsPattern.matcher(additionalImport).matches());
    }


    private static boolean validateQueryIsPresent(BasicQuery queryToCheckFor, RuleFileBluePrint ruleFileBluePrint) {

-        return ruleFileBluePrint.getQueries()
-                .stream()
-                .anyMatch(query -> query.getName().equals(queryToCheckFor.getName()) && query.getCode().equals(queryToCheckFor.getCode()));
+        return ruleFileBluePrint.getQueries().stream().anyMatch(query -> query.getName().equals(queryToCheckFor.getName()) && query.getCode().equals(queryToCheckFor.getCode()));
    }


@@ -201,9 +124,9 @@ public class DroolsSyntaxValidationService {
        var versionId = System.currentTimeMillis();
        var testRules = "test-rules";
        KieBuilder kieBuilder = kieContainerCreationService.registerNewKieContainerVersion(testRules,
-                                                                                           versionId,
-                                                                                           rules.getRulesString(),
-                                                                                           RuleFileType.valueOf(rules.getRuleFileType()));
+                versionId,
+                rules.getRulesString(),
+                RuleFileType.valueOf(rules.getRuleFileType()));
        return buildDroolsCompilerSyntaxValidation(kieBuilder);
    }

@@ -211,18 +134,14 @@ public class DroolsSyntaxValidationService {
    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();
+        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();
+        return DroolsSyntaxErrorMessage.builder().line(message.getLine()).column(message.getColumn()).message(message.getText()).build();
    }

 }
@@ -1292,7 +1292,6 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
                                            .recategorizations(Set.of(ManualRecategorization.builder()
                                                                              .annotationId("3029651d0842a625f2d23f8375c23600")
                                                                              .type("CBI_author")
-                                                                              .legalBasis("")
                                                                              .requestDate(OffsetDateTime.now())
                                                                              .fileId(TEST_FILE_ID)
                                                                              .build()))
@@ -5,14 +5,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;

 import java.awt.Color;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;

-import org.drools.io.ClassPathResource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.drools.files.management.services;

-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

@@ -19,7 +18,6 @@ import org.springframework.core.io.ClassPathResource;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
 import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
 import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
-import com.iqser.red.service.redaction.v1.server.DeprecatedElementsFinder;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.model.drools.RuleFileBluePrint;
 import com.iqser.red.service.redaction.v1.server.service.document.EntityEnrichmentService;
@@ -49,15 +47,13 @@ class DroolsSyntaxValidationServiceTest {
    @SneakyThrows
    void testRules() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/rules.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());

        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
        assertTrue(droolsSyntaxValidation.isCompiled());
    }

@@ -66,16 +62,14 @@ class DroolsSyntaxValidationServiceTest {
    @SneakyThrows
    void testRulesWithRemovedImportsAndChangedName() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/rules.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
        rulesString = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;", "");
        rulesString = rulesString.replaceAll("rule \"LDS.0.0: Run local dictionary search\"", "rule \"LDS.0.0: run local dictionary search\"");
        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
        assertTrue(droolsSyntaxValidation.isCompiled());
    }

@@ -83,32 +77,102 @@ class DroolsSyntaxValidationServiceTest {
    @SneakyThrows
    void testRulesWithAddedImports() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/rules.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
-        rulesString = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;",
-                                             "import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;\nimport com.iqser.red.service.redaction.v1.server.service.document.EntityComparators;");
+        rulesString = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;", "import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;\nimport com.iqser.red.service.redaction.v1.server.service.document.EntityComparators;");
        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
        assertTrue(droolsSyntaxValidation.isCompiled());
    }

+    @Test
+    @SneakyThrows
+    void testRulesWithUnallowedAddedImports() {
+
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
+        var rulesFile = new ClassPathResource("drools/rules.drl");
+
+        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
+        rulesString = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;", "import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;\nimport com.google.common.collect.Sets;");
+        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
+        assertFalse(droolsSyntaxValidation.isCompiled());
+    }
+
+
+    @Test
+    @SneakyThrows
+    void testAllRules() {
+
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
+        var rulesFile = new ClassPathResource("drools/all_redact_manager_rules.drl");
+
+        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
+
+        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
+        assertTrue(droolsSyntaxValidation.isCompiled());
+    }
+
+
+    @Test
+    @SneakyThrows
+    void testAcceptanceRules() {
+
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
+        var rulesFile = new ClassPathResource("drools/acceptance_rules.drl");
+
+        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
+
+        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
+        assertTrue(droolsSyntaxValidation.isCompiled());
+    }
+
+
+    @Test
+    @SneakyThrows
+    void testManualRedactionRules() {
+
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
+        var rulesFile = new ClassPathResource("drools/manual_redaction_rules.drl");
+
+        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
+
+        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
+        assertTrue(droolsSyntaxValidation.isCompiled());
+    }
+
+
+    @Test
+    @SneakyThrows
+    void testRulesV2() {
+
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
+        var rulesFile = new ClassPathResource("drools/rules_v2.drl");
+
+        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
+
+        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
+        assertTrue(droolsSyntaxValidation.isCompiled());
+    }
+
+
    @Test
    @SneakyThrows
    void testDocumineRules() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/documine_flora.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());

        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
        assertTrue(droolsSyntaxValidation.isCompiled());
    }

@@ -117,8 +181,7 @@ class DroolsSyntaxValidationServiceTest {
    @SneakyThrows
    void testCorruptedRules() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/rules.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
@@ -133,13 +196,12 @@ class DroolsSyntaxValidationServiceTest {
    @SneakyThrows
    void testCorruptedImports() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/rules.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
        String corruptedRules = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;",
-                                                       "import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;\nimport com.iqser.red.service.redaction.v1.server.model.document.nodes.SomethingElse;");
+                "import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;\nimport com.iqser.red.service.redaction.v1.server.model.document.nodes.SomethingElse;");

        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), corruptedRules));
        assertFalse(droolsSyntaxValidation.isCompiled());
@@ -150,16 +212,14 @@ class DroolsSyntaxValidationServiceTest {
    @SneakyThrows
    void testRemoveQuery() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/rules.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
        String corruptedRules = rulesString.replaceAll("query \"getFileAttributes\"\n.*\n *end", "");

        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), corruptedRules));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
        assertFalse(droolsSyntaxValidation.isCompiled());
    }

@@ -168,15 +228,13 @@ class DroolsSyntaxValidationServiceTest {
    @SneakyThrows
    void testComponentDrools() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/documine_flora_components.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());

        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.COMPONENT.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
        assertTrue(droolsSyntaxValidation.isCompiled());
    }

@@ -185,15 +243,13 @@ class DroolsSyntaxValidationServiceTest {
    @SneakyThrows
    void testComponentDroolsAsEntityDrools() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
        var rulesFile = new ClassPathResource("drools/documine_flora_components.drl");

        String rulesString = new String(rulesFile.getInputStream().readAllBytes());

        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
        assertFalse(droolsSyntaxValidation.isCompiled());
    }

@@ -203,15 +259,13 @@ class DroolsSyntaxValidationServiceTest {
    @Disabled
    void attemptImportsFixToAllRuleFiles() {

-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));

-        List<String> ruleFiles = List.of("drools/rules.drl",
-                                         "drools/all_redact_manager_rules.drl",
-                                         "drools/documine_flora.drl",
-                                         "drools/manual_redaction_rules.drl",
-                                         "drools/acceptance_rules.drl",
-                                         "drools/rules_v2.drl");
+        List<String> ruleFiles = List.of("drools/rules.drl", "drools/all_redact_manager_rules.drl",
+                "drools/documine_flora.drl",
+                "drools/manual_redaction_rules.drl",
+                "drools/acceptance_rules.drl",
+                "drools/rules_v2.drl");

        for (String ruleFile : ruleFiles) {
            var rulesFile = new ClassPathResource(ruleFile);
@@ -234,109 +288,4 @@ class DroolsSyntaxValidationServiceTest {

    }

-
-    @Test
-    @SneakyThrows
-    void testRulesWithUnallowedAddedImports() {
-
-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
-        var rulesFile = new ClassPathResource("drools/rules.drl");
-
-        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
-        rulesString = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;",
-                                             "import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;\nimport com.google.common.collect.Sets;");
-        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
-        assertFalse(droolsSyntaxValidation.isCompiled());
-    }
-
-
-    @Test
-    @SneakyThrows
-    void testAllRules() {
-
-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
-        var rulesFile = new ClassPathResource("drools/all_redact_manager_rules.drl");
-
-        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
-
-        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
-        assertTrue(droolsSyntaxValidation.isCompiled());
-    }
-
-
-    @Test
-    @SneakyThrows
-    void testAcceptanceRules() {
-
-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
-        var rulesFile = new ClassPathResource("drools/acceptance_rules.drl");
-
-        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
-
-        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
-        assertTrue(droolsSyntaxValidation.isCompiled());
-    }
-
-
-    @Test
-    @SneakyThrows
-    void testManualRedactionRules() {
-
-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
-        var rulesFile = new ClassPathResource("drools/manual_redaction_rules.drl");
-
-        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
-
-        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
-        assertTrue(droolsSyntaxValidation.isCompiled());
-    }
-
-
-    @Test
-    @SneakyThrows
-    void testRulesV2() {
-
-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
-        var rulesFile = new ClassPathResource("drools/rules_v2.drl");
-
-        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
-
-        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
-        assertTrue(droolsSyntaxValidation.isCompiled());
-    }
-
-
-    @Test
-    @SneakyThrows
-    void testRulesWithDeprecatedFunctions() {
-
-        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient),
-                                                                                                        new DeprecatedElementsFinder());
-        var rulesFile = new ClassPathResource("drools/rules.drl");
-
-        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
-        rulesString = rulesString.replaceAll(".resize\\(", ".resizeEntityAndReinsert(");
-
-        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
-        droolsSyntaxValidation.getDroolsSyntaxErrorMessages()
-                .forEach(System.out::println);
-        assertTrue(droolsSyntaxValidation.isCompiled());
-        assertEquals(droolsSyntaxValidation.getDroolsSyntaxDeprecatedWarnings().size(), 2);
-    }
-
 }
@@ -115,12 +115,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest {
        assertEquals(legalBasis, entity.getManualOverwrite().getLegalBasis().orElse(entity.getMatchedRule().getLegalBasis()));
        assertEquals(section, entity.getManualOverwrite().getSection().orElse(entity.getDeepestFullyContainingNode().toString()));

-        ManualRecategorization imageRecategorizationRequest = ManualRecategorization.builder()
-                .type("type")
-                .requestDate(start.plusSeconds(5))
-                .annotationId(annotationId)
-                .legalBasis("")
-                .build();
+        ManualRecategorization imageRecategorizationRequest = ManualRecategorization.builder().type("type").requestDate(start.plusSeconds(5)).annotationId(annotationId).build();
        entity.getManualOverwrite().addChange(imageRecategorizationRequest);
        assertTrue(entity.getManualOverwrite().getRecategorized().isPresent());
        assertTrue(entity.getManualOverwrite().getRecategorized().get());
@@ -16,8 +16,8 @@ class SemanticNodeComparatorsTest {
    @Test
    public void testFirstSemanticNode() {

-        var node = new Section(List.of(0, 1), null, null, null, null,null);
-        var otherNode = new Section(List.of(0, 2), null, null, null, null,null);
+        var node = new Section(List.of(0, 1), null, null, null, null);
+        var otherNode = new Section(List.of(0, 2), null, null, null, null);
        List<SemanticNode> list = new ArrayList<>();
        list.add(otherNode);
        list.add(node);
@@ -29,8 +29,8 @@ class SemanticNodeComparatorsTest {
    @Test
    public void testFirstSemanticNode2() {

-        var node = new Section(Collections.emptyList(), null, null, null, null, null);
-        var otherNode = new Section(List.of(0, 2), null, null, null, null, null);
+        var node = new Section(Collections.emptyList(), null, null, null, null);
+        var otherNode = new Section(List.of(0, 2), null, null, null, null);
        List<SemanticNode> list = new ArrayList<>();
        list.add(otherNode);
        list.add(node);
@@ -42,8 +42,8 @@ class SemanticNodeComparatorsTest {
    @Test
    public void testFirstSemanticNode3() {

-        var node = new Section(List.of(1, 5, 8), null, null, null, null, null);
-        var otherNode = new Section(List.of(0, 2), null, null, null, null, null);
+        var node = new Section(List.of(1, 5, 8), null, null, null, null);
+        var otherNode = new Section(List.of(0, 2), null, null, null, null);
        List<SemanticNode> list = new ArrayList<>();
        list.add(otherNode);
        list.add(node);
@@ -55,8 +55,8 @@ class SemanticNodeComparatorsTest {
    @Test
    public void testFirstSemanticNode4() {

-        var node = new Section(List.of(1, 5, 8), null, null, null, null,null);
-        var otherNode = new Section(List.of(1, 5, 9), null, null, null, null,null);
+        var node = new Section(List.of(1, 5, 8), null, null, null, null);
+        var otherNode = new Section(List.of(1, 5, 9), null, null, null, null);
        List<SemanticNode> list = new ArrayList<>();
        list.add(otherNode);
        list.add(node);
@@ -29,7 +29,6 @@ public class LayoutParsingRequestProvider {
                .originFileStorageId(originFileStorageId)
                .tablesFileStorageId(Optional.of(tablesFileStorageId))
                .imagesFileStorageId(Optional.of(imagesFileStorageId))
-                .visualLayoutParsingFileId(Optional.empty())
                .structureFileStorageId(structureFileStorageId)
                .textBlockFileStorageId(textBlockFileStorageId)
                .positionBlockFileStorageId(positionBlockFileStorageId)
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -692,22 +690,13 @@ rule "ETC.3.1: Redact logos (vertebrate study)"


 // Rule unit: ETC.5
-rule "ETC.5.0: Skip dossier_redaction entries if confidentiality is 'confidential'"
-    when
-        FileAttribute(label == "Confidentiality", value == "confidential")
-        $dossierRedaction: TextEntity(type() == "dossier_redaction")
-    then
-        $dossierRedaction.skip("ETC.5.0", "Ignore dossier_redaction when confidential");
-        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
-    end
-
-rule "ETC.5.1: Remove dossier_redaction entries if confidentiality is not 'confidential'"
+rule "ETC.5.0: Ignore dossier_redaction entries if confidentiality is not 'confidential'"
    when
        not FileAttribute(label == "Confidentiality", value == "confidential")
        $dossierRedaction: TextEntity(type() == "dossier_redaction")
    then
-        $dossierRedaction.remove("ETC.5.1", "Remove dossier_redaction when not confidential");
-        retract($dossierRedaction);
+        $dossierRedaction.ignore("ETC.5.0", "Ignore dossier redactions, when not confidential");
+        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
    end


@@ -857,7 +846,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -1024,27 +1013,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
    end


-// Rule unit: X.9
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-
-// Rule unit: X.10
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-
 //------------------------------------ File attributes rules ------------------------------------

 // Rule unit: FA.1
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -1150,22 +1148,13 @@ rule "ETC.4.2: Redact dossier dictionary entries"


 // Rule unit: ETC.5
-rule "ETC.5.0: Skip dossier_redaction entries if confidentiality is 'confidential'"
-    when
-        FileAttribute(label == "Confidentiality", value == "confidential")
-        $dossierRedaction: TextEntity(type() == "dossier_redaction")
-    then
-        $dossierRedaction.skip("ETC.5.0", "Ignore dossier_redaction when confidential");
-        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
-    end
-
-rule "ETC.5.1: Remove dossier_redaction entries if confidentiality is not 'confidential'"
+rule "ETC.5.0: Ignore dossier_redaction entries if confidentiality is not 'confidential'"
    when
        not FileAttribute(label == "Confidentiality", value == "confidential")
        $dossierRedaction: TextEntity(type() == "dossier_redaction")
    then
-        $dossierRedaction.remove("ETC.5.1", "Remove dossier_redaction when not confidential");
-        retract($dossierRedaction);
+        $dossierRedaction.ignore("ETC.5.0", "Ignore dossier redactions, when not confidential");
+        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
    end


@@ -1420,7 +1409,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -1587,27 +1576,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
    end


-// Rule unit: X.9
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-
-// Rule unit: X.10
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-
 //------------------------------------ File attributes rules ------------------------------------

 // Rule unit: FA.1
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -1278,7 +1276,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -1416,27 +1414,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
    end


-// Rule unit: X.9
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-
-// Rule unit: X.10
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-
 //------------------------------------ File attributes rules ------------------------------------

 // Rule unit: FA.1
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -190,7 +188,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -257,27 +255,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
    end


-// Rule unit: X.9
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-
-// Rule unit: X.10
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-
 //------------------------------------ Local dictionary search rules ------------------------------------

 // Rule unit: LDS.0
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -802,22 +800,13 @@ rule "ETC.4.0: Redact dossier dictionary entries"


 // Rule unit: ETC.5
-rule "ETC.5.0: Skip dossier_redaction entries if confidentiality is 'confidential'"
-    when
-        FileAttribute(label == "Confidentiality", value == "confidential")
-        $dossierRedaction: TextEntity(type() == "dossier_redaction")
-    then
-        $dossierRedaction.skip("ETC.5.0", "Ignore dossier_redaction when confidential");
-        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
-    end
-
-rule "ETC.5.1: Remove dossier_redaction entries if confidentiality is not 'confidential'"
+rule "ETC.5.0: Ignore dossier_redaction entries if confidentiality is not 'confidential'"
    when
        not FileAttribute(label == "Confidentiality", value == "confidential")
        $dossierRedaction: TextEntity(type() == "dossier_redaction")
    then
-        $dossierRedaction.remove("ETC.5.1", "Remove dossier_redaction when not confidential");
-        retract($dossierRedaction);
+        $dossierRedaction.ignore("ETC.5.0", "Ignore dossier redactions, when not confidential");
+        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
    end


@@ -1010,7 +999,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -1177,27 +1166,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
    end


-// Rule unit: X.9
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-
-// Rule unit: X.10
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-
 //------------------------------------ File attributes rules ------------------------------------

 // Rule unit: FA.1
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -214,7 +212,7 @@ rule "MAN.3.1: Apply entity recategorization of same type"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -381,27 +379,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
    end


-// Rule unit: X.9
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-
-// Rule unit: X.10
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-
 //------------------------------------ File attributes rules ------------------------------------

 // Rule unit: FA.1
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -340,7 +338,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -502,27 +500,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
    end


-// Rule unit: X.9
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-
-// Rule unit: X.10
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-
 //------------------------------------ File attributes rules ------------------------------------

 // Rule unit: FA.1
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -240,7 +238,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -418,27 +416,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
    end


-// Rule unit: X.9
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-
-// Rule unit: X.10
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-
 //------------------------------------ File attributes rules ------------------------------------

 // Rule unit: FA.1
@@ -449,22 +449,14 @@ rule "ETC.3.1: Redact logos (non vertebrate study)"


 // Rule unit: ETC.5
-rule "ETC.5.0: Skip dossier_redaction entries if confidentiality is 'confidential'"
-    when
-        FileAttribute(label == "Confidentiality", value == "confidential")
-        $dossierRedaction: TextEntity(type() == "dossier_redaction")
-    then
-        $dossierRedaction.skip("ETC.5.0", "Ignore dossier_redaction when confidential");
-        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
-    end
-
-rule "ETC.5.1: Remove dossier_redaction entries if confidentiality is not 'confidential'"
+rule "ETC.5.0: Ignore dossier_redaction entries if confidentiality is not 'confidential'"
    when
        not FileAttribute(label == "Confidentiality", value == "confidential")
        $dossierRedaction: TextEntity(type() == "dossier_redaction")
    then
-        $dossierRedaction.remove("ETC.5.1", "Remove dossier_redaction when not confidential");
-        retract($dossierRedaction);
+        $dossierRedaction.ignore("ETC.5.0", "Ignore dossier redactions, when not confidential");
+        update($dossierRedaction);
+        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
    end


@@ -33,11 +33,7 @@ public class RuleFileMigrator {
            rulesToAdd.forEach(ruleFileBluePrint::addRule);
        }

-        RuleFileBluePrint newBluePrint = new RuleFileBluePrint(combinedBluePrint.imports(),
-                                                               combinedBluePrint.globals(),
-                                                               combinedBluePrint.queries(),
-                                                               ruleFileBluePrint.ruleClasses());
-        String migratedRulesString = RuleFileFactory.buildRuleString(newBluePrint);
+        String migratedRulesString = RuleFileFactory.buildRuleString(ruleFileBluePrint);
        String migratedFilePath = ruleFile.getAbsolutePath();
        try (var out = new FileOutputStream(migratedFilePath)) {
            out.write(migratedRulesString.getBytes(StandardCharsets.UTF_8));
@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -1159,22 +1157,13 @@ rule "ETC.4.2: Redact dossier dictionary entries"


 // Rule unit: ETC.5
-rule "ETC.5.0: Skip dossier_redaction entries if confidentiality is 'confidential'"
-    when
-        FileAttribute(label == "Confidentiality", value == "confidential")
-        $dossierRedaction: TextEntity(type() == "dossier_redaction")
-    then
-        $dossierRedaction.skip("ETC.5.0", "Ignore dossier_redaction when confidential");
-        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
-    end
-
-rule "ETC.5.1: Remove dossier_redaction entries if confidentiality is not 'confidential'"
+rule "ETC.5.0: Ignore dossier_redaction entries if confidentiality is not 'confidential'"
    when
        not FileAttribute(label == "Confidentiality", value == "confidential")
        $dossierRedaction: TextEntity(type() == "dossier_redaction")
    then
-        $dossierRedaction.remove("ETC.5.1", "Remove dossier_redaction when not confidential");
-        retract($dossierRedaction);
+        $dossierRedaction.ignore("ETC.5.0", "Ignore dossier redactions, when not confidential");
+        $dossierRedaction.getIntersectingNodes().forEach(node -> update(node));
    end


@@ -1443,7 +1432,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -1608,24 +1597,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
        retract($other);
    end

-// Rule unit: X.9.0
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-// Rule unit: X.10.0
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end

 //------------------------------------ File attributes rules ------------------------------------

@@ -54,8 +54,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;

-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
-
 global Document document
 global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
@@ -1301,6 +1299,7 @@ rule "TAB.7.0: Indicator (Species)"
            .ifPresent(redactionEntity -> redactionEntity.apply("TAB.7.0", "Vertebrate study found"));
    end

+
 //------------------------------------ Manual redaction rules ------------------------------------

 // Rule unit: MAN.0
@@ -1424,7 +1423,7 @@ rule "MAN.3.2: Apply image recategorization"
 rule "MAN.3.3: Apply recategorization entities by default"
    salience 128
    when
-        $entity: TextEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type()))
    then
        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis());
    end
@@ -1562,26 +1561,6 @@ rule "X.8.1: Remove Entity when intersected by imported Entity"
        retract($other);
    end

-// Rule unit: X.9.0
-rule "X.9.0: Merge mostly contained signatures"
-    when
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI)
-        $signature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.ALGORITHM, mostlyContains($aiSignature, 0.8))
-    then
-        $aiSignature.remove("X.9.0", "removed because already contained by alogrithm signature");
-        $signature.addEngine(LayoutEngine.AI);
-    end
-
-// Rule unit: X.10.0
-rule "X.10.0: remove false positives of ai"
-    when
-        $anyImage: Image(engines contains LayoutEngine.ALGORITHM)
-        $aiSignature: Image(imageType == ImageType.SIGNATURE, engines contains LayoutEngine.AI, !mostlyContainedBy($anyImage, 0.8))
-    then
-        $aiSignature.remove("X.10.0", "Removed because false positive");
-    end
-
-

 //------------------------------------ File attributes rules ------------------------------------

@@ -25,9 +25,9 @@ public class RuleFileMigrationTest {

    // Put your redaction service drools paths and dossier-templates paths both RM and DM here
    static final List<String> ruleFileDirs = List.of(
-            "/Users/maverickstuder/Documents/RedactManager/redaction-service/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools",
-            "/Users/maverickstuder/Documents/DocuMine/dossier-templates-v2/",
-            "/Users/maverickstuder/Documents/RedactManager/dossier-templates-v2/");
+            "/home/kschuettler/iqser/redaction/redaction-service/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools",
+            "/home/kschuettler/iqser/fforesight/dossier-templates-v2",
+            "/home/kschuettler/iqser/redaction/dossier-templates-v2");


    @Test
@@ -36,7 +36,11 @@ public class RuleFileMigrationTest {
    void migrateAllEntityRules() {

        for (String ruleFileDir : ruleFileDirs) {
-            Files.walk(Path.of(ruleFileDir)).filter(this::isEntityRuleFile).map(Path::toFile).peek(System.out::println).forEach(RuleFileMigrator::migrateFile);
+            Files.walk(Path.of(ruleFileDir))
+                    .filter(this::isEntityRuleFile)
+                    .map(Path::toFile)
+                    .peek(System.out::println)
+                    .forEach(RuleFileMigrator::migrateFile);
        }
    }
Author	SHA1	Message	Date
Kilian Schüttler	172c9dc3ee	Merge branch 'RED-8615-bp' into 'release/4.244.x' RED-8615: backport See merge request redactmanager/redaction-service!292	2024-02-28 13:12:54 +01:00
Kilian Schüttler	d488bee1bb	RED-8615: backport	2024-02-28 13:12:54 +01:00
Kilian Schüttler	b99d9ed59c	Merge branch 'RED-7384-bp' into 'release/4.244.x' RED-7384: fixes for migration backport See merge request redactmanager/redaction-service!288	2024-02-27 10:04:38 +01:00
Kilian Schüttler	8175f6d012	RED-7384: fixes for migration backport	2024-02-27 10:04:38 +01:00
Kilian Schüttler	8f6b242c40	Merge branch 'hotfix-bp' into 'release/4.244.x' Hotfix bp See merge request redactmanager/redaction-service!286	2024-02-26 17:55:40 +01:00
Kilian Schüttler	12a22bbb47	Hotfix bp	2024-02-26 17:55:40 +01:00
Corina Olariu	e620412f09	Merge branch 'RED-8589-4.0.0' into 'release/4.244.x' RED-8589 - Add "MANUAL" engine to all annotations that has entries in... See merge request redactmanager/redaction-service!287	2024-02-23 13:22:53 +01:00
Corina Olariu	ac38a966c5	RED-8589 - Add "MANUAL" engine to all annotations that has entries in...	2024-02-23 13:22:53 +01:00
Maverick Studer	89227ec850	Merge branch 'RED-8607-bp' into 'release/4.244.x' RED-8607: Higher rank hint removed if overlaps lower rank redaction See merge request redactmanager/redaction-service!284	2024-02-22 16:15:33 +01:00
Maverick Studer	80fdff803d	RED-8607: Higher rank hint removed if overlaps lower rank redaction	2024-02-22 16:15:32 +01:00