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 37986cc440b742f404dcf520159e0c8cc9777ee8 Author: quanth <[email protected]> AuthorDate: Thu May 27 12:02:05 2021 +0700 JAMES-3516 Using the MessageResult::getThreadId property at the JMAP level --- .../scala/org/apache/james/jmap/mail/Email.scala | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Email.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Email.scala index d3b037c..6699876 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Email.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Email.scala @@ -19,10 +19,6 @@ package org.apache.james.jmap.mail -import java.nio.charset.StandardCharsets.US_ASCII -import java.time.ZoneId -import java.util.Date - import cats.implicits._ import eu.timepit.refined import eu.timepit.refined.api.Refined @@ -30,7 +26,6 @@ import eu.timepit.refined.auto._ import eu.timepit.refined.numeric.NonNegative import eu.timepit.refined.refineV import eu.timepit.refined.types.string.NonEmptyString -import javax.inject.Inject import org.apache.james.jmap.api.model.Preview import org.apache.james.jmap.api.projections.{MessageFastViewPrecomputedProperties, MessageFastViewProjection} import org.apache.james.jmap.core.Id.{Id, IdConstraint} @@ -55,6 +50,10 @@ import org.slf4j.{Logger, LoggerFactory} import reactor.core.scala.publisher.{SFlux, SMono} import reactor.core.scheduler.Schedulers +import java.nio.charset.StandardCharsets.US_ASCII +import java.time.ZoneId +import java.util.Date +import javax.inject.Inject import scala.jdk.CollectionConverters._ import scala.util.{Failure, Success, Try} @@ -421,6 +420,7 @@ private class EmailMetadataViewFactory @Inject()(zoneIdProvider: ZoneIdProvider) val mailboxIds: MailboxIds = MailboxIds(message._2 .map(_.getMailboxId) .toList) + val threadId: ThreadId = ThreadId(message._2.head.getThreadId.serialize()) for { firstMessage <- message._2 @@ -434,7 +434,7 @@ private class EmailMetadataViewFactory @Inject()(zoneIdProvider: ZoneIdProvider) metadata = EmailMetadata( id = messageId, blobId = blobId, - threadId = ThreadId(messageId.serialize), + threadId = threadId, keywords = keywords, mailboxIds = mailboxIds, receivedAt = UTCDate.from(firstMessage.getInternalDate, zoneIdProvider.get()), @@ -449,6 +449,7 @@ private class EmailHeaderViewFactory @Inject()(zoneIdProvider: ZoneIdProvider) e val mailboxIds: MailboxIds = MailboxIds(message._2 .map(_.getMailboxId) .toList) + val threadId: ThreadId = ThreadId(message._2.head.getThreadId.serialize()) for { firstMessage <- message._2 @@ -463,7 +464,7 @@ private class EmailHeaderViewFactory @Inject()(zoneIdProvider: ZoneIdProvider) e metadata = EmailMetadata( id = messageId, blobId = blobId, - threadId = ThreadId(messageId.serialize), + threadId = threadId, mailboxIds = mailboxIds, receivedAt = UTCDate.from(firstMessage.getInternalDate, zoneIdProvider.get()), size = sanitizeSize(firstMessage.getSize), @@ -480,6 +481,7 @@ private class EmailFullViewFactory @Inject()(zoneIdProvider: ZoneIdProvider, pre val mailboxIds: MailboxIds = MailboxIds(message._2 .map(_.getMailboxId) .toList) + val threadId: ThreadId = ThreadId(message._2.head.getThreadId.serialize()) for { firstMessage <- message._2 @@ -497,7 +499,7 @@ private class EmailFullViewFactory @Inject()(zoneIdProvider: ZoneIdProvider, pre metadata = EmailMetadata( id = messageId, blobId = blobId, - threadId = ThreadId(messageId.serialize), + threadId = threadId, mailboxIds = mailboxIds, receivedAt = UTCDate.from(firstMessage.getInternalDate, zoneIdProvider.get()), keywords = keywords, @@ -647,6 +649,7 @@ private class EmailFastViewReader @Inject()(messageIdManager: MessageIdManager, val mailboxIds: MailboxIds = MailboxIds(message._2 .map(_.getMailboxId) .toList) + val threadId: ThreadId = ThreadId(message._2.head.getThreadId.serialize()) for { firstMessage <- message._2 @@ -661,7 +664,7 @@ private class EmailFastViewReader @Inject()(messageIdManager: MessageIdManager, metadata = EmailMetadata( id = messageId, blobId = blobId, - threadId = ThreadId(messageId.serialize), + threadId = threadId, mailboxIds = mailboxIds, receivedAt = UTCDate.from(firstMessage.getInternalDate, zoneIdProvider.get()), size = sanitizeSize(firstMessage.getSize), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
