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:08 UTC
[james-project] 15/26: JAMES-3771 search.properties: implementation 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 8289056660b69732e428cda7f59aff1ece964bab
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Aug 5 11:19:54 2022 +0700
JAMES-3771 search.properties: implementation elastic -> opensearch
---
.../james/mpt/smtp/CassandraForwardSmtpTest.java | 2 +-
.../mpt/smtp/CassandraSmtpStarttlsCommandTest.java | 2 +-
.../james/AuthenticatedCassandraJamesServerTest.java | 4 ++--
.../test/java/org/apache/james/CacheSessionTest.java | 2 +-
.../org/apache/james/CassandraJamesServerTest.java | 2 +-
.../java/org/apache/james/CassandraJmapTestRule.java | 2 +-
.../org/apache/james/CassandraLdapJamesServerTest.java | 2 +-
.../apache/james/CassandraLdapJmapJamesServerTest.java | 2 +-
.../james/CassandraMailRepositoryIntegrationTest.java | 2 +-
.../java/org/apache/james/CassandraNodeConfTest.java | 2 +-
.../java/org/apache/james/CassandraWithTikaTest.java | 2 +-
.../apache/james/DefaultCassandraJamesServerTest.java | 2 +-
.../src/test/java/org/apache/james/ESReporterTest.java | 2 +-
.../org/apache/james/JamesCapabilitiesServerTest.java | 2 +-
.../james/JamesServerWithRetryConnectionTest.java | 8 ++++----
.../JamesWithNonCompatibleElasticSearchServerTest.java | 2 +-
.../java/org/apache/james/KeyspaceCreationTest.java | 8 ++++----
.../james/WithCassandraBlobStoreImmutableTest.java | 2 +-
.../CassandraSchemaVersionStartUpCheckTest.java | 2 +-
.../james/CassandraRabbitMQAwsS3JmapTestRule.java | 2 +-
.../james/CassandraRabbitMQJamesServerFixture.java | 2 +-
.../CassandraRabbitMQLdapJmapJamesServerTest.java | 2 +-
.../org/apache/james/NamespaceConfigurationTest.java | 2 +-
.../java/org/apache/james/WithCacheImmutableTest.java | 2 +-
...thCassandraDeduplicationBlobStoreImmutableTest.java | 2 +-
...WithCassandraDeduplicationBlobStoreMutableTest.java | 2 +-
...WithCassandraPassThroughBlobStoreImmutableTest.java | 2 +-
.../WithCassandraPassThroughBlobStoreMutableTest.java | 2 +-
.../james/WithEncryptedBlobStoreImmutableTest.java | 2 +-
.../james/WithEncryptedBlobStoreMutableTest.java | 2 +-
.../org/apache/james/DistributedPOP3ServerTest.java | 2 +-
.../java/org/apache/james/SearchConfiguration.java | 18 +++++++++---------
.../java/org/apache/james/SearchModuleChooser.java | 2 +-
.../java/org/apache/james/SearchConfigurationTest.java | 16 ++++++++--------
.../jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java | 2 +-
.../rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java | 2 +-
.../distributed/DistributedAuthenticationTest.java | 2 +-
.../rfc8621/distributed/DistributedEchoMethodTest.java | 2 +-
.../distributed/DistributedEmailQueryMethodTest.java | 2 ++
.../distributed/DistributedIdentityGetTest.java | 2 +-
.../distributed/DistributedIdentitySetTest.java | 2 +-
.../distributed/DistributedSessionRouteTest.java | 2 +-
.../distributed/DistributedThreadGetMethodTest.java | 2 +-
.../rabbitmq/ConsistencyTasksIntegrationTest.java | 2 +-
.../integration/rabbitmq/FixingGhostMailboxTest.java | 2 +-
.../rabbitmq/MailReceptionCheckIntegrationTest.java | 2 +-
.../rabbitmq/RabbitMQAuthorizedEndpointsTest.java | 2 +-
.../RabbitMQEventDeadLettersIntegrationTest.java | 2 +-
...MQFastViewProjectionHealthCheckIntegrationTest.java | 2 +-
.../rabbitmq/RabbitMQForwardIntegrationTest.java | 2 +-
.../rabbitmq/RabbitMQJwtFilterIntegrationTest.java | 2 +-
.../rabbitmq/RabbitMQQuotaSearchIntegrationTest.java | 2 +-
.../RabbitMQReindexingWithEventDeadLettersTest.java | 2 +-
.../rabbitmq/RabbitMQUnauthorizedEndpointsTest.java | 2 +-
.../RabbitMQWebAdminServerBlobGCIntegrationTest.java | 2 +-
...RabbitMQWebAdminServerIntegrationImmutableTest.java | 2 +-
.../RabbitMQWebAdminServerIntegrationTest.java | 2 +-
...erverTaskSerializationIntegrationImmutableTest.java | 2 +-
...WebAdminServerTaskSerializationIntegrationTest.java | 2 +-
.../RabbitMQDeletedMessageVaultIntegrationTest.java | 2 +-
...itMQLinshareBlobExportMechanismIntegrationTest.java | 2 +-
upgrade-instructions.md | 3 +++
62 files changed, 87 insertions(+), 82 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 532e82cf28..819c9cb727 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
@@ -44,7 +44,7 @@ public class CassandraForwardSmtpTest implements ForwardSmtpTest {
}
@Order(1)
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(cassandraExtension)
.extension(new InMemoryDnsExtension())
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 af2bedbb9e..3dfe6e7e1d 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
@@ -39,7 +39,7 @@ public class CassandraSmtpStarttlsCommandTest extends SmtpStarttlsCommandTest {
@Order(1)
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(cassandraExtension)
.extension(new InMemoryDnsExtension())
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 d66cdc5640..cfe6f7477d 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
@@ -40,7 +40,7 @@ class AuthenticatedCassandraJamesServerTest {
@Nested
class AuthenticationTest implements JamesServerContract {
@RegisterExtension
- JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(cassandraExtension)
.server(CassandraJamesServerMain::createServer)
@@ -55,7 +55,7 @@ class AuthenticatedCassandraJamesServerTest {
@Nested
class AuthenticationFailureTest {
@RegisterExtension
- JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(cassandraExtension)
.disableAutoStart()
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 088631c11a..216e7f8924 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
@@ -77,7 +77,7 @@ class CacheSessionTest {
CassandraJamesServerConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 96c1c2d5f7..97db79fc00 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
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraJamesServerTest implements JamesServerContract, JmapJamesServerContract {
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
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 648fc53045..84a93bb5d2 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
@@ -56,7 +56,7 @@ public class CassandraJmapTestRule implements TestRule {
CassandraJamesServerConfiguration configuration = CassandraJamesServerConfiguration.builder()
.workingDirectory(temporaryFolder.newFolder())
.configurationFromClasspath()
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build();
return CassandraJamesServerMain.createServer(configuration)
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 24487e786d..109001241a 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
@@ -61,7 +61,7 @@ class CassandraLdapJamesServerTest implements JamesServerContract {
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder
.forConfiguration(configuration -> configuration
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.usersRepository(UsersRepositoryModuleChooser.Implementation.LDAP))
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 bb965e9cf0..be6aea3756 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
@@ -29,7 +29,7 @@ class CassandraLdapJmapJamesServerTest implements JmapJamesServerContract {
@RegisterExtension
static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder
.forConfiguration(configuration -> configuration
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.usersRepository(UsersRepositoryModuleChooser.Implementation.LDAP))
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 e192bb6790..3634152afa 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
@@ -46,7 +46,7 @@ class CassandraMailRepositoryIntegrationTest {
private SMTPMessageSender smtpMessageSender = new SMTPMessageSender("other.com");
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
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 1349527f61..76d6d178df 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
@@ -42,7 +42,7 @@ class CassandraNodeConfTest {
private static final int CASSANDRA_PORT = 9042;
private static JamesServerBuilder extensionBuilder() {
- return TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ return TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
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 ebe421c64c..dc412a2f2e 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
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraWithTikaTest implements JamesServerContract {
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new CassandraExtension())
.extension(new TikaExtension())
.extension(new DockerOpenSearchExtension())
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 8c1fd19ad3..160f417a2c 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
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class DefaultCassandraJamesServerTest {
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
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 02881bf616..29a4b7d8d5 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
@@ -63,7 +63,7 @@ class ESReporterTest {
static final DockerOpenSearchExtension elasticSearchExtension = new DockerOpenSearchExtension();
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(elasticSearchExtension)
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
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 c705d65034..20b41d3142 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
@@ -36,7 +36,7 @@ class JamesCapabilitiesServerTest {
private static final MailboxManager mailboxManager = mock(MailboxManager.class);
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
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 d93b8110ae..bcea7a3b67 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,12 +42,12 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class JamesServerWithRetryConnectionTest {
private static final long WAITING_TIME = TimeUnit.MILLISECONDS.convert(10, TimeUnit.SECONDS);
- private static final DockerOpenSearchExtension dockerElasticSearch = new DockerOpenSearchExtension();
+ private static final DockerOpenSearchExtension dockerOpenSearch = new DockerOpenSearchExtension();
private static final CassandraExtension dockerCassandra = new CassandraExtension();
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
- .extension(dockerElasticSearch)
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
+ .extension(dockerOpenSearch)
.extension(dockerCassandra)
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
@@ -88,7 +88,7 @@ class JamesServerWithRetryConnectionTest {
void serverShouldRetryToConnectToOpenSearchWhenStartService(GuiceJamesServer server) throws Exception {
dockerOpenSearch.getDockerES().pause();
- waitToStartContainer(WAITING_TIME, dockerElasticSearch.getDockerES()::unpause);
+ waitToStartContainer(WAITING_TIME, dockerOpenSearch.getDockerES()::unpause);
assertThatServerStartCorrectly(server);
}
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 d6c405a8c9..078782885c 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
@@ -37,7 +37,7 @@ class JamesWithNonCompatibleElasticSearchServerTest {
static DockerOpenSearch dockerES6 = new DockerOpenSearch.NoAuth(Images.ELASTICSEARCH_6);
@RegisterExtension
- static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension(dockerES6))
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
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 c4ed7707bb..f3a81e7473 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
@@ -33,7 +33,7 @@ class KeyspaceCreationTest {
@Nested
class CreateWhenKeyspaceExists {
@RegisterExtension
- JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(CassandraJamesServerMain::createServer)
@@ -54,7 +54,7 @@ class KeyspaceCreationTest {
@Nested
class CreateWhenDoesNotExistAndHasRights {
@RegisterExtension
- JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(CassandraJamesServerMain::createServer)
@@ -81,7 +81,7 @@ class KeyspaceCreationTest {
@Nested
class CreateWhenDoesNotExistAndDoNotHaveRights {
@RegisterExtension
- JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(CassandraJamesServerMain::createServer)
@@ -108,7 +108,7 @@ class KeyspaceCreationTest {
@Nested
class StartWhenKeyspaceDoesNotExist {
@RegisterExtension
- JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(CassandraJamesServerMain::createServer)
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 426e4eedc9..81a16c55d0 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
@@ -30,7 +30,7 @@ class WithCassandraBlobStoreImmutableTest implements JmapJamesServerContract, Ja
.build();
static JamesServerBuilder<CassandraJamesServerConfiguration> baseExtensionBuilder() {
- return TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.elasticSearch())
+ return TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
.server(configuration -> CassandraJamesServerMain.createServer(configuration)
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 ed1f92bef6..bb6248eda7 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
@@ -63,7 +63,7 @@ class CassandraSchemaVersionStartUpCheckTest {
CassandraJamesServerConfiguration.builder()
.workingDirectory(tmpDir)
.configurationFromClasspath()
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 8639697246..21a4b5062d 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
@@ -66,7 +66,7 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build();
return CassandraRabbitMQJamesServerMain.createServer(configuration)
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 6d7cdd1173..8a5c75a285 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
@@ -38,7 +38,7 @@ public class CassandraRabbitMQJamesServerFixture {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 3efeb0e60c..c8361cf891 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
@@ -85,7 +85,7 @@ class CassandraRabbitMQLdapJmapJamesServerTest {
.workingDirectory(tmpDir)
.configurationFromClasspath()
.blobStore(blobStoreConfiguration)
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.usersRepository(UsersRepositoryModuleChooser.Implementation.LDAP)
.build())
.extension(new DockerOpenSearchExtension())
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 a97a2e8e09..584d35e4b8 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
@@ -59,7 +59,7 @@ class NamespaceConfigurationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 7ec6a97df2..7264a35df8 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
@@ -43,7 +43,7 @@ class WithCacheImmutableTest implements JmapJamesServerContract, JamesServerCont
.enableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 4829b71d65..7fea0a5682 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
@@ -34,7 +34,7 @@ public class WithCassandraDeduplicationBlobStoreImmutableTest implements JmapJam
.blobStore(BlobStoreConfiguration.cassandra()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
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 40184e06f8..fb7835cd3c 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
@@ -60,7 +60,7 @@ public class WithCassandraDeduplicationBlobStoreMutableTest implements MailsShou
.blobStore(BlobStoreConfiguration.cassandra()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
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 a2fb03b391..df0e94acd8 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
@@ -34,7 +34,7 @@ public class WithCassandraPassThroughBlobStoreImmutableTest implements JmapJames
.blobStore(BlobStoreConfiguration.cassandra()
.passthrough()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
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 556df99b7c..2f015a6396 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
@@ -60,7 +60,7 @@ public class WithCassandraPassThroughBlobStoreMutableTest implements MailsShould
.blobStore(BlobStoreConfiguration.cassandra()
.passthrough()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
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 411c2cf2ae..6cbcd06947 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
@@ -39,7 +39,7 @@ public class WithEncryptedBlobStoreImmutableTest implements JmapJamesServerContr
// Hex.encode("salty".getBytes(StandardCharsets.UTF_8))
.salt("73616c7479")
.build()))
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
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 4ce5edc602..2034b0b0c0 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
@@ -38,7 +38,7 @@ public class WithEncryptedBlobStoreMutableTest implements MailsShouldBeWellRecei
// Hex.encode("salty".getBytes(StandardCharsets.UTF_8))
.salt("73616c7479")
.build()))
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
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 e1bd2fa0ec..5dab6f3d6b 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
@@ -40,7 +40,7 @@ public class DistributedPOP3ServerTest implements Pop3ServerContract {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
diff --git a/server/container/guice/opensearch/src/main/java/org/apache/james/SearchConfiguration.java b/server/container/guice/opensearch/src/main/java/org/apache/james/SearchConfiguration.java
index 0840e5846c..70848d1495 100644
--- a/server/container/guice/opensearch/src/main/java/org/apache/james/SearchConfiguration.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/SearchConfiguration.java
@@ -32,7 +32,7 @@ public class SearchConfiguration {
public enum Implementation {
Scanning,
- ElasticSearch
+ OpenSearch
}
public static SearchConfiguration parse(PropertiesProvider propertiesProvider) throws ConfigurationException {
@@ -40,22 +40,22 @@ public class SearchConfiguration {
Configuration configuration = propertiesProvider.getConfiguration(SEARCH_CONFIGURATION_NAME);
return SearchConfiguration.from(configuration);
} catch (FileNotFoundException e) {
- LOGGER.debug("Could not find {} configuration file, enabling elasticsearch by default", SEARCH_CONFIGURATION_NAME);
- return elasticSearch();
+ LOGGER.debug("Could not find {} configuration file, enabling opensearch by default", SEARCH_CONFIGURATION_NAME);
+ return openSearch();
}
}
static SearchConfiguration from(Configuration configuration) throws ConfigurationException {
- String searchOption = configuration.getString("implementation", Implementation.ElasticSearch.name());
- if (searchOption.equalsIgnoreCase(Implementation.ElasticSearch.name())) {
- return elasticSearch();
+ String searchOption = configuration.getString("implementation", Implementation.OpenSearch.name());
+ if (searchOption.equalsIgnoreCase(Implementation.OpenSearch.name())) {
+ return openSearch();
}
if (searchOption.equalsIgnoreCase(Implementation.Scanning.name())) {
return scanning();
}
throw new ConfigurationException(String.format("'implementation' parameter in '%s.properties' should have '%s' or '%s' value",
SEARCH_CONFIGURATION_NAME,
- Implementation.ElasticSearch.name(),
+ Implementation.OpenSearch.name(),
Implementation.Scanning.name()));
}
@@ -63,8 +63,8 @@ public class SearchConfiguration {
return new SearchConfiguration(Implementation.Scanning);
}
- public static SearchConfiguration elasticSearch() {
- return new SearchConfiguration(Implementation.ElasticSearch);
+ public static SearchConfiguration openSearch() {
+ return new SearchConfiguration(Implementation.OpenSearch);
}
private static final Logger LOGGER = LoggerFactory.getLogger(SearchConfiguration.class);
diff --git a/server/container/guice/opensearch/src/main/java/org/apache/james/SearchModuleChooser.java b/server/container/guice/opensearch/src/main/java/org/apache/james/SearchModuleChooser.java
index 5432f217e3..41ce755338 100644
--- a/server/container/guice/opensearch/src/main/java/org/apache/james/SearchModuleChooser.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/SearchModuleChooser.java
@@ -133,7 +133,7 @@ public class SearchModuleChooser {
public static List<Module> chooseModules(SearchConfiguration searchConfiguration) {
switch (searchConfiguration.getImplementation()) {
- case ElasticSearch:
+ case OpenSearch:
return ImmutableList.of(
new OpenSearchClientModule(),
new OpenSearchMailboxModule(),
diff --git a/server/container/guice/opensearch/src/test/java/org/apache/james/SearchConfigurationTest.java b/server/container/guice/opensearch/src/test/java/org/apache/james/SearchConfigurationTest.java
index ecb0a628a7..0a23304378 100644
--- a/server/container/guice/opensearch/src/test/java/org/apache/james/SearchConfigurationTest.java
+++ b/server/container/guice/opensearch/src/test/java/org/apache/james/SearchConfigurationTest.java
@@ -36,25 +36,25 @@ class SearchConfigurationTest {
}
@Test
- void searchImplementationShouldReturnElasticSearchByDefault() throws Exception {
+ void searchImplementationShouldReturnOpenSearchByDefault() throws Exception {
assertThat(SearchConfiguration.from(new PropertiesConfiguration()).getImplementation())
- .isEqualTo(SearchConfiguration.Implementation.ElasticSearch);
+ .isEqualTo(SearchConfiguration.Implementation.OpenSearch);
}
@Test
- void searchImplementationShouldReturnElasticSearchWhenSetToElasticSearch() throws Exception {
+ void searchImplementationShouldReturnOpenSearchWhenSetToOpenSearch() throws Exception {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("implementation", "ElasticSearch");
+ configuration.addProperty("implementation", "OpenSearch");
assertThat(SearchConfiguration.from(configuration).getImplementation())
- .isEqualTo(SearchConfiguration.Implementation.ElasticSearch);
+ .isEqualTo(SearchConfiguration.Implementation.OpenSearch);
}
@Test
- void searchImplementationShouldReturnElasticSearchWhenSetToElasticSearchWithAlternativeCase() throws Exception {
+ void searchImplementationShouldReturnOpenSearchWhenSetToOpenSearchWithAlternativeCase() throws Exception {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("implementation", "elasticsearch");
+ configuration.addProperty("implementation", "opensearch");
assertThat(SearchConfiguration.from(configuration).getImplementation())
- .isEqualTo(SearchConfiguration.Implementation.ElasticSearch);
+ .isEqualTo(SearchConfiguration.Implementation.OpenSearch);
}
@Test
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 f8e33956ca..971a41cca4 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
@@ -47,7 +47,7 @@ public class RabbitMQAwsS3SendMDNMethodTest extends SendMDNMethodTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 5e9130ee71..5954e479c1 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
@@ -81,7 +81,7 @@ public class RabbitMQAwsS3Stepdefs {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build();
mainStepdefs.jmapServer = CassandraRabbitMQJamesServerMain.createServer(configuration)
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 cf166bfbc0..3870a593a4 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
@@ -44,7 +44,7 @@ class DistributedAuthenticationTest implements AuthenticationContract {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 7a032d38c3..89786c0dc8 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
@@ -45,7 +45,7 @@ public class DistributedEchoMethodTest implements EchoMethodContract {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 d6716a16e9..7f59a9e8fd 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
@@ -25,6 +25,7 @@ import org.apache.james.CassandraRabbitMQJamesServerMain;
import org.apache.james.DockerOpenSearchExtension;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
+import org.apache.james.SearchConfiguration;
import org.apache.james.jmap.rfc8621.contract.EmailQueryMethodContract;
import org.apache.james.modules.AwsS3BlobStoreExtension;
import org.apache.james.modules.RabbitMQExtension;
@@ -45,6 +46,7 @@ public class DistributedEmailQueryMethodTest implements EmailQueryMethodContract
.disableCache()
.deduplication()
.noCryptoConfig())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(ELASTIC_SEARCH_EXTENSION)
.extension(new CassandraExtension())
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 cad0ade758..a8ce325c31 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
@@ -45,7 +45,7 @@ class DistributedIdentityGetTest implements IdentityGetContract {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 fffcee7e30..7c967365b7 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
@@ -45,7 +45,7 @@ public class DistributedIdentitySetTest implements IdentitySetContract {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 17ae803ec7..4478878945 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
@@ -43,7 +43,7 @@ public class DistributedSessionRouteTest implements SessionRoutesContract {
.disableCache()
.passthrough()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 d4e191ad1d..ec4d41534c 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
@@ -76,7 +76,7 @@ public class DistributedThreadGetMethodTest implements ThreadGetContract {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 a2947c1505..063e351697 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
@@ -133,7 +133,7 @@ class ConsistencyTasksIntegrationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 18599c373d..6418beffea 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
@@ -120,7 +120,7 @@ class FixingGhostMailboxTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 b5f59cd065..2ca45f44fd 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
@@ -70,7 +70,7 @@ class MailReceptionCheckIntegrationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(CASSANDRA_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 478334edca..fcb4bfc5a9 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
@@ -48,7 +48,7 @@ class RabbitMQAuthorizedEndpointsTest extends AuthorizedEndpointsTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 5e31d41d99..74540455ce 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
@@ -210,7 +210,7 @@ class RabbitMQEventDeadLettersIntegrationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 619ba27f82..61440d1723 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
@@ -44,7 +44,7 @@ class RabbitMQFastViewProjectionHealthCheckIntegrationTest extends FastViewProje
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 196547ba57..fcefd0b38f 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
@@ -44,7 +44,7 @@ class RabbitMQForwardIntegrationTest extends ForwardIntegrationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 c9fdd713c2..bad5b79d57 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
@@ -50,7 +50,7 @@ class RabbitMQJwtFilterIntegrationTest extends JwtFilterIntegrationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 f64131249c..29c5329df7 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
@@ -45,7 +45,7 @@ class RabbitMQQuotaSearchIntegrationTest extends QuotaSearchIntegrationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(ELASTIC_SEARCH_EXTENSION)
.extension(new CassandraExtension())
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 a4fe3eb405..288fd3ab8c 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
@@ -89,7 +89,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(dockerElasticSearch)
.extension(new CassandraExtension())
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 dee0c71480..2e71be399f 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
@@ -74,7 +74,7 @@ class RabbitMQUnauthorizedEndpointsTest extends UnauthorizedEndpointsTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 6f0cc0f9de..21137c6ab5 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
@@ -104,7 +104,7 @@ class RabbitMQWebAdminServerBlobGCIntegrationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 09730d7e19..979407793e 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
@@ -59,7 +59,7 @@ class RabbitMQWebAdminServerIntegrationImmutableTest extends WebAdminServerInteg
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 3d4b1de943..fe6255946d 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
@@ -66,7 +66,7 @@ class RabbitMQWebAdminServerIntegrationTest extends WebAdminServerIntegrationTes
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 8c31b9dc12..032aa85d28 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
@@ -73,7 +73,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationImmutableTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 6d4b342ff5..015617a900 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
@@ -104,7 +104,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest {
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
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 687747fb84..575a42935b 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
@@ -53,7 +53,7 @@ class RabbitMQDeletedMessageVaultIntegrationTest extends DeletedMessageVaultInte
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(ES_EXTENSION)
.extension(new CassandraExtension())
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 def60778f9..83b3652011 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
@@ -51,7 +51,7 @@ class RabbitMQLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExp
.disableCache()
.deduplication()
.noCryptoConfig())
- .searchConfiguration(SearchConfiguration.elasticSearch())
+ .searchConfiguration(SearchConfiguration.openSearch())
.build())
.extension(new DockerOpenSearchExtension())
.extension(new CassandraExtension())
diff --git a/upgrade-instructions.md b/upgrade-instructions.md
index 616c509182..c0b90dcefa 100644
--- a/upgrade-instructions.md
+++ b/upgrade-instructions.md
@@ -41,6 +41,9 @@ You would need to manually delete the bindings from the event queues in RabbitMQ
Configuration file was relocated to `opensearch.properties` and properties are now prefixed by `opensearch.` rather than
`elasticsearch.`.
+Furthermore, implementation name that could be specified explicitly in `search.properties` has changed from `elasticsearch`
+to `opensearch`.
+
### Migration to Cassandra driver 4
Date: 07/06/2022
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org