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 6284bd374e32c7a4670ef398cc7ca4309dd6d6f9 Author: Tran Tien Duc <[email protected]> AuthorDate: Thu Nov 21 11:06:46 2019 +0700 JAMES-2987 MessageViewFactory -> MessageFullViewFactory --- .../apache/james/jmap/draft/JMAPCommonModule.java | 4 +- .../jmap/draft/methods/GetMessagesMethod.java | 12 ++--- .../jmap/draft/methods/MIMEMessageConverter.java | 4 +- .../james/jmap/draft/methods/MessageAppender.java | 28 +++++------ .../james/jmap/draft/methods/MessageSender.java | 6 +-- .../james/jmap/draft/methods/SendMDNProcessor.java | 4 +- .../methods/SetMessagesCreationProcessor.java | 14 +++--- ...iewFactory.java => MessageFullViewFactory.java} | 6 +-- .../jmap/draft/methods/GetMessagesMethodTest.java | 10 ++-- .../jmap/draft/methods/MessageSenderTest.java | 12 ++--- .../methods/SetMessagesCreationProcessorTest.java | 12 ++--- ...ryTest.java => MessageFullViewFactoryTest.java} | 58 +++++++++++----------- 12 files changed, 85 insertions(+), 85 deletions(-) diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPCommonModule.java b/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPCommonModule.java index 2e061e8..3bf46e5 100644 --- a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPCommonModule.java +++ b/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPCommonModule.java @@ -35,7 +35,7 @@ import org.apache.james.jmap.draft.crypto.SignedTokenFactory; import org.apache.james.jmap.draft.crypto.SignedTokenManager; import org.apache.james.jmap.draft.model.MailboxFactory; import org.apache.james.jmap.draft.model.MessagePreviewGenerator; -import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; import org.apache.james.jmap.draft.send.MailSpool; import org.apache.james.jmap.draft.utils.HeadersAuthenticationExtractor; import org.apache.james.lifecycle.api.StartUpCheck; @@ -68,7 +68,7 @@ public class JMAPCommonModule extends AbstractModule { bind(MailSpool.class).in(Scopes.SINGLETON); bind(AutomaticallySentMailDetectorImpl.class).in(Scopes.SINGLETON); bind(MailboxFactory.class).in(Scopes.SINGLETON); - bind(MessageViewFactory.class).in(Scopes.SINGLETON); + bind(MessageFullViewFactory.class).in(Scopes.SINGLETON); bind(MessagePreviewGenerator.class).in(Scopes.SINGLETON); bind(MessageContentExtractor.class).in(Scopes.SINGLETON); bind(HeadersAuthenticationExtractor.class).in(Scopes.SINGLETON); diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/GetMessagesMethod.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/GetMessagesMethod.java index 6ac3f13..3790fae 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/GetMessagesMethod.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/GetMessagesMethod.java @@ -34,7 +34,7 @@ import org.apache.james.jmap.draft.model.MessageProperties; import org.apache.james.jmap.draft.model.MessageProperties.HeaderProperty; import org.apache.james.jmap.draft.model.MethodCallId; import org.apache.james.jmap.draft.model.message.view.MessageFullView; -import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.exception.MailboxException; @@ -59,16 +59,16 @@ public class GetMessagesMethod implements Method { private static final Logger LOGGER = LoggerFactory.getLogger(GetMessagesMethod.class); private static final Method.Request.Name METHOD_NAME = Method.Request.name("getMessages"); private static final Method.Response.Name RESPONSE_NAME = Method.Response.name("messages"); - private final MessageViewFactory messageViewFactory; + private final MessageFullViewFactory messageFullViewFactory; private final MessageIdManager messageIdManager; private final MetricFactory metricFactory; @Inject @VisibleForTesting GetMessagesMethod( - MessageViewFactory messageViewFactory, + MessageFullViewFactory messageFullViewFactory, MessageIdManager messageIdManager, MetricFactory metricFactory) { - this.messageViewFactory = messageViewFactory; + this.messageFullViewFactory = messageFullViewFactory; this.messageIdManager = messageIdManager; this.metricFactory = metricFactory; } @@ -144,9 +144,9 @@ public class GetMessagesMethod implements Method { private Function<Collection<MessageResult>, Stream<MessageFullView>> toMessageViews() { return messageResults -> { try { - return Stream.of(messageViewFactory.fromMessageResults(messageResults)); + return Stream.of(messageFullViewFactory.fromMessageResults(messageResults)); } catch (Exception e) { - LOGGER.error("Can not convert metaData with content to Message for {}", messageResults.iterator().next().getMessageId().serialize(), e); + LOGGER.error("Can not convert MessageResults to Message for {}", messageResults.iterator().next().getMessageId().serialize(), e); return Stream.of(); } }; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MIMEMessageConverter.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MIMEMessageConverter.java index eac8c13..c9e3dcd 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MIMEMessageConverter.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/MIMEMessageConverter.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; import org.apache.james.jmap.draft.model.CreationMessage; import org.apache.james.jmap.draft.model.CreationMessage.DraftEmailer; -import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; import org.apache.james.mailbox.model.MessageAttachment; import org.apache.james.mime4j.codec.DecodeMonitor; import org.apache.james.mime4j.codec.EncoderUtil; @@ -176,7 +176,7 @@ public class MIMEMessageConverter { } private void addMultivaluedHeader(Message.Builder messageBuilder, String fieldName, String multipleValues) { - Splitter.on(MessageViewFactory.JMAP_MULTIVALUED_FIELD_DELIMITER).split(multipleValues) + Splitter.on(MessageFullViewFactory.JMAP_MULTIVALUED_FIELD_DELIMITER).split(multipleValues) .forEach(value -> addHeader(messageBuilder, fieldName, value)); } 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 e662809..3da0fdf 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; import org.apache.james.mailbox.AttachmentManager; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; @@ -73,9 +73,9 @@ public class MessageAppender { this.mimeMessageConverter = mimeMessageConverter; } - public MessageViewFactory.MetaDataWithContent appendMessageInMailboxes(CreationMessageEntry createdEntry, - List<MailboxId> targetMailboxes, - MailboxSession session) throws MailboxException { + public MessageFullViewFactory.MetaDataWithContent appendMessageInMailboxes(CreationMessageEntry createdEntry, + List<MailboxId> targetMailboxes, + MailboxSession session) throws MailboxException { Preconditions.checkArgument(!targetMailboxes.isEmpty()); ImmutableList<MessageAttachment> messageAttachments = getMessageAttachments(session, createdEntry.getValue().getAttachments()); byte[] messageContent = mimeMessageConverter.convert(createdEntry, messageAttachments); @@ -94,7 +94,7 @@ public class MessageAppender { messageIdManager.setInMailboxes(message.getMessageId(), targetMailboxes, session); } - return MessageViewFactory.MetaDataWithContent.builder() + return MessageFullViewFactory.MetaDataWithContent.builder() .uid(message.getUid()) .keywords(createdEntry.getValue().getKeywords()) .internalDate(internalDate.toInstant()) @@ -106,11 +106,11 @@ public class MessageAppender { .build(); } - public MessageViewFactory.MetaDataWithContent appendMessageInMailbox(org.apache.james.mime4j.dom.Message message, - MessageManager messageManager, - List<MessageAttachment> attachments, - Flags flags, - MailboxSession session) throws MailboxException { + public MessageFullViewFactory.MetaDataWithContent appendMessageInMailbox(org.apache.james.mime4j.dom.Message message, + MessageManager messageManager, + List<MessageAttachment> attachments, + Flags flags, + MailboxSession session) throws MailboxException { byte[] messageContent = asBytes(message); @@ -121,7 +121,7 @@ public class MessageAppender { .withFlags(flags) .build(content), session); - return MessageViewFactory.MetaDataWithContent.builder() + return MessageFullViewFactory.MetaDataWithContent.builder() .uid(appendedMessage.getUid()) .keywords(Keywords.lenientFactory().fromFlags(flags)) .internalDate(internalDate.toInstant()) @@ -141,9 +141,9 @@ public class MessageAppender { } } - public MessageViewFactory.MetaDataWithContent appendMessageInMailbox(CreationMessageEntry createdEntry, - MailboxId targetMailbox, - MailboxSession session) throws MailboxException { + public MessageFullViewFactory.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 a922ecb..9daa03c 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; 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(MessageViewFactory.MetaDataWithContent message, + public void sendMessage(MessageFullViewFactory.MetaDataWithContent message, Envelope envelope, MailboxSession session) throws MessagingException { Mail mail = buildMail(message, envelope); @@ -60,7 +60,7 @@ public class MessageSender { } @VisibleForTesting - static Mail buildMail(MessageViewFactory.MetaDataWithContent message, Envelope envelope) throws MessagingException { + static Mail buildMail(MessageFullViewFactory.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 4f60780..45c2f1d 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; 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); - MessageViewFactory.MetaDataWithContent metaDataWithContent = messageAppender.appendMessageInMailbox(mdnAnswer, + MessageFullViewFactory.MetaDataWithContent metaDataWithContent = messageAppender.appendMessageInMailbox(mdnAnswer, getOutbox(mailboxSession), reportAsAttachment, seen, mailboxSession); messageSender.sendMessage(metaDataWithContent, diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/SetMessagesCreationProcessor.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/SetMessagesCreationProcessor.java index c30df23..aa99deb 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/SetMessagesCreationProcessor.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/SetMessagesCreationProcessor.java @@ -48,8 +48,8 @@ import org.apache.james.jmap.draft.model.SetMessagesRequest; import org.apache.james.jmap.draft.model.SetMessagesResponse; import org.apache.james.jmap.draft.model.SetMessagesResponse.Builder; import org.apache.james.jmap.draft.model.message.view.MessageFullView; -import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; -import org.apache.james.jmap.draft.model.message.view.MessageViewFactory.MetaDataWithContent; +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.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; @@ -76,7 +76,7 @@ import com.google.common.collect.ImmutableList; public class SetMessagesCreationProcessor implements SetMessagesProcessor { private static final Logger LOG = LoggerFactory.getLogger(SetMailboxesCreationProcessor.class); - private final MessageViewFactory messageViewFactory; + private final MessageFullViewFactory messageFullViewFactory; private final SystemMailboxesProvider systemMailboxesProvider; private final AttachmentChecker attachmentChecker; private final MetricFactory metricFactory; @@ -88,7 +88,7 @@ public class SetMessagesCreationProcessor implements SetMessagesProcessor { @VisibleForTesting @Inject - SetMessagesCreationProcessor(MessageViewFactory messageViewFactory, + SetMessagesCreationProcessor(MessageFullViewFactory messageFullViewFactory, SystemMailboxesProvider systemMailboxesProvider, AttachmentChecker attachmentChecker, MetricFactory metricFactory, @@ -97,7 +97,7 @@ public class SetMessagesCreationProcessor implements SetMessagesProcessor { MessageAppender messageAppender, MessageSender messageSender, ReferenceUpdater referenceUpdater) { - this.messageViewFactory = messageViewFactory; + this.messageFullViewFactory = messageFullViewFactory; this.systemMailboxesProvider = systemMailboxesProvider; this.attachmentChecker = attachmentChecker; this.metricFactory = metricFactory; @@ -276,7 +276,7 @@ public class SetMessagesCreationProcessor implements SetMessagesProcessor { private MessageWithId handleOutboxMessages(CreationMessageEntry entry, MailboxSession session) throws MailboxException, MessagingException { assertUserIsSender(session, entry.getValue().getFrom()); MetaDataWithContent newMessage = messageAppender.appendMessageInMailboxes(entry, toMailboxIds(entry), session); - MessageFullView jmapMessage = messageViewFactory.fromMetaDataWithContent(newMessage); + MessageFullView jmapMessage = messageFullViewFactory.fromMetaDataWithContent(newMessage); Envelope envelope = EnvelopeUtils.fromMessage(jmapMessage); messageSender.sendMessage(newMessage, envelope, session); referenceUpdater.updateReferences(entry.getValue().getHeaders(), session); @@ -294,7 +294,7 @@ public class SetMessagesCreationProcessor implements SetMessagesProcessor { private MessageWithId handleDraftMessages(CreationMessageEntry entry, MailboxSession session) throws MailboxException, MessagingException { MetaDataWithContent newMessage = messageAppender.appendMessageInMailboxes(entry, toMailboxIds(entry), session); - MessageFullView jmapMessage = messageViewFactory.fromMetaDataWithContent(newMessage); + MessageFullView jmapMessage = messageFullViewFactory.fromMetaDataWithContent(newMessage); return new ValueWithId.MessageWithId(entry.getCreationId(), jmapMessage); } diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactory.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java similarity index 98% rename from server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactory.java rename to server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java index 90ca232..2f7d15b 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactory.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java @@ -66,7 +66,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; -public class MessageViewFactory { +public class MessageFullViewFactory { public static final String JMAP_MULTIVALUED_FIELD_DELIMITER = "\n"; private static final KeywordsCombiner ACCUMULATOR = new KeywordsCombiner(); @@ -78,8 +78,8 @@ public class MessageViewFactory { private final Keywords.KeywordsFactory keywordsFactory; @Inject - public MessageViewFactory(BlobManager blobManager, MessagePreviewGenerator messagePreview, MessageContentExtractor messageContentExtractor, - HtmlTextExtractor htmlTextExtractor) { + public MessageFullViewFactory(BlobManager blobManager, MessagePreviewGenerator messagePreview, MessageContentExtractor messageContentExtractor, + HtmlTextExtractor htmlTextExtractor) { this.blobManager = blobManager; this.messagePreview = messagePreview; this.messageContentExtractor = messageContentExtractor; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/GetMessagesMethodTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/GetMessagesMethodTest.java index 3cb8ec3..6fa5adb 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/GetMessagesMethodTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/GetMessagesMethodTest.java @@ -44,7 +44,7 @@ import org.apache.james.jmap.draft.model.MessagePreviewGenerator; import org.apache.james.jmap.draft.model.MessageProperties.MessageProperty; import org.apache.james.jmap.draft.model.MethodCallId; import org.apache.james.jmap.draft.model.message.view.MessageFullView; -import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; import org.apache.james.jmap.draft.utils.HtmlTextExtractor; import org.apache.james.jmap.draft.utils.JsoupHtmlTextExtractor; import org.apache.james.mailbox.BlobManager; @@ -96,7 +96,7 @@ public class GetMessagesMethodTest { private MailboxPath inboxPath; private MailboxPath customMailboxPath; private MethodCallId methodCallId; - private MessageViewFactory messageViewFactory; + private MessageFullViewFactory messageFullViewFactory; @Before public void setup() throws Exception { @@ -106,7 +106,7 @@ public class GetMessagesMethodTest { MessageContentExtractor messageContentExtractor = new MessageContentExtractor(); BlobManager blobManager = mock(BlobManager.class); when(blobManager.toBlobId(any(MessageId.class))).thenReturn(BlobId.fromString("fake")); - messageViewFactory = spy(new MessageViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor)); + messageFullViewFactory = spy(new MessageFullViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor)); InMemoryIntegrationResources resources = InMemoryIntegrationResources.defaultResources(); mailboxManager = resources.getMailboxManager(); @@ -116,7 +116,7 @@ public class GetMessagesMethodTest { mailboxManager.createMailbox(inboxPath, session); mailboxManager.createMailbox(customMailboxPath, session); messageIdManager = resources.getMessageIdManager(); - testee = new GetMessagesMethod(messageViewFactory, messageIdManager, new DefaultMetricFactory()); + testee = new GetMessagesMethod(messageFullViewFactory, messageIdManager, new DefaultMetricFactory()); messageContent1 = org.apache.james.mime4j.dom.Message.Builder.of() .setSubject("message 1 subject") @@ -493,7 +493,7 @@ public class GetMessagesMethodTest { doCallRealMethod() .doThrow(new RuntimeException()) - .when(messageViewFactory) + .when(messageFullViewFactory) .fromMessageResults(any()); GetMessagesRequest request = GetMessagesRequest.builder() 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 388de80..0a03271 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 @@ -38,7 +38,7 @@ import org.apache.james.jmap.draft.model.Keyword; 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; import org.apache.james.jmap.draft.utils.HtmlTextExtractor; import org.apache.james.mailbox.BlobManager; import org.apache.james.mailbox.MessageUid; @@ -59,7 +59,7 @@ import com.google.common.collect.ImmutableSet; class MessageSenderTest { private Envelope envelope; - private MessageViewFactory.MetaDataWithContent message; + private MessageFullViewFactory.MetaDataWithContent message; private MessageFullView jmapMessage; @BeforeEach @@ -72,7 +72,7 @@ class MessageSenderTest { String content = headers + "Hello! How are you?"; - message = MessageViewFactory.MetaDataWithContent.builder() + message = MessageFullViewFactory.MetaDataWithContent.builder() .uid(MessageUid.of(2)) .keywords(Keywords.strictFactory().from(Keyword.SEEN)) .size(content.length()) @@ -90,14 +90,14 @@ class MessageSenderTest { MessageContentExtractor messageContentExtractor = new MessageContentExtractor(); BlobManager blobManager = mock(BlobManager.class); when(blobManager.toBlobId(any(MessageId.class))).thenReturn(BlobId.fromString("fake")); - MessageViewFactory messageViewFactory = new MessageViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor); - jmapMessage = messageViewFactory.fromMetaDataWithContent(message); + MessageFullViewFactory messageFullViewFactory = new MessageFullViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor); + jmapMessage = messageFullViewFactory.fromMetaDataWithContent(message); envelope = EnvelopeUtils.fromMessage(jmapMessage); } @Test void buildMailShouldThrowWhenNullMailboxMessage() throws Exception { - MessageViewFactory.MetaDataWithContent message = null; + MessageFullViewFactory.MetaDataWithContent message = null; assertThatThrownBy(() -> MessageSender.buildMail(message, envelope)).isInstanceOf(NullPointerException.class); } diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/SetMessagesCreationProcessorTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/SetMessagesCreationProcessorTest.java index 624e118..7ffd423 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/SetMessagesCreationProcessorTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/SetMessagesCreationProcessorTest.java @@ -40,7 +40,7 @@ import org.apache.james.jmap.draft.model.CreationMessageId; import org.apache.james.jmap.draft.model.MessagePreviewGenerator; 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory; import org.apache.james.jmap.draft.send.MailMetadata; import org.apache.james.jmap.draft.send.MailSpool; import org.apache.james.jmap.draft.utils.HtmlTextExtractor; @@ -100,7 +100,7 @@ public class SetMessagesCreationProcessorTest { .build()) .build(); - private MessageViewFactory messageViewFactory; + private MessageFullViewFactory messageFullViewFactory; private MailSpool mockedMailSpool; private SystemMailboxesProvider fakeSystemMailboxesProvider; private MailboxSession session; @@ -127,7 +127,7 @@ public class SetMessagesCreationProcessorTest { when(messagePreview.compute(any())).thenReturn("text preview"); BlobManager blobManager = mock(BlobManager.class); when(blobManager.toBlobId(any(MessageId.class))).thenReturn(org.apache.james.mailbox.model.BlobId.fromString("fake")); - messageViewFactory = new MessageViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor); + messageFullViewFactory = new MessageFullViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor); mockedMailSpool = mock(MailSpool.class); mockedAttachmentManager = mock(AttachmentManager.class); mockedMailboxManager = mock(MailboxManager.class); @@ -140,7 +140,7 @@ public class SetMessagesCreationProcessorTest { messageAppender = new MessageAppender(mockedMailboxManager, mockMessageIdManager, mockedAttachmentManager, mimeMessageConverter); messageSender = new MessageSender(mockedMailSpool); referenceUpdater = new ReferenceUpdater(mockMessageIdManager, mockedMailboxManager); - sut = new SetMessagesCreationProcessor(messageViewFactory, + sut = new SetMessagesCreationProcessor(messageFullViewFactory, fakeSystemMailboxesProvider, new AttachmentChecker(mockedAttachmentManager), new NoopMetricFactory(), @@ -232,7 +232,7 @@ public class SetMessagesCreationProcessorTest { @Test public void processShouldReturnNonEmptyCreatedWhenRequestHasNonEmptyCreate() throws MailboxException { // Given - sut = new SetMessagesCreationProcessor(messageViewFactory, fakeSystemMailboxesProvider, new AttachmentChecker(mockedAttachmentManager), new NoopMetricFactory(), mockedMailboxManager, mockedMailboxIdFactory, messageAppender, messageSender, referenceUpdater); + sut = new SetMessagesCreationProcessor(messageFullViewFactory, fakeSystemMailboxesProvider, new AttachmentChecker(mockedAttachmentManager), new NoopMetricFactory(), mockedMailboxManager, mockedMailboxIdFactory, messageAppender, messageSender, referenceUpdater); // When SetMessagesResponse result = sut.process(createMessageInOutbox, session); @@ -247,7 +247,7 @@ public class SetMessagesCreationProcessorTest { public void processShouldReturnErrorWhenOutboxNotFound() { // Given TestSystemMailboxesProvider doNotProvideOutbox = new TestSystemMailboxesProvider(Optional::empty, () -> optionalDrafts); - SetMessagesCreationProcessor sut = new SetMessagesCreationProcessor(messageViewFactory, doNotProvideOutbox, + SetMessagesCreationProcessor sut = new SetMessagesCreationProcessor(messageFullViewFactory, doNotProvideOutbox, new AttachmentChecker(mockedAttachmentManager), new NoopMetricFactory(), mockedMailboxManager, mockedMailboxIdFactory, messageAppender, messageSender, diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactoryTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java similarity index 92% rename from server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactoryTest.java rename to server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java index 7566276..97b4fa8 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactoryTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java @@ -36,7 +36,7 @@ import org.apache.james.jmap.draft.model.Keyword; import org.apache.james.jmap.draft.model.Keywords; import org.apache.james.jmap.draft.model.MessagePreviewGenerator; import org.apache.james.jmap.draft.model.Number; -import org.apache.james.jmap.draft.model.message.view.MessageViewFactory.MetaDataWithContent; +import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory.MetaDataWithContent; import org.apache.james.jmap.draft.utils.HtmlTextExtractor; import org.apache.james.jmap.draft.utils.JsoupHtmlTextExtractor; import org.apache.james.mailbox.BlobManager; @@ -54,12 +54,12 @@ import org.junit.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -public class MessageViewFactoryTest { +public class MessageFullViewFactoryTest { private static final String FORWARDED = "forwarded"; private static final InMemoryId MAILBOX_ID = InMemoryId.of(18L); private static final Instant INTERNAL_DATE = Instant.parse("2012-02-03T14:30:42Z"); - private MessageViewFactory messageViewFactory; + private MessageFullViewFactory messageFullViewFactory; @Before public void setUp() { @@ -70,7 +70,7 @@ public class MessageViewFactoryTest { BlobManager blobManager = mock(BlobManager.class); when(blobManager.toBlobId(any(MessageId.class))).thenReturn(org.apache.james.mailbox.model.BlobId.fromString("blobId")); - messageViewFactory = new MessageViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor); + messageFullViewFactory = new MessageFullViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor); } @Test @@ -86,7 +86,7 @@ public class MessageViewFactoryTest { .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee) .extracting(MessageFullView::getPreview, MessageFullView::getSize, MessageFullView::getSubject, MessageFullView::getHeaders, MessageFullView::getDate) .containsExactly("(Empty)", Number.ZERO, "", ImmutableMap.of("MIME-Version", "1.0"), INTERNAL_DATE); @@ -104,7 +104,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee) .extracting(MessageFullView::isIsUnread, MessageFullView::isIsFlagged, MessageFullView::isIsAnswered, MessageFullView::isIsDraft, MessageFullView::isIsForwarded) .containsExactly(true, true, true, true, true); @@ -152,7 +152,7 @@ public class MessageViewFactoryTest { .put("MIME-Version", "1.0") .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); MessageFullView expected = MessageFullView.builder() .id(TestMessageId.of(2)) .blobId(BlobId.of("blobId")) @@ -206,7 +206,7 @@ public class MessageViewFactoryTest { .put("To", "user1 <user1@domain>, user2 <user2@domain>") .put("MIME-Version", "1.0") .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); MessageFullView expected = MessageFullView.builder() .id(TestMessageId.of(2)) .blobId(BlobId.of("blobId")) @@ -256,7 +256,7 @@ public class MessageViewFactoryTest { .put("To", "user1 <user1@domain>") .put("MIME-Version", "1.0") .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); MessageFullView expected = MessageFullView.builder() .id(TestMessageId.of(2)) .blobId(BlobId.of("blobId")) @@ -293,7 +293,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getTextBody()).hasValue("Mail body"); } @@ -326,7 +326,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getTextBody()) .isPresent() @@ -355,7 +355,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getPreview()).isEqualTo(expectedPreview); } @@ -371,7 +371,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getAttachments()).isEmpty(); } @@ -406,7 +406,7 @@ public class MessageViewFactoryTest { .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getAttachments()).hasSize(1); assertThat(testee.getAttachments().get(0)).isEqualToComparingFieldByField(expectedAttachment); @@ -430,7 +430,7 @@ public class MessageViewFactoryTest { .messageId(new TestMessageId.Factory().generate()) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); Emailer user = Emailer.builder().name("user").email("userdomain").allowInvalid().build(); Emailer user1 = Emailer.builder().name("user1").email("user1domain").allowInvalid().build(); @@ -459,7 +459,7 @@ public class MessageViewFactoryTest { .messageId(new TestMessageId.Factory().generate()) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getFrom()).isEmpty(); } @@ -484,7 +484,7 @@ public class MessageViewFactoryTest { .messageId(new TestMessageId.Factory().generate()) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getDate()) .isEqualTo(Instant.parse("2017-05-17T11:18:52.000Z")); @@ -510,7 +510,7 @@ public class MessageViewFactoryTest { .messageId(new TestMessageId.Factory().generate()) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getDate()) .isEqualTo(Instant.parse("2017-05-17T11:18:52.000Z")); @@ -535,7 +535,7 @@ public class MessageViewFactoryTest { .messageId(new TestMessageId.Factory().generate()) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getDate()).isEqualTo(INTERNAL_DATE); } @@ -553,7 +553,7 @@ public class MessageViewFactoryTest { .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee) .extracting(MessageFullView::getPreview, MessageFullView::getSize, MessageFullView::getSubject, MessageFullView::getHeaders, MessageFullView::getDate) .containsExactly("(Empty)", Number.fromLong(1010L), "", ImmutableMap.of("MIME-Version", "1.0"), INTERNAL_DATE); @@ -575,7 +575,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getPreview()).isEqualTo("my HTML message"); assertThat(testee.getTextBody()).hasValue("my HTML message"); @@ -596,7 +596,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getPreview()).isEqualTo(MessagePreviewGenerator.NO_BODY); assertThat(testee.getHtmlBody()).contains(""); @@ -628,7 +628,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getPreview()).isEqualTo(expected); } @@ -650,7 +650,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getPreview()).isEqualTo("My plain text"); } @@ -669,7 +669,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee) .extracting(MessageFullView::getPreview, MessageFullView::getHtmlBody, MessageFullView::getTextBody) @@ -693,7 +693,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee) .extracting(MessageFullView::getPreview, MessageFullView::getHtmlBody, MessageFullView::getTextBody) @@ -729,7 +729,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee) .extracting(MessageFullView::getPreview, MessageFullView::getHtmlBody, MessageFullView::getTextBody) @@ -750,7 +750,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getKeywords()).containsAllEntriesOf(keywords.asMap()); } @@ -768,7 +768,7 @@ public class MessageViewFactoryTest { .mailboxId(MAILBOX_ID) .messageId(TestMessageId.of(2)) .build(); - MessageFullView testee = messageViewFactory.fromMetaDataWithContent(testMail); + MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); assertThat(testee.getKeywords()).containsAllEntriesOf(keywords.asMap()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
