From ff6c56c1a5b267855fe95ce40660013a553867cb Mon Sep 17 00:00:00 2001 From: Maverick Studer Date: Fri, 24 May 2024 13:30:22 +0200 Subject: [PATCH] Revert "RED-5870: Enable force redaction of hints" --- .../model/document/entity/ManualChangeOverwrite.java | 11 ++--------- .../server/manualchanges/ManualChangesUnitTest.java | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java index 47b345d4..d68ab337 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java @@ -110,7 +110,7 @@ public class ManualChangeOverwrite { } if (manualChange instanceof ManualRedactionEntry manualRedactionEntry) { - setToAppliedIfNotHint(); + setToApplied(); legalBasis = manualRedactionEntry.getLegalBasis(); } @@ -158,7 +158,7 @@ public class ManualChangeOverwrite { } - private void setToAppliedIfNotHint() { + private void setToApplied() { removed = false; ignored = false; @@ -167,13 +167,6 @@ public class ManualChangeOverwrite { } } - private void setToApplied() { - - removed = false; - ignored = false; - applied = true; - } - public void addChange(BaseAnnotation manualChange) { diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java index 5957ff08..4e12dd27 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesUnitTest.java @@ -184,7 +184,7 @@ public class ManualChangesUnitTest extends BuildDocumentIntegrationTest { .legalBasis("coolio") .build(); entity.getManualOverwrite().addChange(forceRedaction); - assertTrue(entity.applied()); + assertFalse(entity.applied()); assertFalse(entity.ignored()); assertFalse(entity.removed()); assertEquals(reason + ", removed by manual override, forced by manual override", entity.buildReasonWithManualChangeDescriptions());