From 99bac4550a9cade36de313735916687ea26d7b4d Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 7 Aug 2020 12:28:21 +0200 Subject: [PATCH] Use @EqualsAndHashCode(onlyExplicitlyIncluded = true) in Entity.java --- .../v1/server/redaction/model/Entity.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 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 e68c6121..776ae1b0 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 @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.redaction.model; - import java.util.ArrayList; import java.util.List; @@ -8,37 +7,28 @@ import lombok.Data; import lombok.EqualsAndHashCode; @Data -@EqualsAndHashCode +@EqualsAndHashCode(onlyExplicitlyIncluded = true) public class Entity { + @EqualsAndHashCode.Include private final String word; - - @EqualsAndHashCode.Exclude private final String type; - - @EqualsAndHashCode.Exclude private boolean redaction; - - @EqualsAndHashCode.Exclude private String redactionReason; - - @EqualsAndHashCode.Exclude private List positionSequences = new ArrayList<>(); - - @EqualsAndHashCode.Exclude private Integer start; - - @EqualsAndHashCode.Exclude private Integer end; + @EqualsAndHashCode.Include private String headline; - - @EqualsAndHashCode.Exclude private int matchedRule; + @EqualsAndHashCode.Include private int sectionNumber; + public Entity(String word, String type, boolean redaction, String redactionReason, List positionSequences, String headline, int matchedRule, int sectionNumber) { + this.word = word; this.type = type; this.redaction = redaction; @@ -49,7 +39,9 @@ public class Entity { this.sectionNumber = sectionNumber; } + public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber) { + this.word = word; this.type = type; this.start = start; @@ -57,4 +49,5 @@ public class Entity { this.headline = headline; this.sectionNumber = sectionNumber; } + }