This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit bc795b48a137bca0786b455e6027208e5e484134 Author: quanth <[email protected]> AuthorDate: Wed Jun 30 10:54:20 2021 +0700 JAMES-3516 Change ThreadIdGuessingAlgorithm::guessThreadId signature Using Optional to handle the case In-Reply-To and References fields could be null --- .../james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithmImpl.java | 3 ++- .../org/apache/james/mailbox/store/mail/ThreadIdGuessingAlgorithm.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithmImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithmImpl.java index 5dec27a..ebf5ed5 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithmImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/NaiveThreadIdGuessingAlgorithmImpl.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store.mail; import java.util.List; +import java.util.Optional; import org.apache.james.core.Username; import org.apache.james.mailbox.model.MessageId; @@ -29,7 +30,7 @@ import org.apache.james.mailbox.store.mail.model.Subject; public class NaiveThreadIdGuessingAlgorithmImpl implements ThreadIdGuessingAlgorithm { @Override - public ThreadId guessThreadId(Username username, MessageId messageId, MimeMessageId thisMimeMessageId, MimeMessageId inReplyTo, List<MimeMessageId> references, Subject subject) { + public ThreadId guessThreadId(Username username, MessageId messageId, Optional<MimeMessageId> thisMimeMessageId, Optional<MimeMessageId> inReplyTo, Optional<List<MimeMessageId>> references, Optional<Subject> subject) { return ThreadId.fromBaseMessageId(messageId); } } diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ThreadIdGuessingAlgorithm.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ThreadIdGuessingAlgorithm.java index a468e8e..8405fb7 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ThreadIdGuessingAlgorithm.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ThreadIdGuessingAlgorithm.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store.mail; import java.util.List; +import java.util.Optional; import org.apache.james.core.Username; import org.apache.james.mailbox.model.MessageId; @@ -28,5 +29,5 @@ import org.apache.james.mailbox.store.mail.model.MimeMessageId; import org.apache.james.mailbox.store.mail.model.Subject; public interface ThreadIdGuessingAlgorithm { - ThreadId guessThreadId(Username username, MessageId messageId, MimeMessageId thisMimeMessageId, MimeMessageId inReplyTo, List<MimeMessageId> references, Subject subject); + ThreadId guessThreadId(Username username, MessageId messageId, Optional<MimeMessageId> thisMimeMessageId, Optional<MimeMessageId> inReplyTo, Optional<List<MimeMessageId>> references, Optional<Subject> subject); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
