Repository: james-project Updated Branches: refs/heads/master e7048f41c -> 8051692fe
MAILBOX-357 Wire MailboxSessionMapperFactory in search indexes This allows relying on the MailboxSessionMapperFactory for retrieving mailboxes, which are not part of the core mailbox API Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8d2db2c3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8d2db2c3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8d2db2c3 Branch: refs/heads/master Commit: 8d2db2c33af6a8d29389049935297ea8acffef01 Parents: 3713109 Author: Benoit Tellier <[email protected]> Authored: Mon Dec 10 13:58:00 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Dec 12 17:50:57 2018 +0700 ---------------------------------------------------------------------- .../ElasticSearchListeningMessageSearchIndex.java | 4 ++-- .../ElasticSearchListeningMessageSearchIndexTest.java | 4 ++-- .../mailbox/lucene/search/LuceneMessageSearchIndex.java | 12 +++++------- .../mailbox/store/search/LazyMessageSearchIndex.java | 6 +++--- .../store/search/ListeningMessageSearchIndex.java | 6 +++--- 5 files changed, 15 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/8d2db2c3/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java index 2b76986..955ca63 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java @@ -46,7 +46,7 @@ import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.SearchQuery; import org.apache.james.mailbox.model.UpdatedFlags; -import org.apache.james.mailbox.store.mail.MessageMapperFactory; +import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex; @@ -68,7 +68,7 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe private final MessageToElasticSearchJson messageToElasticSearchJson; @Inject - public ElasticSearchListeningMessageSearchIndex(MessageMapperFactory factory, + public ElasticSearchListeningMessageSearchIndex(MailboxSessionMapperFactory factory, @Named(MailboxElasticSearchConstants.InjectionNames.MAILBOX) ElasticSearchIndexer indexer, ElasticSearchSearcher searcher, MessageToElasticSearchJson messageToElasticSearchJson, MailboxManager mailboxManager) { http://git-wip-us.apache.org/repos/asf/james-project/blob/8d2db2c3/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java index 90f012d..d8ed910 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java @@ -42,7 +42,7 @@ import org.apache.james.mailbox.elasticsearch.search.ElasticSearchSearcher; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.TestId; import org.apache.james.mailbox.model.UpdatedFlags; -import org.apache.james.mailbox.store.mail.MessageMapperFactory; +import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.elasticsearch.ElasticsearchException; @@ -74,7 +74,7 @@ public class ElasticSearchListeningMessageSearchIndexTest { @Before public void setup() { - MessageMapperFactory mapperFactory = mock(MessageMapperFactory.class); + MailboxSessionMapperFactory mapperFactory = mock(MailboxSessionMapperFactory.class); messageToElasticSearchJson = mock(MessageToElasticSearchJson.class); ElasticSearchSearcher elasticSearchSearcher = mock(ElasticSearchSearcher.class); MailboxManager mockMailboxManager = mock(MailboxManager.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/8d2db2c3/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java index 9d091b9..e6619b8 100644 --- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java +++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java @@ -66,7 +66,7 @@ import org.apache.james.mailbox.model.SearchQuery.NumericOperator; import org.apache.james.mailbox.model.SearchQuery.UidCriterion; import org.apache.james.mailbox.model.SearchQuery.UidRange; import org.apache.james.mailbox.model.UpdatedFlags; -import org.apache.james.mailbox.store.mail.MessageMapperFactory; +import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; @@ -363,24 +363,22 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex { @Inject public LuceneMessageSearchIndex( - MessageMapperFactory factory, + MailboxSessionMapperFactory factory, MailboxId.Factory mailboxIdFactory, Directory directory, MessageId.Factory messageIdFactory, - MailboxManager mailboxManager - ) throws IOException { + MailboxManager mailboxManager) throws IOException { this(factory, mailboxIdFactory, directory, false, true, messageIdFactory, mailboxManager); } public LuceneMessageSearchIndex( - MessageMapperFactory factory, + MailboxSessionMapperFactory factory, MailboxId.Factory mailboxIdFactory, Directory directory, boolean dropIndexOnStart, boolean lenient, MessageId.Factory messageIdFactory, - MailboxManager mailboxManager - ) throws IOException { + MailboxManager mailboxManager) throws IOException { super(factory, mailboxManager); this.mailboxIdFactory = mailboxIdFactory; this.messageIdFactory = messageIdFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/8d2db2c3/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java index 5ede660..850fef0 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java @@ -35,8 +35,8 @@ import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.model.SearchQuery; import org.apache.james.mailbox.model.UpdatedFlags; +import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; -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.MailboxMessage; import org.slf4j.Logger; @@ -59,10 +59,10 @@ public class LazyMessageSearchIndex extends ListeningMessageSearchIndex { private final ListeningMessageSearchIndex index; private final ConcurrentHashMap<MailboxId, Object> indexed = new ConcurrentHashMap<>(); - private final MessageMapperFactory factory; + private final MailboxSessionMapperFactory factory; - public LazyMessageSearchIndex(ListeningMessageSearchIndex index, MessageMapperFactory factory, MailboxManager mailboxManager) { + public LazyMessageSearchIndex(ListeningMessageSearchIndex index, MailboxSessionMapperFactory factory, MailboxManager mailboxManager) { super(factory, mailboxManager); this.index = index; this.factory = factory; http://git-wip-us.apache.org/repos/asf/james-project/blob/8d2db2c3/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java index badfe3f..01a0d21 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java @@ -29,9 +29,9 @@ import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.model.UpdatedFlags; +import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.event.EventFactory; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; -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.MailboxMessage; import org.slf4j.Logger; @@ -47,10 +47,10 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex, private static final Logger LOGGER = LoggerFactory.getLogger(ListeningMessageSearchIndex.class); private static final int UNLIMITED = -1; - private final MessageMapperFactory factory; + private final MailboxSessionMapperFactory factory; private final MailboxManager mailboxManager; - public ListeningMessageSearchIndex(MessageMapperFactory factory, MailboxManager mailboxManager) { + public ListeningMessageSearchIndex(MailboxSessionMapperFactory factory, MailboxManager mailboxManager) { this.factory = factory; this.mailboxManager = mailboxManager; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
