You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/01/05 04:56:01 UTC
[james-project] 22/24: JAMES-3471 Adapt the different
implementations of MessageMapper and MessageIdMapper to add the message id
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 3ba4665a13ebbd2218555c7bc8e7969f68c08b8c
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Thu Dec 31 17:50:07 2020 +0700
JAMES-3471 Adapt the different implementations of MessageMapper and MessageIdMapper to add the message id
---
.../james/mailbox/cassandra/mail/CassandraMessageIdMapper.java | 1 +
.../james/mailbox/cassandra/mail/CassandraMessageMapper.java | 2 ++
.../main/java/org/apache/james/mailbox/jpa/mail/MessageUtils.java | 1 +
.../apache/james/mailbox/maildir/mail/MaildirMessageMapper.java | 1 +
.../james/mailbox/inmemory/mail/InMemoryMessageIdMapper.java | 1 +
.../org/apache/james/mailbox/store/mail/AbstractMessageMapper.java | 1 +
.../mailbox/store/AbstractMessageIdManagerSideEffectTest.java | 1 +
.../apache/james/mailbox/store/mail/model/MessageIdMapperTest.java | 7 +++++++
.../apache/james/mailbox/store/mail/model/MessageMapperTest.java | 5 +++++
9 files changed, 20 insertions(+)
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
index 19fe49b..3fae704 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
@@ -268,6 +268,7 @@ public class CassandraMessageIdMapper implements MessageIdMapper {
return Pair.of(composedMessageIdWithMetaData.getComposedMessageId().getMailboxId(),
UpdatedFlags.builder()
.uid(composedMessageIdWithMetaData.getComposedMessageId().getUid())
+ .messageId(composedMessageIdWithMetaData.getComposedMessageId().getMessageId())
.modSeq(composedMessageIdWithMetaData.getModSeq())
.oldFlags(oldFlags)
.newFlags(composedMessageIdWithMetaData.getFlags())
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
index 88c23e6..419b8f8 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -541,6 +541,7 @@ public class CassandraMessageMapper implements MessageMapper {
if (identicalFlags(oldFlags, newFlags)) {
return Mono.just(FlagsUpdateStageResult.success(UpdatedFlags.builder()
.uid(oldMetaData.getComposedMessageId().getUid())
+ .messageId(oldMetaData.getComposedMessageId().getMessageId())
.modSeq(oldMetaData.getModSeq())
.oldFlags(oldFlags)
.newFlags(newFlags)
@@ -552,6 +553,7 @@ public class CassandraMessageMapper implements MessageMapper {
if (success) {
return FlagsUpdateStageResult.success(UpdatedFlags.builder()
.uid(oldMetaData.getComposedMessageId().getUid())
+ .messageId(oldMetaData.getComposedMessageId().getMessageId())
.modSeq(newModSeq)
.oldFlags(oldFlags)
.newFlags(newFlags)
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/MessageUtils.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/MessageUtils.java
index bd5d513..1c097e7 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/MessageUtils.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/MessageUtils.java
@@ -74,6 +74,7 @@ class MessageUtils {
updatedFlags.add(UpdatedFlags.builder()
.uid(member.getUid())
+ .messageId(member.getMessageId())
.modSeq(member.getModSeq())
.newFlags(newFlags)
.oldFlags(originalFlags)
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
index e670055..f8f7894 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
@@ -194,6 +194,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
updatedFlags.add(UpdatedFlags.builder()
.uid(member.getUid())
+ .messageId(member.getMessageId())
.modSeq(member.getModSeq())
.newFlags(newFlags)
.oldFlags(originalFlags)
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapper.java
index 521cb96..626640a 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapper.java
@@ -151,6 +151,7 @@ public class InMemoryMessageIdMapper implements MessageIdMapper {
UpdatedFlags updatedFlags = UpdatedFlags.builder()
.modSeq(message.getModSeq())
.uid(message.getUid())
+ .messageId(message.getMessageId())
.oldFlags(message.createFlags())
.newFlags(newState)
.build();
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
index 9fd5cf3..a80eead 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
@@ -102,6 +102,7 @@ public abstract class AbstractMessageMapper extends TransactionalMapper implemen
updatedFlags.add(UpdatedFlags.builder()
.uid(member.getUid())
+ .messageId(member.getMessageId())
.modSeq(member.getModSeq())
.newFlags(newFlags)
.oldFlags(originalFlags)
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
index 751704b..63e87f1 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
@@ -467,6 +467,7 @@ public abstract class AbstractMessageIdManagerSideEffectTest {
ModSeq modSeq = messageResult.getModSeq();
UpdatedFlags updatedFlags = UpdatedFlags.builder()
.uid(messageUid)
+ .messageId(messageId)
.modSeq(modSeq)
.oldFlags(FLAGS)
.newFlags(newFlags)
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
index 6f97388..5093ea9 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
@@ -355,6 +355,7 @@ public abstract class MessageIdMapperTest {
ModSeq modSeq = mapperProvider.highestModSeq(benwaInboxMailbox);
UpdatedFlags expectedUpdatedFlags = UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(messageId)
.modSeq(modSeq)
.oldFlags(new Flags())
.newFlags(newFlags)
@@ -382,6 +383,7 @@ public abstract class MessageIdMapperTest {
ModSeq modSeq = mapperProvider.highestModSeq(benwaInboxMailbox);
UpdatedFlags expectedUpdatedFlags = UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(messageId)
.modSeq(modSeq)
.oldFlags(messageFlags)
.newFlags(newFlags)
@@ -411,6 +413,7 @@ public abstract class MessageIdMapperTest {
ModSeq modSeq = mapperProvider.highestModSeq(benwaInboxMailbox);
UpdatedFlags expectedUpdatedFlags = UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(messageId)
.modSeq(modSeq)
.oldFlags(messageFlags)
.newFlags(new Flags(Flags.Flag.RECENT))
@@ -483,6 +486,7 @@ public abstract class MessageIdMapperTest {
ModSeq modSeq = mapperProvider.highestModSeq(benwaInboxMailbox);
UpdatedFlags expectedUpdatedFlags = UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(messageId)
.modSeq(modSeq)
.oldFlags(initialFlags)
.newFlags(newFlags)
@@ -510,12 +514,14 @@ public abstract class MessageIdMapperTest {
ModSeq modSeqBenwaWorkMailbox = mapperProvider.highestModSeq(benwaWorkMailbox);
UpdatedFlags expectedUpdatedFlags = UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(messageId)
.modSeq(modSeqBenwaInboxMailbox)
.oldFlags(new Flags())
.newFlags(newFlags)
.build();
UpdatedFlags expectedUpdatedFlags2 = UpdatedFlags.builder()
.uid(message1InOtherMailbox.getUid())
+ .messageId(messageId)
.modSeq(modSeqBenwaWorkMailbox)
.oldFlags(new Flags())
.newFlags(newFlags)
@@ -854,6 +860,7 @@ public abstract class MessageIdMapperTest {
ImmutableList.of(UpdatedFlags.builder()
.modSeq(modSeq)
.uid(message1.getUid())
+ .messageId(message1.getMessageId())
.newFlags(flags)
.oldFlags(flags)
.build())));
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
index 0a59a33..cc949d5 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
@@ -709,6 +709,7 @@ public abstract class MessageMapperTest {
assertThat(updatedFlags)
.contains(UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(message1.getMessageId())
.modSeq(modSeq.next())
.oldFlags(new Flags())
.newFlags(new Flags(Flags.Flag.FLAGGED))
@@ -723,6 +724,7 @@ public abstract class MessageMapperTest {
assertThat(messageMapper.updateFlags(benwaInboxMailbox, message1.getUid(), new FlagsUpdateCalculator(new Flags(Flags.Flag.SEEN), FlagsUpdateMode.ADD)))
.contains(UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(message1.getMessageId())
.modSeq(modSeq.next())
.oldFlags(new Flags(Flags.Flag.FLAGGED))
.newFlags(new FlagsBuilder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build())
@@ -756,6 +758,7 @@ public abstract class MessageMapperTest {
.contains(
UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(message1.getMessageId())
.modSeq(modSeq.next())
.oldFlags(new FlagsBuilder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build())
.newFlags(new Flags(Flags.Flag.FLAGGED))
@@ -881,6 +884,7 @@ public abstract class MessageMapperTest {
.contains(
UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(message1.getMessageId())
.modSeq(modSeq.next())
.oldFlags(new Flags())
.newFlags(new Flags(USER_FLAG))
@@ -897,6 +901,7 @@ public abstract class MessageMapperTest {
.contains(
UpdatedFlags.builder()
.uid(message1.getUid())
+ .messageId(message1.getMessageId())
.modSeq(message1.getModSeq())
.oldFlags(new Flags())
.newFlags(new Flags())
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org