From a2a3e840318f464f0c61d9118e25c0d7a23b115a Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Wed, 3 Apr 2024 15:38:30 +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 918404da..4df6c28f 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 @@ -1237,21 +1237,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 afe49154..4ff8dd5e 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 @@ -1840,21 +1840,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 71dfc1d7..79e9acaa 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 @@ -804,21 +804,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 1ef10ab3..cf20b9be 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 @@ -1326,21 +1326,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 6996d10c..01279a69 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 @@ -256,21 +256,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 2c299166..29bfbe84 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 @@ -282,21 +282,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 5f90d1a1..d723e2ac 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 @@ -1863,21 +1863,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"