You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/05/23 03:37:53 UTC
[james-project] 05/14: JAMES-2764 Migrate mailbox ES tests to ES6
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 b091de9aa59e15f012712b782fed47973fe6ecd8
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Fri May 17 17:55:51 2019 +0700
JAMES-2764 Migrate mailbox ES tests to ES6
---
.../v6/ElasticSearchIntegrationTest.java | 24 ++++++++--------------
.../v6/ElasticSearchMailboxConfigurationTest.java | 6 +++---
...asticSearchListeningMessageSearchIndexTest.java | 11 +++++-----
3 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/ElasticSearchIntegrationTest.java
index 81a4293..c838692 100644
--- a/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/ElasticSearchIntegrationTest.java
+++ b/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/ElasticSearchIntegrationTest.java
@@ -21,14 +21,13 @@ package org.apache.james.mailbox.elasticsearch.v6;
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.time.ZoneId;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import org.apache.james.backends.es.DockerElasticSearchRule;
-import org.apache.james.backends.es.ElasticSearchConfiguration;
-import org.apache.james.backends.es.ElasticSearchIndexer;
+import org.apache.james.backends.es.v6.DockerElasticSearchRule;
+import org.apache.james.backends.es.v6.ElasticSearchConfiguration;
+import org.apache.james.backends.es.v6.ElasticSearchIndexer;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
@@ -50,8 +49,7 @@ import org.apache.james.mailbox.tika.TikaHttpClientImpl;
import org.apache.james.mailbox.tika.TikaTextExtractor;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.mime4j.dom.Message;
-import org.apache.james.util.concurrent.NamedThreadFactory;
-import org.elasticsearch.client.Client;
+import org.elasticsearch.client.RestHighLevelClient;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -87,15 +85,14 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
}
@Override
- protected void initializeMailboxManager() {
- Client client = MailboxIndexCreationUtil.prepareDefaultClient(
+ protected void initializeMailboxManager() throws IOException {
+ RestHighLevelClient client = MailboxIndexCreationUtil.prepareDefaultClient(
elasticSearch.clientProvider().get(),
ElasticSearchConfiguration.builder()
- .addHost(elasticSearch.getTcpHost())
+ .addHost(elasticSearch.getDockerElasticSearch().getHttpHost())
.build());
InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory();
- ThreadFactory threadFactory = NamedThreadFactory.withClassName(getClass());
InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder()
.preProvisionnedFakeAuthenticator()
@@ -106,14 +103,11 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
.listeningSearchIndex(preInstanciationStage -> new ElasticSearchListeningMessageSearchIndex(
preInstanciationStage.getMapperFactory(),
new ElasticSearchIndexer(client,
- Executors.newSingleThreadExecutor(threadFactory),
MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS,
- MailboxElasticSearchConstants.MESSAGE_TYPE,
BATCH_SIZE),
new ElasticSearchSearcher(client, new QueryConverter(new CriterionConverter()), SEARCH_SIZE,
new InMemoryId.Factory(), messageIdFactory,
- MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS,
- MailboxElasticSearchConstants.MESSAGE_TYPE),
+ MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS),
new MessageToElasticSearchJson(textExtractor, ZoneId.of("Europe/Paris"), IndexAttachments.YES),
preInstanciationStage.getSessionProvider()))
.noPreDeletionHooks()
diff --git a/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/ElasticSearchMailboxConfigurationTest.java b/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/ElasticSearchMailboxConfigurationTest.java
index 64a1cd0..6136627 100644
--- a/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/ElasticSearchMailboxConfigurationTest.java
+++ b/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/ElasticSearchMailboxConfigurationTest.java
@@ -22,9 +22,9 @@ package org.apache.james.mailbox.elasticsearch.v6;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.james.backends.es.IndexName;
-import org.apache.james.backends.es.ReadAliasName;
-import org.apache.james.backends.es.WriteAliasName;
+import org.apache.james.backends.es.v6.IndexName;
+import org.apache.james.backends.es.v6.ReadAliasName;
+import org.apache.james.backends.es.v6.WriteAliasName;
import org.junit.Test;
public class ElasticSearchMailboxConfigurationTest {
diff --git a/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/events/ElasticSearchListeningMessageSearchIndexTest.java b/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/events/ElasticSearchListeningMessageSearchIndexTest.java
index e17f6ca..2596d5c 100644
--- a/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/events/ElasticSearchListeningMessageSearchIndexTest.java
+++ b/mailbox/elasticsearch-v6/src/test/java/org/apache/james/mailbox/elasticsearch/v6/events/ElasticSearchListeningMessageSearchIndexTest.java
@@ -29,13 +29,14 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import java.util.List;
import java.util.Optional;
import javax.mail.Flags;
-import org.apache.james.backends.es.ElasticSearchIndexer;
-import org.apache.james.backends.es.UpdatedRepresentation;
+import org.apache.james.backends.es.v6.ElasticSearchIndexer;
+import org.apache.james.backends.es.v6.UpdatedRepresentation;
import org.apache.james.core.User;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
@@ -159,7 +160,7 @@ public class ElasticSearchListeningMessageSearchIndexTest {
@Test
@SuppressWarnings("unchecked")
- public void deleteShouldWork() {
+ public void deleteShouldWork() throws IOException {
//Given
BulkResponse expectedBulkResponse = mock(BulkResponse.class);
when(elasticSearchIndexer.delete(any(List.class)))
@@ -174,7 +175,7 @@ public class ElasticSearchListeningMessageSearchIndexTest {
@Test
@SuppressWarnings("unchecked")
- public void deleteShouldWorkWhenMultipleMessageIds() {
+ public void deleteShouldWorkWhenMultipleMessageIds() throws IOException {
//Given
MessageUid messageId2 = MessageUid.of(2);
MessageUid messageId3 = MessageUid.of(3);
@@ -194,7 +195,7 @@ public class ElasticSearchListeningMessageSearchIndexTest {
@Test
@SuppressWarnings("unchecked")
- public void deleteShouldPropagateExceptionWhenExceptionOccurs() {
+ public void deleteShouldPropagateExceptionWhenExceptionOccurs() throws IOException {
//Given
when(elasticSearchIndexer.delete(any(List.class)))
.thenThrow(new ElasticsearchException(""));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org