From db31bb442c58ffc0c02698c8f905e085a7860b1d Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 8 Feb 2022 10:03:25 +0200 Subject: [PATCH] Fixed equals issue --- .../v1/api/model/annotations/entitymapped/BaseAnnotation.java | 2 ++ .../v1/api/model/annotations/entitymapped/IdRemoval.java | 3 +++ .../model/annotations/entitymapped/ManualForceRedaction.java | 2 ++ .../annotations/entitymapped/ManualImageRecategorization.java | 2 ++ .../model/annotations/entitymapped/ManualLegalBasisChange.java | 2 ++ .../model/annotations/entitymapped/ManualRedactionEntry.java | 2 ++ .../model/annotations/entitymapped/ManualResizeRedaction.java | 2 ++ 7 files changed, 15 insertions(+) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/BaseAnnotation.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/BaseAnnotation.java index 0b715cf04..697c3b1eb 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/BaseAnnotation.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/BaseAnnotation.java @@ -3,6 +3,7 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations.entit import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.OffsetDateTime; @@ -10,6 +11,7 @@ import java.time.OffsetDateTime; @Data @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode 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/entitymapped/IdRemoval.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/IdRemoval.java index 383190c55..461d3a2ce 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/IdRemoval.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/IdRemoval.java @@ -3,12 +3,14 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations.entit import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus; import lombok.Builder; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.OffsetDateTime; @Data @NoArgsConstructor +@EqualsAndHashCode(callSuper = true) public class IdRemoval extends BaseAnnotation { private boolean removeFromDictionary; @@ -21,4 +23,5 @@ public class IdRemoval extends BaseAnnotation { 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/entitymapped/ManualForceRedaction.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualForceRedaction.java index 5b7666faa..b5b650ee2 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualForceRedaction.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualForceRedaction.java @@ -3,12 +3,14 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations.entit import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus; import lombok.Builder; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.OffsetDateTime; @Data @NoArgsConstructor +@EqualsAndHashCode(callSuper = true) public class ManualForceRedaction extends BaseAnnotation { private String legalBasis; diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualImageRecategorization.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualImageRecategorization.java index 93aaa2ed4..4e68b985e 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualImageRecategorization.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualImageRecategorization.java @@ -3,12 +3,14 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations.entit import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus; import lombok.Builder; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.OffsetDateTime; @Data @NoArgsConstructor +@EqualsAndHashCode(callSuper = true) public class ManualImageRecategorization extends BaseAnnotation { private String type; diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualLegalBasisChange.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualLegalBasisChange.java index 40d64905f..e4dbe80d4 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualLegalBasisChange.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualLegalBasisChange.java @@ -3,12 +3,14 @@ package com.iqser.red.service.persistence.service.v1.api.model.annotations.entit import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus; import lombok.Builder; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.OffsetDateTime; @Data @NoArgsConstructor +@EqualsAndHashCode(callSuper = true) public class ManualLegalBasisChange extends BaseAnnotation { private String section; diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java index 3565531a6..4c175b2d5 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java @@ -4,6 +4,7 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.Annota import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle; import lombok.Builder; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.OffsetDateTime; @@ -12,6 +13,7 @@ import java.util.List; @Data @NoArgsConstructor +@EqualsAndHashCode(callSuper = true) public class ManualRedactionEntry extends BaseAnnotation { private String type; diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualResizeRedaction.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualResizeRedaction.java index 61e63b5de..362d5751a 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualResizeRedaction.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualResizeRedaction.java @@ -4,6 +4,7 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.Annota import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle; import lombok.Builder; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.OffsetDateTime; @@ -12,6 +13,7 @@ import java.util.List; @Data @NoArgsConstructor +@EqualsAndHashCode(callSuper = true) public class ManualResizeRedaction extends BaseAnnotation { private String value;