Author: matthieu
Date: Tue Jan 12 13:17:03 2016
New Revision: 1724225
URL: http://svn.apache.org/viewvc?rev=1724225&view=rev
Log:
MAILBOX-262 rename Message into MailboxMessage
Added:
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMessageMapperTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessage.java
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapperTest.java
james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMessage.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java
james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
james/project/trunk/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
james/project/trunk/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMessageNameTest.java
james/project/trunk/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMessageManagerTest.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageResultImplTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageResultIteratorTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/MailboxMessagePackEventSerializerTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/MessagePackEventSerializerTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AbstractMailboxMessageTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AbstractMessageTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMailboxMessageIdTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMessageAssertTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssertTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java
- copied, changed from r1724224,
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessageTest.java
james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MailboxMessageResultUtilsTest.java
- copied, changed from r1724224,
james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMailboxMessageListMethodTest.java
- copied, changed from r1724224,
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListRequestTest.java
- copied, changed from r1724224,
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java
- copied, changed from r1724224,
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListResponseTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxMessageTest.java
- copied, changed from r1724224,
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java
- copied, changed from r1724224,
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMessageTest.java
Removed:
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessage.java
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapperTest.java
james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMessage.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java
james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
james/project/trunk/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
james/project/trunk/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMessageNameTest.java
james/project/trunk/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMessageManagerTest.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageResultImplTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageResultIteratorTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/MessagePackEventSerializerTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AbstractMessageTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DefaultMessageIdTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssertTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessageTest.java
james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
james/project/trunk/server/protocols/jmap-integration-testing/src/test/java/org/apache/james/jmap/methods/cassandra/CassandraGetMessageListMethodTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListResponseTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMessageTest.java
Modified:
james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence-template.xml
james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence.xml
james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml
james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml
james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java
james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
james/project/trunk/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
james/project/trunk/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
james/project/trunk/mailbox/jpa/src/main/resources/META-INF/persistence.xml
james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java
james/project/trunk/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPASubscriptionManagerTest.java
james/project/trunk/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
james/project/trunk/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
james/project/trunk/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/StrictLuceneMessageSearchIndexText.java
james/project/trunk/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
james/project/trunk/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/MessagePackEventSerializer.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/CurrentQuotaCalculator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/ReverseComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/AbstractMessageMapperTest.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java
james/project/trunk/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java
james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
james/project/trunk/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
james/project/trunk/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java
james/project/trunk/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/MailboxMessageAppenderOnCyrusHost.java
james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
james/project/trunk/server/app/src/main/resources/META-INF/persistence-template.xml
james/project/trunk/server/app/src/main/resources/META-INF/persistence.xml
james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessageListMethod.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Message.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/IndexableMessage.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/MimePartParser.java
james/project/trunk/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java
james/project/trunk/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortToComparatorConvertorTest.java
Modified:
james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence-template.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence-template.xml?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence-template.xml
(original)
+++
james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence-template.xml
Tue Jan 12 13:17:03 2016
@@ -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>
Modified:
james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence.xml?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence.xml
(original)
+++
james/project/trunk/dockerfiles/run/guice/destination/conf/META-INF/persistence.xml
Tue Jan 12 13:17:03 2016
@@ -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.JPAMessage</class>
+
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</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>
Modified:
james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml
(original)
+++
james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml
Tue Jan 12 13:17:03 2016
@@ -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>
Modified:
james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml
(original)
+++
james/project/trunk/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml
Tue Jan 12 13:17:03 2016
@@ -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.JPAMessage</class>
+
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</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>
Modified:
james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java
(original)
+++
james/project/trunk/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMessageMapper.java
Tue Jan 12 13:17:03 2016
@@ -11,7 +11,7 @@ import org.apache.james.mailbox.store.Fl
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 @@ import org.apache.james.mailbox.store.ma
*/
public class CachingMessageMapper<Id extends MailboxId> implements
MessageMapper<Id> {
-
private MessageMapper<Id> underlying;
private MailboxMetadataCache<Id> cache;
@@ -41,10 +40,10 @@ public class CachingMessageMapper<Id ext
}
@Override
- public Iterator<Message<Id>> findInMailbox(Mailbox<Id> mailbox,
- MessageRange set,
- org.apache.james.mailbox.store.mail.MessageMapper.FetchType type,
- int limit) throws MailboxException {
+ public Iterator<MailboxMessage<Id>> findInMailbox(Mailbox<Id> mailbox,
+ MessageRange set,
+
org.apache.james.mailbox.store.mail.MessageMapper.FetchType type,
+ int limit) throws
MailboxException {
return underlying.findInMailbox(mailbox, set, type, limit);
}
@@ -68,7 +67,7 @@ public class CachingMessageMapper<Id ext
}
@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 class CachingMessageMapper<Id ext
}
@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 class CachingMessageMapper<Id ext
@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 @@ public class CachingMessageMapper<Id ext
}
@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");
}
Modified:
james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
(original)
+++
james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
Tue Jan 12 13:17:03 2016
@@ -89,9 +89,9 @@ import org.apache.james.mailbox.store.ma
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 class CassandraMessageMapper impl
}
@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 class CassandraMessageMapper impl
}
@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 class CassandraMessageMapper impl
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 class CassandraMessageMapper impl
}
@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 class CassandraMessageMapper impl
}
@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 @@ public class CassandraMessageMapper impl
session.execute(update(CassandraMailboxCountersTable.TABLE_NAME).with(operation).where(eq(CassandraMailboxCountersTable.MAILBOX_ID,
mailbox.getMailboxId().asUuid())));
}
- private Message<CassandraId> message(Row row) {
- SimpleMessage<CassandraId> message =
- new SimpleMessage<>(
+ private MailboxMessage<CassandraId> message(Row row) {
+ SimpleMailboxMessage<CassandraId> message =
+ new SimpleMailboxMessage<>(
row.getDate(INTERNAL_DATE),
row.getInt(FULL_CONTENT_OCTETS),
row.getInt(BODY_START_OCTET),
@@ -321,7 +321,7 @@ public class CassandraMessageMapper impl
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 @@ public class CassandraMessageMapper impl
}
}
- 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 @@ public class CassandraMessageMapper impl
.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 @@ public class CassandraMessageMapper impl
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()))
Copied:
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMessageMapperTest.java
(from r1724224,
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMessageMapperTest.java?p2=james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMessageMapperTest.java&p1=james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
(original)
+++
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMessageMapperTest.java
Tue Jan 12 13:17:03 2016
@@ -21,8 +21,8 @@ package org.apache.james.mailbox.cassand
import org.apache.james.mailbox.cassandra.CassandraId;
import org.apache.james.mailbox.store.mail.model.AbstractMessageMapperTest;
-public class CassandraMessageMapperTest extends
AbstractMessageMapperTest<CassandraId> {
- public CassandraMessageMapperTest() {
+public class CassandraMailboxMessageMapperTest extends
AbstractMessageMapperTest<CassandraId> {
+ public CassandraMailboxMessageMapperTest() {
super(new CassandraMapperProvider());
}
}
Modified:
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
Tue Jan 12 13:17:03 2016
@@ -34,7 +34,7 @@ import org.apache.james.mailbox.model.Se
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 class ElasticSearchListeningMessa
}
@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) {
Modified:
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java
Tue Jan 12 13:17:03 2016
@@ -26,7 +26,7 @@ import com.google.common.collect.Multima
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 @@ import java.util.stream.Collectors;
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 @@ public class IndexableMessage {
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 @@ public class IndexableMessage {
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();
}
Modified:
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java
Tue Jan 12 13:17:03 2016
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.datatype.gu
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 class MessageToElasticSearchJson
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));
}
Modified:
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java
Tue Jan 12 13:17:03 2016
@@ -22,7 +22,7 @@ package org.apache.james.mailbox.elastic
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 @@ import java.util.LinkedList;
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<>();
Copied:
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java
(from r1724224,
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java?p2=james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java&p1=james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMailboxMessageSearchIndexTest.java
Tue Jan 12 13:17:03 2016
@@ -40,7 +40,7 @@ import org.apache.james.mailbox.model.Me
import org.apache.james.mailbox.store.TestId;
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.Message;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.easymock.IMocksControl;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.delete.DeleteResponse;
@@ -52,7 +52,7 @@ import org.junit.Test;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.base.Throwables;
-public class ElasticSearchListeningMessageSearchIndexTest {
+public class ElasticSearchListeningMailboxMessageSearchIndexTest {
public static final long MODSEQ = 18L;
private IMocksControl control;
@@ -72,7 +72,7 @@ public class ElasticSearchListeningMessa
mapperFactory = control.createMock(MessageMapperFactory.class);
indexer = control.createMock(ElasticSearchIndexer.class);
messageToElasticSearchJson =
control.createMock(MessageToElasticSearchJson.class);
-
expect(messageToElasticSearchJson.convertToJson(anyObject(Message.class))).andReturn("json
content").anyTimes();
+
expect(messageToElasticSearchJson.convertToJson(anyObject(MailboxMessage.class))).andReturn("json
content").anyTimes();
expect(messageToElasticSearchJson.getUpdatedJsonMessagePart(anyObject(Flags.class),
anyLong())).andReturn("json updated content").anyTimes();
elasticSearchSearcher =
control.createMock(ElasticSearchSearcher.class);
@@ -89,7 +89,7 @@ public class ElasticSearchListeningMessa
long messageId = 1;
TestId mailboxId = TestId.of(12);
expect(mailbox.getMailboxId()).andReturn(mailboxId);
- Message<TestId> message = mockedMessage(messageId, mailboxId);
+ MailboxMessage<TestId> message = mockedMessage(messageId, mailboxId);
IndexResponse expectedIndexResponse =
control.createMock(IndexResponse.class);
expect(indexer.indexMessage(eq(mailboxId.serialize() + ":" +
messageId), anyString()))
@@ -101,8 +101,8 @@ public class ElasticSearchListeningMessa
}
@SuppressWarnings("unchecked")
- private Message<TestId> mockedMessage(long messageId, TestId mailboxId)
throws IOException {
- Message<TestId> message = control.createMock(Message.class);
+ private MailboxMessage<TestId> mockedMessage(long messageId, TestId
mailboxId) throws IOException {
+ MailboxMessage<TestId> message =
control.createMock(MailboxMessage.class);
expect(message.getUid()).andReturn(messageId).anyTimes();
return message;
}
@@ -115,7 +115,7 @@ public class ElasticSearchListeningMessa
long messageId = 1;
TestId mailboxId = TestId.of(12);
- Message<TestId> message = mockedMessage(messageId, mailboxId);
+ MailboxMessage<TestId> message = mockedMessage(messageId, mailboxId);
expect(mailbox.getMailboxId()).andReturn(mailboxId);
expect(indexer.indexMessage(eq(mailboxId.serialize() + ":" +
messageId), anyString()))
Copied:
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java
(from r1724224,
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java?p2=james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java&p1=james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MailboxMessageToElasticSearchJsonTest.java
Tue Jan 12 13:17:03 2016
@@ -22,12 +22,12 @@ package org.apache.james.mailbox.elastic
import com.google.common.base.Throwables;
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.FlagsBuilder;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.apache.james.mailbox.tika.extractor.TikaTextExtractor;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.TestId;
-import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
import org.junit.Before;
import org.junit.Test;
@@ -42,7 +42,7 @@ import static net.javacrumbs.jsonunit.co
import static net.javacrumbs.jsonunit.core.Option.IGNORING_VALUES;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
-public class MessageToElasticSearchJsonTest {
+public class MailboxMessageToElasticSearchJsonTest {
public static final int SIZE = 25;
public static final int BODY_START_OCTET = 100;
@@ -69,7 +69,7 @@ public class MessageToElasticSearchJsonT
MessageToElasticSearchJson messageToElasticSearchJson = new
MessageToElasticSearchJson(
new DefaultTextExtractor(),
ZoneId.of("Europe/Paris"));
- Message<TestId> spamMail = new SimpleMessage<>(date,
+ MailboxMessage<TestId> spamMail = new SimpleMailboxMessage<>(date,
SIZE,
BODY_START_OCTET,
new
SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("documents/spamMail.eml"))),
@@ -87,7 +87,7 @@ public class MessageToElasticSearchJsonT
MessageToElasticSearchJson messageToElasticSearchJson = new
MessageToElasticSearchJson(
new DefaultTextExtractor(),
ZoneId.of("Europe/Paris"));
- Message<TestId> htmlMail = new SimpleMessage<>(date,
+ MailboxMessage<TestId> htmlMail = new SimpleMailboxMessage<>(date,
SIZE,
BODY_START_OCTET,
new
SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("documents/htmlMail.eml"))),
@@ -106,7 +106,7 @@ public class MessageToElasticSearchJsonT
MessageToElasticSearchJson messageToElasticSearchJson = new
MessageToElasticSearchJson(
new DefaultTextExtractor(),
ZoneId.of("Europe/Paris"));
- Message<TestId> pgpSignedMail = new SimpleMessage<>(date,
+ MailboxMessage<TestId> pgpSignedMail = new SimpleMailboxMessage<>(date,
SIZE,
BODY_START_OCTET,
new
SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("documents/pgpSignedMail.eml"))),
@@ -125,7 +125,7 @@ public class MessageToElasticSearchJsonT
MessageToElasticSearchJson messageToElasticSearchJson = new
MessageToElasticSearchJson(
new DefaultTextExtractor(),
ZoneId.of("Europe/Paris"));
- Message<TestId> mail = new SimpleMessage<>(date,
+ MailboxMessage<TestId> mail = new SimpleMailboxMessage<>(date,
SIZE,
BODY_START_OCTET,
new
SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("documents/mail.eml"))),
@@ -144,7 +144,7 @@ public class MessageToElasticSearchJsonT
MessageToElasticSearchJson messageToElasticSearchJson = new
MessageToElasticSearchJson(
new DefaultTextExtractor(),
ZoneId.of("Europe/Paris"));
- Message<TestId> recursiveMail = new SimpleMessage<>(date,
+ MailboxMessage<TestId> recursiveMail = new SimpleMailboxMessage<>(date,
SIZE,
BODY_START_OCTET,
new
SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("documents/recursiveMail.eml"))),
@@ -163,7 +163,7 @@ public class MessageToElasticSearchJsonT
MessageToElasticSearchJson messageToElasticSearchJson = new
MessageToElasticSearchJson(
new DefaultTextExtractor(),
ZoneId.of("Europe/Paris"));
- Message<TestId> mailWithNoInternalDate = new SimpleMessage<>(null,
+ MailboxMessage<TestId> mailWithNoInternalDate = new
SimpleMailboxMessage<>(null,
SIZE,
BODY_START_OCTET,
new
SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("documents/recursiveMail.eml"))),
@@ -183,9 +183,9 @@ public class MessageToElasticSearchJsonT
MessageToElasticSearchJson messageToElasticSearchJson = new
MessageToElasticSearchJson(
new DefaultTextExtractor(),
ZoneId.of("Europe/Paris"));
- Message<TestId> mailWithNoMailboxId;
+ MailboxMessage<TestId> mailWithNoMailboxId;
try {
- mailWithNoMailboxId = new SimpleMessage<>(date,
+ mailWithNoMailboxId = new SimpleMailboxMessage<>(date,
SIZE,
BODY_START_OCTET,
new
SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("documents/recursiveMail.eml"))),
@@ -231,7 +231,7 @@ public class MessageToElasticSearchJsonT
MessageToElasticSearchJson messageToElasticSearchJson = new
MessageToElasticSearchJson(
new TikaTextExtractor(),
ZoneId.of("Europe/Paris"));
- Message<TestId> spamMail = new SimpleMessage<>(date,
+ MailboxMessage<TestId> spamMail = new SimpleMailboxMessage<>(date,
SIZE,
BODY_START_OCTET,
new
SharedByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("documents/nonTextual.eml"))),
Modified:
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
(original)
+++
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
Tue Jan 12 13:17:03 2016
@@ -70,11 +70,11 @@ import org.apache.hadoop.hbase.client.Pu
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.james.mailbox.hbase.io.ChunkInputStream;
-import org.apache.james.mailbox.hbase.mail.HBaseMessage;
+import org.apache.james.mailbox.hbase.mail.HBaseMailboxMessage;
import org.apache.james.mailbox.hbase.mail.model.HBaseMailbox;
import org.apache.james.mailbox.model.MailboxPath;
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.Property;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.user.model.Subscription;
@@ -145,7 +145,7 @@ public class HBaseUtils {
* @param message
* @return a put that contains all metadata information.
*/
- public static Put metadataToPut(Message<HBaseId> message) {
+ public static Put metadataToPut(MailboxMessage<HBaseId> message) {
Put put = new Put(messageRowKey(message));
// we store the message uid and mailbox uid in the row key
// store the meta data
@@ -203,7 +203,7 @@ public class HBaseUtils {
* @param message message to get row key from
* @return rowkey byte array that can be used with HBase API
*/
- public static byte[] messageRowKey(Message<HBaseId> message) {
+ public static byte[] messageRowKey(MailboxMessage<HBaseId> message) {
return messageRowKey(message.getMailboxId(), message.getUid());
}
@@ -232,16 +232,16 @@ public class HBaseUtils {
}
/**
- * Creates a HBaseMessage from a Result object. This method retrieves all
information
+ * Creates a HBaseMailboxMessage from a Result object. This method
retrieves all information
* except for body and header related bytes. The message content will be
loaded on demand
* through a specialised InputStream called {@link ChunkInputStream}.
* IMPORTANT: the method expects a single version of each cell. Use
setMaxVersions(1).
* @param conf configuration object for HBase cluster
* @param result the result object containing message data
- * @return a HBaseMessage instance with message metadata.
+ * @return a HBaseMailboxMessage instance with message metadata.
*/
- public static Message<HBaseId> messageMetaFromResult(Configuration conf,
Result result) {
- HBaseMessage message = null;
+ public static MailboxMessage<HBaseId> messageMetaFromResult(Configuration
conf, Result result) {
+ HBaseMailboxMessage message = null;
Flags flags = new Flags();
List<Property> propList = new ArrayList<Property>();
KeyValue[] keys = result.raw();
@@ -305,7 +305,7 @@ public class HBaseUtils {
PropertyBuilder props = new PropertyBuilder(propList);
props.setMediaType(mediaType);
props.setSubType(subType);
- message = new HBaseMessage(conf, uuid, internalDate, flags,
contentOctets, (int) (contentOctets - bodyOctets), props);
+ message = new HBaseMailboxMessage(conf, uuid, internalDate, flags,
contentOctets, (int) (contentOctets - bodyOctets), props);
message.setUid(uid);
message.setModSeq(modSeq);
message.setTextualLineCount(textualLineCount);
@@ -328,7 +328,7 @@ public class HBaseUtils {
* @param flags
* @return a put object with
*/
- public static Put flagsToPut(Message<HBaseId> message, Flags flags) {
+ public static Put flagsToPut(MailboxMessage<HBaseId> message, Flags flags)
{
Put put = new Put(messageRowKey(message));
//system flags
if (flags.contains(Flag.ANSWERED)) {
@@ -376,7 +376,7 @@ public class HBaseUtils {
return put;
}
- public static Delete flagsToDelete(Message<HBaseId> message, Flags flags) {
+ public static Delete flagsToDelete(MailboxMessage<HBaseId> message, Flags
flags) {
Delete delete = new Delete(messageRowKey(message));
//we mark for delete flags that are not present (they will be Put'ed)
if (flags.contains(Flag.ANSWERED)) {
Copied:
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java
(from r1724224,
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessage.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java?p2=james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java&p1=james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessage.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessage.java
(original)
+++
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessage.java
Tue Jan 12 13:17:03 2016
@@ -36,17 +36,17 @@ import org.apache.hadoop.conf.Configurat
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.hbase.HBaseId;
import org.apache.james.mailbox.hbase.io.ChunkInputStream;
-import org.apache.james.mailbox.store.mail.model.AbstractMessage;
-import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.AbstractMailboxMessage;
+import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.Property;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
/**
- * Concrete HBaseMessage implementation. This implementation does not store any
+ * Concrete HBaseMailboxMessage implementation. This implementation does not
store any
* message content. The message content is retrieved using a ChunkedInputStream
* directly from HBase.
*/
-public class HBaseMessage extends AbstractMessage<HBaseId> {
+public class HBaseMailboxMessage extends AbstractMailboxMessage<HBaseId> {
private static final String TOSTRING_SEPARATOR = " ";
/** Configuration for the HBase cluster */
@@ -94,7 +94,7 @@ public class HBaseMessage extends Abstra
* @param original
* @throws MailboxException
*/
- public HBaseMessage(Configuration conf, HBaseId mailboxId, long uid, long
modSeq, Message<?> original) throws MailboxException {
+ public HBaseMailboxMessage(Configuration conf, HBaseId mailboxId, long
uid, long modSeq, MailboxMessage<?> original) throws MailboxException {
super();
this.conf = conf;
this.mailboxId = mailboxId;
@@ -126,7 +126,7 @@ public class HBaseMessage extends Abstra
* @param bodyStartOctet
* @param propertyBuilder
*/
- public HBaseMessage(Configuration conf, HBaseId mailboxId, Date
internalDate, Flags flags, long contentOctets, int bodyStartOctet,
PropertyBuilder propertyBuilder) {
+ public HBaseMailboxMessage(Configuration conf, HBaseId mailboxId, Date
internalDate, Flags flags, long contentOctets, int bodyStartOctet,
PropertyBuilder propertyBuilder) {
super();
this.conf = conf;
this.mailboxId = mailboxId;
@@ -144,7 +144,7 @@ public class HBaseMessage extends Abstra
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Message#getBodyContent()
+ * @see
org.apache.james.mailbox.store.mail.model.MailboxMessage#getBodyContent()
*/
@Override
public InputStream getBodyContent() throws IOException {
@@ -153,7 +153,7 @@ public class HBaseMessage extends Abstra
/*
* (non-Javadoc)
- * @see
org.apache.james.mailbox.store.mail.model.Message#getHeaderContent()
+ * @see
org.apache.james.mailbox.store.mail.model.MailboxMessage#getHeaderContent()
*/
@Override
public InputStream getHeaderContent() throws IOException {
@@ -180,7 +180,7 @@ public class HBaseMessage extends Abstra
if (getClass() != obj.getClass()) {
return false;
}
- final HBaseMessage other = (HBaseMessage) obj;
+ final HBaseMailboxMessage other = (HBaseMailboxMessage) obj;
if (getMailboxId() != null) {
if (!getMailboxId().equals(other.getMailboxId())) {
return false;
@@ -198,7 +198,7 @@ public class HBaseMessage extends Abstra
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Message#getModSeq()
+ * @see
org.apache.james.mailbox.store.mail.model.MailboxMessage#getModSeq()
*/
@Override
public long getModSeq() {
@@ -207,7 +207,7 @@ public class HBaseMessage extends Abstra
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.model.Message#setModSeq(long)
+ * @see
org.apache.james.mailbox.store.mail.model.MailboxMessage#setModSeq(long)
*/
@Override
public void setModSeq(long modSeq) {
@@ -274,7 +274,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getInternalDate()
+ * @see MailboxMessage#getInternalDate()
*/
@Override
public Date getInternalDate() {
@@ -282,7 +282,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getMailboxId()
+ * @see MailboxMessage#getMailboxId()
*/
@Override
public HBaseId getMailboxId() {
@@ -290,7 +290,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#getUid()
+ * @see MailboxMessage#getUid()
*/
@Override
public long getUid() {
@@ -298,7 +298,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isAnswered()
+ * @see MailboxMessage#isAnswered()
*/
@Override
public boolean isAnswered() {
@@ -306,7 +306,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isDeleted()
+ * @see MailboxMessage#isDeleted()
*/
@Override
public boolean isDeleted() {
@@ -314,7 +314,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isDraft()
+ * @see MailboxMessage#isDraft()
*/
@Override
public boolean isDraft() {
@@ -322,7 +322,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isFlagged()
+ * @see MailboxMessage#isFlagged()
*/
@Override
public boolean isFlagged() {
@@ -330,7 +330,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isRecent()
+ * @see MailboxMessage#isRecent()
*/
@Override
public boolean isRecent() {
@@ -338,7 +338,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see org.apache.james.mailbox.store.mail.model.Message#isSeen()
+ * @see MailboxMessage#isSeen()
*/
@Override
public boolean isSeen() {
@@ -351,7 +351,7 @@ public class HBaseMessage extends Abstra
}
/**
- * @see
org.apache.james.mailbox.store.mail.model.Message#setFlags(javax.mail.Flags)
+ * @see MailboxMessage#setFlags(javax.mail.Flags)
*/
@Override
public final void setFlags(Flags flags) {
Modified:
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
(original)
+++
james/project/trunk/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
Tue Jan 12 13:17:03 2016
@@ -77,7 +77,7 @@ import org.apache.james.mailbox.store.ma
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.transaction.NonTransactionalMapper;
/**
@@ -106,9 +106,9 @@ public class HBaseMessageMapper extends
}
@Override
- public Iterator<Message<HBaseId>> findInMailbox(Mailbox<HBaseId> mailbox,
MessageRange set, FetchType fType, int max) throws MailboxException {
+ public Iterator<MailboxMessage<HBaseId>> findInMailbox(Mailbox<HBaseId>
mailbox, MessageRange set, FetchType fType, int max) throws MailboxException {
try {
- List<Message<HBaseId>> results;
+ List<MailboxMessage<HBaseId>> results;
long from = set.getUidFrom();
final long to = set.getUidTo();
final Type type = set.getType();
@@ -135,8 +135,8 @@ public class HBaseMessageMapper extends
}
}
- private List<Message<HBaseId>> findMessagesInMailbox(Mailbox<HBaseId>
mailbox, int batchSize, boolean flaggedForDelete) throws IOException {
- List<Message<HBaseId>> messageList = new ArrayList<Message<HBaseId>>();
+ private List<MailboxMessage<HBaseId>>
findMessagesInMailbox(Mailbox<HBaseId> mailbox, int batchSize, boolean
flaggedForDelete) throws IOException {
+ List<MailboxMessage<HBaseId>> messageList = new
ArrayList<MailboxMessage<HBaseId>>();
HTable messages = new HTable(conf, MESSAGES_TABLE);
Scan scan = new Scan(customMessageRowKey(mailbox.getMailboxId(), 0L),
new PrefixFilter(mailbox.getMailboxId().toBytes()));
@@ -164,8 +164,8 @@ public class HBaseMessageMapper extends
return messageList;
}
- private List<Message<HBaseId>>
findMessagesInMailboxWithUID(Mailbox<HBaseId> mailbox, final long messageUid,
final boolean flaggedForDelete) throws IOException {
- List<Message<HBaseId>> messageList = new ArrayList<Message<HBaseId>>();
+ private List<MailboxMessage<HBaseId>>
findMessagesInMailboxWithUID(Mailbox<HBaseId> mailbox, final long messageUid,
final boolean flaggedForDelete) throws IOException {
+ List<MailboxMessage<HBaseId>> messageList = new
ArrayList<MailboxMessage<HBaseId>>();
HTable messages = new HTable(conf, MESSAGES_TABLE);
Get get = new Get(messageRowKey(mailbox.getMailboxId(), messageUid));
get.setMaxVersions(1);
@@ -179,7 +179,7 @@ public class HBaseMessageMapper extends
}
get.addFamily(MESSAGES_META_CF);
Result result = messages.get(get);
- Message<HBaseId> message = null;
+ MailboxMessage<HBaseId> message = null;
if (!result.isEmpty()) {
message = messageMetaFromResult(conf, result);
messageList.add(message);
@@ -188,8 +188,8 @@ public class HBaseMessageMapper extends
return messageList;
}
- private List<Message<HBaseId>>
findMessagesInMailboxAfterUID(Mailbox<HBaseId> mailbox, final long from, final
int batchSize, final boolean flaggedForDelete) throws IOException {
- List<Message<HBaseId>> messageList = new ArrayList<Message<HBaseId>>();
+ private List<MailboxMessage<HBaseId>>
findMessagesInMailboxAfterUID(Mailbox<HBaseId> mailbox, final long from, final
int batchSize, final boolean flaggedForDelete) throws IOException {
+ List<MailboxMessage<HBaseId>> messageList = new
ArrayList<MailboxMessage<HBaseId>>();
HTable messages = new HTable(conf, MESSAGES_TABLE);
// uids are stored in reverse so we need to search
Scan scan = new Scan(messageRowKey(mailbox.getMailboxId(),
Long.MAX_VALUE),
@@ -218,8 +218,8 @@ public class HBaseMessageMapper extends
return messageList;
}
- private List<Message<HBaseId>>
findMessagesInMailboxBetweenUIDs(Mailbox<HBaseId> mailbox, final long from,
final long to, final int batchSize, final boolean flaggedForDelete) throws
IOException {
- List<Message<HBaseId>> messageList = new ArrayList<Message<HBaseId>>();
+ private List<MailboxMessage<HBaseId>>
findMessagesInMailboxBetweenUIDs(Mailbox<HBaseId> mailbox, final long from,
final long to, final int batchSize, final boolean flaggedForDelete) throws
IOException {
+ List<MailboxMessage<HBaseId>> messageList = new
ArrayList<MailboxMessage<HBaseId>>();
if (from > to) {
return messageList;
}
@@ -246,7 +246,7 @@ public class HBaseMessageMapper extends
if (count == 0) {
break;
}
- Message<HBaseId> message = messageMetaFromResult(conf, result);
+ MailboxMessage<HBaseId> message = messageMetaFromResult(conf,
result);
messageList.add(message);
count--;
}
@@ -261,7 +261,7 @@ public class HBaseMessageMapper extends
public Map<Long, MessageMetaData>
expungeMarkedForDeletionInMailbox(Mailbox<HBaseId> mailbox, MessageRange set)
throws MailboxException {
try {
final Map<Long, MessageMetaData> data;
- final List<Message<HBaseId>> results;
+ final List<MailboxMessage<HBaseId>> results;
final long from = set.getUidFrom();
final long to = set.getUidTo();
@@ -356,7 +356,7 @@ public class HBaseMessageMapper extends
}
@Override
- public void delete(Mailbox<HBaseId> mailbox, Message<HBaseId> message)
throws MailboxException {
+ public void delete(Mailbox<HBaseId> mailbox, MailboxMessage<HBaseId>
message) throws MailboxException {
//TODO: maybe switch to checkAndDelete
HTable messages = null;
HTable mailboxes = null;
@@ -475,10 +475,10 @@ public class HBaseMessageMapper extends
/*
* (non-Javadoc)
- * @see
org.apache.james.mailbox.store.mail.MessageMapper#add(org.apache.james.mailbox.store.mail.model.Mailbox,
org.apache.james.mailbox.store.mail.model.Message)
+ * @see
org.apache.james.mailbox.store.mail.MessageMapper#add(org.apache.james.mailbox.store.mail.model.Mailbox,
org.apache.james.mailbox.store.mail.model.MailboxMessage)
*/
@Override
- public MessageMetaData add(Mailbox<HBaseId> mailbox, Message<HBaseId>
message) throws MailboxException {
+ public MessageMetaData add(Mailbox<HBaseId> mailbox,
MailboxMessage<HBaseId> message) throws MailboxException {
message.setUid(uidProvider.nextUid(mailboxSession, mailbox));
// if a mailbox does not support mod-sequences the provider may be null
if (modSeqProvider != null) {
@@ -497,7 +497,7 @@ public class HBaseMessageMapper extends
public Iterator<UpdatedFlags> updateFlags(final Mailbox<HBaseId> mailbox,
FlagsUpdateCalculator flagsUpdateCalculator, MessageRange set) throws
MailboxException {
final List<UpdatedFlags> updatedFlags = new ArrayList<UpdatedFlags>();
- Iterator<Message<HBaseId>> messagesFound = findInMailbox(mailbox, set,
FetchType.Metadata, -1);
+ Iterator<MailboxMessage<HBaseId>> messagesFound =
findInMailbox(mailbox, set, FetchType.Metadata, -1);
HTable messages = null;
long modSeq = -1;
@@ -512,7 +512,7 @@ public class HBaseMessageMapper extends
messages = new HTable(conf, MESSAGES_TABLE);
while (messagesFound.hasNext()) {
Put put = null;
- final Message<HBaseId> member = messagesFound.next();
+ final MailboxMessage<HBaseId> member = messagesFound.next();
Flags originalFlags = member.createFlags();
member.setFlags(flagsUpdateCalculator.buildNewFlags(originalFlags));
Flags newFlags = member.createFlags();
@@ -545,27 +545,27 @@ public class HBaseMessageMapper extends
/*
* (non-Javadoc)
- * @see
org.apache.james.mailbox.store.mail.MessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox,
org.apache.james.mailbox.store.mail.model.Message)
+ * @see
org.apache.james.mailbox.store.mail.MessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox,
org.apache.james.mailbox.store.mail.model.MailboxMessage)
*/
@Override
- public MessageMetaData copy(Mailbox<HBaseId> mailbox, Message<HBaseId>
original) throws MailboxException {
+ public MessageMetaData copy(Mailbox<HBaseId> mailbox,
MailboxMessage<HBaseId> original) throws MailboxException {
long uid = uidProvider.nextUid(mailboxSession, mailbox);
long modSeq = -1;
if (modSeqProvider != null) {
modSeq = modSeqProvider.nextModSeq(mailboxSession, mailbox);
}
//TODO: check if creating a HBase message is the right thing to do
- HBaseMessage message = new HBaseMessage(conf,
+ HBaseMailboxMessage message = new HBaseMailboxMessage(conf,
mailbox.getMailboxId(), uid, modSeq, original);
return save(mailbox, message);
}
/*
* (non-Javadoc)
- * @see
org.apache.james.mailbox.store.mail.MessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox,
org.apache.james.mailbox.store.mail.model.Message)
+ * @see
org.apache.james.mailbox.store.mail.MessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox,
org.apache.james.mailbox.store.mail.model.MailboxMessage)
*/
@Override
- public MessageMetaData move(Mailbox<HBaseId> mailbox, Message<HBaseId>
original) throws MailboxException {
+ public MessageMetaData move(Mailbox<HBaseId> mailbox,
MailboxMessage<HBaseId> original) throws MailboxException {
//TODO implement if possible
throw new UnsupportedOperationException();
}
@@ -589,14 +589,14 @@ public class HBaseMessageMapper extends
}
/**
- * Save the {@link Message} for the given {@link Mailbox} and return the
{@link MessageMetaData}
+ * Save the {@link MailboxMessage} for the given {@link Mailbox} and
return the {@link MessageMetaData}
*
* @param mailbox
* @param message
* @return metaData
* @throws MailboxException
*/
- protected MessageMetaData save(Mailbox<HBaseId> mailbox, Message<HBaseId>
message) throws MailboxException {
+ protected MessageMetaData save(Mailbox<HBaseId> mailbox,
MailboxMessage<HBaseId> message) throws MailboxException {
HTable messages = null;
HTable mailboxes = null;
BufferedInputStream in = null;
@@ -756,10 +756,10 @@ public class HBaseMessageMapper extends
messages.close();
}
- private Map<Long, MessageMetaData> createMetaData(List<Message<HBaseId>>
uids) {
+ private Map<Long, MessageMetaData>
createMetaData(List<MailboxMessage<HBaseId>> uids) {
final Map<Long, MessageMetaData> data = new HashMap<Long,
MessageMetaData>();
for (int i = 0; i < uids.size(); i++) {
- Message<HBaseId> m = uids.get(i);
+ MailboxMessage<HBaseId> m = uids.get(i);
data.put(m.getUid(), new SimpleMessageMetaData(m));
}
return data;
Modified:
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java?rev=1724225&r1=1724224&r2=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
(original)
+++
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
Tue Jan 12 13:17:03 2016
@@ -57,7 +57,7 @@ import org.apache.james.mailbox.hbase.ma
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.model.Property;
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 org.apache.james.mailbox.store.user.model.Subscription;
import org.apache.james.mailbox.store.user.model.impl.SimpleSubscription;
@@ -146,7 +146,7 @@ public class HBaseUtilsTest {
flags.add("userFlag1");
flags.add("userFlag2");
HBaseId uuid = HBaseId.of(UUID.randomUUID());
- final SimpleMessage<HBaseId> message = new SimpleMessage<HBaseId>(new
Date(), 100, 10, null, flags, new PropertyBuilder(), uuid);
+ final SimpleMailboxMessage<HBaseId> message = new
SimpleMailboxMessage<HBaseId>(new Date(), 100, 10, null, flags, new
PropertyBuilder(), uuid);
Put put = flagsToPut(message, flags);
//test for the system flags
assertTrue(put.has(MESSAGES_META_CF, FLAGS_SEEN, MARKER_PRESENT));
Copied:
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java
(from r1724224,
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapperTest.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java?p2=james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java&p1=james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapperTest.java&r1=1724224&r2=1724225&rev=1724225&view=diff
==============================================================================
---
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapperTest.java
(original)
+++
james/project/trunk/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java
Tue Jan 12 13:17:03 2016
@@ -50,9 +50,9 @@ import org.apache.james.mailbox.hbase.ma
import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.MailboxPath;
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.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
* Unit tests for HBaseMessageMapper.
*
*/
-public class HBaseMessageMapperTest {
+public class HBaseMailboxMessageMapperTest {
private static final Logger LOG =
LoggerFactory.getLogger(HBaseMailboxMapperTest.class);
public static final HBaseClusterSingleton CLUSTER =
HBaseClusterSingleton.build();
@@ -71,7 +71,7 @@ public class HBaseMessageMapperTest {
private static HBaseMessageMapper messageMapper;
private static final List<MailboxPath> MBOX_PATHS = new
ArrayList<MailboxPath>();
private static final List<Mailbox<HBaseId>> MBOXES = new
ArrayList<Mailbox<HBaseId>>();
- private static final List<Message<HBaseId>> MESSAGE_NO = new
ArrayList<Message<HBaseId>>();
+ private static final List<MailboxMessage<HBaseId>> MESSAGE_NO = new
ArrayList<MailboxMessage<HBaseId>>();
private static final int COUNT = 5;
private static Configuration conf;
/*
@@ -82,7 +82,7 @@ public class HBaseMessageMapperTest {
+ "From: Fred Foobar <[email protected]>\n"
+ "Subject: Test 02\n"
+ "To: [email protected]\n"
- + "Message-Id: <[email protected]>\n"
+ + "MailboxMessage-Id: <[email protected]>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: TEXT/PLAIN; CHARSET=US-ASCII\n"
+ "\n"
@@ -137,12 +137,12 @@ public class HBaseMessageMapperTest {
propBuilder.setSubType("html");
propBuilder.setTextualLineCount(2L);
- SimpleMessage<HBaseId> myMsg;
+ SimpleMailboxMessage<HBaseId> myMsg;
final Flags flags = new Flags(Flags.Flag.RECENT);
final Date today = new Date();
for (int i = 0; i < COUNT * 2; i++) {
- myMsg = new SimpleMessage<HBaseId>(today, messageTemplate.length,
+ myMsg = new SimpleMailboxMessage<HBaseId>(today,
messageTemplate.length,
messageTemplate.length - 20, content, flags, propBuilder,
MBOXES.get(1).getMailboxId());
if (i == COUNT * 2 - 1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
