This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 805b4a32cbbff4acb1a7f919555abfa92ec62483 Author: Khanh Le <[email protected]> AuthorDate: Tue Aug 13 15:01:10 2019 +0700 JAMES-2856 QuotaRoot should match BeanContract --- .../org/apache/james/mailbox/model/QuotaRoot.java | 19 +++++--- .../apache/james/mailbox/model/QuotaRootTest.java} | 54 +++------------------- 2 files changed, 19 insertions(+), 54 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java index aa591f3..c7a825a 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java @@ -19,12 +19,12 @@ package org.apache.james.mailbox.model; +import java.util.Objects; import java.util.Optional; import org.apache.james.core.Domain; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; /** * Represents RFC 2087 Quota root @@ -43,15 +43,20 @@ public class QuotaRoot { this.domain = domain; } - public boolean equals(Object o) { - if (o == null || !(o instanceof QuotaRoot)) { - return false; + @Override + public final boolean equals(Object o) { + if (o instanceof QuotaRoot) { + QuotaRoot quotaRoot = (QuotaRoot) o; + + return Objects.equals(this.value, quotaRoot.value) + && Objects.equals(this.domain, quotaRoot.domain); } - return value.equals(((QuotaRoot) o).getValue()); + return false; } - public int hashCode() { - return Objects.hashCode(value, domain); + @Override + public final int hashCode() { + return Objects.hash(value, domain); } public String getValue() { diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/QuotaRootTest.java similarity index 52% copy from mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java copy to mailbox/api/src/test/java/org/apache/james/mailbox/model/QuotaRootTest.java index aa591f3..b9b80fb 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/QuotaRootTest.java @@ -19,53 +19,13 @@ package org.apache.james.mailbox.model; -import java.util.Optional; +import org.junit.jupiter.api.Test; -import org.apache.james.core.Domain; +import nl.jqno.equalsverifier.EqualsVerifier; -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; - -/** - * Represents RFC 2087 Quota root - */ -public class QuotaRoot { - - public static QuotaRoot quotaRoot(String value, Optional<Domain> domain) { - return new QuotaRoot(value, domain); - } - - private final String value; - private final Optional<Domain> domain; - - private QuotaRoot(String value, Optional<Domain> domain) { - this.value = value; - this.domain = domain; - } - - public boolean equals(Object o) { - if (o == null || !(o instanceof QuotaRoot)) { - return false; - } - return value.equals(((QuotaRoot) o).getValue()); - } - - public int hashCode() { - return Objects.hashCode(value, domain); - } - - public String getValue() { - return value; - } - - public Optional<Domain> getDomain() { - return domain; - } - - public String toString() { - return MoreObjects.toStringHelper(this) - .add("value", value) - .add("domain", domain) - .toString(); +class QuotaRootTest { + @Test + void shouldMatchBeanContract() { + EqualsVerifier.forClass(QuotaRoot.class).verify(); } -} +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
