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 0794c5ba49d050c31b9adce2da4266ddafd5b1a5 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Wed Nov 13 09:25:02 2019 +0700 [Refactoring] Use a default method for MailboxMessage::compareTo --- .../jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java | 8 -------- .../james/mailbox/store/mail/model/DelegatingMailboxMessage.java | 5 ----- .../apache/james/mailbox/store/mail/model/MailboxMessage.java | 9 ++++++--- .../org/apache/james/mailbox/store/SimpleMailboxMembership.java | 5 ----- .../james/mailbox/store/mail/model/ListMessageAssertTest.java | 5 ----- 5 files changed, 6 insertions(+), 26 deletions(-) diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java index 792209d..306a436 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java @@ -23,7 +23,6 @@ import java.io.InputStream; import java.io.SequenceInputStream; import java.io.Serializable; import java.util.ArrayList; -import java.util.Comparator; import java.util.Date; import java.util.List; @@ -96,8 +95,6 @@ import com.google.common.base.Objects; @NamedQuery(name = "deleteAllMemberships", query = "DELETE FROM MailboxMessage message") }) @MappedSuperclass public abstract class AbstractJPAMailboxMessage implements MailboxMessage { - - private static final Comparator<MailboxMessage> MESSAGE_UID_COMPARATOR = Comparator.comparing(MailboxMessage::getUid); private static final String TOSTRING_SEPARATOR = " "; /** Identifies composite key */ @@ -487,11 +484,6 @@ public abstract class AbstractJPAMailboxMessage implements MailboxMessage { return new DefaultMessageId(); } - @Override - public int compareTo(MailboxMessage other) { - return MESSAGE_UID_COMPARATOR.compare(this, other); - } - public String toString() { return "message(" + "mailboxId = " + this.getMailboxId() + TOSTRING_SEPARATOR diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessage.java index fde3f82..46e5a94 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessage.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessage.java @@ -37,11 +37,6 @@ public abstract class DelegatingMailboxMessage implements MailboxMessage { } @Override - public int compareTo(MailboxMessage other) { - return this.getUid().compareTo(other.getUid()); - } - - @Override public final Flags createFlags() { return FlagsFactory.createFlags(this, createUserFlags()); } diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java index 2936f1e..399fc10 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java @@ -43,7 +43,7 @@ public interface MailboxMessage extends Message, Comparable<MailboxMessage> { * Return the uid */ MessageUid getUid(); - + /** * Set the uid for the message. This must be called before the message is added to the store * and must be unique / sequential. @@ -51,11 +51,11 @@ public interface MailboxMessage extends Message, Comparable<MailboxMessage> { void setUid(MessageUid uid); /** - * Set the mod-sequence for the message. This must be called before the message is added to the store + * Set the mod-sequence for the message. This must be called before the message is added to the store * or any flags are changed. This must be unique / sequential. */ void setModSeq(long modSeq); - + /** * Return the mod-sequence for the message */ @@ -109,4 +109,7 @@ public interface MailboxMessage extends Message, Comparable<MailboxMessage> { return new MessageMetaData(getUid(), getModSeq(), createFlags(), getFullContentOctets(), getInternalDate(), getMessageId()); } + default int compareTo(MailboxMessage other) { + return this.getUid().compareTo(other.getUid()); + } } \ No newline at end of file diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java index 7e50a95..322f87a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java @@ -282,11 +282,6 @@ public class SimpleMailboxMembership implements MailboxMessage { } @Override - public int compareTo(MailboxMessage other) { - return getUid().compareTo(other.getUid()); - } - - @Override public long getModSeq() { return modSeq; } diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java index ad84d6a..ee42ac9 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java @@ -159,11 +159,6 @@ public class ListMessageAssertTest { } @Override - public int compareTo(MailboxMessage o) { - return 0; - } - - @Override public long getHeaderOctets() { return bodyStart; } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org