diff --git a/src/main/java/com/cys4/sensitivediscoverer/model/RegexEntity.java b/src/main/java/com/cys4/sensitivediscoverer/model/RegexEntity.java index af40caf..c61a4fd 100644 --- a/src/main/java/com/cys4/sensitivediscoverer/model/RegexEntity.java +++ b/src/main/java/com/cys4/sensitivediscoverer/model/RegexEntity.java @@ -23,6 +23,7 @@ public class RegexEntity { private final EnumSet sections; private final List tests; private boolean active; + public RegexEntity(String description, String regex) throws IllegalArgumentException { this(description, regex, true, ProxyItemSection.getDefault(), null); } @@ -114,8 +115,13 @@ public String getSectionsHumanReadable() { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - RegexEntity that = (RegexEntity) o; - return this.getRegex().equals(that.getRegex()); + RegexEntity entity = (RegexEntity) o; + return Objects.equals(getRegex(), entity.getRegex()) && Objects.equals(getDescription(), entity.getDescription()) && Objects.equals(getSections(), entity.getSections()); + } + + @Override + public int hashCode() { + return Objects.hash(getRegex(), getDescription(), getSections()); } @Override @@ -126,9 +132,4 @@ public String toString() { ", sections=" + sections + '}'; } - - @Override - public int hashCode() { - return Objects.hash(this.getRegex()); - } }