Author: matthieu
Date: Tue Nov 3 16:41:20 2015
New Revision: 1712324
URL: http://svn.apache.org/viewvc?rev=1712324&view=rev
Log:
JAMES-1626 Use javax.inject in ElasticSearch mailbox
Modified:
james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
james/project/trunk/mailbox/elasticsearch/pom.xml
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexer.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/MessageToElasticSearchJson.java
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/QueryConverter.java
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java
Modified:
james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java?rev=1712324&r1=1712323&r2=1712324&view=diff
==============================================================================
---
james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
(original)
+++
james/project/trunk/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
Tue Nov 3 16:41:20 2015
@@ -34,6 +34,7 @@ import org.apache.james.mailbox.store.St
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
+import org.apache.james.mailbox.store.search.MessageSearchIndex;
/**
* Cassandra implementation of {@link StoreMailboxManager}
@@ -53,6 +54,12 @@ public class CassandraMailboxManager ext
}
@Override
+ @Inject
+ public void setMessageSearchIndex(MessageSearchIndex<CassandraId> index) {
+ super.setMessageSearchIndex(index);
+ }
+
+ @Override
protected Mailbox<CassandraId> doCreateMailbox(MailboxPath mailboxPath,
MailboxSession session) throws MailboxException {
SimpleMailbox<CassandraId> cassandraMailbox = new
SimpleMailbox<>(mailboxPath, randomUidValidity());
cassandraMailbox.setACL(SimpleMailboxACL.EMPTY);
Modified: james/project/trunk/mailbox/elasticsearch/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/pom.xml?rev=1712324&r1=1712323&r2=1712324&view=diff
==============================================================================
--- james/project/trunk/mailbox/elasticsearch/pom.xml (original)
+++ james/project/trunk/mailbox/elasticsearch/pom.xml Tue Nov 3 16:41:20 2015
@@ -202,6 +202,10 @@
<version>1.6.3</version>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
Modified:
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexer.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexer.java?rev=1712324&r1=1712323&r2=1712324&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexer.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIndexer.java
Tue Nov 3 16:41:20 2015
@@ -27,6 +27,8 @@ import org.elasticsearch.index.query.Que
import com.google.common.base.Preconditions;
+import javax.inject.Inject;
+
public class ElasticSearchIndexer {
public static final String MAILBOX_INDEX = "mailbox";
@@ -34,6 +36,7 @@ public class ElasticSearchIndexer {
private final ClientProvider clientProvider;
+ @Inject
public ElasticSearchIndexer(ClientProvider clientProvider) {
this.clientProvider = clientProvider;
}
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=1712324&r1=1712323&r2=1712324&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 Nov 3 16:41:20 2015
@@ -20,6 +20,7 @@ package org.apache.james.mailbox.elastic
import java.util.Iterator;
+import javax.inject.Inject;
import javax.mail.Flags;
import org.apache.james.mailbox.MailboxSession;
@@ -48,6 +49,7 @@ public class ElasticSearchListeningMessa
private final ElasticSearchSearcher<Id> searcher;
private final MessageToElasticSearchJson messageToElasticSearchJson;
+ @Inject
public ElasticSearchListeningMessageSearchIndex(MessageMapperFactory<Id>
factory, ElasticSearchIndexer indexer,
ElasticSearchSearcher<Id> searcher, MessageToElasticSearchJson
messageToElasticSearchJson) {
super(factory);
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=1712324&r1=1712323&r2=1712324&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 Nov 3 16:41:20 2015
@@ -19,6 +19,7 @@
package org.apache.james.mailbox.elasticsearch.json;
+import javax.inject.Inject;
import javax.mail.Flags;
import java.time.ZoneId;
@@ -45,6 +46,7 @@ public class MessageToElasticSearchJson
this.mapper.registerModule(new Jdk8Module());
}
+ @Inject
public MessageToElasticSearchJson(TextExtractor textExtractor) {
this(textExtractor, ZoneId.systemDefault());
}
Modified:
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/QueryConverter.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/QueryConverter.java?rev=1712324&r1=1712323&r2=1712324&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/QueryConverter.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/QueryConverter.java
Tue Nov 3 16:41:20 2015
@@ -23,6 +23,8 @@ import org.apache.james.mailbox.elastics
import org.apache.james.mailbox.model.SearchQuery;
import org.elasticsearch.common.lang3.tuple.Pair;
import org.elasticsearch.index.query.QueryBuilder;
+
+import javax.inject.Inject;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Stream;
@@ -36,6 +38,7 @@ public class QueryConverter implements F
private final CriterionConverter criterionConverter;
+ @Inject
public QueryConverter(CriterionConverter criterionConverter) {
this.criterionConverter = criterionConverter;
}
Modified:
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java?rev=1712324&r1=1712323&r2=1712324&view=diff
==============================================================================
---
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java
(original)
+++
james/project/trunk/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java
Tue Nov 3 16:41:20 2015
@@ -40,6 +40,8 @@ import org.elasticsearch.search.SearchHi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.inject.Inject;
+
public class ElasticSearchSearcher<Id extends MailboxId> {
private static final Logger LOGGER =
LoggerFactory.getLogger(ElasticSearchSearcher.class);
@@ -47,6 +49,7 @@ public class ElasticSearchSearcher<Id ex
private final ClientProvider clientProvider;
private final QueryConverter queryConverter;
+ @Inject
public ElasticSearchSearcher(ClientProvider clientProvider, QueryConverter
queryConverter) {
this.clientProvider = clientProvider;
this.queryConverter = queryConverter;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
