[james-project] 27/38: JAMES-2726 Support FakeMail without messages

[btellier]

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 2b4fcb7b330e3964c1b11eb0d6bac79f11f2ed5f
Author: Rémi Kowalski <rkowal...@linagora.com>
AuthorDate: Tue Jul 2 13:28:09 2019 +0200

    JAMES-2726 Support FakeMail without messages
---
 .../src/main/java/org/apache/mailet/base/test/FakeMail.java | 13 ++++++++++---
 .../memory/MailRepositoryStoreConfigurationTest.java        |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/mailet/test/src/main/java/org/apache/mailet/base/test/FakeMail.java 
b/mailet/test/src/main/java/org/apache/mailet/base/test/FakeMail.java
index 4ac9fe2..9e73a33 100644
--- a/mailet/test/src/main/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/test/src/main/java/org/apache/mailet/base/test/FakeMail.java
@@ -282,6 +282,11 @@ public class FakeMail implements Mail {
             return this;
         }
 
+        public Builder addAllHeadersForRecipients(PerRecipientHeaders 
perRecipientHeaders) {
+            this.perRecipientHeaders.addAll(perRecipientHeaders);
+            return this;
+        }
+
         public FakeMail build() throws MessagingException {
             return new FakeMail(getMimeMessage(), recipients, name, 
sender.orElse(null), state.orElse(null), errorMessage.orElse(null), 
lastUpdated.orElse(null),
                 attributes, size.orElse(0L), 
remoteAddr.orElse(DEFAULT_REMOTE_ADDRESS), 
remoteHost.orElse(DEFAULT_REMOTE_HOST), perRecipientHeaders);
@@ -340,9 +345,8 @@ public class FakeMail implements Mail {
 
     @Override
     public Mail duplicate() throws MessagingException {
-        return builder()
+        Builder builder = builder()
             .name(name)
-            .mimeMessage(msg)
             .recipients(ImmutableList.copyOf(recipients))
             .sender(MaybeSender.of(sender))
             .state(Optional.ofNullable(state))
@@ -352,7 +356,10 @@ public class FakeMail implements Mail {
             .size(size)
             .remoteAddr(remoteAddr)
             .remoteHost(remoteHost)
-            .build();
+            .addAllHeadersForRecipients(perRecipientHeaders);
+
+        Optional.ofNullable(msg).ifPresent(builder::mimeMessage);
+        return builder.build();
     }
 
     @Override
diff --git 
a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfigurationTest.java
 
b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfigurationTest.java
index 8559e97..7fa9f5a 100644
--- 
a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfigurationTest.java
+++ 
b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfigurationTest.java
@@ -73,4 +73,4 @@ class MailRepositoryStoreConfigurationTest {
 
         assertThat(defaultProtocol).contains(new Protocol("1"));
     }
-}
\ No newline at end of file
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org