You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/12/19 11:24:51 UTC
[10/10] james-project git commit: MAILBOX-363 Rely on iterable in
Scala MessageMoveEvent
MAILBOX-363 Rely on iterable in Scala MessageMoveEvent
Only this is required for Java <-> scala transformation. Furthermore,
JavaSet.asScala returns an Iterable and not a Set....
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e151594f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e151594f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e151594f
Branch: refs/heads/master
Commit: e151594fda77db2dae2aa5f524e26f6afd367a3e
Parents: 26af5b2
Author: Benoit Tellier <bt...@linagora.com>
Authored: Tue Dec 18 09:19:41 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Dec 19 18:24:21 2018 +0700
----------------------------------------------------------------------
.../java/org/apache/james/mailbox/MessageMoveEvent.java | 2 +-
.../java/org/apache/james/mailbox/model/MessageMoves.java | 4 ++--
.../org/apache/james/event/json/EventSerializer.scala | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e151594f/mailbox/api/src/main/java/org/apache/james/mailbox/MessageMoveEvent.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageMoveEvent.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageMoveEvent.java
index 5122766..d10058b 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageMoveEvent.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageMoveEvent.java
@@ -65,7 +65,7 @@ public class MessageMoveEvent implements Event {
return this;
}
- public Builder messageId(Collection<MessageId> messageIds) {
+ public Builder messageId(Iterable<MessageId> messageIds) {
this.messageIds.addAll(messageIds);
return this;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e151594f/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageMoves.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageMoves.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageMoves.java
index a041a25..b4ef7ea 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageMoves.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageMoves.java
@@ -37,7 +37,7 @@ public class MessageMoves {
targetMailboxIds = ImmutableSet.builder();
}
- public Builder previousMailboxIds(Collection<MailboxId> mailboxIds) {
+ public Builder previousMailboxIds(Iterable<MailboxId> mailboxIds) {
previousMailboxIds.addAll(mailboxIds);
return this;
}
@@ -47,7 +47,7 @@ public class MessageMoves {
return this;
}
- public Builder targetMailboxIds(Collection<MailboxId> mailboxIds) {
+ public Builder targetMailboxIds(Iterable<MailboxId> mailboxIds) {
targetMailboxIds.addAll(mailboxIds);
return this;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e151594f/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
----------------------------------------------------------------------
diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
index 31ebf49..3a64653 100644
--- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
+++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
@@ -84,8 +84,8 @@ private object DTO {
expunged.mapValues(_.toJava).asJava)
}
- case class MessageMoveEvent(user: User, previousMailboxIds: Seq[MailboxId], targetMailboxIds: Seq[MailboxId],
- messageIds: Seq[MessageId]) extends Event {
+ case class MessageMoveEvent(user: User, previousMailboxIds: Iterable[MailboxId], targetMailboxIds: Iterable[MailboxId],
+ messageIds: Iterable[MessageId]) extends Event {
override def toJava: JavaEvent = JavaMessageMoveEvent.builder()
.user(user)
.messageId(messageIds.asJava)
@@ -157,9 +157,9 @@ private object ScalaConverter {
private def toScala(event: JavaMessageMoveEvent): DTO.MessageMoveEvent = DTO.MessageMoveEvent(
user = event.getUser,
- previousMailboxIds = event.getMessageMoves.getPreviousMailboxIds.asScala.toList,
- targetMailboxIds = event.getMessageMoves.getTargetMailboxIds.asScala.toList,
- messageIds = event.getMessageIds.asScala.toList)
+ previousMailboxIds = event.getMessageMoves.getPreviousMailboxIds.asScala,
+ targetMailboxIds = event.getMessageMoves.getTargetMailboxIds.asScala,
+ messageIds = event.getMessageIds.asScala)
def toScala(javaEvent: JavaEvent): Event = javaEvent match {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org