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/08/23 10:25:03 UTC
[james-project] 10/26: JAMES-3771 Cassandra App: Elastic -> OpenSearch
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 366a0c2f79c08d9c1f60d0e696fb5183590de724
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Aug 5 10:37:13 2022 +0700
JAMES-3771 Cassandra App: Elastic -> OpenSearch
---
.../james/mpt/smtp/CassandraForwardSmtpTest.java | 4 ++--
.../mpt/smtp/CassandraSmtpStarttlsCommandTest.java | 4 ++--
server/apps/cassandra-app/pom.xml | 8 ++++----
.../james/AuthenticatedCassandraJamesServerTest.java | 4 ++--
.../test/java/org/apache/james/CacheSessionTest.java | 2 +-
.../james/CassandraDuplicatingJamesServerTest.java | 2 +-
.../org/apache/james/CassandraJamesServerTest.java | 2 +-
.../java/org/apache/james/CassandraJmapTestRule.java | 10 +++-------
.../apache/james/CassandraLdapJamesServerTest.java | 2 +-
.../james/CassandraLdapJmapJamesServerTest.java | 2 +-
.../CassandraMailRepositoryIntegrationTest.java | 2 +-
.../java/org/apache/james/CassandraNodeConfTest.java | 2 +-
.../java/org/apache/james/CassandraWithTikaTest.java | 2 +-
.../james/DefaultCassandraJamesServerTest.java | 2 +-
...Extension.java => DockerOpenSearchExtension.java} | 10 +++++-----
...sticSearchRule.java => DockerOpenSearchRule.java} | 16 +++++++---------
.../test/java/org/apache/james/ESReporterTest.java | 2 +-
.../apache/james/JamesCapabilitiesServerTest.java | 2 +-
.../james/JamesServerWithRetryConnectionTest.java | 6 +++---
...amesWithNonCompatibleElasticSearchServerTest.java | 2 +-
.../java/org/apache/james/KeyspaceCreationTest.java | 8 ++++----
.../james/WithCassandraBlobStoreImmutableTest.java | 2 +-
...chModule.java => TestDockerOpenSearchModule.java} | 4 ++--
.../CassandraSchemaVersionStartUpCheckTest.java | 4 ++--
.../james/CassandraRabbitMQAwsS3JmapTestRule.java | 6 +++---
.../james/CassandraRabbitMQJamesServerFixture.java | 2 +-
.../CassandraRabbitMQLdapJmapJamesServerTest.java | 2 +-
.../org/apache/james/NamespaceConfigurationTest.java | 2 +-
.../org/apache/james/WithCacheImmutableTest.java | 2 +-
...CassandraDeduplicationBlobStoreImmutableTest.java | 2 +-
...thCassandraDeduplicationBlobStoreMutableTest.java | 2 +-
...thCassandraPassThroughBlobStoreImmutableTest.java | 2 +-
...WithCassandraPassThroughBlobStoreMutableTest.java | 2 +-
.../james/WithEncryptedBlobStoreImmutableTest.java | 2 +-
.../james/WithEncryptedBlobStoreMutableTest.java | 2 +-
.../org/apache/james/DistributedPOP3ServerTest.java | 2 +-
.../org/apache/james/DockerElasticSearchRule.java | 4 +++-
...chModule.java => TestDockerOpenSearchModule.java} | 20 ++++++++++----------
.../rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java | 4 ++--
.../cucumber/awss3/CucumberOpenSearchSingleton.java | 4 ++--
.../cucumber/awss3/RabbitMQAwsS3Stepdefs.java | 4 ++--
.../distributed/DistributedAuthenticationTest.java | 4 ++--
.../distributed/DistributedCustomMethodTest.java | 4 ++--
.../distributed/DistributedCustomNamespaceTest.java | 4 ++--
.../rfc8621/distributed/DistributedDownloadTest.java | 4 ++--
.../distributed/DistributedEchoMethodTest.java | 4 ++--
.../DistributedEmailChangeMethodTest.java | 4 ++--
.../distributed/DistributedEmailGetMethodTest.java | 4 ++--
.../DistributedEmailQueryMethodNoViewTest.java | 4 ++--
.../distributed/DistributedEmailQueryMethodTest.java | 4 ++--
.../distributed/DistributedEmailSetMethodTest.java | 4 ++--
.../DistributedEmailSubmissionSetMethodtest.java | 4 ++--
.../distributed/DistributedIdentityGetTest.java | 4 ++--
.../distributed/DistributedIdentitySetTest.java | 4 ++--
.../distributed/DistributedMDNParseMethodTest.java | 4 ++--
.../distributed/DistributedMDNSendMethodTest.java | 4 ++--
.../DistributedMailboxChangeMethodTest.java | 4 ++--
.../distributed/DistributedMailboxGetMethodTest.java | 4 ++--
.../DistributedMailboxQueryMethodTest.java | 4 ++--
.../distributed/DistributedMailboxSetMethodTest.java | 4 ++--
.../distributed/DistributedProvisioningTest.java | 4 ++--
.../DistributedPushSubscriptionSetMethodTest.java | 4 ++--
.../distributed/DistributedSessionRouteTest.java | 4 ++--
.../distributed/DistributedThreadGetMethodTest.java | 7 +++----
.../rfc8621/distributed/DistributedUploadTest.java | 4 ++--
.../DistributedVacationResponseGetMethodTest.java | 4 ++--
.../DistributedVacationResponseSetMethodTest.java | 4 ++--
.../rfc8621/distributed/DistributedWebPushTest.java | 4 ++--
.../distributed/DistributedWebSocketTest.java | 4 ++--
.../jmap/rfc8621/distributed/ReadLevelTest.java | 4 ++--
.../rabbitmq/ConsistencyTasksIntegrationTest.java | 4 ++--
.../integration/rabbitmq/FixingGhostMailboxTest.java | 4 ++--
.../rabbitmq/MailReceptionCheckIntegrationTest.java | 4 ++--
.../rabbitmq/RabbitMQAuthorizedEndpointsTest.java | 4 ++--
.../RabbitMQEventDeadLettersIntegrationTest.java | 4 ++--
...FastViewProjectionHealthCheckIntegrationTest.java | 4 ++--
.../rabbitmq/RabbitMQForwardIntegrationTest.java | 4 ++--
.../rabbitmq/RabbitMQJwtFilterIntegrationTest.java | 4 ++--
.../rabbitmq/RabbitMQQuotaSearchIntegrationTest.java | 4 ++--
.../RabbitMQReindexingWithEventDeadLettersTest.java | 6 +++---
.../rabbitmq/RabbitMQUnauthorizedEndpointsTest.java | 4 ++--
.../RabbitMQWebAdminServerBlobGCIntegrationTest.java | 4 ++--
...bbitMQWebAdminServerIntegrationImmutableTest.java | 4 ++--
.../RabbitMQWebAdminServerIntegrationTest.java | 4 ++--
...verTaskSerializationIntegrationImmutableTest.java | 4 ++--
...bAdminServerTaskSerializationIntegrationTest.java | 4 ++--
.../RabbitMQDeletedMessageVaultIntegrationTest.java | 4 ++--
...MQLinshareBlobExportMechanismIntegrationTest.java | 4 ++--
88 files changed, 178 insertions(+), 183 deletions(-)
diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
index 7c8fc33a31..532e82cf28 100644
--- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
+++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
@@ -23,7 +23,7 @@ import static org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnec
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
import org.apache.james.TestingDistributedJamesServerBuilder;
@@ -45,7 +45,7 @@ public class CassandraForwardSmtpTest implements ForwardSmtpTest {
@Order(1)
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(cassandraExtension)
.extension(new InMemoryDnsExtension())
.server(CassandraJamesServerMain::createServer)
diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
index 3fe34f0f91..af2bedbb9e 100644
--- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
+++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
@@ -23,7 +23,7 @@ import static org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnec
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
import org.apache.james.TestingDistributedJamesServerBuilder;
@@ -40,7 +40,7 @@ public class CassandraSmtpStarttlsCommandTest extends SmtpStarttlsCommandTest {
@Order(1)
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(cassandraExtension)
.extension(new InMemoryDnsExtension())
.server(CassandraJamesServerMain::createServer)
diff --git a/server/apps/cassandra-app/pom.xml b/server/apps/cassandra-app/pom.xml
index 25e168b90a..e3862476bd 100644
--- a/server/apps/cassandra-app/pom.xml
+++ b/server/apps/cassandra-app/pom.xml
@@ -133,10 +133,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-opensearch</artifactId>
- </dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-es-resporter</artifactId>
@@ -175,6 +171,10 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-managedsieve</artifactId>
</dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-opensearch</artifactId>
+ </dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-pop</artifactId>
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java
index 92dca59b08..d66cdc5640 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java
@@ -41,7 +41,7 @@ class AuthenticatedCassandraJamesServerTest {
class AuthenticationTest implements JamesServerContract {
@RegisterExtension
JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(cassandraExtension)
.server(CassandraJamesServerMain::createServer)
.overrideServerModule(binder -> binder.bind(ClusterConfiguration.class)
@@ -56,7 +56,7 @@ class AuthenticatedCassandraJamesServerTest {
class AuthenticationFailureTest {
@RegisterExtension
JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(cassandraExtension)
.disableAutoStart()
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CacheSessionTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CacheSessionTest.java
index 2e0f8c8bcc..088631c11a 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CacheSessionTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CacheSessionTest.java
@@ -79,7 +79,7 @@ class CacheSessionTest {
.configurationFromClasspath()
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.combineWith(new CassandraCacheSessionModule()))
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraDuplicatingJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraDuplicatingJamesServerTest.java
index f9feabbeee..fdfc88ce9e 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraDuplicatingJamesServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraDuplicatingJamesServerTest.java
@@ -34,7 +34,7 @@ class CassandraDuplicatingJamesServerTest implements JamesServerContract, JmapJa
.configurationFromClasspath()
.blobStore(new BlobStoreConfiguration(StorageStrategy.PASSTHROUGH, Optional.empty()))
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJamesServerTest.java
index e9db66f9f6..96c1c2d5f7 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJamesServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJamesServerTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraJamesServerTest implements JamesServerContract, JmapJamesServerContract {
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJmapTestRule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJmapTestRule.java
index bb744a2281..648fc53045 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJmapTestRule.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraJmapTestRule.java
@@ -39,16 +39,16 @@ public class CassandraJmapTestRule implements TestRule {
}
private final GuiceModuleTestRule guiceModuleTestRule;
- private final DockerElasticSearchRule dockerElasticSearchRule;
+ private final DockerOpenSearchRule dockerOpenSearchRule;
public CassandraJmapTestRule(GuiceModuleTestRule... guiceModuleTestRule) {
TempFilesystemTestRule tempFilesystemTestRule = new TempFilesystemTestRule();
- this.dockerElasticSearchRule = new DockerElasticSearchRule();
+ this.dockerOpenSearchRule = new DockerOpenSearchRule();
this.temporaryFolder = tempFilesystemTestRule.getTemporaryFolder();
this.guiceModuleTestRule =
AggregateGuiceModuleTestRule
.of(guiceModuleTestRule)
- .aggregate(dockerElasticSearchRule)
+ .aggregate(dockerOpenSearchRule)
.aggregate(tempFilesystemTestRule);
}
@@ -75,8 +75,4 @@ public class CassandraJmapTestRule implements TestRule {
public void await() {
guiceModuleTestRule.await();
}
-
- public DockerElasticSearchRule getDockerElasticSearchRule() {
- return dockerElasticSearchRule;
- }
}
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
index b248f47004..24487e786d 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
@@ -63,7 +63,7 @@ class CassandraLdapJamesServerTest implements JamesServerContract {
.forConfiguration(configuration -> configuration
.searchConfiguration(SearchConfiguration.elasticSearch())
.usersRepository(UsersRepositoryModuleChooser.Implementation.LDAP))
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(ldap)
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
index 6bcb98e793..bb965e9cf0 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
@@ -31,7 +31,7 @@ class CassandraLdapJmapJamesServerTest implements JmapJamesServerContract {
.forConfiguration(configuration -> configuration
.searchConfiguration(SearchConfiguration.elasticSearch())
.usersRepository(UsersRepositoryModuleChooser.Implementation.LDAP))
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new LdapTestExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
index f83c2c1bc6..e192bb6790 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
@@ -47,7 +47,7 @@ class CassandraMailRepositoryIntegrationTest {
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraNodeConfTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraNodeConfTest.java
index 361de3fd71..1349527f61 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraNodeConfTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraNodeConfTest.java
@@ -43,7 +43,7 @@ class CassandraNodeConfTest {
private static JamesServerBuilder extensionBuilder() {
return TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraWithTikaTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraWithTikaTest.java
index 7979d5db3a..ebe421c64c 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraWithTikaTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraWithTikaTest.java
@@ -27,7 +27,7 @@ class CassandraWithTikaTest implements JamesServerContract {
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
.extension(new CassandraExtension())
.extension(new TikaExtension())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
.lifeCycle(JamesServerExtension.Lifecycle.PER_CLASS)
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
index 229654e1cc..8c1fd19ad3 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class DefaultCassandraJamesServerTest {
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchExtension.java b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchExtension.java
similarity index 87%
rename from server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchExtension.java
rename to server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchExtension.java
index ac733b1da6..c9114ef5c3 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchExtension.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchExtension.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.extension.ExtensionContext;
import com.google.inject.Module;
-public class DockerElasticSearchExtension implements GuiceModuleTestExtension {
+public class DockerOpenSearchExtension implements GuiceModuleTestExtension {
private final DockerOpenSearch dockerOpenSearch;
private Optional<Duration> requestTimeout;
@@ -38,12 +38,12 @@ public class DockerElasticSearchExtension implements GuiceModuleTestExtension {
this(DockerOpenSearchSingleton.INSTANCE);
}
- public DockerElasticSearchExtension withRequestTimeout(Duration requestTimeout) {
+ public DockerOpenSearchExtension withRequestTimeout(Duration requestTimeout) {
this.requestTimeout = Optional.of(requestTimeout);
return this;
}
- public DockerElasticSearchExtension(DockerOpenSearch dockerOpenSearch) {
+ public DockerOpenSearchExtension(DockerOpenSearch dockerOpenSearch) {
this.dockerOpenSearch = dockerOpenSearch;
requestTimeout = Optional.empty();
}
@@ -68,7 +68,7 @@ public class DockerElasticSearchExtension implements GuiceModuleTestExtension {
@Override
public Module getModule() {
return binder -> binder.bind(OpenSearchConfiguration.class)
- .toInstance(getElasticSearchConfigurationForDocker());
+ .toInstance(getOpenSearchConfigurationForDocker());
}
@Override
@@ -76,7 +76,7 @@ public class DockerElasticSearchExtension implements GuiceModuleTestExtension {
getDockerES().flushIndices();
}
- private OpenSearchConfiguration getElasticSearchConfigurationForDocker() {
+ private OpenSearchConfiguration getOpenSearchConfigurationForDocker() {
return OpenSearchConfiguration.builder()
.addHost(getDockerES().getHttpHost())
.requestTimeout(requestTimeout)
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchRule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchRule.java
similarity index 82%
rename from server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchRule.java
rename to server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchRule.java
index cd24b6a9cc..d8abc84201 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/DockerElasticSearchRule.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/DockerOpenSearchRule.java
@@ -21,16 +21,14 @@ package org.apache.james;
import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.apache.james.backends.opensearch.DockerOpenSearchSingleton;
-import org.apache.james.modules.TestDockerElasticSearchModule;
+import org.apache.james.modules.TestDockerOpenSearchModule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import com.google.inject.Module;
-
-public class DockerElasticSearchRule implements GuiceModuleTestRule {
-
- private final DockerOpenSearch elasticSearch = DockerOpenSearchSingleton.INSTANCE;
+public class DockerOpenSearchRule implements GuiceModuleTestRule {
+ private final DockerOpenSearch openSearch = DockerOpenSearchSingleton.INSTANCE;
@Override
public Statement apply(Statement base, Description description) {
@@ -39,19 +37,19 @@ public class DockerElasticSearchRule implements GuiceModuleTestRule {
@Override
public void await() {
- elasticSearch.flushIndices();
+ openSearch.flushIndices();
}
@Override
public Module getModule() {
- return new TestDockerElasticSearchModule(elasticSearch);
+ return new TestDockerOpenSearchModule(openSearch);
}
public DockerOpenSearch getDockerEs() {
- return elasticSearch;
+ return openSearch;
}
public void start() {
- elasticSearch.start();
+ openSearch.start();
}
}
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/ESReporterTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/ESReporterTest.java
index 04bb6a8bbb..02881bf616 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/ESReporterTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/ESReporterTest.java
@@ -60,7 +60,7 @@ import io.restassured.http.ContentType;
class ESReporterTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ESReporterTest.class);
- static final DockerElasticSearchExtension elasticSearchExtension = new DockerElasticSearchExtension();
+ static final DockerOpenSearchExtension elasticSearchExtension = new DockerOpenSearchExtension();
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
index 0a8f58dc65..c705d65034 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
@@ -37,7 +37,7 @@ class JamesCapabilitiesServerTest {
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
index f6c8531651..d93b8110ae 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class JamesServerWithRetryConnectionTest {
private static final long WAITING_TIME = TimeUnit.MILLISECONDS.convert(10, TimeUnit.SECONDS);
- private static final DockerElasticSearchExtension dockerElasticSearch = new DockerElasticSearchExtension();
+ private static final DockerOpenSearchExtension dockerElasticSearch = new DockerOpenSearchExtension();
private static final CassandraExtension dockerCassandra = new CassandraExtension();
@RegisterExtension
@@ -85,8 +85,8 @@ class JamesServerWithRetryConnectionTest {
}
@Test
- void serverShouldRetryToConnectToElasticSearchWhenStartService(GuiceJamesServer server) throws Exception {
- dockerElasticSearch.getDockerES().pause();
+ void serverShouldRetryToConnectToOpenSearchWhenStartService(GuiceJamesServer server) throws Exception {
+ dockerOpenSearch.getDockerES().pause();
waitToStartContainer(WAITING_TIME, dockerElasticSearch.getDockerES()::unpause);
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
index 7e97c895d9..d6c405a8c9 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
@@ -38,7 +38,7 @@ class JamesWithNonCompatibleElasticSearchServerTest {
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension(dockerES6))
+ .extension(new DockerOpenSearchExtension(dockerES6))
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/KeyspaceCreationTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/KeyspaceCreationTest.java
index 14e229e615..c4ed7707bb 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/KeyspaceCreationTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/KeyspaceCreationTest.java
@@ -34,7 +34,7 @@ class KeyspaceCreationTest {
class CreateWhenKeyspaceExists {
@RegisterExtension
JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(CassandraJamesServerMain::createServer)
.overrideServerModule(binder -> binder.bind(ClusterConfiguration.class)
@@ -55,7 +55,7 @@ class KeyspaceCreationTest {
class CreateWhenDoesNotExistAndHasRights {
@RegisterExtension
JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(CassandraJamesServerMain::createServer)
.overrideServerModule(binder -> binder.bind(KeyspacesConfiguration.class).toInstance(KeyspacesConfiguration.builder()
@@ -82,7 +82,7 @@ class KeyspaceCreationTest {
class CreateWhenDoesNotExistAndDoNotHaveRights {
@RegisterExtension
JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(CassandraJamesServerMain::createServer)
.overrideServerModule(binder -> binder.bind(ClusterConfiguration.class)
@@ -109,7 +109,7 @@ class KeyspaceCreationTest {
class StartWhenKeyspaceDoesNotExist {
@RegisterExtension
JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(CassandraJamesServerMain::createServer)
.overrideServerModule(binder -> binder.bind(ClusterConfiguration.class)
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/WithCassandraBlobStoreImmutableTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/WithCassandraBlobStoreImmutableTest.java
index 25c26dd21a..426e4eedc9 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/WithCassandraBlobStoreImmutableTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/WithCassandraBlobStoreImmutableTest.java
@@ -31,7 +31,7 @@ class WithCassandraBlobStoreImmutableTest implements JmapJamesServerContract, Ja
static JamesServerBuilder<CassandraJamesServerConfiguration> baseExtensionBuilder() {
return TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()));
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java b/server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerOpenSearchModule.java
similarity index 94%
rename from server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java
rename to server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerOpenSearchModule.java
index 2d204c10ac..466647f6e8 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/modules/TestDockerOpenSearchModule.java
@@ -26,7 +26,7 @@ import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import com.google.inject.AbstractModule;
import com.google.inject.multibindings.Multibinder;
-public class TestDockerElasticSearchModule extends AbstractModule {
+public class TestDockerOpenSearchModule extends AbstractModule {
private static class ESContainerCleanUp implements CleanupTasksPerformer.CleanupTask {
@@ -46,7 +46,7 @@ public class TestDockerElasticSearchModule extends AbstractModule {
private final DockerOpenSearch elasticSearch;
- public TestDockerElasticSearchModule(DockerOpenSearch elasticSearch) {
+ public TestDockerOpenSearchModule(DockerOpenSearch elasticSearch) {
this.elasticSearch = elasticSearch;
}
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java
index e22bb48159..ed1f92bef6 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java
@@ -33,7 +33,7 @@ import java.util.Optional;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraJamesServerConfiguration;
import org.apache.james.CassandraJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -65,7 +65,7 @@ class CassandraSchemaVersionStartUpCheckTest {
.configurationFromClasspath()
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(CassandraSchemaVersionDAO.class)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
index 0e0b844a96..8639697246 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java
@@ -44,16 +44,16 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule {
}
private final GuiceModuleTestRule guiceModuleTestRule;
- private final DockerElasticSearchRule dockerElasticSearchRule;
+ private final DockerOpenSearchRule dockerOpenSearchRule;
public CassandraRabbitMQAwsS3JmapTestRule(GuiceModuleTestRule... guiceModuleTestRule) {
TempFilesystemTestRule tempFilesystemTestRule = new TempFilesystemTestRule();
- this.dockerElasticSearchRule = new DockerElasticSearchRule();
+ this.dockerOpenSearchRule = new DockerOpenSearchRule();
this.temporaryFolder = tempFilesystemTestRule.getTemporaryFolder();
this.guiceModuleTestRule =
AggregateGuiceModuleTestRule
.of(guiceModuleTestRule)
- .aggregate(dockerElasticSearchRule)
+ .aggregate(dockerOpenSearchRule)
.aggregate(tempFilesystemTestRule);
}
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
index 2ac2825f11..6d7cdd1173 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
@@ -40,7 +40,7 @@ public class CassandraRabbitMQJamesServerFixture {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(rabbitMQExtension)
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
index 40b6f4b26d..3efeb0e60c 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
@@ -88,7 +88,7 @@ class CassandraRabbitMQLdapJmapJamesServerTest {
.searchConfiguration(SearchConfiguration.elasticSearch())
.usersRepository(UsersRepositoryModuleChooser.Implementation.LDAP)
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new LdapTestExtension())
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/NamespaceConfigurationTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/NamespaceConfigurationTest.java
index 4398fcb2ae..a97a2e8e09 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/NamespaceConfigurationTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/NamespaceConfigurationTest.java
@@ -61,7 +61,7 @@ class NamespaceConfigurationTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/WithCacheImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCacheImmutableTest.java
index eebc25f169..7ec6a97df2 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/WithCacheImmutableTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/WithCacheImmutableTest.java
@@ -45,7 +45,7 @@ class WithCacheImmutableTest implements JmapJamesServerContract, JamesServerCont
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreImmutableTest.java
index 9f845f07d7..4829b71d65 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreImmutableTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreImmutableTest.java
@@ -38,7 +38,7 @@ public class WithCassandraDeduplicationBlobStoreImmutableTest implements JmapJam
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.lifeCycle(JamesServerExtension.Lifecycle.PER_CLASS)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreMutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreMutableTest.java
index 3a38f75bb0..40184e06f8 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreMutableTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraDeduplicationBlobStoreMutableTest.java
@@ -64,7 +64,7 @@ public class WithCassandraDeduplicationBlobStoreMutableTest implements MailsShou
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.lifeCycle(JamesServerExtension.Lifecycle.PER_TEST)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreImmutableTest.java
index cc81e6a58f..a2fb03b391 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreImmutableTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreImmutableTest.java
@@ -38,7 +38,7 @@ public class WithCassandraPassThroughBlobStoreImmutableTest implements JmapJames
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.lifeCycle(JamesServerExtension.Lifecycle.PER_CLASS)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreMutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreMutableTest.java
index 66b5d9116f..556df99b7c 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreMutableTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/WithCassandraPassThroughBlobStoreMutableTest.java
@@ -64,7 +64,7 @@ public class WithCassandraPassThroughBlobStoreMutableTest implements MailsShould
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.lifeCycle(JamesServerExtension.Lifecycle.PER_TEST)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreImmutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreImmutableTest.java
index 3caf921f0d..411c2cf2ae 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreImmutableTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreImmutableTest.java
@@ -43,7 +43,7 @@ public class WithEncryptedBlobStoreImmutableTest implements JmapJamesServerContr
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.lifeCycle(JamesServerExtension.Lifecycle.PER_CLASS)
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreMutableTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreMutableTest.java
index da8e05694a..4ce5edc602 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreMutableTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/WithEncryptedBlobStoreMutableTest.java
@@ -42,7 +42,7 @@ public class WithEncryptedBlobStoreMutableTest implements MailsShouldBeWellRecei
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.lifeCycle(JamesServerExtension.Lifecycle.PER_TEST)
diff --git a/server/apps/distributed-pop3-app/src/test/java/org/apache/james/DistributedPOP3ServerTest.java b/server/apps/distributed-pop3-app/src/test/java/org/apache/james/DistributedPOP3ServerTest.java
index e22fee6f4e..e1bd2fa0ec 100644
--- a/server/apps/distributed-pop3-app/src/test/java/org/apache/james/DistributedPOP3ServerTest.java
+++ b/server/apps/distributed-pop3-app/src/test/java/org/apache/james/DistributedPOP3ServerTest.java
@@ -42,7 +42,7 @@ public class DistributedPOP3ServerTest implements Pop3ServerContract {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(rabbitMQExtension)
.server(configuration -> DistributedPOP3JamesServerMain.createServer(configuration)
diff --git a/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerElasticSearchRule.java b/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerElasticSearchRule.java
index 20d50e4967..938c553f3e 100644
--- a/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerElasticSearchRule.java
+++ b/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerElasticSearchRule.java
@@ -21,6 +21,8 @@ package org.apache.james;
import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.apache.james.modules.TestDockerElasticSearchModule;
+import org.apache.james.backends.opensearch.DockerOpenSearchSingleton;
+import org.apache.james.modules.TestDockerOpenSearchModule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -43,7 +45,7 @@ public class DockerElasticSearchRule implements GuiceModuleTestRule {
@Override
public Module getModule() {
- return new TestDockerElasticSearchModule(elasticSearch);
+ return new TestDockerOpenSearchModule(elasticSearch);
}
public DockerOpenSearch getDockerEs() {
diff --git a/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java b/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/modules/TestDockerOpenSearchModule.java
similarity index 76%
rename from server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java
rename to server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/modules/TestDockerOpenSearchModule.java
index 2d204c10ac..a539b9b19e 100644
--- a/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/modules/TestDockerElasticSearchModule.java
+++ b/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/modules/TestDockerOpenSearchModule.java
@@ -26,36 +26,36 @@ import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import com.google.inject.AbstractModule;
import com.google.inject.multibindings.Multibinder;
-public class TestDockerElasticSearchModule extends AbstractModule {
+public class TestDockerOpenSearchModule extends AbstractModule {
private static class ESContainerCleanUp implements CleanupTasksPerformer.CleanupTask {
- private final DockerOpenSearch elasticSearch;
+ private final DockerOpenSearch openSearch;
- private ESContainerCleanUp(DockerOpenSearch elasticSearch) {
- this.elasticSearch = elasticSearch;
+ private ESContainerCleanUp(DockerOpenSearch openSearch) {
+ this.openSearch = openSearch;
}
@Override
public Result run() {
- elasticSearch.cleanUpData();
+ openSearch.cleanUpData();
return Result.COMPLETED;
}
}
- private final DockerOpenSearch elasticSearch;
+ private final DockerOpenSearch openSearch;
- public TestDockerElasticSearchModule(DockerOpenSearch elasticSearch) {
- this.elasticSearch = elasticSearch;
+ public TestDockerOpenSearchModule(DockerOpenSearch openSearch) {
+ this.openSearch = openSearch;
}
@Override
protected void configure() {
- bind(OpenSearchConfiguration.class).toInstance(elasticSearch.configuration());
+ bind(OpenSearchConfiguration.class).toInstance(openSearch.configuration());
Multibinder.newSetBinder(binder(), CleanupTasksPerformer.CleanupTask.class)
.addBinding()
- .toInstance(new ESContainerCleanUp(elasticSearch));
+ .toInstance(new ESContainerCleanUp(openSearch));
}
}
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
index 33d050158c..f8e33956ca 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rabbitmq;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -49,7 +49,7 @@ public class RabbitMQAwsS3SendMDNMethodTest extends SendMDNMethodTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberOpenSearchSingleton.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberOpenSearchSingleton.java
index 8c2bfc4fc2..a0419cb172 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberOpenSearchSingleton.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberOpenSearchSingleton.java
@@ -18,10 +18,10 @@
****************************************************************/
package org.apache.james.jmap.rabbitmq.cucumber.awss3;
-import org.apache.james.DockerElasticSearchRule;
+import org.apache.james.DockerOpenSearchRule;
class CucumberOpenSearchSingleton {
- static final DockerElasticSearchRule elasticSearch = new DockerElasticSearchRule();
+ static final DockerOpenSearchRule elasticSearch = new DockerOpenSearchRule();
}
diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
index 6a65ffe3bd..5e9130ee71 100644
--- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
+++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java
@@ -27,7 +27,7 @@ import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
import org.apache.james.CleanupTasksPerformer;
import org.apache.james.DockerCassandraRule;
-import org.apache.james.DockerElasticSearchRule;
+import org.apache.james.DockerOpenSearchRule;
import org.apache.james.SearchConfiguration;
import org.apache.james.jmap.draft.methods.integration.cucumber.ImapStepdefs;
import org.apache.james.jmap.draft.methods.integration.cucumber.MainStepdefs;
@@ -54,7 +54,7 @@ public class RabbitMQAwsS3Stepdefs {
private final ImapStepdefs imapStepdefs;
private final TemporaryFolder temporaryFolder = new TemporaryFolder();
private final DockerCassandraRule cassandraServer = CucumberCassandraSingleton.cassandraServer;
- private final DockerElasticSearchRule elasticSearch = CucumberOpenSearchSingleton.elasticSearch;
+ private final DockerOpenSearchRule elasticSearch = CucumberOpenSearchSingleton.elasticSearch;
private final DockerRabbitMQRule rabbitMQServer = CucumberRabbitMQSingleton.rabbitMQServer;
private final DockerAwsS3TestRule awsS3Server = CucumberAwsS3Singleton.awsS3Server;
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedAuthenticationTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedAuthenticationTest.java
index 84904a9c66..cf166bfbc0 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedAuthenticationTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedAuthenticationTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -46,7 +46,7 @@ class DistributedAuthenticationTest implements AuthenticationContract {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedCustomMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedCustomMethodTest.java
index ef0785a2ca..7500c05299 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedCustomMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedCustomMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.CustomMethodContract;
@@ -45,7 +45,7 @@ public class DistributedCustomMethodTest implements CustomMethodContract {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedCustomNamespaceTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedCustomNamespaceTest.java
index 435a2f5b58..c8bf3066ab 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedCustomNamespaceTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedCustomNamespaceTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.CustomNamespaceContract;
@@ -45,7 +45,7 @@ public class DistributedCustomNamespaceTest implements CustomNamespaceContract {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedDownloadTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedDownloadTest.java
index 67a4e51858..e48c526d39 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedDownloadTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedDownloadTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.DownloadContract;
@@ -50,7 +50,7 @@ public class DistributedDownloadTest implements DownloadContract {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEchoMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEchoMethodTest.java
index b1b1df3e65..7a032d38c3 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEchoMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEchoMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -47,7 +47,7 @@ public class DistributedEchoMethodTest implements EchoMethodContract {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailChangeMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailChangeMethodTest.java
index 70adcd3b26..308ac85412 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailChangeMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailChangeMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.api.change.Limit;
@@ -51,7 +51,7 @@ public class DistributedEmailChangeMethodTest implements EmailChangesMethodContr
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailGetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailGetMethodTest.java
index 45b5d8b19d..7f8ee6492d 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailGetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailGetMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.EmailGetMethodContract;
@@ -50,7 +50,7 @@ public class DistributedEmailGetMethodTest implements EmailGetMethodContract {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailQueryMethodNoViewTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailQueryMethodNoViewTest.java
index 3562c64a5d..c9cc85853e 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailQueryMethodNoViewTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailQueryMethodNoViewTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.JMAPConfiguration;
@@ -34,7 +34,7 @@ import org.apache.james.modules.blobstore.BlobStoreConfiguration;
import org.junit.jupiter.api.extension.RegisterExtension;
public class DistributedEmailQueryMethodNoViewTest implements EmailQueryMethodContract {
- public static final DockerElasticSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerElasticSearchExtension();
+ public static final DockerOpenSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerOpenSearchExtension();
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailQueryMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailQueryMethodTest.java
index e05c3a845c..d6716a16e9 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailQueryMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailQueryMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.EmailQueryMethodContract;
@@ -33,7 +33,7 @@ import org.apache.james.modules.blobstore.BlobStoreConfiguration;
import org.junit.jupiter.api.extension.RegisterExtension;
public class DistributedEmailQueryMethodTest implements EmailQueryMethodContract {
- public static final DockerElasticSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerElasticSearchExtension();
+ public static final DockerOpenSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerOpenSearchExtension();
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailSetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailSetMethodTest.java
index 622a0d56c1..546e3da9b7 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailSetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailSetMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import com.datastax.oss.driver.api.core.uuid.Uuids;
public class DistributedEmailSetMethodTest implements EmailSetMethodContract {
- public static final DockerElasticSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerElasticSearchExtension();
+ public static final DockerOpenSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerOpenSearchExtension();
public static final CassandraMessageId.Factory MESSAGE_ID_FACTORY = new CassandraMessageId.Factory();
@RegisterExtension
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailSubmissionSetMethodtest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailSubmissionSetMethodtest.java
index 8eb9c84851..606ac4e179 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailSubmissionSetMethodtest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedEmailSubmissionSetMethodtest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.EmailSubmissionSetMethodContract;
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import com.datastax.oss.driver.api.core.uuid.Uuids;
class DistributedEmailSubmissionSetMethodtest implements EmailSubmissionSetMethodContract {
- public static final DockerElasticSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerElasticSearchExtension();
+ public static final DockerOpenSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerOpenSearchExtension();
public static final CassandraMessageId.Factory MESSAGE_ID_FACTORY = new CassandraMessageId.Factory();
@RegisterExtension
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedIdentityGetTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedIdentityGetTest.java
index aa2771cbf5..cad0ade758 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedIdentityGetTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedIdentityGetTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -47,7 +47,7 @@ class DistributedIdentityGetTest implements IdentityGetContract {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedIdentitySetTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedIdentitySetTest.java
index 9cad99c989..fffcee7e30 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedIdentitySetTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedIdentitySetTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -47,7 +47,7 @@ public class DistributedIdentitySetTest implements IdentitySetContract {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMDNParseMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMDNParseMethodTest.java
index abd10fe020..d53caf2204 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMDNParseMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMDNParseMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.MDNParseMethodContract;
@@ -50,7 +50,7 @@ public class DistributedMDNParseMethodTest implements MDNParseMethodContract {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMDNSendMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMDNSendMethodTest.java
index 071c1af1b0..e036536e96 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMDNSendMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMDNSendMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.MDNSendMethodContract;
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import com.datastax.oss.driver.api.core.uuid.Uuids;
class DistributedMDNSendMethodTest implements MDNSendMethodContract {
- public static final DockerElasticSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerElasticSearchExtension();
+ public static final DockerOpenSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerOpenSearchExtension();
public static final CassandraMessageId.Factory MESSAGE_ID_FACTORY = new CassandraMessageId.Factory();
@RegisterExtension
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxChangeMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxChangeMethodTest.java
index 7df9623df1..620fbec523 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxChangeMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxChangeMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.api.change.Limit;
@@ -53,7 +53,7 @@ public class DistributedMailboxChangeMethodTest implements MailboxChangesMethodC
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxGetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxGetMethodTest.java
index c260d5df75..3d21ebca45 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxGetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxGetMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.MailboxGetMethodContract;
@@ -48,7 +48,7 @@ public class DistributedMailboxGetMethodTest implements MailboxGetMethodContract
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxQueryMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxQueryMethodTest.java
index ea7245658b..a1e7b5b9b8 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxQueryMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxQueryMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.MailboxQueryMethodContract;
@@ -33,7 +33,7 @@ import org.apache.james.modules.blobstore.BlobStoreConfiguration;
import org.junit.jupiter.api.extension.RegisterExtension;
public class DistributedMailboxQueryMethodTest implements MailboxQueryMethodContract {
- public static final DockerElasticSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerElasticSearchExtension();
+ public static final DockerOpenSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerOpenSearchExtension();
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxSetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxSetMethodTest.java
index f2aa932297..b548a93800 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxSetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedMailboxSetMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -51,7 +51,7 @@ public class DistributedMailboxSetMethodTest implements MailboxSetMethodContract
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedProvisioningTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedProvisioningTest.java
index c89a915fef..8e485329c2 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedProvisioningTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedProvisioningTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.ProvisioningContract;
@@ -44,7 +44,7 @@ public class DistributedProvisioningTest implements ProvisioningContract {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedPushSubscriptionSetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedPushSubscriptionSetMethodTest.java
index 6cc236a3ea..dbcb1571a1 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedPushSubscriptionSetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedPushSubscriptionSetMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.pushsubscription.PushClientConfiguration;
@@ -47,7 +47,7 @@ public class DistributedPushSubscriptionSetMethodTest implements PushSubscriptio
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedSessionRouteTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedSessionRouteTest.java
index de8d786a6c..17ae803ec7 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedSessionRouteTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedSessionRouteTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -45,7 +45,7 @@ public class DistributedSessionRouteTest implements SessionRoutesContract {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedThreadGetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedThreadGetMethodTest.java
index bfaf2ca88f..d4e191ad1d 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedThreadGetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedThreadGetMethodTest.java
@@ -28,11 +28,10 @@ import java.util.List;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
-import org.apache.james.backends.opensearch.DockerOpenSearchExtension;
import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.jmap.rfc8621.contract.ThreadGetContract;
import org.apache.james.mailbox.model.MailboxId;
@@ -65,7 +64,7 @@ public class DistributedThreadGetMethodTest implements ThreadGetContract {
private ReactorOpenSearchClient client;
@RegisterExtension
- DockerOpenSearchExtension elasticSearch = new DockerOpenSearchExtension();
+ org.apache.james.backends.opensearch.DockerOpenSearchExtension elasticSearch = new org.apache.james.backends.opensearch.DockerOpenSearchExtension();
@RegisterExtension
JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
@@ -79,7 +78,7 @@ public class DistributedThreadGetMethodTest implements ThreadGetContract {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedUploadTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedUploadTest.java
index b7ffbedd67..824d61d998 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedUploadTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedUploadTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.UploadContract;
@@ -44,7 +44,7 @@ public class DistributedUploadTest implements UploadContract {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedVacationResponseGetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedVacationResponseGetMethodTest.java
index 56e191929a..9d0dd3c34a 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedVacationResponseGetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedVacationResponseGetMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.VacationResponseGetMethodContract;
@@ -44,7 +44,7 @@ public class DistributedVacationResponseGetMethodTest implements VacationRespons
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedVacationResponseSetMethodTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedVacationResponseSetMethodTest.java
index 091e744cda..812c190a04 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedVacationResponseSetMethodTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedVacationResponseSetMethodTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.VacationResponseSetMethodContract;
@@ -44,7 +44,7 @@ public class DistributedVacationResponseSetMethodTest implements VacationRespons
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedWebPushTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedWebPushTest.java
index c7422f301a..c22c8eb912 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedWebPushTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedWebPushTest.java
@@ -23,7 +23,7 @@ import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
import org.apache.james.ClockExtension;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.pushsubscription.PushClientConfiguration;
@@ -37,7 +37,7 @@ import org.apache.james.modules.blobstore.BlobStoreConfiguration;
import org.junit.jupiter.api.extension.RegisterExtension;
class DistributedWebPushTest implements WebPushContract {
- public static final DockerElasticSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerElasticSearchExtension();
+ public static final DockerOpenSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerOpenSearchExtension();
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedWebSocketTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedWebSocketTest.java
index 3d1cccb93a..6772b1516d 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedWebSocketTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedWebSocketTest.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.rfc8621.distributed;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.rfc8621.contract.WebSocketContract;
@@ -44,7 +44,7 @@ public class DistributedWebSocketTest implements WebSocketContract {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java
index 49397a5d1c..6fb0301786 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java
@@ -32,7 +32,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -111,7 +111,7 @@ class ReadLevelTest {
.deduplication()
.noCryptoConfig())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/ConsistencyTasksIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/ConsistencyTasksIntegrationTest.java
index e5164044da..a2947c1505 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/ConsistencyTasksIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/ConsistencyTasksIntegrationTest.java
@@ -42,7 +42,7 @@ import java.time.Duration;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -135,7 +135,7 @@ class ConsistencyTasksIntegrationTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
index d55d2f3b6b..18599c373d 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java
@@ -46,7 +46,7 @@ import java.time.Duration;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -122,7 +122,7 @@ class FixingGhostMailboxTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/MailReceptionCheckIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/MailReceptionCheckIntegrationTest.java
index f413c0900e..b5f59cd065 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/MailReceptionCheckIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/MailReceptionCheckIntegrationTest.java
@@ -33,7 +33,7 @@ import java.util.Optional;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -72,7 +72,7 @@ class MailReceptionCheckIntegrationTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(CASSANDRA_EXTENSION)
.extension(new AwsS3BlobStoreExtension())
.extension(RABBIT_MQ_EXTENSION)
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
index c661e038a9..478334edca 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java
@@ -22,7 +22,7 @@ package org.apache.james.webadmin.integration.rabbitmq;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -50,7 +50,7 @@ class RabbitMQAuthorizedEndpointsTest extends AuthorizedEndpointsTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
index 83921ef16d..5e31d41d99 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.GuiceModuleTestExtension;
import org.apache.james.JamesServerBuilder;
@@ -212,7 +212,7 @@ class RabbitMQEventDeadLettersIntegrationTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(RABBIT_MQ_EXTENSION)
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java
index ef392b3b7a..619ba27f82 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java
@@ -22,7 +22,7 @@ package org.apache.james.webadmin.integration.rabbitmq;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -46,7 +46,7 @@ class RabbitMQFastViewProjectionHealthCheckIntegrationTest extends FastViewProje
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
index f62ceaca29..196547ba57 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java
@@ -22,7 +22,7 @@ package org.apache.james.webadmin.integration.rabbitmq;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -46,7 +46,7 @@ class RabbitMQForwardIntegrationTest extends ForwardIntegrationTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
index 2882ae2518..c9fdd713c2 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java
@@ -24,7 +24,7 @@ import static org.apache.james.JamesServerExtension.Lifecycle.PER_CLASS;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -52,7 +52,7 @@ class RabbitMQJwtFilterIntegrationTest extends JwtFilterIntegrationTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQQuotaSearchIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQQuotaSearchIntegrationTest.java
index 21405aeeb0..f64131249c 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQQuotaSearchIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQQuotaSearchIntegrationTest.java
@@ -22,7 +22,7 @@ package org.apache.james.webadmin.integration.rabbitmq;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -34,7 +34,7 @@ import org.apache.james.webadmin.integration.QuotaSearchIntegrationTest;
import org.junit.jupiter.api.extension.RegisterExtension;
class RabbitMQQuotaSearchIntegrationTest extends QuotaSearchIntegrationTest {
- public static final DockerElasticSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerElasticSearchExtension();
+ public static final DockerOpenSearchExtension ELASTIC_SEARCH_EXTENSION = new DockerOpenSearchExtension();
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
CassandraRabbitMQJamesConfiguration.builder()
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
index 1c009845a7..a4fe3eb405 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
@@ -35,7 +35,7 @@ import java.util.List;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -76,8 +76,8 @@ class RabbitMQReindexingWithEventDeadLettersTest {
.atMost(Duration.ofMinutes(5))
.await();
- private static final DockerElasticSearchExtension dockerElasticSearch =
- new DockerElasticSearchExtension().withRequestTimeout(java.time.Duration.ofSeconds(5));
+ private static final DockerOpenSearchExtension dockerElasticSearch =
+ new DockerOpenSearchExtension().withRequestTimeout(java.time.Duration.ofSeconds(5));
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java
index 1cfad767dc..dee0c71480 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java
@@ -25,7 +25,7 @@ import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
import org.apache.james.CleanupTasksPerformer;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -76,7 +76,7 @@ class RabbitMQUnauthorizedEndpointsTest extends UnauthorizedEndpointsTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerBlobGCIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerBlobGCIntegrationTest.java
index b63d6361f3..6f0cc0f9de 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerBlobGCIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerBlobGCIntegrationTest.java
@@ -33,7 +33,7 @@ import javax.mail.util.SharedByteArrayInputStream;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.GuiceModuleTestExtension;
import org.apache.james.JamesServerBuilder;
@@ -106,7 +106,7 @@ class RabbitMQWebAdminServerBlobGCIntegrationTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationImmutableTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationImmutableTest.java
index 535fd91335..09730d7e19 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationImmutableTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationImmutableTest.java
@@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -61,7 +61,7 @@ class RabbitMQWebAdminServerIntegrationImmutableTest extends WebAdminServerInteg
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
index b81a1f75f8..3d4b1de943 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
@@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.is;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -68,7 +68,7 @@ class RabbitMQWebAdminServerIntegrationTest extends WebAdminServerIntegrationTes
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationImmutableTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationImmutableTest.java
index 0218422023..8c31b9dc12 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationImmutableTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationImmutableTest.java
@@ -30,7 +30,7 @@ import static org.hamcrest.collection.IsMapWithSize.anEmptyMap;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -75,7 +75,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationImmutableTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
index 4e5ba18230..6d4b342ff5 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
@@ -39,7 +39,7 @@ import javax.mail.Flags;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -106,7 +106,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest {
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new AwsS3BlobStoreExtension())
.extension(new RabbitMQExtension())
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
index c8cbcdd6de..687747fb84 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java
@@ -22,7 +22,7 @@ package org.apache.james.webadmin.integration.rabbitmq.vault;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class RabbitMQDeletedMessageVaultIntegrationTest extends DeletedMessageVaultIntegrationTest {
- private static final DockerElasticSearchExtension ES_EXTENSION = new DockerElasticSearchExtension();
+ private static final DockerOpenSearchExtension ES_EXTENSION = new DockerOpenSearchExtension();
@RegisterExtension
static JamesServerExtension testExtension = new JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
index 639036df74..def60778f9 100644
--- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java
@@ -22,7 +22,7 @@ package org.apache.james.webadmin.integration.rabbitmq.vault;
import org.apache.james.CassandraExtension;
import org.apache.james.CassandraRabbitMQJamesConfiguration;
import org.apache.james.CassandraRabbitMQJamesServerMain;
-import org.apache.james.DockerElasticSearchExtension;
+import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.SearchConfiguration;
@@ -53,7 +53,7 @@ class RabbitMQLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExp
.noCryptoConfig())
.searchConfiguration(SearchConfiguration.elasticSearch())
.build())
- .extension(new DockerElasticSearchExtension())
+ .extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new AwsS3BlobStoreExtension())
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org