From d2ddb93b37d54e2357721371d4f2985136b5b25c Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 24 Oct 2023 08:56:59 +0200 Subject: [PATCH 1/3] RED-7759: Cannot resize local manual redactions * fixed mistake when manually resizing redactions that are dictionary based --- .../v1/server/service/drools/EntityDroolsExecutionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java index 82b4883b..20989ef7 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java @@ -81,7 +81,7 @@ public class EntityDroolsExecutionService { fileAttributes.stream().filter(f -> f.getValue() != null).forEach(kieSession::insert); if (manualRedactions != null) { - manualRedactions.getResizeRedactions().forEach(kieSession::insert); + manualRedactions.getResizeRedactions().stream().filter(manualResizeRedaction -> !manualResizeRedaction.getUpdateDictionary()).forEach(kieSession::insert); manualRedactions.getRecategorizations().forEach(kieSession::insert); manualRedactions.getEntriesToAdd().forEach(kieSession::insert); manualRedactions.getForceRedactions().forEach(kieSession::insert); -- 2.47.2 From a77c87c2c8b61e34c93842b7675811f782083287 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 24 Oct 2023 15:49:58 +0200 Subject: [PATCH 2/3] RED-7759: Cannot resize local manual redactions * fixed nullpointer --- .../v1/server/service/drools/EntityDroolsExecutionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java index 20989ef7..7abff3ce 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java @@ -81,7 +81,7 @@ public class EntityDroolsExecutionService { fileAttributes.stream().filter(f -> f.getValue() != null).forEach(kieSession::insert); if (manualRedactions != null) { - manualRedactions.getResizeRedactions().stream().filter(manualResizeRedaction -> !manualResizeRedaction.getUpdateDictionary()).forEach(kieSession::insert); + manualRedactions.getResizeRedactions().stream().filter(manualResizeRedaction -> manualResizeRedaction.getUpdateDictionary()==null).forEach(kieSession::insert); manualRedactions.getRecategorizations().forEach(kieSession::insert); manualRedactions.getEntriesToAdd().forEach(kieSession::insert); manualRedactions.getForceRedactions().forEach(kieSession::insert); -- 2.47.2 From 4f6abfc78c61e832bec49be722d4eec49a66068e Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 24 Oct 2023 15:49:58 +0200 Subject: [PATCH 3/3] RED-7759: Cannot resize local manual redactions * fixed nullpointer --- .../v1/server/service/drools/EntityDroolsExecutionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java index f9156cdc..e2f4be00 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java @@ -81,7 +81,7 @@ public class EntityDroolsExecutionService { fileAttributes.stream().filter(f -> f.getValue() != null).forEach(kieSession::insert); if (manualRedactions != null) { - manualRedactions.getResizeRedactions().stream().filter(manualResizeRedaction -> !manualResizeRedaction.getUpdateDictionary()).forEach(kieSession::insert); + manualRedactions.getResizeRedactions().stream().filter(manualResizeRedaction -> manualResizeRedaction.getUpdateDictionary()==null).forEach(kieSession::insert); manualRedactions.getRecategorizations().forEach(kieSession::insert); manualRedactions.getEntriesToAdd().forEach(kieSession::insert); manualRedactions.getForceRedactions().forEach(kieSession::insert); -- 2.47.2