From 04ec3cb7b9e2a715290005d619321b264934e42a Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Wed, 3 Apr 2024 15:33:10 +0200 Subject: [PATCH] RED-8877 - Remove X.1.0 rule --- .../test/resources/drools/acceptance_rules.drl | 15 --------------- .../resources/drools/all_redact_manager_rules.drl | 15 --------------- .../test/resources/drools/efsa_sanitisation.drl | 15 --------------- .../src/test/resources/drools/rules.drl | 15 --------------- .../src/test/resources/drools/rules_v2.drl | 15 --------------- .../src/test/resources/drools/test_rules.drl | 15 --------------- .../main/resources/all_redact_manager_rules.drl | 15 --------------- 7 files changed, 105 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl index 47932980..60535b3b 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl @@ -1247,21 +1247,6 @@ rule "X.0.0: Remove Entity contained by Entity of same type" end -// Rule unit: X.1 -rule "X.1.0: Merge intersecting Entities of same type" - salience 64 - when - $first: TextEntity($type: type(), $entityType: entityType, !resized(), active()) - $second: TextEntity(intersects($first), type() == $type, entityType == $entityType, this != $first, !hasManualChanges(), active()) - then - TextEntity mergedEntity = entityCreationService.mergeEntitiesOfSameType(List.of($first, $second), $type, $entityType, document); - $first.remove("X.1.0", "merge intersecting Entities of same type"); - $second.remove("X.1.0", "merge intersecting Entities of same type"); - retract($first); - retract($second); - mergedEntity.getIntersectingNodes().forEach(node -> update(node)); - end - // Rule unit: X.2 rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE" diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl index d68eb557..4f435d57 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl @@ -1869,21 +1869,6 @@ rule "X.0.0: Remove Entity contained by Entity of same type" end -// Rule unit: X.1 -rule "X.1.0: Merge intersecting Entities of same type" - salience 64 - when - $first: TextEntity($type: type(), $entityType: entityType, !resized(), active()) - $second: TextEntity(intersects($first), type() == $type, entityType == $entityType, this != $first, !hasManualChanges(), active()) - then - TextEntity mergedEntity = entityCreationService.mergeEntitiesOfSameType(List.of($first, $second), $type, $entityType, document); - $first.remove("X.1.0", "merge intersecting Entities of same type"); - $second.remove("X.1.0", "merge intersecting Entities of same type"); - retract($first); - retract($second); - mergedEntity.getIntersectingNodes().forEach(node -> update(node)); - end - // Rule unit: X.2 rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE" diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/efsa_sanitisation.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/efsa_sanitisation.drl index 776b665b..87f66ad4 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/efsa_sanitisation.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/efsa_sanitisation.drl @@ -806,21 +806,6 @@ rule "X.0.0: Remove Entity contained by Entity of same type" end -// Rule unit: X.1 -rule "X.1.0: Merge intersecting Entities of same type" - salience 64 - when - $first: TextEntity($type: type(), $entityType: entityType, !resized(), active()) - $second: TextEntity(intersects($first), type() == $type, entityType == $entityType, this != $first, !hasManualChanges(), active()) - then - TextEntity mergedEntity = entityCreationService.mergeEntitiesOfSameType(List.of($first, $second), $type, $entityType, document); - $first.remove("X.1.0", "merge intersecting Entities of same type"); - $second.remove("X.1.0", "merge intersecting Entities of same type"); - retract($first); - retract($second); - mergedEntity.getIntersectingNodes().forEach(node -> update(node)); - end - // Rule unit: X.2 rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE" diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl index 9a5fbb48..fd96f578 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl @@ -1335,21 +1335,6 @@ rule "X.0.0: Remove Entity contained by Entity of same type" end -// Rule unit: X.1 -rule "X.1.0: Merge intersecting Entities of same type" - salience 64 - when - $first: TextEntity($type: type(), $entityType: entityType, !resized(), active()) - $second: TextEntity(intersects($first), type() == $type, entityType == $entityType, this != $first, !hasManualChanges(), active()) - then - TextEntity mergedEntity = entityCreationService.mergeEntitiesOfSameType(List.of($first, $second), $type, $entityType, document); - $first.remove("X.1.0", "merge intersecting Entities of same type"); - $second.remove("X.1.0", "merge intersecting Entities of same type"); - retract($first); - retract($second); - mergedEntity.getIntersectingNodes().forEach(node -> update(node)); - end - // Rule unit: X.2 rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE" diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl index 6f138a65..00bcfcdd 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl @@ -258,21 +258,6 @@ rule "X.0.0: Remove Entity contained by Entity of same type" end -// Rule unit: X.1 -rule "X.1.0: Merge intersecting Entities of same type" - salience 64 - when - $first: TextEntity($type: type(), $entityType: entityType, !resized(), active()) - $second: TextEntity(intersects($first), type() == $type, entityType == $entityType, this != $first, !hasManualChanges(), active()) - then - TextEntity mergedEntity = entityCreationService.mergeEntitiesOfSameType(List.of($first, $second), $type, $entityType, document); - $first.remove("X.1.0", "merge intersecting Entities of same type"); - $second.remove("X.1.0", "merge intersecting Entities of same type"); - retract($first); - retract($second); - mergedEntity.getIntersectingNodes().forEach(node -> update(node)); - end - // Rule unit: X.2 rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE" diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl index 0fea626a..54edeec0 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl @@ -284,21 +284,6 @@ rule "X.0.0: Remove Entity contained by Entity of same type" end -// Rule unit: X.1 -rule "X.1.0: Merge intersecting Entities of same type" - salience 64 - when - $first: TextEntity($type: type(), $entityType: entityType, !resized(), active()) - $second: TextEntity(intersects($first), type() == $type, entityType == $entityType, this != $first, !hasManualChanges(), active()) - then - TextEntity mergedEntity = entityCreationService.mergeEntitiesOfSameType(List.of($first, $second), $type, $entityType, document); - $first.remove("X.1.0", "merge intersecting Entities of same type"); - $second.remove("X.1.0", "merge intersecting Entities of same type"); - retract($first); - retract($second); - mergedEntity.getIntersectingNodes().forEach(node -> update(node)); - end - // Rule unit: X.2 rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE" diff --git a/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl b/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl index 40103b4f..1623c6ab 100644 --- a/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl +++ b/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl @@ -1864,21 +1864,6 @@ rule "X.0.0: Remove Entity contained by Entity of same type" end -// Rule unit: X.1 -rule "X.1.0: Merge intersecting Entities of same type" - salience 64 - when - $first: TextEntity($type: type(), $entityType: entityType, !resized(), active()) - $second: TextEntity(intersects($first), type() == $type, entityType == $entityType, this != $first, !hasManualChanges(), active()) - then - TextEntity mergedEntity = entityCreationService.mergeEntitiesOfSameType(List.of($first, $second), $type, $entityType, document); - $first.remove("X.1.0", "merge intersecting Entities of same type"); - $second.remove("X.1.0", "merge intersecting Entities of same type"); - retract($first); - retract($second); - mergedEntity.getIntersectingNodes().forEach(node -> update(node)); - end - // Rule unit: X.2 rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE"