From 0f6c7facebc7aa110ff5c8af99a03e3255075871 Mon Sep 17 00:00:00 2001
From: Ali Oezyetimoglu <ali.oezyetimoglu@knecon.com>
Date: Wed, 24 Apr 2024 13:12:59 +0200
Subject: [PATCH] Revert "RED-8480: differenciate between recategorize and
 legal basis change"

This reverts commit dcb5c0e03e1f4fabbe270658a790f1c5d08b4cfd.
---
 .../v1/processor/service/EntityLogMergeService.java       | 2 ++
 .../v1/server/integration/tests/ManualRedactionTest.java  | 8 ++++----
 .../annotations/entitymapped/ManualLegalBasisChange.java  | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
index b7ed57a53..bc1de2d55 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
@@ -357,6 +357,7 @@ public class EntityLogMergeService {
     }
 
 
+    @Deprecated(forRemoval = true)
     private void mergeLegalBasisChange(ManualLegalBasisChange manualLegalBasisChange,
                                        EntityLogEntry entityLogEntry,
                                        int analysisNumber) {
@@ -378,6 +379,7 @@ public class EntityLogMergeService {
     }
 
 
+    @Deprecated(forRemoval = true)
     private Map<String, String> getPropertyChanges(ManualLegalBasisChange manualLegalBasisChange) {
 
         Map<String, String> propertyChanges = new HashMap<>();
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
index 3f1f2a620..ce3c56fa0 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
@@ -2100,14 +2100,14 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
         manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recatModel), false);
 
         var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
-        assertEquals(1, allManualRedactions.getLegalBasisChanges().size());
-        assertTrue(allManualRedactions.getLegalBasisChanges()
+        assertEquals(1, allManualRedactions.getRecategorizations().size());
+        assertTrue(allManualRedactions.getRecategorizations()
                            .stream()
                            .anyMatch(entry -> entry.getAnnotationId().equals("annotationId")));
-        assertTrue(allManualRedactions.getLegalBasisChanges()
+        assertTrue(allManualRedactions.getRecategorizations()
                            .stream()
                            .anyMatch(entry -> entry.getLegalBasis().equals("lb2")));
-        assertTrue(allManualRedactions.getLegalBasisChanges()
+        assertTrue(allManualRedactions.getRecategorizations()
                            .stream()
                            .anyMatch(entry -> entry.getSection().equals("section")));
     }
diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualLegalBasisChange.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualLegalBasisChange.java
index c04f12e80..c06399fef 100644
--- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualLegalBasisChange.java
+++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualLegalBasisChange.java
@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+@Deprecated(forRemoval = true)
 @Data
 @SuperBuilder
 @NoArgsConstructor