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:01 UTC
[james-project] 08/26: JAMES-3771 Rename backend commons files: ElasticSearch => OpenSearch [2]
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 1738b3f534fcf27e1d8420fba72a91ea8c7af1af
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Aug 5 10:26:27 2022 +0700
JAMES-3771 Rename backend commons files: ElasticSearch => OpenSearch [2]
---
.../james/backends/opensearch/ClientProvider.java | 24 ++++++++--------
.../opensearch/DeleteByQueryPerformer.java | 4 +--
.../backends/opensearch/IndexCreationFactory.java | 18 ++++++------
.../backends/opensearch/OpenSearchHealthCheck.java | 8 +++---
.../backends/opensearch/OpenSearchIndexer.java | 4 +--
...rchClient.java => ReactorOpenSearchClient.java} | 4 +--
.../backends/opensearch/search/ScrolledSearch.java | 6 ++--
...iderImplConnectionAuthESIgnoreSSLCheckTest.java | 2 +-
...ImplConnectionAuthESOverrideTrustStoreTest.java | 2 +-
.../ClientProviderImplConnectionContract.java | 2 +-
.../ClientProviderImplConnectionNoAuthESTest.java | 2 +-
...ton.java => DockerAuthOpenSearchSingleton.java} | 2 +-
.../backends/opensearch/DockerOpenSearch.java | 20 +++++++-------
.../opensearch/DockerOpenSearchExtension.java | 8 +++---
...ngleton.java => DockerOpenSearchSingleton.java} | 2 +-
.../opensearch/IndexCreationFactoryTest.java | 4 +--
.../OpenSearchHealthCheckConnectionTest.java | 12 ++++----
.../opensearch/OpenSearchHealthCheckTest.java | 6 ++--
.../backends/opensearch/OpenSearchIndexerTest.java | 32 +++++++++++-----------
.../opensearch/search/ScrolledSearchTest.java | 18 ++++++------
.../src/test/resources/auth-es/README.md | 5 +++-
.../opensearch/MailboxIndexCreationUtil.java | 14 +++++-----
.../opensearch/search/OpenSearchSearcher.java | 6 ++--
.../opensearch/OpenSearchIntegrationTest.java | 4 +--
.../OpenSearchListeningMessageSearchIndexTest.java | 4 +--
.../opensearch/search/OpenSearchSearcherTest.java | 8 +++---
.../search/opensearch/OpenSearchQuotaSearcher.java | 6 ++--
.../opensearch/QuotaSearchIndexCreationUtil.java | 14 +++++-----
.../OpenSearchQuotaSearchTestSystemExtension.java | 4 +--
.../events/OpenSearchQuotaMailboxListenerTest.java | 4 +--
.../elasticsearch/host/OpenSearchHostSystem.java | 8 +++---
.../apache/james/DockerElasticSearchExtension.java | 6 ++--
.../org/apache/james/DockerElasticSearchRule.java | 4 +--
.../test/java/org/apache/james/ESReporterTest.java | 12 ++++----
.../apache/james/DockerElasticSearchExtension.java | 6 ++--
.../org/apache/james/DockerElasticSearchRule.java | 1 -
.../modules/mailbox/OpenSearchClientModule.java | 4 +--
.../modules/mailbox/OpenSearchMailboxModule.java | 8 +++---
.../mailbox/OpenSearchQuotaSearcherModule.java | 8 +++---
.../modules/mailbox/OpenSearchStartUpCheck.java | 4 +--
.../DistributedThreadGetMethodTest.java | 8 +++---
.../james/webadmin/routes/MailboxesRoutesTest.java | 8 +++---
.../routes/OpenSearchQuotaSearchExtension.java | 8 +++---
.../webadmin/routes/UserMailboxesRoutesTest.java | 8 +++---
44 files changed, 172 insertions(+), 170 deletions(-)
diff --git a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ClientProvider.java b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ClientProvider.java
index 0ad8bf9b18..52bf765741 100644
--- a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ClientProvider.java
+++ b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ClientProvider.java
@@ -54,7 +54,7 @@ import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
import reactor.util.retry.Retry;
-public class ClientProvider implements Provider<ReactorElasticSearchClient> {
+public class ClientProvider implements Provider<ReactorOpenSearchClient> {
private static class HttpAsyncClientConfigurer {
@@ -75,7 +75,7 @@ public class ClientProvider implements Provider<ReactorElasticSearchClient> {
configuration.getMaxConnections().ifPresent(builder::setMaxConnTotal);
configuration.getMaxConnectionsPerHost().ifPresent(builder::setMaxConnPerRoute);
- builder.setThreadFactory(NamedThreadFactory.withName("ElasticSearch-driver"));
+ builder.setThreadFactory(NamedThreadFactory.withName("OpenSearch-driver"));
return builder;
}
@@ -181,31 +181,31 @@ public class ClientProvider implements Provider<ReactorElasticSearchClient> {
private static final Logger LOGGER = LoggerFactory.getLogger(ClientProvider.class);
private final OpenSearchConfiguration configuration;
- private final RestHighLevelClient elasticSearchRestHighLevelClient;
+ private final RestHighLevelClient openSearchRestHighLevelClient;
private final HttpAsyncClientConfigurer httpAsyncClientConfigurer;
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
@Inject
public ClientProvider(OpenSearchConfiguration configuration) {
this.httpAsyncClientConfigurer = new HttpAsyncClientConfigurer(configuration);
this.configuration = configuration;
- this.elasticSearchRestHighLevelClient = connect(configuration);
- this.client = new ReactorElasticSearchClient(this.elasticSearchRestHighLevelClient);
+ this.openSearchRestHighLevelClient = connect(configuration);
+ this.client = new ReactorOpenSearchClient(this.openSearchRestHighLevelClient);
}
private RestHighLevelClient connect(OpenSearchConfiguration configuration) {
Duration waitDelay = Duration.ofMillis(configuration.getMinDelay());
boolean suppressLeadingZeroElements = true;
boolean suppressTrailingZeroElements = true;
- return Mono.fromCallable(() -> connectToCluster(configuration))
- .doOnError(e -> LOGGER.warn("Error establishing ElasticSearch connection. Next retry scheduled in {}",
+ return Mono.fromCallable(this::connectToCluster)
+ .doOnError(e -> LOGGER.warn("Error establishing OpenSearch connection. Next retry scheduled in {}",
DurationFormatUtils.formatDurationWords(waitDelay.toMillis(), suppressLeadingZeroElements, suppressTrailingZeroElements), e))
.retryWhen(Retry.backoff(configuration.getMaxRetries(), waitDelay).scheduler(Schedulers.boundedElastic()))
.block();
}
- private RestHighLevelClient connectToCluster(OpenSearchConfiguration configuration) {
- LOGGER.info("Trying to connect to ElasticSearch service at {}", LocalDateTime.now());
+ private RestHighLevelClient connectToCluster() {
+ LOGGER.info("Trying to connect to OpenSearch service at {}", LocalDateTime.now());
return new RestHighLevelClient(
RestClient
@@ -220,12 +220,12 @@ public class ClientProvider implements Provider<ReactorElasticSearchClient> {
}
@Override
- public ReactorElasticSearchClient get() {
+ public ReactorOpenSearchClient get() {
return client;
}
@PreDestroy
public void close() throws IOException {
- elasticSearchRestHighLevelClient.close();
+ openSearchRestHighLevelClient.close();
}
}
diff --git a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/DeleteByQueryPerformer.java b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/DeleteByQueryPerformer.java
index 14846851bd..bff700a518 100644
--- a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/DeleteByQueryPerformer.java
+++ b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/DeleteByQueryPerformer.java
@@ -27,10 +27,10 @@ import reactor.core.publisher.Mono;
public class DeleteByQueryPerformer {
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
private final WriteAliasName aliasName;
- DeleteByQueryPerformer(ReactorElasticSearchClient client, WriteAliasName aliasName) {
+ DeleteByQueryPerformer(ReactorOpenSearchClient client, WriteAliasName aliasName) {
this.client = client;
this.aliasName = aliasName;
}
diff --git a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/IndexCreationFactory.java b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/IndexCreationFactory.java
index 7befb6fd4b..48756d104c 100644
--- a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/IndexCreationFactory.java
+++ b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/IndexCreationFactory.java
@@ -140,15 +140,15 @@ public class IndexCreationFactory {
return new IndexCreationPerformer(nbShards, nbReplica, waitForActiveShards, indexName, aliases.build(), customAnalyzers, customTokenizers);
}
- public ReactorElasticSearchClient createIndexAndAliases(ReactorElasticSearchClient client) {
+ public ReactorOpenSearchClient createIndexAndAliases(ReactorOpenSearchClient client) {
return build().createIndexAndAliases(client, Optional.empty(), Optional.empty());
}
- public ReactorElasticSearchClient createIndexAndAliases(ReactorElasticSearchClient client, XContentBuilder mappingContent) {
+ public ReactorOpenSearchClient createIndexAndAliases(ReactorOpenSearchClient client, XContentBuilder mappingContent) {
return build().createIndexAndAliases(client, Optional.empty(), Optional.of(mappingContent));
}
- public ReactorElasticSearchClient createIndexAndAliases(ReactorElasticSearchClient client, Optional<XContentBuilder> indexSettings, Optional<XContentBuilder> mappingContent) {
+ public ReactorOpenSearchClient createIndexAndAliases(ReactorOpenSearchClient client, Optional<XContentBuilder> indexSettings, Optional<XContentBuilder> mappingContent) {
return build().createIndexAndAliases(client, indexSettings, mappingContent);
}
}
@@ -178,8 +178,8 @@ public class IndexCreationFactory {
this.customTokenizers = customTokenizers;
}
- public ReactorElasticSearchClient createIndexAndAliases(ReactorElasticSearchClient client, Optional<XContentBuilder> indexSettings,
- Optional<XContentBuilder> mappingContent) {
+ public ReactorOpenSearchClient createIndexAndAliases(ReactorOpenSearchClient client, Optional<XContentBuilder> indexSettings,
+ Optional<XContentBuilder> mappingContent) {
Preconditions.checkNotNull(indexName);
try {
createIndexIfNeeded(client, indexName, indexSettings.orElse(generateSetting()), mappingContent);
@@ -191,7 +191,7 @@ public class IndexCreationFactory {
return client;
}
- private void createAliasIfNeeded(ReactorElasticSearchClient client, IndexName indexName, AliasName aliasName) throws IOException {
+ private void createAliasIfNeeded(ReactorOpenSearchClient client, IndexName indexName, AliasName aliasName) throws IOException {
if (!aliasExist(client, aliasName)) {
client.indices()
.updateAliases(
@@ -203,12 +203,12 @@ public class IndexCreationFactory {
}
}
- private boolean aliasExist(ReactorElasticSearchClient client, AliasName aliasName) throws IOException {
+ private boolean aliasExist(ReactorOpenSearchClient client, AliasName aliasName) throws IOException {
return client.indices()
.existsAlias(new GetAliasesRequest().aliases(aliasName.getValue()), RequestOptions.DEFAULT);
}
- private void createIndexIfNeeded(ReactorElasticSearchClient client, IndexName indexName, XContentBuilder settings, Optional<XContentBuilder> mappingContent) throws IOException {
+ private void createIndexIfNeeded(ReactorOpenSearchClient client, IndexName indexName, XContentBuilder settings, Optional<XContentBuilder> mappingContent) throws IOException {
try {
if (!indexExists(client, indexName)) {
CreateIndexRequest request = new CreateIndexRequest(indexName.getValue()).source(settings);
@@ -226,7 +226,7 @@ public class IndexCreationFactory {
}
}
- private boolean indexExists(ReactorElasticSearchClient client, IndexName indexName) throws IOException {
+ private boolean indexExists(ReactorOpenSearchClient client, IndexName indexName) throws IOException {
return client.indices().exists(new GetIndexRequest(indexName.getValue()), RequestOptions.DEFAULT);
}
diff --git a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchHealthCheck.java b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchHealthCheck.java
index 48aadebd70..a0a9c5b515 100644
--- a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchHealthCheck.java
+++ b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchHealthCheck.java
@@ -37,13 +37,13 @@ import com.google.common.annotations.VisibleForTesting;
import reactor.core.publisher.Mono;
public class OpenSearchHealthCheck implements HealthCheck {
- private static final ComponentName COMPONENT_NAME = new ComponentName("ElasticSearch Backend");
+ private static final ComponentName COMPONENT_NAME = new ComponentName("OpenSearch Backend");
private final Set<IndexName> indexNames;
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
@Inject
- OpenSearchHealthCheck(ReactorElasticSearchClient client, Set<IndexName> indexNames) {
+ OpenSearchHealthCheck(ReactorOpenSearchClient client, Set<IndexName> indexNames) {
this.client = client;
this.indexNames = indexNames;
}
@@ -75,7 +75,7 @@ public class OpenSearchHealthCheck implements HealthCheck {
case RED:
return Result.unhealthy(COMPONENT_NAME, response.getClusterName() + " status is RED");
default:
- throw new NotImplementedException("Un-handled ElasticSearch cluster status");
+ throw new NotImplementedException("Un-handled OpenSearch cluster status");
}
}
}
diff --git a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchIndexer.java b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchIndexer.java
index 711fd0d181..9a0002cf91 100644
--- a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchIndexer.java
+++ b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchIndexer.java
@@ -45,11 +45,11 @@ public class OpenSearchIndexer {
private static final Logger LOGGER = LoggerFactory.getLogger(OpenSearchIndexer.class);
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
private final AliasName aliasName;
private final DeleteByQueryPerformer deleteByQueryPerformer;
- public OpenSearchIndexer(ReactorElasticSearchClient client,
+ public OpenSearchIndexer(ReactorOpenSearchClient client,
WriteAliasName aliasName) {
this.client = client;
this.deleteByQueryPerformer = new DeleteByQueryPerformer(client, aliasName);
diff --git a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ReactorElasticSearchClient.java b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ReactorOpenSearchClient.java
similarity index 98%
rename from backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ReactorElasticSearchClient.java
rename to backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ReactorOpenSearchClient.java
index 8f30539cfa..1c739fcf37 100644
--- a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ReactorElasticSearchClient.java
+++ b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ReactorOpenSearchClient.java
@@ -66,10 +66,10 @@ import reactor.core.publisher.Mono;
import reactor.core.publisher.MonoSink;
import reactor.core.scheduler.Schedulers;
-public class ReactorElasticSearchClient implements AutoCloseable {
+public class ReactorOpenSearchClient implements AutoCloseable {
private final RestHighLevelClient client;
- public ReactorElasticSearchClient(RestHighLevelClient client) {
+ public ReactorOpenSearchClient(RestHighLevelClient client) {
this.client = client;
}
diff --git a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/search/ScrolledSearch.java b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/search/ScrolledSearch.java
index cf50ff30a8..ecb9cf955a 100644
--- a/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/search/ScrolledSearch.java
+++ b/backends-common/opensearch/src/main/java/org/apache/james/backends/opensearch/search/ScrolledSearch.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.opensearch.action.search.ClearScrollRequest;
import org.opensearch.action.search.SearchRequest;
import org.opensearch.action.search.SearchResponse;
@@ -42,10 +42,10 @@ public class ScrolledSearch {
private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1);
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
private final SearchRequest searchRequest;
- public ScrolledSearch(ReactorElasticSearchClient client, SearchRequest searchRequest) {
+ public ScrolledSearch(ReactorOpenSearchClient client, SearchRequest searchRequest) {
this.client = client;
this.searchRequest = searchRequest;
}
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionAuthESIgnoreSSLCheckTest.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionAuthESIgnoreSSLCheckTest.java
index a4a7336073..1435f16fe3 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionAuthESIgnoreSSLCheckTest.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionAuthESIgnoreSSLCheckTest.java
@@ -29,7 +29,7 @@ class ClientProviderImplConnectionAuthESIgnoreSSLCheckTest implements ClientProv
@RegisterExtension
static OpenSearchClusterExtension extension = new OpenSearchClusterExtension(new OpenSearchClusterExtension.OpenSearchCluster(
- DockerAuthElasticSearchSingleton.INSTANCE,
+ DockerAuthOpenSearchSingleton.INSTANCE,
new DockerOpenSearch.WithAuth()));
@Override
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionAuthESOverrideTrustStoreTest.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionAuthESOverrideTrustStoreTest.java
index e8a0b4b8ec..e66132458b 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionAuthESOverrideTrustStoreTest.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionAuthESOverrideTrustStoreTest.java
@@ -32,7 +32,7 @@ public class ClientProviderImplConnectionAuthESOverrideTrustStoreTest implements
@RegisterExtension
static OpenSearchClusterExtension extension = new OpenSearchClusterExtension(new OpenSearchClusterExtension.OpenSearchCluster(
- DockerAuthElasticSearchSingleton.INSTANCE,
+ DockerAuthOpenSearchSingleton.INSTANCE,
new DockerOpenSearch.WithAuth()));
@Override
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionContract.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionContract.java
index 9fe764172d..9434324172 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionContract.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionContract.java
@@ -74,7 +74,7 @@ interface ClientProviderImplConnectionContract {
}
default boolean isConnected(ClientProvider clientProvider) {
- try (ReactorElasticSearchClient client = clientProvider.get()) {
+ try (ReactorOpenSearchClient client = clientProvider.get()) {
client.search(
new SearchRequest()
.source(new SearchSourceBuilder().query(QueryBuilders.existsQuery("any"))),
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionNoAuthESTest.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionNoAuthESTest.java
index 492529d41a..65ead27b03 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionNoAuthESTest.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/ClientProviderImplConnectionNoAuthESTest.java
@@ -25,6 +25,6 @@ class ClientProviderImplConnectionNoAuthESTest implements ClientProviderImplConn
@RegisterExtension
static OpenSearchClusterExtension extension = new OpenSearchClusterExtension(new OpenSearchClusterExtension.OpenSearchCluster(
- DockerElasticSearchSingleton.INSTANCE,
+ DockerOpenSearchSingleton.INSTANCE,
new DockerOpenSearch.NoAuth()));
}
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerAuthElasticSearchSingleton.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerAuthOpenSearchSingleton.java
similarity index 96%
rename from backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerAuthElasticSearchSingleton.java
rename to backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerAuthOpenSearchSingleton.java
index 0dfe2551b7..8ddf0f8362 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerAuthElasticSearchSingleton.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerAuthOpenSearchSingleton.java
@@ -19,7 +19,7 @@
package org.apache.james.backends.opensearch;
-public class DockerAuthElasticSearchSingleton {
+public class DockerAuthOpenSearchSingleton {
public static DockerOpenSearch INSTANCE = new DockerOpenSearch.WithAuth();
static {
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearch.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearch.java
index 0b70cf9240..65bd5f114b 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearch.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearch.java
@@ -203,7 +203,7 @@ public interface DockerOpenSearch {
public static final Credential DEFAULT_CREDENTIAL =
Credential.of(DEFAULT_USERNAME, DEFAULT_PASSWORD);
- private final DockerOpenSearch.NoAuth elasticSearch;
+ private final DockerOpenSearch.NoAuth openSearch;
private final DockerContainer nginx;
private final Network network;
@@ -213,10 +213,10 @@ public interface DockerOpenSearch {
WithAuth(String imageName) {
this.network = Network.newNetwork();
- this.elasticSearch = new DockerOpenSearch.NoAuth(
+ this.openSearch = new DockerOpenSearch.NoAuth(
DockerOpenSearch.NoAuth
.defaultContainer(imageName)
- .withLogConsumer(frame -> LOGGER.debug("[ElasticSearch] " + frame.getUtf8String()))
+ .withLogConsumer(frame -> LOGGER.debug("[OpenSearch] " + frame.getUtf8String()))
.withNetwork(network)
.withNetworkAliases("elasticsearch"));
@@ -235,13 +235,13 @@ public interface DockerOpenSearch {
public void start() {
- elasticSearch.start();
+ openSearch.start();
nginx.start();
}
public void stop() {
nginx.stop();
- elasticSearch.stop();
+ openSearch.stop();
}
public int getHttpPort() {
@@ -282,17 +282,17 @@ public interface DockerOpenSearch {
public void pause() {
nginx.pause();
- elasticSearch.pause();
+ openSearch.pause();
}
public void unpause() {
- elasticSearch.unpause();
+ openSearch.unpause();
nginx.unpause();
}
@Override
public boolean isRunning() {
- return nginx.isRunning() && elasticSearch.isRunning();
+ return nginx.isRunning() && openSearch.isRunning();
}
}
@@ -324,13 +324,13 @@ public interface DockerOpenSearch {
default void cleanUpData() {
if (esAPI().deleteAllIndexes().status() != HttpStatus.SC_OK) {
- throw new IllegalStateException("Failed to delete all data from ElasticSearch");
+ throw new IllegalStateException("Failed to delete all data from OpenSearch");
}
}
default void flushIndices() {
if (esAPI().flush().status() != HttpStatus.SC_OK) {
- throw new IllegalStateException("Failed to flush ElasticSearch");
+ throw new IllegalStateException("Failed to flush OpenSearch");
}
}
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearchExtension.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearchExtension.java
index dd4675432b..ff55a0dcb3 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearchExtension.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearchExtension.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ParameterResolver;
public class DockerOpenSearchExtension implements AfterEachCallback, BeforeEachCallback, ParameterResolver {
- private final DockerOpenSearch elasticSearch = DockerElasticSearchSingleton.INSTANCE;
+ private final DockerOpenSearch elasticSearch = DockerOpenSearchSingleton.INSTANCE;
@Override
public void afterEach(ExtensionContext context) {
@@ -40,7 +40,7 @@ public class DockerOpenSearchExtension implements AfterEachCallback, BeforeEachC
if (!elasticSearch.isRunning()) {
elasticSearch.unpause();
}
- awaitForElasticSearch();
+ awaitForOpenSearch();
}
@Override
@@ -53,11 +53,11 @@ public class DockerOpenSearchExtension implements AfterEachCallback, BeforeEachC
return elasticSearch;
}
- public void awaitForElasticSearch() {
+ public void awaitForOpenSearch() {
elasticSearch.flushIndices();
}
- public DockerOpenSearch getDockerElasticSearch() {
+ public DockerOpenSearch getDockerOpenSearch() {
return elasticSearch;
}
}
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerElasticSearchSingleton.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearchSingleton.java
similarity index 96%
rename from backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerElasticSearchSingleton.java
rename to backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearchSingleton.java
index fb87f00c91..b3e3a1d1b8 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerElasticSearchSingleton.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerOpenSearchSingleton.java
@@ -19,7 +19,7 @@
package org.apache.james.backends.opensearch;
-public class DockerElasticSearchSingleton {
+public class DockerOpenSearchSingleton {
public static DockerOpenSearch INSTANCE = new DockerOpenSearch.NoAuth();
static {
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/IndexCreationFactoryTest.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/IndexCreationFactoryTest.java
index 58d8a1581c..8cda09676f 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/IndexCreationFactoryTest.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/IndexCreationFactoryTest.java
@@ -95,11 +95,11 @@ class IndexCreationFactoryTest {
@RegisterExtension
public DockerOpenSearchExtension elasticSearch = new DockerOpenSearchExtension();
- private ReactorElasticSearchClient client;
+ private ReactorOpenSearchClient client;
@BeforeEach
void setUp() {
- client = elasticSearch.getDockerElasticSearch().clientProvider().get();
+ client = elasticSearch.getDockerOpenSearch().clientProvider().get();
}
@AfterEach
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckConnectionTest.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckConnectionTest.java
index d81f59d88d..fe71fcbbbf 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckConnectionTest.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckConnectionTest.java
@@ -32,30 +32,30 @@ class OpenSearchHealthCheckConnectionTest {
private static final Duration REQUEST_TIMEOUT = Duration.ofSeconds(5);
@RegisterExtension
- public DockerOpenSearchExtension elasticSearch = new DockerOpenSearchExtension();
+ public DockerOpenSearchExtension openSearch = new DockerOpenSearchExtension();
private OpenSearchHealthCheck openSearchHealthCheck;
@BeforeEach
void setUp() {
- ReactorElasticSearchClient client = elasticSearch.getDockerElasticSearch().clientProvider(REQUEST_TIMEOUT).get();
+ ReactorOpenSearchClient client = openSearch.getDockerOpenSearch().clientProvider(REQUEST_TIMEOUT).get();
openSearchHealthCheck = new OpenSearchHealthCheck(client, ImmutableSet.of());
}
@Test
- void checkShouldSucceedWhenElasticSearchIsRunning() {
+ void checkShouldSucceedWhenOpenSearchIsRunning() {
assertThat(openSearchHealthCheck.check().block().isHealthy()).isTrue();
}
@Test
- void checkShouldFailWhenElasticSearchIsPaused() {
+ void checkShouldFailWhenOpenSearchIsPaused() {
- elasticSearch.getDockerElasticSearch().pause();
+ openSearch.getDockerOpenSearch().pause();
try {
assertThat(openSearchHealthCheck.check().block().isUnHealthy()).isTrue();
} finally {
- elasticSearch.getDockerElasticSearch().unpause();
+ openSearch.getDockerOpenSearch().unpause();
}
}
}
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckTest.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckTest.java
index becad9a3fb..5bacd05967 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckTest.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckTest.java
@@ -41,21 +41,21 @@ class OpenSearchHealthCheckTest {
}
@Test
- void checkShouldReturnHealthyWhenElasticSearchClusterHealthStatusIsGreen() {
+ void checkShouldReturnHealthyWhenOpenSearchClusterHealthStatusIsGreen() {
FakeClusterHealthResponse response = new FakeClusterHealthResponse(ClusterHealthStatus.GREEN);
assertThat(healthCheck.toHealthCheckResult(response).isHealthy()).isTrue();
}
@Test
- void checkShouldReturnUnHealthyWhenElasticSearchClusterHealthStatusIsRed() {
+ void checkShouldReturnUnHealthyWhenOpenSearchClusterHealthStatusIsRed() {
FakeClusterHealthResponse response = new FakeClusterHealthResponse(ClusterHealthStatus.RED);
assertThat(healthCheck.toHealthCheckResult(response).isUnHealthy()).isTrue();
}
@Test
- void checkShouldReturnHealthyWhenElasticSearchClusterHealthStatusIsYellow() {
+ void checkShouldReturnHealthyWhenOpenSearchClusterHealthStatusIsYellow() {
FakeClusterHealthResponse response = new FakeClusterHealthResponse(ClusterHealthStatus.YELLOW);
assertThat(healthCheck.toHealthCheckResult(response).isHealthy()).isTrue();
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchIndexerTest.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchIndexerTest.java
index 99f3e33516..2c8ba75c6e 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchIndexerTest.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchIndexerTest.java
@@ -61,11 +61,11 @@ class OpenSearchIndexerTest {
@RegisterExtension
public DockerOpenSearchExtension elasticSearch = new DockerOpenSearchExtension();
private OpenSearchIndexer testee;
- private ReactorElasticSearchClient client;
+ private ReactorOpenSearchClient client;
@BeforeEach
void setup() {
- client = elasticSearch.getDockerElasticSearch().clientProvider().get();
+ client = elasticSearch.getDockerOpenSearch().clientProvider().get();
new IndexCreationFactory(OpenSearchConfiguration.DEFAULT_CONFIGURATION)
.useIndex(INDEX_NAME)
.addAlias(ALIAS_NAME)
@@ -85,7 +85,7 @@ class OpenSearchIndexerTest {
testee.index(documentId, content, useDocumentId(documentId)).block();
- awaitForElasticSearch(QueryBuilders.matchQuery("message", "trying"), 1L);
+ awaitForOpenSearch(QueryBuilders.matchQuery("message", "trying"), 1L);
}
@Test
@@ -99,12 +99,12 @@ class OpenSearchIndexerTest {
String content = "{\"message\": \"trying out Elasticsearch\",\"field\":\"Should be unchanged\"}";
testee.index(DOCUMENT_ID, content, useDocumentId(DOCUMENT_ID)).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 1L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 1L);
testee.update(ImmutableList.of(new UpdatedRepresentation(DOCUMENT_ID, "{\"message\": \"mastering out Elasticsearch\"}")), useDocumentId(DOCUMENT_ID)).block();
- awaitForElasticSearch(QueryBuilders.matchQuery("message", "mastering"), 1L);
+ awaitForOpenSearch(QueryBuilders.matchQuery("message", "mastering"), 1L);
- awaitForElasticSearch(QueryBuilders.matchQuery("field", "unchanged"), 1L);
+ awaitForOpenSearch(QueryBuilders.matchQuery("field", "unchanged"), 1L);
}
@Test
@@ -142,11 +142,11 @@ class OpenSearchIndexerTest {
RoutingKey routingKey = useDocumentId(documentId);
testee.index(documentId, content, routingKey).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 1L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 1L);
testee.deleteAllMatchingQuery(termQuery("property", "1"), routingKey).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 0L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 0L);
}
@Test
@@ -165,11 +165,11 @@ class OpenSearchIndexerTest {
String content3 = "{\"message\": \"trying out Elasticsearch 3\", \"property\":\"2\"}";
testee.index(documentId3, content3, ROUTING).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 3L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 3L);
testee.deleteAllMatchingQuery(termQuery("property", "1"), ROUTING).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 1L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 1L);
}
@Test
@@ -178,11 +178,11 @@ class OpenSearchIndexerTest {
String content = "{\"message\": \"trying out Elasticsearch\"}";
testee.index(documentId, content, useDocumentId(documentId)).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 1L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 1L);
testee.delete(ImmutableList.of(documentId), useDocumentId(documentId)).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 0L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 0L);
}
@Test
@@ -199,11 +199,11 @@ class OpenSearchIndexerTest {
String content3 = "{\"message\": \"trying out Elasticsearch 3\", \"mailboxId\":\"2\"}";
testee.index(documentId3, content3, ROUTING).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 3L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 3L);
testee.delete(ImmutableList.of(documentId, documentId3), ROUTING).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 1L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 1L);
}
@Test
@@ -224,7 +224,7 @@ class OpenSearchIndexerTest {
String content = "{\"message\":\"trying out Elasticsearch\"}";
testee.index(documentId, content, useDocumentId(documentId)).block();
- awaitForElasticSearch(QueryBuilders.matchAllQuery(), 1L);
+ awaitForOpenSearch(QueryBuilders.matchAllQuery(), 1L);
GetResponse getResponse = testee.get(documentId, useDocumentId(documentId)).block();
@@ -243,7 +243,7 @@ class OpenSearchIndexerTest {
.isInstanceOf(NullPointerException.class);
}
- private void awaitForElasticSearch(QueryBuilder query, long totalHits) {
+ private void awaitForOpenSearch(QueryBuilder query, long totalHits) {
CALMLY_AWAIT.atMost(Durations.TEN_SECONDS)
.untilAsserted(() -> assertThat(client.search(
new SearchRequest(INDEX_NAME.getValue())
diff --git a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/search/ScrolledSearchTest.java b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/search/ScrolledSearchTest.java
index 9f3bcbc0c5..dcd10da200 100644
--- a/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/search/ScrolledSearchTest.java
+++ b/backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/search/ScrolledSearchTest.java
@@ -28,7 +28,7 @@ import org.apache.james.backends.opensearch.DockerOpenSearchExtension;
import org.apache.james.backends.opensearch.IndexCreationFactory;
import org.apache.james.backends.opensearch.IndexName;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.backends.opensearch.ReadAliasName;
import org.awaitility.Durations;
import org.awaitility.core.ConditionFactory;
@@ -54,17 +54,17 @@ class ScrolledSearchTest {
private static final ConditionFactory WAIT_CONDITION = await().timeout(Durations.FIVE_SECONDS);
@RegisterExtension
- public DockerOpenSearchExtension elasticSearch = new DockerOpenSearchExtension();
- private ReactorElasticSearchClient client;
+ public DockerOpenSearchExtension openSearch = new DockerOpenSearchExtension();
+ private ReactorOpenSearchClient client;
@BeforeEach
void setUp() {
- client = elasticSearch.getDockerElasticSearch().clientProvider().get();
+ client = openSearch.getDockerOpenSearch().clientProvider().get();
new IndexCreationFactory(OpenSearchConfiguration.DEFAULT_CONFIGURATION)
.useIndex(INDEX_NAME)
.addAlias(ALIAS_NAME)
.createIndexAndAliases(client);
- elasticSearch.awaitForElasticSearch();
+ openSearch.awaitForOpenSearch();
}
@AfterEach
@@ -93,7 +93,7 @@ class ScrolledSearchTest {
RequestOptions.DEFAULT)
.block();
- elasticSearch.awaitForElasticSearch();
+ openSearch.awaitForOpenSearch();
WAIT_CONDITION.untilAsserted(() -> hasIdsInIndex(client, id));
SearchRequest searchRequest = new SearchRequest(INDEX_NAME.getValue())
@@ -123,7 +123,7 @@ class ScrolledSearchTest {
RequestOptions.DEFAULT)
.block();
- elasticSearch.awaitForElasticSearch();
+ openSearch.awaitForOpenSearch();
WAIT_CONDITION.untilAsserted(() -> hasIdsInIndex(client, id1, id2));
SearchRequest searchRequest = new SearchRequest(INDEX_NAME.getValue())
@@ -160,7 +160,7 @@ class ScrolledSearchTest {
RequestOptions.DEFAULT)
.block();
- elasticSearch.awaitForElasticSearch();
+ openSearch.awaitForOpenSearch();
WAIT_CONDITION.untilAsserted(() -> hasIdsInIndex(client, id1, id2, id3));
SearchRequest searchRequest = new SearchRequest(INDEX_NAME.getValue())
@@ -174,7 +174,7 @@ class ScrolledSearchTest {
.containsOnly(id1, id2, id3);
}
- private void hasIdsInIndex(ReactorElasticSearchClient client, String... ids) {
+ private void hasIdsInIndex(ReactorOpenSearchClient client, String... ids) {
SearchRequest searchRequest = new SearchRequest(INDEX_NAME.getValue())
.scroll(TIMEOUT)
.source(new SearchSourceBuilder()
diff --git a/backends-common/opensearch/src/test/resources/auth-es/README.md b/backends-common/opensearch/src/test/resources/auth-es/README.md
index 5dd42de574..2f9347c906 100644
--- a/backends-common/opensearch/src/test/resources/auth-es/README.md
+++ b/backends-common/opensearch/src/test/resources/auth-es/README.md
@@ -3,9 +3,12 @@
### nginx-conf
Contains nginx configuration files:
- - reverse_elasticsearch.conf: allow nginx to be the proxy connecting to ElasticSearch
+ - reverse_elasticsearch.conf: allow nginx to be the proxy connecting to OpenSearch
- passwd: Nginx credentials file store, each record follows the format: `username:encrypted-password`
+TODO This set up is inherited from ElasticSearch where the security plugin was proprietary and this was our only way to
+test things like SSL, auth. Now that we use OpenSearch we could instead rely on OpenSearch native features.
+
### default.crt & default.key
public (.crt) and private (.key) of the self signed SSL certification. It will be loaded by nginx
diff --git a/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/MailboxIndexCreationUtil.java b/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/MailboxIndexCreationUtil.java
index 9ef2cd9c74..d2c8a73c5f 100644
--- a/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/MailboxIndexCreationUtil.java
+++ b/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/MailboxIndexCreationUtil.java
@@ -22,17 +22,17 @@ package org.apache.james.mailbox.opensearch;
import org.apache.james.backends.opensearch.IndexCreationFactory;
import org.apache.james.backends.opensearch.IndexName;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.backends.opensearch.ReadAliasName;
import org.apache.james.backends.opensearch.WriteAliasName;
public class MailboxIndexCreationUtil {
- public static ReactorElasticSearchClient prepareClient(ReactorElasticSearchClient client,
- ReadAliasName readAlias,
- WriteAliasName writeAlias,
- IndexName indexName,
- OpenSearchConfiguration configuration) {
+ public static ReactorOpenSearchClient prepareClient(ReactorOpenSearchClient client,
+ ReadAliasName readAlias,
+ WriteAliasName writeAlias,
+ IndexName indexName,
+ OpenSearchConfiguration configuration) {
return new IndexCreationFactory(configuration)
.useIndex(indexName)
.addAlias(readAlias)
@@ -40,7 +40,7 @@ public class MailboxIndexCreationUtil {
.createIndexAndAliases(client, MailboxMappingFactory.getMappingContent());
}
- public static ReactorElasticSearchClient prepareDefaultClient(ReactorElasticSearchClient client, OpenSearchConfiguration configuration) {
+ public static ReactorOpenSearchClient prepareDefaultClient(ReactorOpenSearchClient client, OpenSearchConfiguration configuration) {
return prepareClient(client,
MailboxOpenSearchConstants.DEFAULT_MAILBOX_READ_ALIAS,
MailboxOpenSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS,
diff --git a/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearcher.java b/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearcher.java
index 8a326f4733..f1bfcecfc6 100644
--- a/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearcher.java
+++ b/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearcher.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Optional;
import org.apache.james.backends.opensearch.AliasName;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.backends.opensearch.ReadAliasName;
import org.apache.james.backends.opensearch.RoutingKey;
import org.apache.james.backends.opensearch.search.ScrolledSearch;
@@ -44,13 +44,13 @@ public class OpenSearchSearcher {
private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1);
private static final int MAX_ROUTING_KEY = 5;
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
private final QueryConverter queryConverter;
private final int size;
private final AliasName aliasName;
private final RoutingKey.Factory<MailboxId> routingKeyFactory;
- public OpenSearchSearcher(ReactorElasticSearchClient client, QueryConverter queryConverter, int size,
+ public OpenSearchSearcher(ReactorOpenSearchClient client, QueryConverter queryConverter, int size,
ReadAliasName aliasName, RoutingKey.Factory<MailboxId> routingKeyFactory) {
this.client = client;
this.queryConverter = queryConverter;
diff --git a/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchIntegrationTest.java b/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchIntegrationTest.java
index 4776d2f765..e7c1fa5d01 100644
--- a/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchIntegrationTest.java
+++ b/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchIntegrationTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import org.apache.james.backends.opensearch.DockerOpenSearchExtension;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
@@ -89,7 +89,7 @@ class OpenSearchIntegrationTest extends AbstractMessageSearchIndexTest {
DockerOpenSearchExtension openSearch = new DockerOpenSearchExtension();
TikaTextExtractor textExtractor;
- ReactorElasticSearchClient client;
+ ReactorOpenSearchClient client;
@AfterEach
void tearDown() throws IOException {
diff --git a/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/events/OpenSearchListeningMessageSearchIndexTest.java b/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/events/OpenSearchListeningMessageSearchIndexTest.java
index 09883c9dd1..3070f59872 100644
--- a/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/events/OpenSearchListeningMessageSearchIndexTest.java
+++ b/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/events/OpenSearchListeningMessageSearchIndexTest.java
@@ -33,7 +33,7 @@ import javax.mail.Flags;
import org.apache.james.backends.opensearch.DockerOpenSearchExtension;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.core.Username;
import org.apache.james.events.Group;
import org.apache.james.mailbox.Authorizator;
@@ -158,7 +158,7 @@ class OpenSearchListeningMessageSearchIndexTest {
}
}
- ReactorElasticSearchClient client;
+ ReactorOpenSearchClient client;
OpenSearchListeningMessageSearchIndex testee;
MailboxSession session;
Mailbox mailbox;
diff --git a/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearcherTest.java b/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearcherTest.java
index da3c1fdc82..32addbd835 100644
--- a/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearcherTest.java
+++ b/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/search/OpenSearchSearcherTest.java
@@ -31,7 +31,7 @@ import java.util.stream.IntStream;
import org.apache.james.backends.opensearch.DockerOpenSearchExtension;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.core.Username;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
@@ -92,7 +92,7 @@ class OpenSearchSearcherTest {
DockerOpenSearchExtension openSearch = new DockerOpenSearchExtension();
TikaTextExtractor textExtractor;
- ReactorElasticSearchClient client;
+ ReactorOpenSearchClient client;
private InMemoryMailboxManager storeMailboxManager;
@BeforeEach
@@ -105,8 +105,8 @@ class OpenSearchSearcherTest {
.build()));
client = MailboxIndexCreationUtil.prepareDefaultClient(
- openSearch.getDockerElasticSearch().clientProvider().get(),
- openSearch.getDockerElasticSearch().configuration());
+ openSearch.getDockerOpenSearch().clientProvider().get(),
+ openSearch.getDockerOpenSearch().configuration());
InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory();
MailboxIdRoutingKeyFactory routingKeyFactory = new MailboxIdRoutingKeyFactory();
diff --git a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcher.java b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcher.java
index 628ffb0fb1..f26c2faa55 100644
--- a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcher.java
+++ b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcher.java
@@ -22,7 +22,7 @@ package org.apache.james.quota.search.opensearch;
import java.util.List;
import org.apache.james.backends.opensearch.AliasName;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.backends.opensearch.ReadAliasName;
import org.apache.james.backends.opensearch.search.ScrolledSearch;
import org.apache.james.core.Username;
@@ -44,11 +44,11 @@ import reactor.core.publisher.Flux;
public class OpenSearchQuotaSearcher implements QuotaSearcher {
private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1);
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
private final AliasName readAlias;
private final QuotaQueryConverter quotaQueryConverter;
- public OpenSearchQuotaSearcher(ReactorElasticSearchClient client, ReadAliasName readAlias) {
+ public OpenSearchQuotaSearcher(ReactorOpenSearchClient client, ReadAliasName readAlias) {
this.client = client;
this.readAlias = readAlias;
this.quotaQueryConverter = new QuotaQueryConverter();
diff --git a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaSearchIndexCreationUtil.java b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaSearchIndexCreationUtil.java
index da50e759fe..21baee11a2 100644
--- a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaSearchIndexCreationUtil.java
+++ b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaSearchIndexCreationUtil.java
@@ -25,15 +25,15 @@ import org.apache.james.backends.opensearch.AliasName;
import org.apache.james.backends.opensearch.IndexCreationFactory;
import org.apache.james.backends.opensearch.IndexName;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
public class QuotaSearchIndexCreationUtil {
- public static ReactorElasticSearchClient prepareClient(ReactorElasticSearchClient client,
- AliasName readAlias,
- AliasName writeAlias,
- IndexName indexName,
- OpenSearchConfiguration configuration) {
+ public static ReactorOpenSearchClient prepareClient(ReactorOpenSearchClient client,
+ AliasName readAlias,
+ AliasName writeAlias,
+ IndexName indexName,
+ OpenSearchConfiguration configuration) {
return new IndexCreationFactory(configuration)
.useIndex(indexName)
.addAlias(readAlias)
@@ -41,7 +41,7 @@ public class QuotaSearchIndexCreationUtil {
.createIndexAndAliases(client, QuotaRatioMappingFactory.getMappingContent());
}
- public static ReactorElasticSearchClient prepareDefaultClient(ReactorElasticSearchClient client, OpenSearchConfiguration configuration) throws IOException {
+ public static ReactorOpenSearchClient prepareDefaultClient(ReactorOpenSearchClient client, OpenSearchConfiguration configuration) throws IOException {
return prepareClient(client,
QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS,
QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS,
diff --git a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearchTestSystemExtension.java
index 48f754b267..a250e478d0 100644
--- a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearchTestSystemExtension.java
+++ b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearchTestSystemExtension.java
@@ -23,10 +23,10 @@ import static org.mockito.Mockito.mock;
import java.io.IOException;
-import org.apache.james.backends.opensearch.DockerElasticSearchSingleton;
import org.apache.james.backends.opensearch.DockerOpenSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearchSingleton;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.domainlist.memory.MemoryDomainList;
diff --git a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListenerTest.java b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListenerTest.java
index 4114a9b8d9..7834821820 100644
--- a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListenerTest.java
+++ b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListenerTest.java
@@ -31,7 +31,7 @@ import java.io.IOException;
import org.apache.james.backends.opensearch.DockerOpenSearchExtension;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.events.Event;
import org.apache.james.events.Group;
import org.apache.james.mailbox.SessionProvider;
@@ -68,7 +68,7 @@ class OpenSearchQuotaMailboxListenerTest {
DockerOpenSearchExtension openSearch = new DockerOpenSearchExtension();
OpenSearchQuotaMailboxListener quotaMailboxListener;
- ReactorElasticSearchClient client;
+ ReactorOpenSearchClient client;
private DefaultUserQuotaRootResolver quotaRootResolver;
@BeforeEach
diff --git a/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/OpenSearchHostSystem.java b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/OpenSearchHostSystem.java
index f63964495d..ed602b4876 100644
--- a/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/OpenSearchHostSystem.java
+++ b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/OpenSearchHostSystem.java
@@ -23,11 +23,11 @@ import java.io.IOException;
import java.time.ZoneId;
import org.apache.commons.lang3.NotImplementedException;
-import org.apache.james.backends.opensearch.DockerElasticSearchSingleton;
import org.apache.james.backends.opensearch.DockerOpenSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearchSingleton;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.core.quota.QuotaCountLimit;
import org.apache.james.core.quota.QuotaSizeLimit;
import org.apache.james.imap.api.process.ImapProcessor;
@@ -64,12 +64,12 @@ public class OpenSearchHostSystem extends JamesImapHostSystem {
private DockerOpenSearch dockerOpenSearch;
private StoreMailboxManager mailboxManager;
- private ReactorElasticSearchClient client;
+ private ReactorOpenSearchClient client;
@Override
public void beforeTest() throws Exception {
super.beforeTest();
- this.dockerOpenSearch = DockerElasticSearchSingleton.INSTANCE;
+ this.dockerOpenSearch = DockerOpenSearchSingleton.INSTANCE;
dockerOpenSearch.start();
initFields();
}
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/DockerElasticSearchExtension.java
index 21612a7fec..ac733b1da6 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/DockerElasticSearchExtension.java
@@ -22,8 +22,8 @@ package org.apache.james;
import java.time.Duration;
import java.util.Optional;
-import org.apache.james.backends.opensearch.DockerElasticSearchSingleton;
import org.apache.james.backends.opensearch.DockerOpenSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearchSingleton;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -34,8 +34,8 @@ public class DockerElasticSearchExtension implements GuiceModuleTestExtension {
private final DockerOpenSearch dockerOpenSearch;
private Optional<Duration> requestTimeout;
- public DockerElasticSearchExtension() {
- this(DockerElasticSearchSingleton.INSTANCE);
+ public DockerOpenSearchExtension() {
+ this(DockerOpenSearchSingleton.INSTANCE);
}
public DockerElasticSearchExtension withRequestTimeout(Duration 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/DockerElasticSearchRule.java
index 153e5de0cd..cd24b6a9cc 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/DockerElasticSearchRule.java
@@ -19,8 +19,8 @@
package org.apache.james;
-import org.apache.james.backends.opensearch.DockerElasticSearchSingleton;
import org.apache.james.backends.opensearch.DockerOpenSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearchSingleton;
import org.apache.james.modules.TestDockerElasticSearchModule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -30,7 +30,7 @@ import com.google.inject.Module;
public class DockerElasticSearchRule implements GuiceModuleTestRule {
- private final DockerOpenSearch elasticSearch = DockerElasticSearchSingleton.INSTANCE;
+ private final DockerOpenSearch elasticSearch = DockerOpenSearchSingleton.INSTANCE;
@Override
public Statement apply(Statement base, Description description) {
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 efa22ffb0b..04bb6a8bbb 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
@@ -34,7 +34,7 @@ import java.util.TimerTask;
import java.util.stream.Collectors;
import org.apache.commons.net.imap.IMAPClient;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.core.Username;
import org.apache.james.jmap.AccessToken;
import org.apache.james.jmap.draft.JmapGuiceProbe;
@@ -42,15 +42,15 @@ import org.apache.james.modules.TestDockerESMetricReporterModule;
import org.apache.james.modules.TestJMAPServerModule;
import org.apache.james.modules.protocols.ImapGuiceProbe;
import org.apache.james.utils.DataProbeImpl;
-import org.opensearch.action.search.SearchRequest;
-import org.opensearch.client.RequestOptions;
-import org.opensearch.index.query.QueryBuilders;
-import org.opensearch.search.builder.SearchSourceBuilder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.builder.SearchSourceBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -151,7 +151,7 @@ class ESReporterTest {
}
private boolean checkMetricRecordedInElasticSearch() {
- try (ReactorElasticSearchClient client = elasticSearchExtension.getDockerES().clientProvider().get()) {
+ try (ReactorOpenSearchClient client = elasticSearchExtension.getDockerES().clientProvider().get()) {
SearchRequest searchRequest = new SearchRequest()
.source(new SearchSourceBuilder()
.query(QueryBuilders.matchAllQuery()));
diff --git a/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerElasticSearchExtension.java b/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerElasticSearchExtension.java
index 21612a7fec..ac733b1da6 100644
--- a/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerElasticSearchExtension.java
+++ b/server/apps/scaling-pulsar-smtp/src/test/java/org/apache/james/DockerElasticSearchExtension.java
@@ -22,8 +22,8 @@ package org.apache.james;
import java.time.Duration;
import java.util.Optional;
-import org.apache.james.backends.opensearch.DockerElasticSearchSingleton;
import org.apache.james.backends.opensearch.DockerOpenSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearchSingleton;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -34,8 +34,8 @@ public class DockerElasticSearchExtension implements GuiceModuleTestExtension {
private final DockerOpenSearch dockerOpenSearch;
private Optional<Duration> requestTimeout;
- public DockerElasticSearchExtension() {
- this(DockerElasticSearchSingleton.INSTANCE);
+ public DockerOpenSearchExtension() {
+ this(DockerOpenSearchSingleton.INSTANCE);
}
public DockerElasticSearchExtension withRequestTimeout(Duration requestTimeout) {
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 153e5de0cd..20d50e4967 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
@@ -19,7 +19,6 @@
package org.apache.james;
-import org.apache.james.backends.opensearch.DockerElasticSearchSingleton;
import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.apache.james.modules.TestDockerElasticSearchModule;
import org.junit.runner.Description;
diff --git a/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchClientModule.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchClientModule.java
index 31e43cf162..9c78678830 100644
--- a/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchClientModule.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchClientModule.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.james.backends.opensearch.ClientProvider;
import org.apache.james.backends.opensearch.IndexName;
import org.apache.james.backends.opensearch.OpenSearchHealthCheck;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.core.healthcheck.HealthCheck;
import org.apache.james.mailbox.opensearch.OpenSearchMailboxConfiguration;
import org.apache.james.quota.search.opensearch.OpenSearchQuotaConfiguration;
@@ -41,7 +41,7 @@ public class OpenSearchClientModule extends AbstractModule {
@Override
protected void configure() {
bind(ClientProvider.class).in(Scopes.SINGLETON);
- bind(ReactorElasticSearchClient.class).toProvider(ClientProvider.class);
+ bind(ReactorOpenSearchClient.class).toProvider(ClientProvider.class);
Multibinder.newSetBinder(binder(), HealthCheck.class)
.addBinding()
diff --git a/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchMailboxModule.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchMailboxModule.java
index 48d79646da..da6994b9b2 100644
--- a/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchMailboxModule.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchMailboxModule.java
@@ -32,7 +32,7 @@ import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.backends.opensearch.RoutingKey;
import org.apache.james.events.EventListener;
import org.apache.james.lifecycle.api.StartUpCheck;
@@ -73,12 +73,12 @@ public class OpenSearchMailboxModule extends AbstractModule {
private final OpenSearchConfiguration configuration;
private final OpenSearchMailboxConfiguration mailboxConfiguration;
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
@Inject
MailboxIndexCreator(OpenSearchConfiguration configuration,
OpenSearchMailboxConfiguration mailboxConfiguration,
- ReactorElasticSearchClient client) {
+ ReactorOpenSearchClient client) {
this.configuration = configuration;
this.mailboxConfiguration = mailboxConfiguration;
this.client = client;
@@ -138,7 +138,7 @@ public class OpenSearchMailboxModule extends AbstractModule {
@Provides
@Singleton
- private OpenSearchSearcher createMailboxElasticSearchSearcher(ReactorElasticSearchClient client,
+ private OpenSearchSearcher createMailboxElasticSearchSearcher(ReactorOpenSearchClient client,
QueryConverter queryConverter,
OpenSearchMailboxConfiguration configuration,
RoutingKey.Factory<MailboxId> routingKeyFactory) {
diff --git a/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchQuotaSearcherModule.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchQuotaSearcherModule.java
index 5dc3ceb537..90305c4beb 100644
--- a/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchQuotaSearcherModule.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchQuotaSearcherModule.java
@@ -30,7 +30,7 @@ import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.events.EventListener;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.mailbox.quota.QuotaRootResolver;
@@ -58,7 +58,7 @@ public class OpenSearchQuotaSearcherModule extends AbstractModule {
static class OpenSearchQuotaIndexCreator implements Startable {
private final OpenSearchConfiguration configuration;
private final OpenSearchQuotaConfiguration quotaConfiguration;
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
@Inject
OpenSearchQuotaIndexCreator(OpenSearchConfiguration configuration,
@@ -89,7 +89,7 @@ public class OpenSearchQuotaSearcherModule extends AbstractModule {
@Provides
@Singleton
- public QuotaSearcher provideSearcher(ReactorElasticSearchClient client, OpenSearchQuotaConfiguration configuration) {
+ public QuotaSearcher provideSearcher(ReactorOpenSearchClient client, OpenSearchQuotaConfiguration configuration) {
return new OpenSearchQuotaSearcher(client,
configuration.getReadAliasQuotaRatioName());
}
@@ -108,7 +108,7 @@ public class OpenSearchQuotaSearcherModule extends AbstractModule {
@Provides
@Singleton
- public OpenSearchQuotaMailboxListener provideListener(ReactorElasticSearchClient client,
+ public OpenSearchQuotaMailboxListener provideListener(ReactorOpenSearchClient client,
OpenSearchQuotaConfiguration configuration,
QuotaRootResolver quotaRootResolver) {
return new OpenSearchQuotaMailboxListener(
diff --git a/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchStartUpCheck.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchStartUpCheck.java
index b545e72ecc..dba5f904b1 100644
--- a/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchStartUpCheck.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchStartUpCheck.java
@@ -38,10 +38,10 @@ public class OpenSearchStartUpCheck implements StartUpCheck {
public static final String CHECK_NAME = "OpenSearchStartUpCheck";
- private final ReactorElasticSearchClient client;
+ private final ReactorOpenSearchClient client;
@Inject
- private OpenSearchStartUpCheck(ReactorElasticSearchClient client) {
+ private OpenSearchStartUpCheck(ReactorOpenSearchClient client) {
this.client = client;
}
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 9fb363a80d..bfaf2ca88f 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
@@ -33,7 +33,7 @@ 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.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.jmap.rfc8621.contract.ThreadGetContract;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.SearchQuery;
@@ -62,7 +62,7 @@ public class DistributedThreadGetMethodTest implements ThreadGetContract {
.await();
private final QueryConverter queryConverter = new QueryConverter(new CriterionConverter());
- private ReactorElasticSearchClient client;
+ private ReactorOpenSearchClient client;
@RegisterExtension
DockerOpenSearchExtension elasticSearch = new DockerOpenSearchExtension();
@@ -100,8 +100,8 @@ public class DistributedThreadGetMethodTest implements ThreadGetContract {
@Override
public void initElasticSearchClient() {
client = MailboxIndexCreationUtil.prepareDefaultClient(
- elasticSearch.getDockerElasticSearch().clientProvider().get(),
- elasticSearch.getDockerElasticSearch().configuration());
+ elasticSearch.getDockerOpenSearch().clientProvider().get(),
+ elasticSearch.getDockerOpenSearch().configuration());
}
private void awaitForElasticSearch(QueryBuilder query, long totalHits) {
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
index 7ca846b999..8c066d5fbf 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
@@ -43,7 +43,7 @@ import javax.mail.Flags;
import org.apache.james.backends.opensearch.DockerOpenSearchExtension;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.core.Username;
import org.apache.james.json.DTOConverter;
import org.apache.james.mailbox.MailboxSession;
@@ -124,13 +124,13 @@ class MailboxesRoutesTest {
InMemoryMailboxManager mailboxManager;
MessageIdManager messageIdManager;
MemoryTaskManager taskManager;
- ReactorElasticSearchClient client;
+ ReactorOpenSearchClient client;
@BeforeEach
void beforeEach() throws Exception {
client = MailboxIndexCreationUtil.prepareDefaultClient(
- elasticSearch.getDockerElasticSearch().clientProvider().get(),
- elasticSearch.getDockerElasticSearch().configuration());
+ elasticSearch.getDockerOpenSearch().clientProvider().get(),
+ elasticSearch.getDockerOpenSearch().configuration());
InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory();
MailboxIdRoutingKeyFactory routingKeyFactory = new MailboxIdRoutingKeyFactory();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/OpenSearchQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/OpenSearchQuotaSearchExtension.java
index e364c3e1ef..501e61384e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/OpenSearchQuotaSearchExtension.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/OpenSearchQuotaSearchExtension.java
@@ -23,11 +23,11 @@ import static org.mockito.Mockito.mock;
import java.io.IOException;
-import org.apache.james.backends.opensearch.DockerElasticSearchSingleton;
import org.apache.james.backends.opensearch.DockerOpenSearch;
+import org.apache.james.backends.opensearch.DockerOpenSearchSingleton;
import org.apache.james.backends.opensearch.OpenSearchConfiguration;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.domainlist.memory.MemoryDomainList;
@@ -51,10 +51,10 @@ import org.junit.rules.TemporaryFolder;
public class OpenSearchQuotaSearchExtension implements ParameterResolver, BeforeEachCallback, AfterEachCallback {
- private final DockerOpenSearch elasticSearch = DockerElasticSearchSingleton.INSTANCE;
+ private final DockerOpenSearch elasticSearch = DockerOpenSearchSingleton.INSTANCE;
private WebAdminQuotaSearchTestSystem restQuotaSearchTestSystem;
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private ReactorElasticSearchClient client;
+ private ReactorOpenSearchClient client;
@Override
public void beforeEach(ExtensionContext context) {
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index ca966bf3c8..90f257f30f 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -57,7 +57,7 @@ import javax.mail.Flags;
import org.apache.james.backends.opensearch.DockerOpenSearchExtension;
import org.apache.james.backends.opensearch.OpenSearchIndexer;
-import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
+import org.apache.james.backends.opensearch.ReactorOpenSearchClient;
import org.apache.james.core.Username;
import org.apache.james.json.DTOConverter;
import org.apache.james.mailbox.MailboxManager;
@@ -1456,9 +1456,9 @@ class UserMailboxesRoutesTest {
@BeforeEach
void setUp() throws Exception {
- ReactorElasticSearchClient client = MailboxIndexCreationUtil.prepareDefaultClient(
- elasticSearch.getDockerElasticSearch().clientProvider().get(),
- elasticSearch.getDockerElasticSearch().configuration());
+ ReactorOpenSearchClient client = MailboxIndexCreationUtil.prepareDefaultClient(
+ elasticSearch.getDockerOpenSearch().clientProvider().get(),
+ elasticSearch.getDockerOpenSearch().configuration());
InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory();
MailboxIdRoutingKeyFactory routingKeyFactory = new MailboxIdRoutingKeyFactory();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org