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 2023/06/26 09:27:01 UTC
[james-project] 02/05: [CLEAN CODE] Update Deprecated in JMAP Module
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 8a4d2a016fc28d88babcf213bc5efe833fd6cf72
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Sat Jun 24 06:33:43 2023 +0700
[CLEAN CODE] Update Deprecated in JMAP Module
- Scala Traversable => Iterable
- Hashing.murmur3_32 -> Hashing.murmur3_32_fixed
- SFlux reduceWith -> reduce
...
---
.../jmap/rfc8621/contract/EmailQueryMethodContract.scala | 5 ++---
.../jmap/rfc8621/contract/MailboxQueryMethodContract.scala | 2 +-
.../main/scala/org/apache/james/jmap/core/Capability.scala | 2 +-
.../src/main/scala/org/apache/james/jmap/core/Query.scala | 2 +-
.../apache/james/jmap/method/EmailSetUpdatePerformer.scala | 12 ++++++------
.../apache/james/jmap/method/VacationResponseSetMethod.scala | 5 ++---
6 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
index c06761c68e..b85a358bcc 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
@@ -7487,9 +7487,8 @@ trait EmailQueryMethodContract {
.getMessageId
}
- private def generateQueryState(messages: MessageId*): String = {
- Hashing.murmur3_32()
+ private def generateQueryState(messages: MessageId*): String =
+ Hashing.murmur3_32_fixed()
.hashUnencodedChars(messages.toList.map(_.serialize).mkString(" "))
.toString
- }
}
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxQueryMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxQueryMethodContract.scala
index 2b77c2db88..6f25d83715 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxQueryMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxQueryMethodContract.scala
@@ -533,7 +533,7 @@ trait MailboxQueryMethodContract {
}
private def generateQueryState(ids: MailboxId*): String =
- Hashing.murmur3_32()
+ Hashing.murmur3_32_fixed()
.hashUnencodedChars(ids.toList.map(_.serialize()).mkString(" "))
.toString
}
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capability.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capability.scala
index b198b92f1c..36508de9da 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capability.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capability.scala
@@ -116,7 +116,7 @@ case object WebSocketCapabilityFactory extends CapabilityFactory {
override def id(): CapabilityIdentifier = JMAP_WEBSOCKET
override def create(urlPrefixes: UrlPrefixes): Capability = WebSocketCapability(
- WebSocketCapabilityProperties(SupportsPush(true), new URI(urlPrefixes.webSocketURLPrefix + "/jmap/ws")))
+ WebSocketCapabilityProperties(SupportsPush(true), new URI(urlPrefixes.webSocketURLPrefix.toString + "/jmap/ws")))
}
object MaxSizeUpload {
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Query.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Query.scala
index 3e87aed4fa..78fc360523 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Query.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Query.scala
@@ -72,7 +72,7 @@ object QueryState {
forStrings(ids.map(_.value))
def forStrings(strings: Seq[String]): QueryState = QueryState(
- Hashing.murmur3_32()
+ Hashing.murmur3_32_fixed()
.hashUnencodedChars(strings.mkString(" "))
.toString)
}
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetUpdatePerformer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetUpdatePerformer.scala
index 97c77c646b..6510dd1bf7 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetUpdatePerformer.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetUpdatePerformer.scala
@@ -110,7 +110,7 @@ class EmailSetUpdatePerformer @Inject() (serializer: EmailSetSerializer,
}
private def doUpdate(validUpdates: List[(MessageId, ValidatedEmailSetUpdate)],
- metaData: Map[MessageId, Traversable[ComposedMessageIdWithMetaData]],
+ metaData: Map[MessageId, Iterable[ComposedMessageIdWithMetaData]],
session: MailboxSession): SMono[Seq[EmailUpdateResult]] = {
val sameUpdate: Boolean = validUpdates.map(_._2).distinctBy(_.update).size == 1
val singleMailbox: Boolean = metaData.values.flatten.map(_.getComposedMessageId.getMailboxId).toSet.size == 1
@@ -134,7 +134,7 @@ class EmailSetUpdatePerformer @Inject() (serializer: EmailSetSerializer,
}
}
- private def asRanges(metaData: Map[MessageId, Traversable[ComposedMessageIdWithMetaData]]) =
+ private def asRanges(metaData: Map[MessageId, Iterable[ComposedMessageIdWithMetaData]]) =
MessageRange.toRanges(metaData.values
.flatten.map(_.getComposedMessageId.getUid)
.toList.distinct.asJava)
@@ -143,7 +143,7 @@ class EmailSetUpdatePerformer @Inject() (serializer: EmailSetSerializer,
private def updateFlagsByRange(mailboxId: MailboxId,
flags: Flags,
ranges: List[MessageRange],
- metaData: Map[MessageId, Traversable[ComposedMessageIdWithMetaData]],
+ metaData: Map[MessageId, Iterable[ComposedMessageIdWithMetaData]],
updateMode: FlagsUpdateMode,
session: MailboxSession): SMono[Seq[EmailUpdateResult]] = {
val mailboxMono: SMono[MessageManager] = SMono(mailboxManager.getMailboxReactive(mailboxId, session))
@@ -156,7 +156,7 @@ class EmailSetUpdatePerformer @Inject() (serializer: EmailSetSerializer,
private def moveByRange(mailboxId: MailboxId,
update: ValidatedEmailSetUpdate,
ranges: List[MessageRange],
- metaData: Map[MessageId, Traversable[ComposedMessageIdWithMetaData]],
+ metaData: Map[MessageId, Iterable[ComposedMessageIdWithMetaData]],
session: MailboxSession): SMono[Seq[EmailUpdateResult]] = {
val targetId: MailboxId = update.update.mailboxIds.get.value.headOption.get
@@ -165,7 +165,7 @@ class EmailSetUpdatePerformer @Inject() (serializer: EmailSetSerializer,
}
private def updateByRange(ranges: List[MessageRange],
- metaData: Map[MessageId, Traversable[ComposedMessageIdWithMetaData]],
+ metaData: Map[MessageId, Iterable[ComposedMessageIdWithMetaData]],
operation: MessageRange => SMono[Unit]): SMono[Seq[EmailUpdateResult]] =
SFlux.fromIterable(ranges)
.concatMap(range => {
@@ -179,7 +179,7 @@ class EmailSetUpdatePerformer @Inject() (serializer: EmailSetSerializer,
.reduce(Seq[EmailUpdateResult]())( _ ++ _)
private def updateEachMessage(validUpdates: List[(MessageId, ValidatedEmailSetUpdate)],
- metaData: Map[MessageId, Traversable[ComposedMessageIdWithMetaData]],
+ metaData: Map[MessageId, Iterable[ComposedMessageIdWithMetaData]],
session: MailboxSession): SMono[Seq[EmailUpdateResult]] =
SFlux.fromIterable(validUpdates)
.concatMap[EmailUpdateResult]({
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseSetMethod.scala
index 14ff1eb934..a41e63f40b 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseSetMethod.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseSetMethod.scala
@@ -99,7 +99,7 @@ class VacationResponseSetMethod @Inject()(@Named(InjectionKeys.JMAP) eventBus: E
override def getRequest(mailboxSession: MailboxSession, invocation: Invocation): Either[IllegalArgumentException, VacationResponseSetRequest] =
VacationSerializer.deserializeVacationResponseSetRequest(invocation.arguments.value).asEitherRequest
- private def update(mailboxSession: MailboxSession, vacationResponseSetRequest: VacationResponseSetRequest): SMono[VacationResponseUpdateResults] = {
+ private def update(mailboxSession: MailboxSession, vacationResponseSetRequest: VacationResponseSetRequest): SMono[VacationResponseUpdateResults] =
SFlux.fromIterable(vacationResponseSetRequest.parsePatch()
.map[SMono[VacationResponseUpdateResult]]({
case (id, Right(patch)) =>
@@ -111,8 +111,7 @@ class VacationResponseSetMethod @Inject()(@Named(InjectionKeys.JMAP) eventBus: E
}))
.flatMap[VacationResponseUpdateResult](updateResultMono => updateResultMono)
.map(updateResult => updateResult.asVacationResponseUpdateResults)
- .reduceWith(() => VacationResponseUpdateResults.empty(), VacationResponseUpdateResults.merge)
- }
+ .reduce[VacationResponseUpdateResults](VacationResponseUpdateResults.empty())(VacationResponseUpdateResults.merge)
private def update(validatedPatch: VacationPatch, mailboxSession: MailboxSession): SMono[VacationResponseUpdateResult] =
SMono.fromPublisher(
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org