You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/04/30 04:11:26 UTC
[james-project] 06/21: [PERF] Fasten Mailbox::hashCode
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 bd20060d2c971e8eea2eea41fee7713bd71a6113
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Apr 19 11:44:20 2022 +0700
[PERF] Fasten Mailbox::hashCode
Sub-fields should hash their single field directly.
Note that this is used to enforce mailbox unicity in responses.
---
core/src/main/java/org/apache/james/core/Domain.java | 6 +++++-
core/src/main/java/org/apache/james/core/MaybeSender.java | 2 +-
core/src/test/java/org/apache/james/domainlist/api/DomainTest.java | 2 --
.../api/src/main/java/org/apache/james/mailbox/model/Mailbox.java | 7 ++++---
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/org/apache/james/core/Domain.java b/core/src/main/java/org/apache/james/core/Domain.java
index 80f0e50196..46f7acce10 100644
--- a/core/src/main/java/org/apache/james/core/Domain.java
+++ b/core/src/main/java/org/apache/james/core/Domain.java
@@ -23,6 +23,8 @@ import java.io.Serializable;
import java.util.Locale;
import java.util.Objects;
+import javax.annotation.Nonnull;
+
import com.google.common.base.CharMatcher;
import com.google.common.base.Preconditions;
import com.google.common.net.InetAddresses;
@@ -93,7 +95,9 @@ public class Domain implements Serializable {
}
}
+ @Nonnull
private final String domainName;
+ @Nonnull
private final String normalizedDomainName;
protected Domain(String domainName) {
@@ -120,7 +124,7 @@ public class Domain implements Serializable {
@Override
public final int hashCode() {
- return Objects.hash(normalizedDomainName);
+ return normalizedDomainName.hashCode();
}
@Override
diff --git a/core/src/main/java/org/apache/james/core/MaybeSender.java b/core/src/main/java/org/apache/james/core/MaybeSender.java
index 824a6669cf..8627de970e 100644
--- a/core/src/main/java/org/apache/james/core/MaybeSender.java
+++ b/core/src/main/java/org/apache/james/core/MaybeSender.java
@@ -112,7 +112,7 @@ public class MaybeSender {
@Override
public final int hashCode() {
- return Objects.hash(mailAddress);
+ return Objects.hashCode(mailAddress);
}
@Override
diff --git a/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java b/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java
index c55393a80e..fad7bbf666 100644
--- a/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java
+++ b/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java
@@ -32,8 +32,6 @@ import org.junit.jupiter.params.provider.ValueSource;
import nl.jqno.equalsverifier.EqualsVerifier;
class DomainTest {
- private static String DOMAIN_WITH_64_CHAR_PART = "abc." + "d".repeat(64) + ".com";
-
@Test
void shouldRespectBeanContract() {
EqualsVerifier.forClass(Domain.class)
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Mailbox.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Mailbox.java
index dce6bdc270..ff25f0c995 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/Mailbox.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/Mailbox.java
@@ -18,12 +18,13 @@
****************************************************************/
package org.apache.james.mailbox.model;
+import java.util.Objects;
+
import org.apache.james.core.Username;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxUtil;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
/**
* Models long term mailbox data.
@@ -137,14 +138,14 @@ public class Mailbox {
public boolean equals(Object obj) {
if (obj instanceof Mailbox) {
Mailbox o = (Mailbox)obj;
- return Objects.equal(id, o.getMailboxId());
+ return Objects.equals(id, o.getMailboxId());
}
return false;
}
@Override
public int hashCode() {
- return Objects.hashCode(path);
+ return path.hashCode();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org