You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/05/04 01:11:07 UTC
[james-project] 12/12: [PERF] Cleanup ElasticSearchListeningMessageSearchIndex
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b6bd222ab648d1aa08f4d518fe0fb512e0f0cb5f
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Thu Apr 28 14:20:30 2022 +0700
[PERF] Cleanup ElasticSearchListeningMessageSearchIndex
---
.../v7/events/ElasticSearchListeningMessageSearchIndex.java | 7 -------
.../mailbox/elasticsearch/v7/search/ElasticSearchSearcher.java | 3 ---
.../mailbox/elasticsearch/v7/ElasticSearchIntegrationTest.java | 3 +--
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/mailbox/elasticsearch-v7/src/main/java/org/apache/james/mailbox/elasticsearch/v7/events/ElasticSearchListeningMessageSearchIndex.java b/mailbox/elasticsearch-v7/src/main/java/org/apache/james/mailbox/elasticsearch/v7/events/ElasticSearchListeningMessageSearchIndex.java
index f59398abb4..591a5ddcb5 100644
--- a/mailbox/elasticsearch-v7/src/main/java/org/apache/james/mailbox/elasticsearch/v7/events/ElasticSearchListeningMessageSearchIndex.java
+++ b/mailbox/elasticsearch-v7/src/main/java/org/apache/james/mailbox/elasticsearch/v7/events/ElasticSearchListeningMessageSearchIndex.java
@@ -284,11 +284,4 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe
LOGGER.warn("Can not extract UID, MessageID and/or MailboxId for search result {}", hit.getId());
}
}
-
- private Optional<DocumentField> retrieveMessageIdField(SearchHit hit) {
- if (hit.getFields().containsKey(MESSAGE_ID)) {
- return Optional.ofNullable(hit.field(MESSAGE_ID));
- }
- return Optional.empty();
- }
}
diff --git a/mailbox/elasticsearch-v7/src/main/java/org/apache/james/mailbox/elasticsearch/v7/search/ElasticSearchSearcher.java b/mailbox/elasticsearch-v7/src/main/java/org/apache/james/mailbox/elasticsearch/v7/search/ElasticSearchSearcher.java
index 2f125eb62b..c709de687a 100644
--- a/mailbox/elasticsearch-v7/src/main/java/org/apache/james/mailbox/elasticsearch/v7/search/ElasticSearchSearcher.java
+++ b/mailbox/elasticsearch-v7/src/main/java/org/apache/james/mailbox/elasticsearch/v7/search/ElasticSearchSearcher.java
@@ -36,14 +36,11 @@ import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import reactor.core.publisher.Flux;
public class ElasticSearchSearcher {
public static final int DEFAULT_SEARCH_SIZE = 100;
- private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchSearcher.class);
private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1);
private static final int MAX_ROUTING_KEY = 5;
diff --git a/mailbox/elasticsearch-v7/src/test/java/org/apache/james/mailbox/elasticsearch/v7/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch-v7/src/test/java/org/apache/james/mailbox/elasticsearch/v7/ElasticSearchIntegrationTest.java
index c8785099fa..d7a290a492 100644
--- a/mailbox/elasticsearch-v7/src/test/java/org/apache/james/mailbox/elasticsearch/v7/ElasticSearchIntegrationTest.java
+++ b/mailbox/elasticsearch-v7/src/test/java/org/apache/james/mailbox/elasticsearch/v7/ElasticSearchIntegrationTest.java
@@ -38,7 +38,6 @@ import org.apache.james.mailbox.elasticsearch.v7.json.MessageToElasticSearchJson
import org.apache.james.mailbox.elasticsearch.v7.query.CriterionConverter;
import org.apache.james.mailbox.elasticsearch.v7.query.QueryConverter;
import org.apache.james.mailbox.elasticsearch.v7.search.ElasticSearchSearcher;
-import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.ComposedMessageId;
@@ -103,6 +102,7 @@ class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest {
@Override
protected void initializeMailboxManager() throws Exception {
+ messageIdFactory = new InMemoryMessageId.Factory();
textExtractor = new TikaTextExtractor(new RecordingMetricFactory(),
new TikaHttpClientImpl(TikaConfiguration.builder()
.host(tika.getIp())
@@ -138,7 +138,6 @@ class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest {
messageIdManager = resources.getMessageIdManager();
messageSearchIndex = resources.getSearchIndex();
eventBus = resources.getEventBus();
- messageIdFactory = new InMemoryMessageId.Factory();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org