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/09 10:28:29 UTC
[james-project] 04/14: JAMES-2717 Replace
EmbeddedElasticSearchExtension by the docker one
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 ddaa9f8f9c4618a63d8a25430a73b9b1a0247318
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Wed May 8 14:05:48 2019 +0700
JAMES-2717 Replace EmbeddedElasticSearchExtension by the docker one
---
.../src/test/java/org/apache/james/CassandraJamesServerTest.java | 2 +-
.../test/java/org/apache/james/CassandraJmapJamesServerTest.java | 2 +-
.../org/apache/james/CassandraMailRepositoryIntegrationTest.java | 2 +-
.../org/apache/james/CassandraMessageIdManagerInjectionTest.java | 2 +-
.../src/test/java/org/apache/james/CassandraNodeConfTest.java | 6 +++---
.../test/java/org/apache/james/CassandraVersionCheckingTest.java | 2 +-
.../src/test/java/org/apache/james/CassandraWithTikaTest.java | 2 +-
.../test/java/org/apache/james/DefaultCassandraJamesServerTest.java | 2 +-
.../src/test/java/org/apache/james/FixingGhostMailboxTest.java | 2 +-
.../src/test/java/org/apache/james/JamesCapabilitiesServerTest.java | 2 +-
.../test/java/org/apache/james/CassandraLdapJamesServerTest.java | 2 +-
.../java/org/apache/james/CassandraLdapJmapJamesServerTest.java | 2 +-
.../java/org/apache/james/CassandraRabbitMQJamesServerTest.java | 2 +-
.../org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java | 2 +-
.../org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java | 4 ++--
.../james/jmap/cassandra/CassandraSpamAssassinContractTest.java | 4 ++--
.../apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java | 4 ++--
.../james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java | 4 ++--
18 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
index 3982605..5ded794 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
@@ -34,7 +34,7 @@ class CassandraJamesServerTest implements JamesServerContract {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java
index 92ec06f..3995552 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java
@@ -31,7 +31,7 @@ class CassandraJmapJamesServerTest implements JmapJamesServerContract {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
index ffc378f..bc4f7b4 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
@@ -53,7 +53,7 @@ class CassandraMailRepositoryIntegrationTest {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
index f245a65..05f5f27 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
@@ -43,7 +43,7 @@ class CassandraMessageIdManagerInjectionTest {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java
index 6b0047a..2444764 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java
@@ -66,7 +66,7 @@ class CassandraNodeConfTest {
class NormalBehaviour {
@RegisterExtension
JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
@@ -89,7 +89,7 @@ class CassandraNodeConfTest {
@RegisterExtension
JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension(cassandra))
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
@@ -114,7 +114,7 @@ class CassandraNodeConfTest {
@RegisterExtension
JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension(cassandra))
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraVersionCheckingTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraVersionCheckingTest.java
index 6dab649..d7cb7d1 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraVersionCheckingTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraVersionCheckingTest.java
@@ -55,7 +55,7 @@ class CassandraVersionCheckingTest {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java
index c967b68..6a5c3b3 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java
@@ -32,7 +32,7 @@ class CassandraWithTikaTest implements JamesServerContract {
new JamesServerBuilder()
.extension(new CassandraExtension())
.extension(new TikaExtension())
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
index 362d929..aa850d0 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
@@ -37,7 +37,7 @@ class DefaultCassandraJamesServerTest {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
index 0076501..05daf56 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
@@ -96,7 +96,7 @@ public class FixingGhostMailboxTest {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension(cassandra))
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
index 089f6ec..dd28af5 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
@@ -39,7 +39,7 @@ class JamesCapabilitiesServerTest {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
index dcc156e..5c91b17 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
+++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
@@ -55,7 +55,7 @@ class CassandraLdapJamesServerTest implements JamesServerContract {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new LdapTestExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
index 0d79356..4971cc7 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
+++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
@@ -27,7 +27,7 @@ class CassandraLdapJmapJamesServerTest implements JmapJamesServerContract {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new LdapTestExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java
index d683171..4c3c8a0 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java
@@ -176,7 +176,7 @@ class CassandraRabbitMQJamesServerTest {
private static JamesServerBuilder baseExtensionBuilder() {
return new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.server(CONFIGURATION_BUILDER);
diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
index 1644816..1867638 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
@@ -86,7 +86,7 @@ class CassandraRabbitMQLdapJmapJamesServerTest {
JamesServerBuilder baseJamesServerExtensionBuilder() {
return new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new LdapTestExtension());
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java
index 31798fe..28878f0 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.cassandra;
import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import org.apache.james.CassandraExtension;
-import org.apache.james.EmbeddedElasticSearchExtension;
+import org.apache.james.DockerElasticSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -40,7 +40,7 @@ public class CassandraSendMDNMethodTest extends SendMDNMethodTest {
@RegisterExtension
JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java
index 7d8ad0c..9dbe045 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java
@@ -21,7 +21,7 @@ package org.apache.james.jmap.cassandra;
import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import org.apache.james.CassandraExtension;
-import org.apache.james.EmbeddedElasticSearchExtension;
+import org.apache.james.DockerElasticSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -39,7 +39,7 @@ class CassandraSpamAssassinContractTest implements SpamAssassinContract {
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(spamAssassinExtension)
.server(configuration -> GuiceJamesServer.forConfiguration(configuration)
diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
index 17de893..c0ebee9 100644
--- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
+++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
@@ -21,7 +21,7 @@ package org.apache.james.jmap.rabbitmq;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.EmbeddedElasticSearchExtension;
+import org.apache.james.DockerElasticSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -41,7 +41,7 @@ public class RabbitMQAwsS3SendMDNMethodTest extends SendMDNMethodTest {
@RegisterExtension
JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java
index bf05180..8f4c5ac 100644
--- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java
+++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java
@@ -20,7 +20,7 @@ package org.apache.james.jmap.rabbitmq;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.EmbeddedElasticSearchExtension;
+import org.apache.james.DockerElasticSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -40,7 +40,7 @@ class RabbitMQAwsS3SpamAssassinContractTest implements SpamAssassinContract {
private static final SpamAssassinModuleExtension spamAssassinExtension = new SpamAssassinModuleExtension();
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder()
- .extension(new EmbeddedElasticSearchExtension())
+ .extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org