Merge remote-tracking branch 'mbaechler/JAMES-1825'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ac3340b7 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ac3340b7 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ac3340b7 Branch: refs/heads/master Commit: ac3340b730ee1d0117806ebffdab7e8e5beb267e Parents: 35ccb7b 34242a5 Author: Antoine Duprat <[email protected]> Authored: Mon Oct 10 12:33:39 2016 +0200 Committer: Antoine Duprat <[email protected]> Committed: Mon Oct 10 12:33:39 2016 +0200 ---------------------------------------------------------------------- .../apache/james/mailbox/MailboxListener.java | 8 +- .../apache/james/mailbox/MailboxManager.java | 2 +- .../apache/james/mailbox/MessageManager.java | 14 +- .../org/apache/james/mailbox/MessageUid.java | 93 +++++++ .../james/mailbox/model/MessageMetaData.java | 23 +- .../james/mailbox/model/MessageRange.java | 155 ++++------- .../apache/james/mailbox/model/SearchQuery.java | 146 +++++++++- .../james/mailbox/model/UpdatedFlags.java | 18 +- .../james/mailbox/MailboxManagerStressTest.java | 8 +- .../apache/james/mailbox/MessageUidTest.java | 57 ++++ .../mailbox/manager/ManagerTestResources.java | 3 +- .../james/mailbox/model/MessageRangeTest.java | 112 ++++++-- .../mailbox/caching/CachingMessageMapper.java | 11 +- .../mailbox/caching/MailboxMetadataCache.java | 17 +- .../guava/GuavaMailboxMetadataCache.java | 42 +-- mailbox/cassandra/pom.xml | 5 + .../cassandra/mail/CassandraMessageMapper.java | 41 +-- .../cassandra/mail/CassandraUidProvider.java | 74 ++--- ...essageDeletedDuringFlagsUpdateException.java | 3 +- .../mail/CassandraUidProviderTest.java | 22 +- ...lasticSearchListeningMessageSearchIndex.java | 9 +- .../elasticsearch/json/IndexableMessage.java | 5 +- .../elasticsearch/query/CriterionConverter.java | 6 +- .../search/ElasticSearchSearcher.java | 9 +- ...hListeningMailboxMessageSearchIndexTest.java | 25 +- .../MailboxMessageToElasticSearchJsonTest.java | 5 +- .../apache/james/mailbox/hbase/HBaseUtils.java | 30 +- .../mailbox/hbase/mail/HBaseMailboxMessage.java | 49 ++-- .../mailbox/hbase/mail/HBaseMessageMapper.java | 110 ++++---- .../mailbox/hbase/mail/HBaseUidProvider.java | 17 +- .../james/mailbox/hbase/HBaseUtilsTest.java | 2 + .../mail/HBaseMailboxMessageMapperTest.java | 11 +- .../mail/HBaseUidAndModSeqProviderTest.java | 42 +-- .../mailbox/jcr/mail/JCRMessageMapper.java | 61 ++-- .../james/mailbox/jcr/mail/JCRUidProvider.java | 21 +- .../jcr/mail/model/JCRMailboxMessage.java | 22 +- .../mailbox/jpa/mail/JPAMessageMapper.java | 86 +++--- .../james/mailbox/jpa/mail/JPAUidProvider.java | 14 +- .../openjpa/AbstractJPAMailboxMessage.java | 277 +++++++------------ .../openjpa/JPAEncryptedMailboxMessage.java | 3 +- .../mail/model/openjpa/JPAMailboxMessage.java | 3 +- .../openjpa/JPAStreamingMailboxMessage.java | 3 +- .../lucene/search/LuceneMessageSearchIndex.java | 74 +++-- .../LuceneMailboxMessageSearchIndexTest.java | 237 ++++++++-------- .../james/mailbox/maildir/MaildirFolder.java | 158 ++++++----- .../james/mailbox/maildir/MaildirStore.java | 18 +- .../maildir/mail/MaildirMessageMapper.java | 81 ++---- .../mail/model/MaildirMailboxMessage.java | 11 +- .../inmemory/mail/InMemoryMessageMapper.java | 117 +++----- .../inmemory/mail/InMemoryUidProvider.java | 36 ++- .../james/mailbox/store/MailboxMetaData.java | 29 +- .../james/mailbox/store/MessageResultImpl.java | 39 +-- .../mailbox/store/SimpleMessageMetaData.java | 36 +-- .../mailbox/store/StoreMailboxManager.java | 3 +- .../mailbox/store/StoreMessageManager.java | 94 +++---- .../store/StoreMessageResultIterator.java | 32 +-- .../james/mailbox/store/event/EventFactory.java | 31 ++- .../store/event/MailboxEventDispatcher.java | 7 +- .../store/json/JacksonEventSerializer.java | 59 ++++ .../mailbox/store/json/JsonEventSerializer.java | 3 +- .../store/json/MessagePackEventSerializer.java | 3 +- .../store/json/event/EventConverter.java | 17 +- .../json/event/dto/EventDataTransferObject.java | 22 +- .../dto/MessageMetaDataDataTransferObject.java | 8 +- .../dto/UpdatedFlagsDataTransferObject.java | 5 +- .../store/mail/AbstractLockingUidProvider.java | 14 +- .../store/mail/AbstractMessageMapper.java | 44 +-- .../james/mailbox/store/mail/MessageMapper.java | 29 +- .../james/mailbox/store/mail/UidProvider.java | 17 +- .../store/mail/model/DefaultMessageId.java | 7 +- .../mail/model/DelegatingMailboxMessage.java | 5 +- .../store/mail/model/MailboxMessage.java | 9 +- .../mail/model/impl/MessageUidComparator.java | 31 --- .../mail/model/impl/SimpleMailboxMessage.java | 28 +- .../quota/ListeningCurrentQuotaUpdater.java | 9 +- .../store/search/LazyMessageSearchIndex.java | 7 +- .../search/ListeningMessageSearchIndex.java | 5 +- .../store/search/MessageSearchIndex.java | 5 +- .../mailbox/store/search/MessageSearches.java | 39 +-- .../store/search/SimpleMessageSearchIndex.java | 19 +- .../store/search/comparator/UidComparator.java | 2 +- .../store/MailboxEventDispatcherTest.java | 3 +- .../store/MailboxMessageResultImplTest.java | 9 +- .../james/mailbox/store/MessageBatcherTest.java | 11 +- .../james/mailbox/store/MessageBuilder.java | 5 +- .../store/SearchUtilsMultipartMixedTest.java | 5 +- .../mailbox/store/SearchUtilsRFC822Test.java | 5 +- .../james/mailbox/store/SearchUtilsTest.java | 67 ++--- .../mailbox/store/SimpleMailboxMembership.java | 38 ++- .../StoreMailboxMessageResultIteratorTest.java | 36 +-- ...elegatingMailboxListenerIntegrationTest.java | 7 +- .../mailbox/store/json/EventSerializerTest.java | 7 +- .../MailboxMessagePackEventSerializerTest.java | 35 --- .../json/MessagePackEventSerializerTest.java | 35 +++ .../mail/model/DefaultMailboxMessageIdTest.java | 5 +- .../model/DelegatingMailboxMessageTest.java | 3 +- .../mail/model/MailboxMessageAssertTest.java | 3 +- .../store/mail/model/MessageMapperTest.java | 30 +- .../store/mail/model/MessageMoveTest.java | 2 +- .../store/mail/model/MetadataMapAssert.java | 9 +- .../store/mail/model/MetadataMapAssertTest.java | 19 +- .../quota/ListeningCurrentQuotaUpdaterTest.java | 125 ++------- .../search/AbstractMessageSearchIndexTest.java | 211 +++++++------- .../src/test/resources/eml/nonTextual.json | 2 +- .../store/src/test/resources/eml/spamMail.json | 2 +- .../indexer/events/FlagsMessageEvent.java | 8 +- .../indexer/events/ImpactingMessageEvent.java | 4 +- .../indexer/events/MessageDeletedEvent.java | 8 +- .../registrations/MailboxRegistration.java | 9 +- .../mailbox/indexer/ReIndexerImplTest.java | 3 +- .../registrations/MailboxRegistrationTest.java | 7 +- .../mailbox/store/mail/ZooUidProvider.java | 14 +- .../mailbox/store/mail/ZooUidProviderTest.java | 24 +- protocols/imap/pom.xml | 11 + .../apache/james/imap/api/message/UidRange.java | 148 ++++++++++ .../imap/api/message/request/SearchKey.java | 101 +++---- .../api/message/response/StatusResponse.java | 30 +- .../james/imap/api/process/SelectedMailbox.java | 51 ++-- .../imap/decode/ImapRequestLineReader.java | 75 +++++ .../parser/AbstractSelectionCommandParser.java | 74 +++-- .../decode/parser/ExamineCommandParser.java | 3 +- .../imap/decode/parser/SearchCommandParser.java | 3 +- .../imap/decode/parser/SelectCommandParser.java | 3 +- .../imap/encode/ESearchResponseEncoder.java | 13 +- .../james/imap/encode/FetchResponseEncoder.java | 5 +- .../james/imap/encode/ImapResponseComposer.java | 12 +- .../encode/MailboxStatusResponseEncoder.java | 5 +- .../encode/base/ImapResponseComposerImpl.java | 17 +- .../AbstractMailboxSelectionRequest.java | 15 +- .../imap/message/request/ExamineRequest.java | 3 +- .../imap/message/request/SelectRequest.java | 3 +- .../imap/message/response/ESearchResponse.java | 9 +- .../imap/message/response/FetchResponse.java | 7 +- .../message/response/MailboxStatusResponse.java | 7 +- .../imap/message/response/VanishedResponse.java | 14 +- .../processor/AbstractMailboxProcessor.java | 190 +++++++------ .../AbstractMessageRangeProcessor.java | 2 +- .../processor/AbstractSelectionProcessor.java | 55 ++-- .../james/imap/processor/AppendProcessor.java | 7 +- .../james/imap/processor/ExpungeProcessor.java | 5 +- .../james/imap/processor/SearchProcessor.java | 175 ++++++------ .../james/imap/processor/StatusProcessor.java | 7 +- .../james/imap/processor/StoreProcessor.java | 64 +++-- .../processor/base/SelectedMailboxImpl.java | 165 ++++------- .../processor/fetch/FetchResponseBuilder.java | 9 +- .../james/imap/api/message/UidRangeTest.java | 184 ++++++++++++ .../SearchCommandParserAndParenthesesTest.java | 12 +- .../parser/SearchCommandParserNotTest.java | 12 +- .../parser/SearchCommandParserOrTest.java | 12 +- ...chCommandParserSearchKeySequenceSetTest.java | 63 ++++- .../SearchCommandParserSearchKeyTest.java | 4 +- .../SearchCommandParserTopLevelAndTest.java | 12 +- .../FetchResponseEncoderNoExtensionsTest.java | 7 +- .../imap/encode/FetchResponseEncoderTest.java | 5 +- .../MailboxStatusResponseEncoderTest.java | 3 +- .../james/imap/processor/CopyProcessorTest.java | 22 +- .../james/imap/processor/MoveProcessorTest.java | 25 +- .../imap/processor/SearchProcessorTest.java | 49 ++-- .../base/FakeMailboxListenerAdded.java | 22 +- .../base/FakeMailboxListenerFlagsUpdate.java | 11 +- .../base/MailboxEventAnalyserTest.java | 50 ++-- protocols/pom.xml | 5 + .../jmap/methods/GetMessageListMethod.java | 9 +- .../methods/SetMessagesCreationProcessor.java | 3 +- .../apache/james/jmap/model/MessageFactory.java | 13 +- .../org/apache/james/jmap/model/MessageId.java | 13 +- .../FirstUserConnectionFilterThreadTest.java | 3 +- .../jmap/methods/GetMessagesMethodTest.java | 26 +- .../SetMessagesCreationProcessorTest.java | 2 + .../james/jmap/model/MessageFactoryTest.java | 15 +- .../apache/james/jmap/model/MessageIdTest.java | 7 +- .../apache/james/jmap/send/MailFactoryTest.java | 3 +- .../jmap/send/PostDequeueDecoratorTest.java | 7 +- .../utils/SortToComparatorConvertorTest.java | 7 +- .../pop3server/mailbox/MailboxAdapter.java | 13 +- 175 files changed, 3197 insertions(+), 2515 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
