From b1a266d4d4166700d63a3fc2d4a65880a72c31aa Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Tue, 4 Aug 2020 09:53:58 +0200
Subject: [PATCH] Use EqualsAndHashcode annotation from Lombok

---
 .../v1/server/redaction/model/Entity.java     | 40 ++++++++-----------
 .../model/EntityPositionSequence.java         | 26 ++----------
 2 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java
index 2192763d..de6d56eb 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java
@@ -3,22 +3,37 @@ package com.iqser.red.service.redaction.v1.server.redaction.model;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode
 public class Entity {
 
     private final String word;
     private final String type;
+
+    @EqualsAndHashCode.Exclude
     private boolean redaction;
+
+    @EqualsAndHashCode.Exclude
     private String redactionReason;
+
+    @EqualsAndHashCode.Exclude
     private List<EntityPositionSequence> positionSequences = new ArrayList<>();
+
+    @EqualsAndHashCode.Exclude
     private Integer start;
+
+    @EqualsAndHashCode.Exclude
     private Integer end;
+
     private String headline;
+
+    @EqualsAndHashCode.Exclude
     private int matchedRule;
+
     private int sectionNumber;
 
     public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber) {
@@ -40,27 +55,4 @@ public class Entity {
         this.headline = headline;
         this.sectionNumber = sectionNumber;
     }
-
-
-    @Override
-    public boolean equals(Object o) {
-
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Entity entity = (Entity) o;
-        return sectionNumber == entity.sectionNumber && Objects.equals(word, entity.word) && Objects.equals(type, entity.type) && Objects
-                .equals(headline, entity.headline);
-    }
-
-
-    @Override
-    public int hashCode() {
-
-        return Objects.hash(word, type, headline, sectionNumber);
-    }
-
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityPositionSequence.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityPositionSequence.java
index 20db99f6..96421f53 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityPositionSequence.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityPositionSequence.java
@@ -2,44 +2,24 @@ package com.iqser.red.service.redaction.v1.server.redaction.model;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
-
 @Data
 @RequiredArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode
 public class EntityPositionSequence {
 
+    @EqualsAndHashCode.Exclude
     private List<TextPositionSequence> sequences = new ArrayList<>();
     private int pageNumber;
     private final UUID id;
 
-
-    @Override
-    public boolean equals(Object o) {
-
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EntityPositionSequence that = (EntityPositionSequence) o;
-        return pageNumber == that.pageNumber && Objects.equals(id, that.id);
-    }
-
-
-    @Override
-    public int hashCode() {
-
-        return Objects.hash(pageNumber, id);
-    }
-
 }