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 ro...@apache.org on 2019/02/27 10:56:37 UTC
[james-project] 11/11: JAMES-2672 don't use default constructor
anymore
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 0920a2dad3174b9199178e863e90b9870e2f86c2
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Feb 26 16:30:14 2019 +0100
JAMES-2672 don't use default constructor anymore
---
.../org/apache/james/server/core/MailImpl.java | 23 ++++++++++------------
1 file changed, 10 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 9534dd9..9ca5610 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
@@ -264,18 +264,15 @@ public class MailImpl implements Disposable, Mail {
}
public MailImpl build() {
- MailImpl mail = new MailImpl();
+ MailImpl mail = new MailImpl(state.orElse(DEFAULT), attributes, recipients, perRecipientHeaders);
+
mimeMessage.ifPresent(Throwing.consumer(mail::setMessage).sneakyThrow());
name.ifPresent(mail::setName);
sender.ifPresent(mail::setSender);
- mail.setRecipients(recipients);
- state.ifPresent(mail::setState);
errorMessage.ifPresent(mail::setErrorMessage);
lastUpdated.ifPresent(mail::setLastUpdated);
- mail.setAttributes(attributes);
remoteAddr.ifPresent(mail::setRemoteAddr);
remoteHost.ifPresent(mail::setRemoteHost);
- mail.perRecipientSpecificHeaders.addAll(perRecipientHeaders);
return mail;
}
}
@@ -401,14 +398,14 @@ public class MailImpl implements Disposable, Mail {
*/
private PerRecipientHeaders perRecipientSpecificHeaders;
- /**
- * A constructor that creates a new, uninitialized MailImpl
- */
- private MailImpl() {
- setState(Mail.DEFAULT);
- attributes = new HashMap<>();
- perRecipientSpecificHeaders = new PerRecipientHeaders();
- this.recipients = null;
+ private MailImpl(String state,
+ Map<AttributeName, Attribute> attributes,
+ List<MailAddress> recipients,
+ PerRecipientHeaders perRecipientHeaders) {
+ setState(state);
+ setAttributes(attributes);
+ setRecipients(recipients);
+ perRecipientSpecificHeaders = perRecipientHeaders;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org