MAILBOX-359 Rework MailboxMetaData equals, hashCode & toString
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/86f03be8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/86f03be8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/86f03be8 Branch: refs/heads/master Commit: 86f03be81dd6a5951e4b5ff8a1047671e0d0a48e Parents: c25596d Author: Benoit Tellier <[email protected]> Authored: Tue Dec 18 11:35:15 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Dec 19 10:55:21 2018 +0700 ---------------------------------------------------------------------- .../james/mailbox/model/MailboxMetaData.java | 41 ++++++++------------ 1 file changed, 16 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/86f03be8/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java index 355beb8..3d014c5 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java @@ -19,8 +19,12 @@ package org.apache.james.mailbox.model; +import java.util.Objects; + import org.apache.james.mailbox.StandardMailboxMetaDataComparator; +import com.google.common.base.MoreObjects; + /** * Returned by the list method of MailboxRepository and others */ @@ -120,37 +124,24 @@ public class MailboxMetaData implements Comparable<MailboxMetaData> { @Override public String toString() { - return "ListResult: " + path; + return MoreObjects.toStringHelper(this) + .add("path", path) + .toString(); } @Override - public int hashCode() { - final int PRIME = 31; - int result = 1; - result = PRIME * result + ((path == null) ? 0 : path.hashCode()); - return result; + public final boolean equals(Object o) { + if (o instanceof MailboxMetaData) { + MailboxMetaData that = (MailboxMetaData) o; + + return Objects.equals(this.path, that.path); + } + return false; } @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final MailboxMetaData other = (MailboxMetaData) obj; - if (path == null) { - if (other.path != null) { - return false; - } - } else if (!path.equals(other.path)) { - return false; - } - return true; + public final int hashCode() { + return Objects.hash(path); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
