RED-7631: add EntryType IMAGE_HINT

* also fix BaseAnnotation builder

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 lombok.AllArgsConstructor;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
-
-import lombok.Builder;
 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;
-    }
-
 }

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 lombok.AllArgsConstructor;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
-
-import lombok.Builder;
 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;
-    }
-
 }

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 lombok.AllArgsConstructor;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
-
-import lombok.Builder;
 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;
-    }
-
 }

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 lombok.AllArgsConstructor;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
-
-import lombok.Builder;
 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;
-    }
-
 }

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<Rectangle> 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;
-    }
-
 }