Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Merge branch 'RED-8372' into 'master'

Browse Source 
RED-8372: Include additional info about imported redactions in redaction annotations

Closes RED-8372

See merge request redactmanager/redaction-service!272
This commit is contained in:
Maverick Studer 2024-02-06 09:58:00 +01:00
commit 78869a13f6
10 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl
View File

@ -991,13 +991,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -1005,7 +1005,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

10
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl
View File

@ -1561,13 +1561,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -1575,7 +1575,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

10
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl
View File

@ -1392,13 +1392,13 @@ rule "X.7.0: Remove all images"
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -1406,7 +1406,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

10
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl
View File

@ -233,13 +233,13 @@ rule "X.5.1: Remove Entity of type RECOMMENDATION when contained by RECOMMENDATI
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -247,7 +247,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

10
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
View File

@ -1151,13 +1151,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -1165,7 +1165,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

10
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl
View File

@ -357,13 +357,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -371,7 +371,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

10
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl
View File

@ -478,13 +478,13 @@ rule "X.7.0: Remove all images"
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -492,7 +492,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

10
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl
View File

@ -394,13 +394,13 @@ rule "X.7.0: Remove all images"
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -408,7 +408,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

10
redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl
View File

@ -1585,13 +1585,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -1599,7 +1599,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");

11
redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl
View File

@ -1540,13 +1540,13 @@ rule "X.7.0: Remove all images"
// Rule unit: X.8
rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
salience 257
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
$entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
$other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.0", "remove Entity when equal to imported Entity");
$other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
$entity.addEngines($other.getEngines());
retract($other);
end
@ -1554,13 +1554,14 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
rule "X.8.1: Remove Entity when intersected by imported Entity"
salience 256
when
$entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
$entity: TextEntity(engines contains Engine.IMPORTED, active())
$other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
then
$other.remove("X.8.1", "remove Entity when intersected by imported Entity");
retract($other);
end
//------------------------------------ File attributes rules ------------------------------------
// Rule unit: FA.1