From 66f740b44aa3a9a65d82c89206a2ed43918c7e95 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Thu, 26 Oct 2023 11:58:11 +0200 Subject: [PATCH 1/2] RED-7631: add EntryType IMAGE_HINT * also fix ManualResizeRedaction builder --- .../analysislog/entitylog/EntryType.java | 1 + .../entitymapped/BaseAnnotation.java | 2 ++ .../entitymapped/ManualResizeRedaction.java | 28 +++---------------- .../redactionlog/ManualRedactionType.java | 1 - 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntryType.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntryType.java index 2720705d0..5eebb52e7 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntryType.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntryType.java @@ -7,5 +7,6 @@ public enum EntryType { RECOMMENDATION, FALSE_RECOMMENDATION, IMAGE, + IMAGE_HINT, AREA } 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/BaseAnnotation.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/BaseAnnotation.java index b6f9c882e..65e43eefe 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/BaseAnnotation.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/BaseAnnotation.java @@ -8,8 +8,10 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode 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/ManualResizeRedaction.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/ManualResizeRedaction.java index 9b27ede77..c2629e1ed 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/ManualResizeRedaction.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/ManualResizeRedaction.java @@ -1,19 +1,20 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.List; -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle; -import lombok.Builder; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data +@SuperBuilder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class ManualResizeRedaction extends BaseAnnotation { @@ -24,25 +25,4 @@ public class ManualResizeRedaction extends BaseAnnotation { private Boolean updateDictionary; private boolean addToAllDossiers; - - @Builder - public ManualResizeRedaction(String annotationId, - String fileId, - String user, - AnnotationStatus status, - OffsetDateTime requestDate, - OffsetDateTime processedDate, - OffsetDateTime softDeletedTime, - String value, - String textBefore, - String textAfter, - List positions) { - - super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime); - this.textBefore = textBefore; - this.textAfter = textAfter; - this.value = value; - this.positions = positions != null ? positions : new ArrayList<>(); - } - } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/ManualRedactionType.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/ManualRedactionType.java index f3018136a..8173fdf28 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/ManualRedactionType.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/redactionlog/ManualRedactionType.java @@ -1,7 +1,6 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog; @Deprecated(forRemoval = true) - public enum ManualRedactionType { ADD_LOCALLY, ADD_TO_DICTIONARY, -- 2.47.2 From 9ebf22f52fccf3da56b1fa8e0a0c2d8b98e3b5b9 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Thu, 26 Oct 2023 12:02:29 +0200 Subject: [PATCH 2/2] RED-7631: add EntryType IMAGE_HINT * also fix BaseAnnotation builder --- .../annotations/entitymapped/IdRemoval.java | 26 ++--------- .../entitymapped/ManualForceRedaction.java | 24 ++-------- .../entitymapped/ManualLegalBasisChange.java | 28 ++---------- .../entitymapped/ManualRecategorization.java | 24 ++-------- .../entitymapped/ManualRedactionEntry.java | 44 ++----------------- 5 files changed, 20 insertions(+), 126 deletions(-) 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/IdRemoval.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/IdRemoval.java index fac014413..0c3f43a5a 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/IdRemoval.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/IdRemoval.java @@ -1,37 +1,19 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped; -import java.time.OffsetDateTime; - -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; - -import lombok.Builder; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data +@SuperBuilder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class IdRemoval extends BaseAnnotation { private boolean removeFromDictionary; private boolean removeFromAllDossiers; - - @Builder - public IdRemoval(String annotationId, - String fileId, - String user, - AnnotationStatus status, - OffsetDateTime requestDate, - OffsetDateTime processedDate, - OffsetDateTime softDeletedTime, - boolean removeFromDictionary, - boolean removeFromAllDossiers) { - - super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime); - this.removeFromDictionary = removeFromDictionary; - this.removeFromAllDossiers = removeFromAllDossiers; - } - } 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/ManualForceRedaction.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/ManualForceRedaction.java index 20f72bcbe..991c06859 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/ManualForceRedaction.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/ManualForceRedaction.java @@ -1,34 +1,18 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped; -import java.time.OffsetDateTime; - -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; - -import lombok.Builder; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data +@SuperBuilder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class ManualForceRedaction extends BaseAnnotation { private String legalBasis; - - @Builder - public ManualForceRedaction(String annotationId, - String fileId, - String user, - AnnotationStatus status, - OffsetDateTime requestDate, - OffsetDateTime processedDate, - OffsetDateTime softDeletedTime, - String legalBasis) { - - super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime); - this.legalBasis = legalBasis; - } - } 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 d99d0b0de..5c2582d92 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 @@ -1,16 +1,15 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped; -import java.time.OffsetDateTime; - -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; - -import lombok.Builder; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data +@SuperBuilder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class ManualLegalBasisChange extends BaseAnnotation { @@ -18,23 +17,4 @@ public class ManualLegalBasisChange extends BaseAnnotation { private String value; private String legalBasis; - - @Builder - public ManualLegalBasisChange(String annotationId, - String fileId, - String user, - AnnotationStatus status, - OffsetDateTime requestDate, - OffsetDateTime processedDate, - OffsetDateTime softDeletedTime, - String legalBasis, - String section, - String value) { - - super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime); - this.legalBasis = legalBasis; - this.section = section; - this.value = value; - } - } 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/ManualRecategorization.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/ManualRecategorization.java index ce4fae2d8..73ec2f57a 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/ManualRecategorization.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/ManualRecategorization.java @@ -1,34 +1,18 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped; -import java.time.OffsetDateTime; - -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; - -import lombok.Builder; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data +@SuperBuilder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class ManualRecategorization extends BaseAnnotation { private String type; - - @Builder - public ManualRecategorization(String annotationId, - String fileId, - String user, - AnnotationStatus status, - OffsetDateTime requestDate, - OffsetDateTime processedDate, - OffsetDateTime softDeletedTime, - String type) { - - super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime); - this.type = type; - } - } 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/ManualRedactionEntry.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/ManualRedactionEntry.java index ce2058d70..7ae2833e3 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/ManualRedactionEntry.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/ManualRedactionEntry.java @@ -1,19 +1,20 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.List; -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle; -import lombok.Builder; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; @Data +@SuperBuilder @NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class ManualRedactionEntry extends BaseAnnotation { @@ -30,41 +31,4 @@ public class ManualRedactionEntry extends BaseAnnotation { private String textAfter; private String sourceId; - - @Builder - public ManualRedactionEntry(String annotationId, - String fileId, - String user, - AnnotationStatus status, - OffsetDateTime requestDate, - OffsetDateTime processedDate, - OffsetDateTime softDeletedTime, - String value, - String textBefore, - String textAfter, - boolean rectangle, - boolean addToDictionary, - boolean addToDossierDictionary, - String legalBasis, - String section, - String reason, - String type, - List positions, - String sourceId) { - - super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime); - this.textBefore = textBefore; - this.textAfter = textAfter; - this.value = value; - this.rectangle = rectangle; - this.addToDictionary = addToDictionary; - this.addToDossierDictionary = addToDossierDictionary; - this.legalBasis = legalBasis; - this.section = section; - this.reason = reason; - this.type = type; - this.positions = positions != null ? positions : new ArrayList<>(); - this.sourceId = sourceId; - } - } -- 2.47.2