From d87fbd9ac4e31d5690705fc72f5da0146c8d0850 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 27 Jan 2022 13:26:50 +0200 Subject: [PATCH] constructors for builder --- .../api/model/annotations/BaseAnnotation.java | 4 +++ .../v1/api/model/annotations/IdRemoval.java | 15 ++++++---- .../annotations/ManualForceRedaction.java | 16 ++++++---- .../ManualImageRecategorization.java | 17 +++++++---- .../annotations/ManualLegalBasisChange.java | 18 ++++++++---- .../annotations/ManualRedactionEntry.java | 29 +++++++++++++++++-- .../annotations/ManualResizeRedaction.java | 19 ++++++++---- 7 files changed, 90 insertions(+), 28 deletions(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/BaseAnnotation.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/BaseAnnotation.java index 3db93b763..2b254afce 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/BaseAnnotation.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/BaseAnnotation.java @@ -1,10 +1,14 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.OffsetDateTime; @Data +@NoArgsConstructor +@AllArgsConstructor public class BaseAnnotation { private String annotationId; diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/IdRemoval.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/IdRemoval.java index 9b8f59e79..29897cc97 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/IdRemoval.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/IdRemoval.java @@ -1,16 +1,21 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; + +import java.time.OffsetDateTime; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor public class IdRemoval extends BaseAnnotation { private boolean removeFromDictionary; + @Builder + public IdRemoval(String annotationId, String fileId, + String user, AnnotationStatus status, + OffsetDateTime requestDate, OffsetDateTime processedDate, + OffsetDateTime softDeletedTime, boolean removeFromDictionary) { + super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime); + this.removeFromDictionary = removeFromDictionary; + } } diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualForceRedaction.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualForceRedaction.java index 5923182f3..3e18ec030 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualForceRedaction.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualForceRedaction.java @@ -1,16 +1,22 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; + +import java.time.OffsetDateTime; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualImageRecategorization.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualImageRecategorization.java index de55bfb97..ca17cbea9 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualImageRecategorization.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualImageRecategorization.java @@ -1,15 +1,22 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; + +import java.time.OffsetDateTime; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor public class ManualImageRecategorization extends BaseAnnotation { private String type; + + @Builder + public ManualImageRecategorization(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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualLegalBasisChange.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualLegalBasisChange.java index 67103201e..5012b5bef 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualLegalBasisChange.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualLegalBasisChange.java @@ -1,18 +1,26 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; + +import java.time.OffsetDateTime; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor public class ManualLegalBasisChange extends BaseAnnotation { private String section; 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-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java index 320e62583..3b60dd8d2 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java @@ -5,13 +5,11 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.List; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor public class ManualRedactionEntry extends BaseAnnotation { private String type; @@ -22,8 +20,33 @@ public class ManualRedactionEntry extends BaseAnnotation { private boolean rectangle; private boolean addToDictionary; private boolean addToDossierDictionary; + @Builder.Default private List positions = new ArrayList<>(); private String textBefore; private String textAfter; + @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) { + 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<>(); + } + } diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualResizeRedaction.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualResizeRedaction.java index 765a9bfdc..4298f405d 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualResizeRedaction.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualResizeRedaction.java @@ -1,17 +1,13 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; +import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.List; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor public class ManualResizeRedaction extends BaseAnnotation { private String value; @@ -20,4 +16,17 @@ public class ManualResizeRedaction extends BaseAnnotation { private String textBefore; private String textAfter; + @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<>(); + } }