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 eed6d6a7c1b2d1ebfd0f497b6a809022e3dc8c49 Author: Tran Tien Duc <[email protected]> AuthorDate: Thu Nov 21 09:21:34 2019 +0700 JAMES-2987 Move message view models to a dedicated package --- .../java/org/apache/james/jmap/draft/JMAPCommonModule.java | 2 +- .../apache/james/jmap/draft/methods/GetMessagesMethod.java | 6 +++--- .../apache/james/jmap/draft/methods/MIMEMessageConverter.java | 2 +- .../org/apache/james/jmap/draft/methods/MessageAppender.java | 2 +- .../org/apache/james/jmap/draft/methods/MessageSender.java | 2 +- .../org/apache/james/jmap/draft/methods/SendMDNProcessor.java | 2 +- .../jmap/draft/methods/SetMessagesCreationProcessor.java | 6 +++--- .../java/org/apache/james/jmap/draft/methods/ValueWithId.java | 2 +- .../org/apache/james/jmap/draft/model/CreationMessage.java | 1 + .../java/org/apache/james/jmap/draft/model/EnvelopeUtils.java | 1 + .../apache/james/jmap/draft/model/GetMessagesResponse.java | 1 + .../apache/james/jmap/draft/model/SetMessagesResponse.java | 1 + .../jmap/draft/model/{ => message/view}/MessageFullView.java | 8 +++++++- .../draft/model/{ => message/view}/MessageViewFactory.java | 7 ++++++- .../james/jmap/draft/model/{ => message/view}/SubMessage.java | 6 +++++- .../apache/james/jmap/draft/json/ParsingWritingObjects.java | 4 ++-- .../james/jmap/draft/json/ParsingWritingObjectsTest.java | 2 +- .../james/jmap/draft/methods/GetMessagesMethodTest.java | 4 ++-- .../apache/james/jmap/draft/methods/MessageSenderTest.java | 4 ++-- .../jmap/draft/methods/SetMessagesCreationProcessorTest.java | 2 +- .../james/jmap/draft/model/SetMessagesResponseTest.java | 1 + .../draft/model/{ => message/view}/MessageFullViewTest.java | 8 +++++++- .../model/{ => message/view}/MessageViewFactoryTest.java | 11 +++++++++-- .../draft/model/{ => message/view}/SubMailboxMessageTest.java | 5 ++++- 24 files changed, 63 insertions(+), 27 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 275a17f..2e061e8 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; import org.apache.james.jmap.draft.send.MailSpool; import org.apache.james.jmap.draft.utils.HeadersAuthenticationExtractor; import org.apache.james.lifecycle.api.StartUpCheck; 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 32ec8bb..cc0508a 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 @@ -32,12 +32,12 @@ import org.apache.james.jmap.draft.json.FieldNamePropertyFilter; import org.apache.james.jmap.draft.model.GetMessagesRequest; import org.apache.james.jmap.draft.model.GetMessagesResponse; import org.apache.james.jmap.draft.model.Keywords; -import org.apache.james.jmap.draft.model.MessageFullView; import org.apache.james.jmap.draft.model.MessageProperties; import org.apache.james.jmap.draft.model.MessageProperties.HeaderProperty; -import org.apache.james.jmap.draft.model.MessageViewFactory; -import org.apache.james.jmap.draft.model.MessageViewFactory.MetaDataWithContent; 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.MessageViewFactory.MetaDataWithContent; import org.apache.james.jmap.draft.utils.KeywordsCombiner; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; 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 14f8a28..eac8c13 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; import org.apache.james.mailbox.model.MessageAttachment; import org.apache.james.mime4j.codec.DecodeMonitor; import org.apache.james.mime4j.codec.EncoderUtil; 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 164029d..e662809 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; import org.apache.james.mailbox.AttachmentManager; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; 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 7ec6164..a922ecb 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.MessageViewFactory; +import org.apache.james.jmap.draft.model.message.view.MessageViewFactory; import org.apache.james.jmap.draft.send.MailMetadata; import org.apache.james.jmap.draft.send.MailSpool; import org.apache.james.lifecycle.api.LifecycleUtil; 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 241f8f9..4f60780 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 @@ -32,10 +32,10 @@ import javax.mail.MessagingException; import org.apache.james.jmap.draft.exceptions.InvalidOriginMessageForMDNException; import org.apache.james.jmap.draft.exceptions.MessageNotFoundException; import org.apache.james.jmap.draft.model.JmapMDN; -import org.apache.james.jmap.draft.model.MessageViewFactory; 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.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; 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 99da72f..c30df23 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 @@ -40,16 +40,16 @@ import org.apache.james.jmap.draft.methods.ValueWithId.MessageWithId; import org.apache.james.jmap.draft.model.CreationMessage; import org.apache.james.jmap.draft.model.CreationMessage.DraftEmailer; import org.apache.james.jmap.draft.model.EnvelopeUtils; -import org.apache.james.jmap.draft.model.MessageFullView; import org.apache.james.jmap.draft.model.MessageProperties; import org.apache.james.jmap.draft.model.MessageProperties.MessageProperty; -import org.apache.james.jmap.draft.model.MessageViewFactory; -import org.apache.james.jmap.draft.model.MessageViewFactory.MetaDataWithContent; import org.apache.james.jmap.draft.model.SetError; import org.apache.james.jmap.draft.model.SetMessagesError; 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.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/ValueWithId.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/ValueWithId.java index cc89d1f..c5037a4 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/ValueWithId.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/methods/ValueWithId.java @@ -22,8 +22,8 @@ package org.apache.james.jmap.draft.methods; import org.apache.james.jmap.draft.model.CreationMessage; import org.apache.james.jmap.draft.model.CreationMessageId; import org.apache.james.jmap.draft.model.JmapMDN; -import org.apache.james.jmap.draft.model.MessageFullView; import org.apache.james.jmap.draft.model.SetError; +import org.apache.james.jmap.draft.model.message.view.MessageFullView; import com.google.common.base.MoreObjects; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/CreationMessage.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/CreationMessage.java index aa1b410..d50b3a6 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/CreationMessage.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/CreationMessage.java @@ -33,6 +33,7 @@ import javax.mail.internet.InternetAddress; import org.apache.james.jmap.draft.methods.ValidationResult; import org.apache.james.jmap.draft.model.MessageProperties.MessageProperty; +import org.apache.james.jmap.draft.model.message.view.SubMessage; import org.apache.james.mailbox.MessageManager; import org.apache.james.util.OptionalUtils; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/EnvelopeUtils.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/EnvelopeUtils.java index 69cb4f4..004cf39 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/EnvelopeUtils.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/EnvelopeUtils.java @@ -24,6 +24,7 @@ import java.util.stream.Stream; import org.apache.james.core.MailAddress; import org.apache.james.core.MaybeSender; +import org.apache.james.jmap.draft.model.message.view.MessageFullView; import org.apache.james.server.core.Envelope; import org.apache.james.util.StreamUtils; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/GetMessagesResponse.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/GetMessagesResponse.java index 1af0eb8..8300582 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/GetMessagesResponse.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/GetMessagesResponse.java @@ -23,6 +23,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.james.jmap.draft.methods.Method; +import org.apache.james.jmap.draft.model.message.view.MessageFullView; import org.apache.james.mailbox.model.MessageId; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/SetMessagesResponse.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/SetMessagesResponse.java index d9682d5..58d2ab7 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/SetMessagesResponse.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/SetMessagesResponse.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.commons.lang3.NotImplementedException; import org.apache.james.jmap.draft.methods.Method; +import org.apache.james.jmap.draft.model.message.view.MessageFullView; import org.apache.james.mailbox.model.MessageId; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageFullView.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullView.java similarity index 97% rename from server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageFullView.java rename to server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullView.java index f6576cf..4ba4386 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageFullView.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullView.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft.model; +package org.apache.james.jmap.draft.model.message.view; import java.time.Instant; import java.util.Arrays; @@ -29,6 +29,12 @@ import java.util.function.Predicate; import org.apache.james.jmap.draft.methods.GetMessagesMethod; import org.apache.james.jmap.draft.methods.JmapResponseWriterImpl; +import org.apache.james.jmap.draft.model.Attachment; +import org.apache.james.jmap.draft.model.BlobId; +import org.apache.james.jmap.draft.model.Emailer; +import org.apache.james.jmap.draft.model.Keyword; +import org.apache.james.jmap.draft.model.Keywords; +import org.apache.james.jmap.draft.model.Number; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageViewFactory.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactory.java similarity index 97% rename from server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageViewFactory.java rename to server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactory.java index 4428c9f..e250298 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/MessageViewFactory.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft.model; +package org.apache.james.jmap.draft.model.message.view; import java.io.IOException; import java.io.InputStream; @@ -34,6 +34,11 @@ import java.util.stream.Collectors; import javax.inject.Inject; import javax.mail.internet.SharedInputStream; +import org.apache.james.jmap.draft.model.Attachment; +import org.apache.james.jmap.draft.model.BlobId; +import org.apache.james.jmap.draft.model.Emailer; +import org.apache.james.jmap.draft.model.Keywords; +import org.apache.james.jmap.draft.model.MessagePreviewGenerator; import org.apache.james.jmap.draft.utils.HtmlTextExtractor; import org.apache.james.mailbox.BlobManager; import org.apache.james.mailbox.MessageUid; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/SubMessage.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/SubMessage.java similarity index 97% rename from server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/SubMessage.java rename to server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/SubMessage.java index 1394c82..6854a09 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/SubMessage.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/SubMessage.java @@ -17,13 +17,17 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft.model; +package org.apache.james.jmap.draft.model.message.view; import java.time.Instant; import java.util.List; import java.util.Map; import java.util.Optional; +import org.apache.james.jmap.draft.model.Attachment; +import org.apache.james.jmap.draft.model.BlobId; +import org.apache.james.jmap.draft.model.Emailer; + import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.google.common.annotations.VisibleForTesting; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java index d749817..5baa6b4 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java @@ -28,8 +28,8 @@ import org.apache.james.jmap.draft.model.BlobId; import org.apache.james.jmap.draft.model.Emailer; import org.apache.james.jmap.draft.model.Keyword; import org.apache.james.jmap.draft.model.Keywords; -import org.apache.james.jmap.draft.model.MessageFullView; -import org.apache.james.jmap.draft.model.SubMessage; +import org.apache.james.jmap.draft.model.message.view.MessageFullView; +import org.apache.james.jmap.draft.model.message.view.SubMessage; import org.apache.james.mailbox.FlagsBuilder; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.model.MailboxId; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjectsTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjectsTest.java index aa68c7b..549fd26 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjectsTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjectsTest.java @@ -30,7 +30,7 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; import org.apache.james.jmap.draft.methods.GetMessagesMethod; import org.apache.james.jmap.draft.methods.JmapResponseWriterImpl; -import org.apache.james.jmap.draft.model.SubMessage; +import org.apache.james.jmap.draft.model.message.view.SubMessage; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.model.TestMessageId; import org.junit.Before; 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 bedf3a1..90316f9 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 @@ -38,11 +38,11 @@ import org.apache.commons.lang3.NotImplementedException; import org.apache.james.core.Username; import org.apache.james.jmap.draft.model.GetMessagesRequest; import org.apache.james.jmap.draft.model.GetMessagesResponse; -import org.apache.james.jmap.draft.model.MessageFullView; import org.apache.james.jmap.draft.model.MessagePreviewGenerator; import org.apache.james.jmap.draft.model.MessageProperties.MessageProperty; -import org.apache.james.jmap.draft.model.MessageViewFactory; 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.utils.HtmlTextExtractor; import org.apache.james.jmap.draft.utils.JsoupHtmlTextExtractor; import org.apache.james.mailbox.BlobManager; 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 ee34861..388de80 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 @@ -36,9 +36,9 @@ import org.apache.james.core.MaybeSender; import org.apache.james.jmap.draft.model.EnvelopeUtils; import org.apache.james.jmap.draft.model.Keyword; import org.apache.james.jmap.draft.model.Keywords; -import org.apache.james.jmap.draft.model.MessageFullView; import org.apache.james.jmap.draft.model.MessagePreviewGenerator; -import org.apache.james.jmap.draft.model.MessageViewFactory; +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.utils.HtmlTextExtractor; import org.apache.james.mailbox.BlobManager; import org.apache.james.mailbox.MessageUid; 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 dc9e738..624e118 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 @@ -38,9 +38,9 @@ import org.apache.james.jmap.draft.model.CreationMessage; import org.apache.james.jmap.draft.model.CreationMessage.DraftEmailer; import org.apache.james.jmap.draft.model.CreationMessageId; import org.apache.james.jmap.draft.model.MessagePreviewGenerator; -import org.apache.james.jmap.draft.model.MessageViewFactory; 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.send.MailMetadata; import org.apache.james.jmap.draft.send.MailSpool; import org.apache.james.jmap.draft.utils.HtmlTextExtractor; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java index aabc4ac..9b89f94 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java @@ -25,6 +25,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Instant; import org.apache.commons.lang3.NotImplementedException; +import org.apache.james.jmap.draft.model.message.view.MessageFullView; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.TestMessageId; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessageFullViewTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewTest.java similarity index 97% rename from server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessageFullViewTest.java rename to server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewTest.java index 3998824..a69a8d8 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessageFullViewTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewTest.java @@ -16,13 +16,19 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft.model; +package org.apache.james.jmap.draft.model.message.view; import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; import java.util.Optional; +import org.apache.james.jmap.draft.model.Attachment; +import org.apache.james.jmap.draft.model.BlobId; +import org.apache.james.jmap.draft.model.Emailer; +import org.apache.james.jmap.draft.model.Keyword; +import org.apache.james.jmap.draft.model.Keywords; +import org.apache.james.jmap.draft.model.Number; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.model.TestMessageId; import org.junit.Test; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessageViewFactoryTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactoryTest.java similarity index 98% rename from server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessageViewFactoryTest.java rename to server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactoryTest.java index fb5d09c..7566276 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessageViewFactoryTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageViewFactoryTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft.model; +package org.apache.james.jmap.draft.model.message.view; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -29,7 +29,14 @@ import java.time.Instant; import java.util.Optional; import org.apache.commons.lang3.StringUtils; -import org.apache.james.jmap.draft.model.MessageViewFactory.MetaDataWithContent; +import org.apache.james.jmap.draft.model.Attachment; +import org.apache.james.jmap.draft.model.BlobId; +import org.apache.james.jmap.draft.model.Emailer; +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.utils.HtmlTextExtractor; import org.apache.james.jmap.draft.utils.JsoupHtmlTextExtractor; import org.apache.james.mailbox.BlobManager; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SubMailboxMessageTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/SubMailboxMessageTest.java similarity index 96% rename from server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SubMailboxMessageTest.java rename to server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/SubMailboxMessageTest.java index 395dcc3..15cbc84 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SubMailboxMessageTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/SubMailboxMessageTest.java @@ -16,13 +16,16 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft.model; +package org.apache.james.jmap.draft.model.message.view; import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; import java.util.Optional; +import org.apache.james.jmap.draft.model.Attachment; +import org.apache.james.jmap.draft.model.BlobId; +import org.apache.james.jmap.draft.model.Emailer; import org.junit.Test; import com.google.common.collect.ImmutableList; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
