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 rc...@apache.org on 2019/11/25 09:06:57 UTC
[james-project] 14/22: JAMES-2987 Classes using MetaDataWithContent
subclass should import its class directly
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 855d0919859b9c7078dcd62367d06a885d5885f3
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Fri Nov 22 11:45:55 2019 +0700
JAMES-2987 Classes using MetaDataWithContent subclass should import its class directly
---
.../org/apache/james/jmap/draft/methods/MessageAppender.java | 12 ++++++------
.../org/apache/james/jmap/draft/methods/MessageSender.java | 6 +++---
.../apache/james/jmap/draft/methods/SendMDNProcessor.java | 4 ++--
.../apache/james/jmap/draft/methods/MessageSenderTest.java | 7 ++++---
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MessageAppender.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MessageAppender.java
index 3da0fdf..6e04cfe 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MessageAppender.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MessageAppender.java
@@ -32,7 +32,7 @@ import org.apache.james.jmap.draft.methods.ValueWithId.CreationMessageEntry;
import org.apache.james.jmap.draft.model.Attachment;
import org.apache.james.jmap.draft.model.CreationMessage;
import org.apache.james.jmap.draft.model.Keywords;
-import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory;
+import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory.MetaDataWithContent;
import org.apache.james.mailbox.AttachmentManager;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
@@ -73,7 +73,7 @@ public class MessageAppender {
this.mimeMessageConverter = mimeMessageConverter;
}
- public MessageFullViewFactory.MetaDataWithContent appendMessageInMailboxes(CreationMessageEntry createdEntry,
+ public MetaDataWithContent appendMessageInMailboxes(CreationMessageEntry createdEntry,
List<MailboxId> targetMailboxes,
MailboxSession session) throws MailboxException {
Preconditions.checkArgument(!targetMailboxes.isEmpty());
@@ -94,7 +94,7 @@ public class MessageAppender {
messageIdManager.setInMailboxes(message.getMessageId(), targetMailboxes, session);
}
- return MessageFullViewFactory.MetaDataWithContent.builder()
+ return MetaDataWithContent.builder()
.uid(message.getUid())
.keywords(createdEntry.getValue().getKeywords())
.internalDate(internalDate.toInstant())
@@ -106,7 +106,7 @@ public class MessageAppender {
.build();
}
- public MessageFullViewFactory.MetaDataWithContent appendMessageInMailbox(org.apache.james.mime4j.dom.Message message,
+ public MetaDataWithContent appendMessageInMailbox(org.apache.james.mime4j.dom.Message message,
MessageManager messageManager,
List<MessageAttachment> attachments,
Flags flags,
@@ -121,7 +121,7 @@ public class MessageAppender {
.withFlags(flags)
.build(content), session);
- return MessageFullViewFactory.MetaDataWithContent.builder()
+ return MetaDataWithContent.builder()
.uid(appendedMessage.getUid())
.keywords(Keywords.lenientFactory().fromFlags(flags))
.internalDate(internalDate.toInstant())
@@ -141,7 +141,7 @@ public class MessageAppender {
}
}
- public MessageFullViewFactory.MetaDataWithContent appendMessageInMailbox(CreationMessageEntry createdEntry,
+ public MetaDataWithContent appendMessageInMailbox(CreationMessageEntry createdEntry,
MailboxId targetMailbox,
MailboxSession session) throws MailboxException {
return appendMessageInMailboxes(createdEntry, ImmutableList.of(targetMailbox), session);
diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MessageSender.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MessageSender.java
index 9daa03c..2aced88 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MessageSender.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MessageSender.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory;
+import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory.MetaDataWithContent;
import org.apache.james.jmap.draft.send.MailMetadata;
import org.apache.james.jmap.draft.send.MailSpool;
import org.apache.james.lifecycle.api.LifecycleUtil;
@@ -48,7 +48,7 @@ public class MessageSender {
this.mailSpool = mailSpool;
}
- public void sendMessage(MessageFullViewFactory.MetaDataWithContent message,
+ public void sendMessage(MetaDataWithContent message,
Envelope envelope,
MailboxSession session) throws MessagingException {
Mail mail = buildMail(message, envelope);
@@ -60,7 +60,7 @@ public class MessageSender {
}
@VisibleForTesting
- static Mail buildMail(MessageFullViewFactory.MetaDataWithContent message, Envelope envelope) throws MessagingException {
+ static Mail buildMail(MetaDataWithContent message, Envelope envelope) throws MessagingException {
String name = message.getMessageId().serialize();
return MailImpl.builder()
.name(name)
diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/SendMDNProcessor.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/SendMDNProcessor.java
index 45c2f1d..67db9a2 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/SendMDNProcessor.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/SendMDNProcessor.java
@@ -35,7 +35,7 @@ import org.apache.james.jmap.draft.model.JmapMDN;
import org.apache.james.jmap.draft.model.SetError;
import org.apache.james.jmap.draft.model.SetMessagesRequest;
import org.apache.james.jmap.draft.model.SetMessagesResponse;
-import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory;
+import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory.MetaDataWithContent;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.MessageManager;
@@ -151,7 +151,7 @@ public class SendMDNProcessor implements SetMessagesProcessor {
Message mdnAnswer = mdn.generateMDNMessage(originalMessage, mailboxSession);
Flags seen = new Flags(Flags.Flag.SEEN);
- MessageFullViewFactory.MetaDataWithContent metaDataWithContent = messageAppender.appendMessageInMailbox(mdnAnswer,
+ MetaDataWithContent metaDataWithContent = messageAppender.appendMessageInMailbox(mdnAnswer,
getOutbox(mailboxSession), reportAsAttachment, seen, mailboxSession);
messageSender.sendMessage(metaDataWithContent,
diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/MessageSenderTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/MessageSenderTest.java
index 0a03271..4316a7f 100644
--- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/MessageSenderTest.java
+++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/MessageSenderTest.java
@@ -39,6 +39,7 @@ import org.apache.james.jmap.draft.model.Keywords;
import org.apache.james.jmap.draft.model.MessagePreviewGenerator;
import org.apache.james.jmap.draft.model.message.view.MessageFullView;
import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory;
+import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory.MetaDataWithContent;
import org.apache.james.jmap.draft.utils.HtmlTextExtractor;
import org.apache.james.mailbox.BlobManager;
import org.apache.james.mailbox.MessageUid;
@@ -59,7 +60,7 @@ import com.google.common.collect.ImmutableSet;
class MessageSenderTest {
private Envelope envelope;
- private MessageFullViewFactory.MetaDataWithContent message;
+ private MetaDataWithContent message;
private MessageFullView jmapMessage;
@BeforeEach
@@ -72,7 +73,7 @@ class MessageSenderTest {
String content = headers
+ "Hello! How are you?";
- message = MessageFullViewFactory.MetaDataWithContent.builder()
+ message = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
.keywords(Keywords.strictFactory().from(Keyword.SEEN))
.size(content.length())
@@ -97,7 +98,7 @@ class MessageSenderTest {
@Test
void buildMailShouldThrowWhenNullMailboxMessage() throws Exception {
- MessageFullViewFactory.MetaDataWithContent message = null;
+ MetaDataWithContent message = null;
assertThatThrownBy(() -> MessageSender.buildMail(message, envelope)).isInstanceOf(NullPointerException.class);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org