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,