MAILBOX-262 rename Message into MailboxMessage

git-svn-id: https://svn.apache.org/repos/asf/james/project/trunk@1724225 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 12, 2016 · 4665e55 · 4665e55
1 parent 526411e
commit 4665e55
Show file tree

Hide file tree

Showing 109 changed files with 921 additions and 919 deletions.
diff --git a/dockerfiles/run/guice/destination/conf/META-INF/persistence-template.xml b/dockerfiles/run/guice/destination/conf/META-INF/persistence-template.xml
@@ -31,18 +31,18 @@
         <!-- Mailbox stuff-->
         <class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
         <class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
         <!--
-                <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMessage</class>
+                <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessage</class>
         -->
 
         <!-- This needs to get used when you want to use streaming. Remember to comment the following classes
              org.apache.james.mailbox.jpa.mail.model.JPAMessage
              If you don't do this the EntityManager will get confused!
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage</class>
         -->
         <!-- Comment if you want to use streaming -->
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
 
         <class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
         <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>

diff --git a/dockerfiles/run/guice/destination/conf/META-INF/persistence.xml b/dockerfiles/run/guice/destination/conf/META-INF/persistence.xml
@@ -27,8 +27,8 @@
         <!-- Mailbox stuff-->
         <class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
         <class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
         <class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
         <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
         <class>org.apache.james.domainlist.jpa.model.JPADomain</class>

diff --git a/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml b/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml
@@ -31,18 +31,18 @@
         <!-- Mailbox stuff-->
         <class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
         <class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
         <!--
-                <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMessage</class>
+                <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessage</class>
         -->
 
         <!-- This needs to get used when you want to use streaming. Remember to comment the following classes
              org.apache.james.mailbox.jpa.mail.model.JPAMessage
              If you don't do this the EntityManager will get confused!
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage</class>
         -->
         <!-- Comment if you want to use streaming -->
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
 
         <class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
         <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>

diff --git a/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml b/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml
@@ -27,8 +27,8 @@
         <!-- Mailbox stuff-->
         <class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
         <class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
+        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
         <class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
         <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
         <class>org.apache.james.domainlist.jpa.model.JPADomain</class>

diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java
@@ -11,7 +11,7 @@
 import org.apache.james.mailbox.store.mail.MessageMapper;
 import org.apache.james.mailbox.store.mail.model.MailboxId;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
 
 /**
  * A MessageMapper implementation that uses a MailboxMetadataCache to cache the information
@@ -21,7 +21,6 @@
  */
 public class CachingMessageMapper<Id extends MailboxId> implements MessageMapper<Id> {
 
-
     private MessageMapper<Id> underlying;
     private MailboxMetadataCache<Id> cache;
 
@@ -41,10 +40,10 @@ public <T> T execute(Transaction<T> transaction) throws MailboxException {
     }
 
     @Override
-    public Iterator<Message<Id>> findInMailbox(Mailbox<Id> mailbox,
+    public Iterator<MailboxMessage<Id>> findInMailbox(Mailbox<Id> mailbox,
-            MessageRange set,
+                                                      MessageRange set,
-            org.apache.james.mailbox.store.mail.MessageMapper.FetchType type,
+                                                      org.apache.james.mailbox.store.mail.MessageMapper.FetchType type,
-            int limit) throws MailboxException {
+                                                      int limit) throws MailboxException {
         return underlying.findInMailbox(mailbox, set, type, limit);
     }
 
@@ -68,7 +67,7 @@ public long countUnseenMessagesInMailbox(Mailbox<Id> mailbox)
     }
 
     @Override
-    public void delete(Mailbox<Id> mailbox, Message<Id> message)
+    public void delete(Mailbox<Id> mailbox, MailboxMessage<Id> message)
             throws MailboxException {
         invalidateMetadata(mailbox);
         underlying.delete(mailbox, message);
@@ -89,7 +88,7 @@ public List<Long> findRecentMessageUidsInMailbox(Mailbox<Id> mailbox)
     }
 
     @Override
-    public MessageMetaData add(Mailbox<Id> mailbox, Message<Id> message)
+    public MessageMetaData add(Mailbox<Id> mailbox, MailboxMessage<Id> message)
             throws MailboxException {
         invalidateMetadata(mailbox);
         return underlying.add(mailbox, message);
@@ -106,7 +105,7 @@ public Iterator<UpdatedFlags> updateFlags(Mailbox<Id> mailbox, FlagsUpdateCalcul
 
 
     @Override
-    public MessageMetaData copy(Mailbox<Id> mailbox, Message<Id> original)
+    public MessageMetaData copy(Mailbox<Id> mailbox, MailboxMessage<Id> original)
             throws MailboxException {
         invalidateMetadata(mailbox);
         return underlying.copy(mailbox, original);
@@ -128,7 +127,7 @@ private void invalidateMetadata(Mailbox<Id> mailbox) {
     }
 
     @Override
-    public MessageMetaData move(Mailbox<Id> mailbox, Message<Id> original) throws MailboxException {
+    public MessageMetaData move(Mailbox<Id> mailbox, MailboxMessage<Id> original) throws MailboxException {
         throw new UnsupportedOperationException("Move is not yet supported");
     }
 

diff --git a/...ssandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/...ssandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -89,9 +89,9 @@
 import org.apache.james.mailbox.store.mail.ModSeqProvider;
 import org.apache.james.mailbox.store.mail.UidProvider;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
 import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
 import org.apache.james.mailbox.store.mail.model.impl.SimpleProperty;
 
 import com.datastax.driver.core.BoundStatement;
@@ -150,7 +150,7 @@ public long countUnseenMessagesInMailbox(Mailbox<CassandraId> mailbox) throws Ma
     }
 
     @Override
-    public void delete(Mailbox<CassandraId> mailbox, Message<CassandraId> message) {
+    public void delete(Mailbox<CassandraId> mailbox, MailboxMessage<CassandraId> message) {
         session.execute(
             QueryBuilder.delete()
                 .from(TABLE_NAME)
@@ -163,10 +163,10 @@ public void delete(Mailbox<CassandraId> mailbox, Message<CassandraId> message) {
     }
 
     @Override
-    public Iterator<Message<CassandraId>> findInMailbox(Mailbox<CassandraId> mailbox, MessageRange set, FetchType ftype, int max) throws MailboxException {
+    public Iterator<MailboxMessage<CassandraId>> findInMailbox(Mailbox<CassandraId> mailbox, MessageRange set, FetchType ftype, int max) throws MailboxException {
         return CassandraUtils.convertToStream(session.execute(buildQuery(mailbox, set)))
             .map(this::message)
-            .sorted(Comparator.comparingLong(Message::getUid))
+            .sorted(Comparator.comparingLong(MailboxMessage::getUid))
             .iterator();
     }
 
@@ -192,11 +192,11 @@ public Map<Long, MessageMetaData> expungeMarkedForDeletionInMailbox(final Mailbo
         return CassandraUtils.convertToStream(session.execute(buildQuery(mailbox, set).and(eq(DELETED, true))))
             .map(this::message)
             .peek((message) -> delete(mailbox, message))
-            .collect(Collectors.toMap(Message::getUid, SimpleMessageMetaData::new));
+            .collect(Collectors.toMap(MailboxMessage::getUid, SimpleMessageMetaData::new));
     }
 
     @Override
-    public MessageMetaData move(Mailbox<CassandraId> mailbox, Message<CassandraId> original) throws MailboxException {
+    public MessageMetaData move(Mailbox<CassandraId> mailbox, MailboxMessage<CassandraId> original) throws MailboxException {
         throw new UnsupportedOperationException("Not implemented - see https://issues.apache.org/jira/browse/IMAP-370");
     }
 
@@ -211,7 +211,7 @@ public long getHighestModSeq(Mailbox<CassandraId> mailbox) throws MailboxExcepti
     }
 
     @Override
-    public MessageMetaData add(Mailbox<CassandraId> mailbox, Message<CassandraId> message) throws MailboxException {
+    public MessageMetaData add(Mailbox<CassandraId> mailbox, MailboxMessage<CassandraId> message) throws MailboxException {
         message.setUid(uidProvider.nextUid(mailboxSession, mailbox));
         message.setModSeq(modSeqProvider.nextModSeq(mailboxSession, mailbox));
         MessageMetaData messageMetaData = save(mailbox, message);
@@ -239,7 +239,7 @@ public <T> T execute(Transaction<T> transaction) throws MailboxException {
     }
 
     @Override
-    public MessageMetaData copy(Mailbox<CassandraId> mailbox, Message<CassandraId> original) throws MailboxException {
+    public MessageMetaData copy(Mailbox<CassandraId> mailbox, MailboxMessage<CassandraId> original) throws MailboxException {
 
         original.setUid(uidProvider.nextUid(mailboxSession, mailbox));
         original.setModSeq(modSeqProvider.nextModSeq(mailboxSession, mailbox));
@@ -276,9 +276,9 @@ private void updateMailbox(Mailbox<CassandraId> mailbox, Assignment operation) {
         session.execute(update(CassandraMailboxCountersTable.TABLE_NAME).with(operation).where(eq(CassandraMailboxCountersTable.MAILBOX_ID, mailbox.getMailboxId().asUuid())));
     }
 
-    private Message<CassandraId> message(Row row) {
+    private MailboxMessage<CassandraId> message(Row row) {
-        SimpleMessage<CassandraId> message =
+        SimpleMailboxMessage<CassandraId> message =
-            new SimpleMessage<>(
+            new SimpleMailboxMessage<>(
                 row.getDate(INTERNAL_DATE),
                 row.getInt(FULL_CONTENT_OCTETS),
                 row.getInt(BODY_START_OCTET),
@@ -321,7 +321,7 @@ private PropertyBuilder getPropertyBuilder(Row row) {
         return property;
     }
 
-    private MessageMetaData save(Mailbox<CassandraId> mailbox, Message<CassandraId> message) throws MailboxException {
+    private MessageMetaData save(Mailbox<CassandraId> mailbox, MailboxMessage<CassandraId> message) throws MailboxException {
         try {
             Insert query = insertInto(TABLE_NAME)
                 .value(MAILBOX_ID, mailbox.getMailboxId().asUuid())
@@ -360,7 +360,7 @@ private MessageMetaData save(Mailbox<CassandraId> mailbox, Message<CassandraId>
         }
     }
 
-    private Set<String> userFlagsSet(Message<CassandraId> message) {
+    private Set<String> userFlagsSet(MailboxMessage<CassandraId> message) {
         return Arrays.stream(message.createFlags().getUserFlags()).collect(Collectors.toSet());
     }
 
@@ -379,7 +379,7 @@ private Optional<UpdatedFlags> updateFlagsOnMessage(Mailbox<CassandraId> mailbox
             .orElse(handleRetries(mailbox, flagUpdateCalculator, row.getLong(IMAP_UID)));
     }
 
-    private Optional<UpdatedFlags> tryMessageFlagsUpdate(FlagsUpdateCalculator flagUpdateCalculator, Mailbox<CassandraId> mailbox, Message<CassandraId> message) {
+    private Optional<UpdatedFlags> tryMessageFlagsUpdate(FlagsUpdateCalculator flagUpdateCalculator, Mailbox<CassandraId> mailbox, MailboxMessage<CassandraId> message) {
         try {
             long oldModSeq = message.getModSeq();
             Flags oldFlags = message.createFlags();
@@ -413,7 +413,7 @@ private Optional<UpdatedFlags> retryMessageFlagsUpdate(Mailbox<CassandraId> mail
         return tryMessageFlagsUpdate(flagUpdateCalculator, mailbox, message(Optional.ofNullable(session.execute(selectMessage(mailbox, uid)).one()).orElseThrow(() -> new MessageDeletedDuringFlagsUpdateException(mailbox.getMailboxId(), uid))));
     }
 
-    private boolean conditionalSave(Message<CassandraId> message, long oldModSeq) {
+    private boolean conditionalSave(MailboxMessage<CassandraId> message, long oldModSeq) {
         ResultSet resultSet = session.execute(
             update(TABLE_NAME)
                 .with(set(ANSWERED, message.isAnswered()))

diff --git a/...ndra/mail/CassandraMessageMapperTest.java → ...il/CassandraMailboxMessageMapperTest.java b/...ndra/mail/CassandraMessageMapperTest.java → ...il/CassandraMailboxMessageMapperTest.java
@@ -21,8 +21,8 @@
 import org.apache.james.mailbox.cassandra.CassandraId;
 import org.apache.james.mailbox.store.mail.model.AbstractMessageMapperTest;
 
-public class CassandraMessageMapperTest extends AbstractMessageMapperTest<CassandraId> {
+public class CassandraMailboxMessageMapperTest extends AbstractMessageMapperTest<CassandraId> {
-    public CassandraMessageMapperTest() {
+    public CassandraMailboxMessageMapperTest() {
         super(new CassandraMapperProvider());
     }
 }
diff --git a/...g/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java b/...g/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
@@ -34,7 +34,7 @@
 import org.apache.james.mailbox.store.mail.MessageMapperFactory;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.MailboxId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
 import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@ public Iterator<Long> search(MailboxSession session, Mailbox<Id> mailbox, Search
     }
 
     @Override
-    public void add(MailboxSession session, Mailbox<Id> mailbox, Message<Id> message) throws MailboxException {
+    public void add(MailboxSession session, Mailbox<Id> mailbox, MailboxMessage<Id> message) throws MailboxException {
         try {
             indexer.indexMessage(indexIdFor(mailbox, message.getUid()), messageToElasticSearchJson.convertToJson(message));
         } catch (Exception e) {

diff --git a/...ticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java b/...ticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
@@ -26,7 +26,7 @@
 import org.apache.james.mailbox.elasticsearch.query.DateResolutionFormater;
 import org.apache.james.mailbox.store.extractor.TextExtractor;
 import org.apache.james.mailbox.store.mail.model.MailboxId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
 import org.apache.james.mailbox.store.mail.model.Property;
 import org.apache.james.mime4j.MimeException;
 
@@ -42,7 +42,7 @@
 
 public class IndexableMessage {
 
-    public static IndexableMessage from(Message<? extends MailboxId> message, TextExtractor textExtractor, ZoneId zoneId) {
+    public static IndexableMessage from(MailboxMessage<? extends MailboxId> message, TextExtractor textExtractor, ZoneId zoneId) {
         Preconditions.checkNotNull(message.getMailboxId());
         IndexableMessage indexableMessage = new IndexableMessage();
         try {
@@ -73,7 +73,7 @@ private void copyHeaderFields(HeaderCollection headerCollection, ZonedDateTime i
         this.sentDate = DateResolutionFormater.DATE_TIME_FOMATTER.format(headerCollection.getSentDate().orElse(internalDate));
     }
 
-    private void copyMessageFields(Message<? extends MailboxId> message, ZoneId zoneId) {
+    private void copyMessageFields(MailboxMessage<? extends MailboxId> message, ZoneId zoneId) {
         this.id = message.getUid();
         this.mailboxId = message.getMailboxId().serialize();
         this.modSeq = message.getModSeq();
@@ -91,7 +91,7 @@ private void copyMessageFields(Message<? extends MailboxId> message, ZoneId zone
         this.properties = message.getProperties();
     }
 
-    private static ZonedDateTime getSanitizedInternalDate(Message<? extends MailboxId> message, ZoneId zoneId) {
+    private static ZonedDateTime getSanitizedInternalDate(MailboxMessage<? extends MailboxId> message, ZoneId zoneId) {
         if (message.getInternalDate() == null) {
             return ZonedDateTime.now();
         }

diff --git a/...src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java b/...src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java
@@ -30,7 +30,7 @@
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.google.common.base.Preconditions;
 import org.apache.james.mailbox.store.extractor.TextExtractor;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
 
 public class MessageToElasticSearchJson {
 
@@ -51,7 +51,7 @@ public MessageToElasticSearchJson(TextExtractor textExtractor) {
         this(textExtractor, ZoneId.systemDefault());
     }
 
-    public String convertToJson(Message<?> message) throws JsonProcessingException {
+    public String convertToJson(MailboxMessage<?> message) throws JsonProcessingException {
         Preconditions.checkNotNull(message);
         return mapper.writeValueAsString(IndexableMessage.from(message, textExtractor, zoneId));
     }

diff --git a/...asticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java b/...asticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java
@@ -22,7 +22,7 @@
 import com.google.common.base.Preconditions;
 import org.apache.james.mailbox.store.extractor.TextExtractor;
 import org.apache.james.mailbox.store.mail.model.MailboxId;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.message.DefaultBodyDescriptorBuilder;
 import org.apache.james.mime4j.message.MaximalBodyDescriptor;
@@ -36,14 +36,14 @@
 
 public class MimePartParser {
 
-    private final Message<? extends MailboxId> message;
+    private final MailboxMessage<? extends MailboxId> message;
     private final TextExtractor textExtractor;
     private final MimeTokenStream stream;
     private final Deque<MimePartContainerBuilder> builderStack;
     private MimePart result;
     private MimePartContainerBuilder currentlyBuildMimePart;
 
-    public MimePartParser(Message<? extends MailboxId> message, TextExtractor textExtractor) {
+    public MimePartParser(MailboxMessage<? extends MailboxId> message, TextExtractor textExtractor) {
         this.message = message;
         this.textExtractor = textExtractor;
         this.builderStack = new LinkedList<>();