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 2021/02/04 05:02:40 UTC
[james-project] 14/18: JAMES-3498 Restore JavaEvent convenience
import
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 e5d675fae6705d92dd0c15ad7f64e8a64ddfce04
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Jan 25 19:09:52 2021 +0700
JAMES-3498 Restore JavaEvent convenience import
---
.../james/event/json/MailboxEventSerializer.scala | 35 +++++++++++-----------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/MailboxEventSerializer.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/MailboxEventSerializer.scala
index cee6dc3..0b07edc 100644
--- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/MailboxEventSerializer.scala
+++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/MailboxEventSerializer.scala
@@ -28,9 +28,8 @@ import org.apache.james.core.Username
import org.apache.james.core.quota.{QuotaCountLimit, QuotaCountUsage, QuotaSizeLimit, QuotaSizeUsage}
import org.apache.james.event.json.DTOs.SystemFlag.SystemFlag
import org.apache.james.event.json.DTOs._
-import org.apache.james.events
import org.apache.james.events.Event.EventId
-import org.apache.james.events.EventSerializer
+import org.apache.james.events.{EventSerializer, Event => JavaEvent}
import org.apache.james.mailbox.MailboxSession.SessionId
import org.apache.james.mailbox.events.MailboxEvents.{Added => JavaAdded, Expunged => JavaExpunged, FlagsUpdated => JavaFlagsUpdated, MailboxACLUpdated => JavaMailboxACLUpdated, MailboxAdded => JavaMailboxAdded, MailboxDeletion => JavaMailboxDeletion, MailboxRenamed => JavaMailboxRenamed, QuotaUsageUpdatedEvent => JavaQuotaUsageUpdatedEvent}
import org.apache.james.mailbox.events.{MessageMoveEvent => JavaMessageMoveEvent}
@@ -42,36 +41,36 @@ import play.api.libs.json._
import scala.jdk.CollectionConverters._
private sealed trait Event {
- def toJava: events.Event
+ def toJava: JavaEvent
}
private object DTO {
case class MailboxACLUpdated(eventId: EventId, sessionId: SessionId, user: Username, mailboxPath: MailboxPath, aclDiff: ACLDiff, mailboxId: MailboxId) extends Event {
- override def toJava: events.Event = new JavaMailboxACLUpdated(sessionId, user, mailboxPath.toJava, aclDiff.toJava, mailboxId, eventId)
+ override def toJava: JavaEvent = new JavaMailboxACLUpdated(sessionId, user, mailboxPath.toJava, aclDiff.toJava, mailboxId, eventId)
}
case class MailboxAdded(eventId: EventId, mailboxPath: MailboxPath, mailboxId: MailboxId, user: Username, sessionId: SessionId) extends Event {
- override def toJava: events.Event = new JavaMailboxAdded(sessionId, user, mailboxPath.toJava, mailboxId, eventId)
+ override def toJava: JavaEvent = new JavaMailboxAdded(sessionId, user, mailboxPath.toJava, mailboxId, eventId)
}
case class MailboxDeletion(eventId: EventId, sessionId: SessionId, user: Username, path: MailboxPath, mailboxACL: Option[MailboxACL], quotaRoot: QuotaRoot,
deletedMessageCount: QuotaCountUsage, totalDeletedSize: QuotaSizeUsage, mailboxId: MailboxId) extends Event {
- override def toJava: events.Event = new JavaMailboxDeletion(sessionId, user, path.toJava, mailboxACL.map(mailboxACL => mailboxACL.toJava).getOrElse(new JavaMailboxACL()), quotaRoot, deletedMessageCount,
+ override def toJava: JavaEvent = new JavaMailboxDeletion(sessionId, user, path.toJava, mailboxACL.map(mailboxACL => mailboxACL.toJava).getOrElse(new JavaMailboxACL()), quotaRoot, deletedMessageCount,
totalDeletedSize, mailboxId, eventId)
}
case class MailboxRenamed(eventId: EventId, sessionId: SessionId, user: Username, path: MailboxPath, mailboxId: MailboxId, newPath: MailboxPath) extends Event {
- override def toJava: events.Event = new JavaMailboxRenamed(sessionId, user, path.toJava, mailboxId, newPath.toJava, eventId)
+ override def toJava: JavaEvent = new JavaMailboxRenamed(sessionId, user, path.toJava, mailboxId, newPath.toJava, eventId)
}
case class QuotaUsageUpdatedEvent(eventId: EventId, user: Username, quotaRoot: QuotaRoot, countQuota: Quota[QuotaCountLimit, QuotaCountUsage],
sizeQuota: Quota[QuotaSizeLimit, QuotaSizeUsage], time: Instant) extends Event {
- override def toJava: events.Event = new JavaQuotaUsageUpdatedEvent(eventId, user, quotaRoot, countQuota.toJava, sizeQuota.toJava, time)
+ override def toJava: JavaEvent = new JavaQuotaUsageUpdatedEvent(eventId, user, quotaRoot, countQuota.toJava, sizeQuota.toJava, time)
}
case class Added(eventId: EventId, sessionId: SessionId, user: Username, path: MailboxPath, mailboxId: MailboxId,
added: Map[MessageUid, DTOs.MessageMetaData]) extends Event {
- override def toJava: events.Event = new JavaAdded(
+ override def toJava: JavaEvent = new JavaAdded(
sessionId,
user,
path.toJava,
@@ -82,7 +81,7 @@ private object DTO {
case class Expunged(eventId: EventId, sessionId: SessionId, user: Username, path: MailboxPath, mailboxId: MailboxId,
expunged: Map[MessageUid, DTOs.MessageMetaData]) extends Event {
- override def toJava: events.Event = new JavaExpunged(
+ override def toJava: JavaEvent = new JavaExpunged(
sessionId,
user,
path.toJava,
@@ -93,7 +92,7 @@ private object DTO {
case class MessageMoveEvent(eventId: EventId, user: Username, previousMailboxIds: Iterable[MailboxId], targetMailboxIds: Iterable[MailboxId],
messageIds: Iterable[MessageId]) extends Event {
- override def toJava: events.Event = JavaMessageMoveEvent.builder()
+ override def toJava: JavaEvent = JavaMessageMoveEvent.builder()
.eventId(eventId)
.user(user)
.messageId(messageIds.asJava)
@@ -106,7 +105,7 @@ private object DTO {
case class FlagsUpdated(eventId: EventId, sessionId: SessionId, user: Username, path: MailboxPath, mailboxId: MailboxId,
updatedFlags: List[DTOs.UpdatedFlags]) extends Event {
- override def toJava: events.Event = new JavaFlagsUpdated(
+ override def toJava: JavaEvent = new JavaFlagsUpdated(
sessionId,
user,
path.toJava,
@@ -190,7 +189,7 @@ private object ScalaConverter {
mailboxId = event.getMailboxId,
updatedFlags = event.getUpdatedFlags.asScala.toList.map(DTOs.UpdatedFlags.toUpdatedFlags))
- def toScala(javaEvent: events.Event): Event = javaEvent match {
+ def toScala(javaEvent: JavaEvent): Event = javaEvent match {
case e: JavaAdded => toScala(e)
case e: JavaExpunged => toScala(e)
case e: JavaFlagsUpdated => toScala(e)
@@ -349,18 +348,18 @@ class JsonSerialize(mailboxIdFactory: MailboxId.Factory, messageIdFactory: Messa
}
private val eventSerializerPrivateWrapper = new EventSerializerPrivateWrapper()
- def toJson(event: events.Event): String = eventSerializerPrivateWrapper.toJson(ScalaConverter.toScala(event))
- def fromJson(json: String): JsResult[events.Event] = eventSerializerPrivateWrapper.fromJson(json)
+ def toJson(event: JavaEvent): String = eventSerializerPrivateWrapper.toJson(ScalaConverter.toScala(event))
+ def fromJson(json: String): JsResult[JavaEvent] = eventSerializerPrivateWrapper.fromJson(json)
.map(event => event.toJava)
}
class MailboxEventSerializer @Inject()(mailboxIdFactory: MailboxId.Factory, messageIdFactory: MessageId.Factory, quotaRootDeserializer: QuotaRootDeserializer) extends EventSerializer{
private val jsonSerialize = new JsonSerialize(mailboxIdFactory, messageIdFactory, quotaRootDeserializer)
- override def toJson(event: events.Event): String = jsonSerialize.toJson(event)
+ override def toJson(event: JavaEvent): String = jsonSerialize.toJson(event)
- def fromJson(json: String): JsResult[events.Event] = jsonSerialize.fromJson(json)
+ def fromJson(json: String): JsResult[JavaEvent] = jsonSerialize.fromJson(json)
- override def asEvent(serialized: String): events.Event = fromJson(serialized).get
+ override def asEvent(serialized: String): JavaEvent = fromJson(serialized).get
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org