From 6e7dadd0cf4f6f8a3d3f444338bb95b4eb72a493 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Tue, 19 Dec 2023 14:17:15 +0200 Subject: [PATCH] RED-7256 - Overlapping annotation color from imported redaction and resized redaction - fix immutable map --- .../v1/processor/service/EntityLogMergeService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 d591b5718..3ce4e8644 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 @@ -6,6 +6,7 @@ import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -227,7 +228,10 @@ public class EntityLogMergeService { entity.get().setSection(manualLegalBasisChange.getSection()); entity.get().setValue(manualLegalBasisChange.getValue()); addChanges(entity.get().getChanges(), ChangeType.CHANGED, entityLog.getAnalysisNumber()); - Map propertyChanges = Map.of("legalBasis", manualLegalBasisChange.getLegalBasis()); + Map propertyChanges = new HashMap<>(); + if (!Strings.isNullOrEmpty(manualLegalBasisChange.getLegalBasis())) { + propertyChanges.put("legalBasis", manualLegalBasisChange.getLegalBasis()); + } if (!Strings.isNullOrEmpty(manualLegalBasisChange.getValue())) { propertyChanges.put("value", manualLegalBasisChange.getValue()); }