[james-project] 07/11: JAMES-2672 remove one more MailImpl constructor

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit ede355f7e606e06a9bda35fd47eddf5b20745601
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Feb 26 16:00:18 2019 +0100

    JAMES-2672 remove one more MailImpl constructor
---
 .../java/org/apache/james/server/core/MailImpl.java | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
index 2169592..10bf61e 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java
@@ -103,9 +103,12 @@ public class MailImpl implements Disposable, Mail {
     }
 
     public static MailImpl fromMimeMessage(String name, MimeMessage mimeMessage) throws MessagingException {
-        MailAddress sender = getSender(mimeMessage);
-        ImmutableList<MailAddress> recipients = getRecipients(mimeMessage);
-        return new MailImpl(name, sender, recipients, mimeMessage);
+        return MailImpl.builder()
+            .name(name)
+            .sender(getSender(mimeMessage))
+            .addRecipients(getRecipients(mimeMessage))
+            .mimeMessage(mimeMessage)
+            .build();
     }
 
     public static Builder builder() {
@@ -407,7 +410,8 @@ public class MailImpl implements Disposable, Mail {
 
     @SuppressWarnings({"unchecked", "deprecation"})
     private MailImpl(Mail mail, String newName) throws MessagingException {
-        this(newName, mail.getSender(), mail.getRecipients(), mail.getMessage());
+        this(newName, Optional.ofNullable(mail.getSender()), mail.getRecipients());
+        setMessage(new MimeMessageCopyOnWriteProxy(mail.getMessage()));
         setRemoteHost(mail.getRemoteHost());
         setRemoteAddr(mail.getRemoteAddr());
         setLastUpdated(mail.getLastUpdated());
@@ -430,15 +434,6 @@ public class MailImpl implements Disposable, Mail {
     }
 
     /**
-     * A constructor that creates a MailImpl with the specified name, sender,
-     * recipients, and MimeMessage.
-     */
-    private MailImpl(String name, MailAddress sender, Collection<MailAddress> recipients, MimeMessage message) throws MessagingException {
-        this(name, Optional.ofNullable(sender), recipients);
-        this.setMessage(new MimeMessageCopyOnWriteProxy(message));
-    }
-
-    /**
      * Duplicate the MailImpl, replacing the mail name with the one passed in as
      * an argument.
      *


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