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:24:58 UTC
[james-project] 05/26: JAMES-3771 Quota search: ElasticSearch => 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 ae8696039568ed3fd0c38a4d725d422acd0ac2e4
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Aug 5 10:20:07 2022 +0700
JAMES-3771 Quota search: ElasticSearch => OpenSearch
---
...tion.java => OpenSearchQuotaConfiguration.java} | 22 ++++++------
...aSearcher.java => OpenSearchQuotaSearcher.java} | 4 +--
...nts.java => QuotaRatioOpenSearchConstants.java} | 2 +-
.../opensearch/QuotaSearchIndexCreationUtil.java | 6 ++--
...er.java => OpenSearchQuotaMailboxListener.java} | 22 ++++++------
...chJson.java => QuotaRatioToOpenSearchJson.java} | 4 +--
....java => OpenSearchQuotaConfigurationTest.java} | 20 +++++------
... OpenSearchQuotaSearchTestSystemExtension.java} | 31 ++++++++---------
...rTest.java => OpenSearchQuotaSearcherTest.java} | 8 ++---
...ava => OpenSearchQuotaMailboxListenerTest.java} | 28 +++++++--------
...st.java => QuotaRatioToOpenSearchJsonTest.java} | 10 +++---
.../modules/mailbox/OpenSearchClientModule.java | 4 +--
.../mailbox/OpenSearchQuotaSearcherModule.java | 40 +++++++++++-----------
.../routes/ElasticSearchQuotaSearchExtension.java | 18 +++++-----
14 files changed, 109 insertions(+), 110 deletions(-)
diff --git a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaConfiguration.java b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfiguration.java
similarity index 84%
rename from mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaConfiguration.java
rename to mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfiguration.java
index 1d9f5ed3ac..c96244103c 100644
--- a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaConfiguration.java
+++ b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfiguration.java
@@ -27,7 +27,7 @@ import org.apache.james.backends.opensearch.IndexName;
import org.apache.james.backends.opensearch.ReadAliasName;
import org.apache.james.backends.opensearch.WriteAliasName;
-public class ElasticSearchQuotaConfiguration {
+public class OpenSearchQuotaConfiguration {
public static class Builder {
@@ -69,11 +69,11 @@ public class ElasticSearchQuotaConfiguration {
}
- public ElasticSearchQuotaConfiguration build() {
- return new ElasticSearchQuotaConfiguration(
- indexQuotaRatioName.orElse(QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX),
- readAliasQuotaRatioName.orElse(QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS),
- writeAliasQuotaRatioName.orElse(QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS));
+ public OpenSearchQuotaConfiguration build() {
+ return new OpenSearchQuotaConfiguration(
+ indexQuotaRatioName.orElse(QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_INDEX),
+ readAliasQuotaRatioName.orElse(QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS),
+ writeAliasQuotaRatioName.orElse(QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS));
}
}
@@ -85,9 +85,9 @@ public class ElasticSearchQuotaConfiguration {
public static final String ELASTICSEARCH_ALIAS_READ_QUOTA_RATIO_NAME = "elasticsearch.alias.read.quota.ratio.name";
public static final String ELASTICSEARCH_ALIAS_WRITE_QUOTA_RATIO_NAME = "elasticsearch.alias.write.quota.ratio.name";
- public static final ElasticSearchQuotaConfiguration DEFAULT_CONFIGURATION = builder().build();
+ public static final OpenSearchQuotaConfiguration DEFAULT_CONFIGURATION = builder().build();
- public static ElasticSearchQuotaConfiguration fromProperties(Configuration configuration) {
+ public static OpenSearchQuotaConfiguration fromProperties(Configuration configuration) {
return builder()
.indexQuotaRatioName(computeQuotaSearchIndexName(configuration))
.readAliasQuotaRatioName(computeQuotaSearchReadAlias(configuration))
@@ -114,7 +114,7 @@ public class ElasticSearchQuotaConfiguration {
private final ReadAliasName readAliasQuotaRatioName;
private final WriteAliasName writeAliasQuotaRatioName;
- private ElasticSearchQuotaConfiguration(IndexName indexQuotaRatioName, ReadAliasName readAliasQuotaRatioName, WriteAliasName writeAliasQuotaRatioName) {
+ private OpenSearchQuotaConfiguration(IndexName indexQuotaRatioName, ReadAliasName readAliasQuotaRatioName, WriteAliasName writeAliasQuotaRatioName) {
this.indexQuotaRatioName = indexQuotaRatioName;
this.readAliasQuotaRatioName = readAliasQuotaRatioName;
this.writeAliasQuotaRatioName = writeAliasQuotaRatioName;
@@ -134,8 +134,8 @@ public class ElasticSearchQuotaConfiguration {
@Override
public final boolean equals(Object o) {
- if (o instanceof ElasticSearchQuotaConfiguration) {
- ElasticSearchQuotaConfiguration that = (ElasticSearchQuotaConfiguration) o;
+ if (o instanceof OpenSearchQuotaConfiguration) {
+ OpenSearchQuotaConfiguration that = (OpenSearchQuotaConfiguration) o;
return Objects.equals(this.indexQuotaRatioName, that.indexQuotaRatioName)
&& Objects.equals(this.readAliasQuotaRatioName, that.readAliasQuotaRatioName)
diff --git a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearcher.java b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcher.java
similarity index 96%
rename from mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearcher.java
rename to mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcher.java
index 8593232262..628ffb0fb1 100644
--- a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearcher.java
+++ b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcher.java
@@ -41,14 +41,14 @@ import com.google.common.collect.ImmutableList;
import reactor.core.publisher.Flux;
-public class ElasticSearchQuotaSearcher implements QuotaSearcher {
+public class OpenSearchQuotaSearcher implements QuotaSearcher {
private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1);
private final ReactorElasticSearchClient client;
private final AliasName readAlias;
private final QuotaQueryConverter quotaQueryConverter;
- public ElasticSearchQuotaSearcher(ReactorElasticSearchClient client, ReadAliasName readAlias) {
+ public OpenSearchQuotaSearcher(ReactorElasticSearchClient 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/QuotaRatioElasticSearchConstants.java b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaRatioOpenSearchConstants.java
similarity index 96%
rename from mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaRatioElasticSearchConstants.java
rename to mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaRatioOpenSearchConstants.java
index 9b6b439f84..682ccb3190 100644
--- a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaRatioElasticSearchConstants.java
+++ b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/QuotaRatioOpenSearchConstants.java
@@ -23,7 +23,7 @@ import org.apache.james.backends.opensearch.IndexName;
import org.apache.james.backends.opensearch.ReadAliasName;
import org.apache.james.backends.opensearch.WriteAliasName;
-public interface QuotaRatioElasticSearchConstants {
+public interface QuotaRatioOpenSearchConstants {
interface InjectionNames {
String QUOTA_RATIO = "quotaRatio";
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 f4aec32fec..da50e759fe 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
@@ -43,9 +43,9 @@ public class QuotaSearchIndexCreationUtil {
public static ReactorElasticSearchClient prepareDefaultClient(ReactorElasticSearchClient client, OpenSearchConfiguration configuration) throws IOException {
return prepareClient(client,
- QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS,
- QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS,
- QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX,
+ QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS,
+ QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS,
+ QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_INDEX,
configuration);
}
}
diff --git a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/events/ElasticSearchQuotaMailboxListener.java b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListener.java
similarity index 75%
rename from mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/events/ElasticSearchQuotaMailboxListener.java
rename to mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListener.java
index 162a78ada0..b551374e32 100644
--- a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/events/ElasticSearchQuotaMailboxListener.java
+++ b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListener.java
@@ -30,30 +30,30 @@ import org.apache.james.events.EventListener;
import org.apache.james.events.Group;
import org.apache.james.mailbox.events.MailboxEvents.QuotaUsageUpdatedEvent;
import org.apache.james.mailbox.quota.QuotaRootResolver;
-import org.apache.james.quota.search.opensearch.QuotaRatioElasticSearchConstants;
-import org.apache.james.quota.search.opensearch.json.QuotaRatioToElasticSearchJson;
+import org.apache.james.quota.search.opensearch.QuotaRatioOpenSearchConstants;
+import org.apache.james.quota.search.opensearch.json.QuotaRatioToOpenSearchJson;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Mono;
-public class ElasticSearchQuotaMailboxListener implements EventListener.ReactiveGroupEventListener {
- public static class ElasticSearchQuotaMailboxListenerGroup extends Group {
+public class OpenSearchQuotaMailboxListener implements EventListener.ReactiveGroupEventListener {
+ public static class OpenSearchQuotaMailboxListenerGroup extends Group {
}
- private static final Group GROUP = new ElasticSearchQuotaMailboxListenerGroup();
+ private static final Group GROUP = new OpenSearchQuotaMailboxListenerGroup();
private final OpenSearchIndexer indexer;
- private final QuotaRatioToElasticSearchJson quotaRatioToElasticSearchJson;
+ private final QuotaRatioToOpenSearchJson quotaRatioToOpenSearchJson;
private final RoutingKey.Factory<Username> routingKeyFactory;
private final QuotaRootResolver quotaRootResolver;
@Inject
- public ElasticSearchQuotaMailboxListener(@Named(QuotaRatioElasticSearchConstants.InjectionNames.QUOTA_RATIO) OpenSearchIndexer indexer,
- QuotaRatioToElasticSearchJson quotaRatioToElasticSearchJson,
- RoutingKey.Factory<Username> routingKeyFactory, QuotaRootResolver quotaRootResolver) {
+ public OpenSearchQuotaMailboxListener(@Named(QuotaRatioOpenSearchConstants.InjectionNames.QUOTA_RATIO) OpenSearchIndexer indexer,
+ QuotaRatioToOpenSearchJson quotaRatioToOpenSearchJson,
+ RoutingKey.Factory<Username> routingKeyFactory, QuotaRootResolver quotaRootResolver) {
this.indexer = indexer;
- this.quotaRatioToElasticSearchJson = quotaRatioToElasticSearchJson;
+ this.quotaRatioToOpenSearchJson = quotaRatioToOpenSearchJson;
this.routingKeyFactory = routingKeyFactory;
this.quotaRootResolver = quotaRootResolver;
}
@@ -78,7 +78,7 @@ public class ElasticSearchQuotaMailboxListener implements EventListener.Reactive
DocumentId id = toDocumentId(user);
RoutingKey routingKey = routingKeyFactory.from(user);
- return Mono.fromCallable(() -> quotaRatioToElasticSearchJson.convertToJson(event))
+ return Mono.fromCallable(() -> quotaRatioToOpenSearchJson.convertToJson(event))
.flatMap(json -> indexer.index(id, json, routingKey))
.then();
}
diff --git a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToElasticSearchJson.java b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToOpenSearchJson.java
similarity index 95%
rename from mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToElasticSearchJson.java
rename to mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToOpenSearchJson.java
index 21182bea10..c6708478f8 100644
--- a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToElasticSearchJson.java
+++ b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToOpenSearchJson.java
@@ -30,12 +30,12 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-public class QuotaRatioToElasticSearchJson {
+public class QuotaRatioToOpenSearchJson {
private final QuotaRootResolver quotaRootResolver;
private final ObjectMapper mapper;
@Inject
- public QuotaRatioToElasticSearchJson(QuotaRootResolver quotaRootResolver) {
+ public QuotaRatioToOpenSearchJson(QuotaRootResolver quotaRootResolver) {
this.quotaRootResolver = quotaRootResolver;
this.mapper = new ObjectMapper();
this.mapper.registerModule(new Jdk8Module());
diff --git a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaConfigurationTest.java b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfigurationTest.java
similarity index 76%
rename from mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaConfigurationTest.java
rename to mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfigurationTest.java
index afe452f080..e2b7f9d0c8 100644
--- a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaConfigurationTest.java
+++ b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfigurationTest.java
@@ -27,7 +27,7 @@ import org.apache.james.backends.opensearch.ReadAliasName;
import org.apache.james.backends.opensearch.WriteAliasName;
import org.junit.jupiter.api.Test;
-class ElasticSearchQuotaConfigurationTest {
+class OpenSearchQuotaConfigurationTest {
@Test
void getReadAliasQuotaRatioNameShouldReturnConfiguredValue() {
@@ -36,7 +36,7 @@ class ElasticSearchQuotaConfigurationTest {
configuration.addProperty("elasticsearch.alias.read.quota.ratio.name", name);
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
- ElasticSearchQuotaConfiguration elasticSearchConfiguration = ElasticSearchQuotaConfiguration.fromProperties(configuration);
+ OpenSearchQuotaConfiguration elasticSearchConfiguration = OpenSearchQuotaConfiguration.fromProperties(configuration);
assertThat(elasticSearchConfiguration.getReadAliasQuotaRatioName())
.isEqualTo(new ReadAliasName(name));
@@ -47,10 +47,10 @@ class ElasticSearchQuotaConfigurationTest {
PropertiesConfiguration configuration = new PropertiesConfiguration();
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
- ElasticSearchQuotaConfiguration elasticSearchConfiguration = ElasticSearchQuotaConfiguration.fromProperties(configuration);
+ OpenSearchQuotaConfiguration elasticSearchConfiguration = OpenSearchQuotaConfiguration.fromProperties(configuration);
assertThat(elasticSearchConfiguration.getReadAliasQuotaRatioName())
- .isEqualTo(QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS);
+ .isEqualTo(QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS);
}
@Test
@@ -60,7 +60,7 @@ class ElasticSearchQuotaConfigurationTest {
configuration.addProperty("elasticsearch.alias.write.quota.ratio.name", name);
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
- ElasticSearchQuotaConfiguration elasticSearchConfiguration = ElasticSearchQuotaConfiguration.fromProperties(configuration);
+ OpenSearchQuotaConfiguration elasticSearchConfiguration = OpenSearchQuotaConfiguration.fromProperties(configuration);
assertThat(elasticSearchConfiguration.getWriteAliasQuotaRatioName())
.isEqualTo(new WriteAliasName(name));
@@ -71,10 +71,10 @@ class ElasticSearchQuotaConfigurationTest {
PropertiesConfiguration configuration = new PropertiesConfiguration();
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
- ElasticSearchQuotaConfiguration elasticSearchConfiguration = ElasticSearchQuotaConfiguration.fromProperties(configuration);
+ OpenSearchQuotaConfiguration elasticSearchConfiguration = OpenSearchQuotaConfiguration.fromProperties(configuration);
assertThat(elasticSearchConfiguration.getWriteAliasQuotaRatioName())
- .isEqualTo(QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS);
+ .isEqualTo(QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS);
}
@Test
@@ -84,7 +84,7 @@ class ElasticSearchQuotaConfigurationTest {
configuration.addProperty("elasticsearch.index.quota.ratio.name", name);
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
- ElasticSearchQuotaConfiguration elasticSearchConfiguration = ElasticSearchQuotaConfiguration.fromProperties(configuration);
+ OpenSearchQuotaConfiguration elasticSearchConfiguration = OpenSearchQuotaConfiguration.fromProperties(configuration);
assertThat(elasticSearchConfiguration.getIndexQuotaRatioName())
.isEqualTo(new IndexName(name));
@@ -95,9 +95,9 @@ class ElasticSearchQuotaConfigurationTest {
PropertiesConfiguration configuration = new PropertiesConfiguration();
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
- ElasticSearchQuotaConfiguration elasticSearchConfiguration = ElasticSearchQuotaConfiguration.fromProperties(configuration);
+ OpenSearchQuotaConfiguration elasticSearchConfiguration = OpenSearchQuotaConfiguration.fromProperties(configuration);
assertThat(elasticSearchConfiguration.getIndexQuotaRatioName())
- .isEqualTo(QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX);
+ .isEqualTo(QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_INDEX);
}
}
\ No newline at end of file
diff --git a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearchTestSystemExtension.java
similarity index 81%
rename from mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearchTestSystemExtension.java
rename to mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearchTestSystemExtension.java
index ac9335157f..48f754b267 100644
--- a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearchTestSystemExtension.java
+++ b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearchTestSystemExtension.java
@@ -33,8 +33,8 @@ import org.apache.james.domainlist.memory.MemoryDomainList;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.quota.search.QuotaSearchTestSystem;
-import org.apache.james.quota.search.opensearch.events.ElasticSearchQuotaMailboxListener;
-import org.apache.james.quota.search.opensearch.json.QuotaRatioToElasticSearchJson;
+import org.apache.james.quota.search.opensearch.events.OpenSearchQuotaMailboxListener;
+import org.apache.james.quota.search.opensearch.json.QuotaRatioToOpenSearchJson;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
@@ -43,10 +43,9 @@ import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
import org.junit.jupiter.api.extension.ParameterResolver;
-public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterResolver, BeforeEachCallback, AfterEachCallback {
-
- private final DockerOpenSearch elasticSearch = DockerElasticSearchSingleton.INSTANCE;
- private ReactorElasticSearchClient client;
+public class OpenSearchQuotaSearchTestSystemExtension implements ParameterResolver, BeforeEachCallback, AfterEachCallback {
+ private final DockerOpenSearch openSearch = DockerOpenSearchSingleton.INSTANCE;
+ private ReactorOpenSearchClient client;
@Override
public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
@@ -57,8 +56,8 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes
public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
try {
client = QuotaSearchIndexCreationUtil.prepareDefaultClient(
- elasticSearch.clientProvider().get(),
- elasticSearch.configuration());
+ openSearch.clientProvider().get(),
+ openSearch.configuration());
InMemoryIntegrationResources resources = InMemoryIntegrationResources.defaultResources();
@@ -67,10 +66,10 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes
domainList.configure(DomainListConfiguration.DEFAULT);
MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(domainList);
- ElasticSearchQuotaMailboxListener listener = new ElasticSearchQuotaMailboxListener(
+ OpenSearchQuotaMailboxListener listener = new OpenSearchQuotaMailboxListener(
new OpenSearchIndexer(client,
- QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS),
- new QuotaRatioToElasticSearchJson(resources.getQuotaRootResolver()),
+ QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS),
+ new QuotaRatioToOpenSearchJson(resources.getQuotaRootResolver()),
new UserRoutingKeyFactory(), resources.getQuotaRootResolver());
resources.getMailboxManager().getEventBus().register(listener);
@@ -82,12 +81,12 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes
resources.getMailboxManager(),
quotaComponents.getQuotaManager(),
resources.getDefaultUserQuotaRootResolver(),
- new ElasticSearchQuotaSearcher(client,
- QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS),
+ new OpenSearchQuotaSearcher(client,
+ QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS),
usersRepository,
domainList,
resources.getCurrentQuotaManager(),
- elasticSearch::flushIndices);
+ openSearch::flushIndices);
} catch (Exception e) {
throw new ParameterResolutionException("Error while resolving parameter", e);
}
@@ -95,12 +94,12 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes
@Override
public void beforeEach(ExtensionContext context) {
- elasticSearch.start();
+ openSearch.start();
}
@Override
public void afterEach(ExtensionContext context) throws IOException {
client.close();
- elasticSearch.cleanUpData();
+ openSearch.cleanUpData();
}
}
diff --git a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearcherTest.java b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcherTest.java
similarity index 90%
rename from mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearcherTest.java
rename to mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcherTest.java
index e72e0f1548..9205fa502b 100644
--- a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/ElasticSearchQuotaSearcherTest.java
+++ b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaSearcherTest.java
@@ -34,10 +34,10 @@ import org.apache.james.quota.search.QuotaSearcherContract;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-@ExtendWith(ElasticSearchQuotaSearchTestSystemExtension.class)
-class ElasticSearchQuotaSearcherTest implements QuotaSearcherContract {
+@ExtendWith(OpenSearchQuotaSearchTestSystemExtension.class)
+class OpenSearchQuotaSearcherTest implements QuotaSearcherContract {
@Test
- void searchShouldNotBeLimitedByElasticSearchDefaultSearchLimit(QuotaSearchTestSystem testSystem) throws Exception {
+ void searchShouldNotBeLimitedByOpenSearchDefaultSearchLimit(QuotaSearchTestSystem testSystem) throws Exception {
int userCount = 11;
testSystem.getDomainList().addDomain(SIMPSON_COM);
testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSizeLimit.size(100));
@@ -58,7 +58,7 @@ class ElasticSearchQuotaSearcherTest implements QuotaSearcherContract {
}
@Test
- void searchShouldNotBeLimitedByElasticSearchDefaultSearchLimitWhenUsingOffset(QuotaSearchTestSystem testSystem) throws Exception {
+ void searchShouldNotBeLimitedByOpenSearchDefaultSearchLimitWhenUsingOffset(QuotaSearchTestSystem testSystem) throws Exception {
int userCount = 12;
testSystem.getDomainList().addDomain(SIMPSON_COM);
testSystem.getMaxQuotaManager().setGlobalMaxStorage(QuotaSizeLimit.size(100));
diff --git a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/ElasticSearchQuotaMailboxListenerTest.java b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListenerTest.java
similarity index 82%
rename from mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/ElasticSearchQuotaMailboxListenerTest.java
rename to mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListenerTest.java
index ece869939e..27e6b526ba 100644
--- a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/ElasticSearchQuotaMailboxListenerTest.java
+++ b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/events/OpenSearchQuotaMailboxListenerTest.java
@@ -40,10 +40,10 @@ import org.apache.james.mailbox.quota.QuotaFixture.Sizes;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.event.EventFactory;
import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver;
-import org.apache.james.quota.search.opensearch.QuotaRatioElasticSearchConstants;
+import org.apache.james.quota.search.opensearch.QuotaRatioOpenSearchConstants;
import org.apache.james.quota.search.opensearch.QuotaSearchIndexCreationUtil;
import org.apache.james.quota.search.opensearch.UserRoutingKeyFactory;
-import org.apache.james.quota.search.opensearch.json.QuotaRatioToElasticSearchJson;
+import org.apache.james.quota.search.opensearch.json.QuotaRatioToOpenSearchJson;
import org.awaitility.Awaitility;
import org.awaitility.Durations;
import org.awaitility.core.ConditionFactory;
@@ -56,7 +56,7 @@ import org.opensearch.client.RequestOptions;
import org.opensearch.index.query.QueryBuilders;
import org.opensearch.search.builder.SearchSourceBuilder;
-class ElasticSearchQuotaMailboxListenerTest {
+class OpenSearchQuotaMailboxListenerTest {
private static final ConditionFactory CALMLY_AWAIT = Awaitility
.with().pollInterval(ONE_HUNDRED_MILLISECONDS)
@@ -65,25 +65,25 @@ class ElasticSearchQuotaMailboxListenerTest {
static Event.EventId EVENT_ID = Event.EventId.of("6e0dd59d-660e-4d9b-b22f-0354479f47b4");
@RegisterExtension
- DockerElasticSearchExtension elasticSearch = new DockerElasticSearchExtension();
+ DockerOpenSearchExtension openSearch = new DockerOpenSearchExtension();
- ElasticSearchQuotaMailboxListener quotaMailboxListener;
+ OpenSearchQuotaMailboxListener quotaMailboxListener;
ReactorElasticSearchClient client;
private DefaultUserQuotaRootResolver quotaRootResolver;
@BeforeEach
void setUp() throws IOException {
- client = elasticSearch.getDockerElasticSearch().clientProvider().get();
+ client = openSearch.getDockerOpenSearch().clientProvider().get();
QuotaSearchIndexCreationUtil.prepareDefaultClient(client, OpenSearchConfiguration.builder()
- .addHost(elasticSearch.getDockerElasticSearch().getHttpHost())
+ .addHost(openSearch.getDockerOpenSearch().getHttpHost())
.build());
quotaRootResolver = new DefaultUserQuotaRootResolver(mock(SessionProvider.class), mock(MailboxSessionMapperFactory.class));
- quotaMailboxListener = new ElasticSearchQuotaMailboxListener(
+ quotaMailboxListener = new OpenSearchQuotaMailboxListener(
new OpenSearchIndexer(client,
- QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS),
- new QuotaRatioToElasticSearchJson(quotaRootResolver),
+ QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS),
+ new QuotaRatioToOpenSearchJson(quotaRootResolver),
new UserRoutingKeyFactory(), quotaRootResolver);
}
@@ -93,9 +93,9 @@ class ElasticSearchQuotaMailboxListenerTest {
}
@Test
- void deserializeElasticSearchQuotaMailboxListenerGroup() throws Exception {
- assertThat(Group.deserialize("org.apache.james.quota.search.opensearch.events.ElasticSearchQuotaMailboxListener$ElasticSearchQuotaMailboxListenerGroup"))
- .isEqualTo(new ElasticSearchQuotaMailboxListener.ElasticSearchQuotaMailboxListenerGroup());
+ void deserializeOpenSearchQuotaMailboxListenerGroup() throws Exception {
+ assertThat(Group.deserialize("org.apache.james.quota.search.opensearch.events.OpenSearchQuotaMailboxListener$OpenSearchQuotaMailboxListenerGroup"))
+ .isEqualTo(new OpenSearchQuotaMailboxListener.OpenSearchQuotaMailboxListenerGroup());
}
@Test
@@ -111,7 +111,7 @@ class ElasticSearchQuotaMailboxListenerTest {
CALMLY_AWAIT.atMost(Durations.TEN_SECONDS)
.untilAsserted(() -> assertThat(client.search(
- new SearchRequest(QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS.getValue())
+ new SearchRequest(QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS.getValue())
.source(new SearchSourceBuilder().query(QueryBuilders.matchAllQuery())),
RequestOptions.DEFAULT)
.block()
diff --git a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToElasticSearchJsonTest.java b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToOpenSearchJsonTest.java
similarity index 89%
rename from mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToElasticSearchJsonTest.java
rename to mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToOpenSearchJsonTest.java
index 702705a5ea..cf731a6f65 100644
--- a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToElasticSearchJsonTest.java
+++ b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/json/QuotaRatioToOpenSearchJsonTest.java
@@ -36,7 +36,7 @@ import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver;
import org.apache.james.util.ClassLoaderUtils;
import org.junit.jupiter.api.Test;
-class QuotaRatioToElasticSearchJsonTest {
+class QuotaRatioToOpenSearchJsonTest {
static Event.EventId EVENT_ID = Event.EventId.of("6e0dd59d-660e-4d9b-b22f-0354479f47b4");
@Test
@@ -52,9 +52,9 @@ class QuotaRatioToElasticSearchJsonTest {
.quotaSize(QuotaFixture.Sizes._55_PERCENT)
.instant(Instant.now())
.build();
- QuotaRatioToElasticSearchJson quotaRatioToElasticSearchJson = new QuotaRatioToElasticSearchJson(
+ QuotaRatioToOpenSearchJson quotaRatioToOpenSearchJson = new QuotaRatioToOpenSearchJson(
quotaRootResolver);
- String convertToJson = quotaRatioToElasticSearchJson.convertToJson(event);
+ String convertToJson = quotaRatioToOpenSearchJson.convertToJson(event);
assertThatJson(convertToJson)
.when(IGNORING_ARRAY_ORDER)
@@ -75,8 +75,8 @@ class QuotaRatioToElasticSearchJsonTest {
.instant(Instant.now())
.build();
- QuotaRatioToElasticSearchJson quotaRatioToElasticSearchJson = new QuotaRatioToElasticSearchJson(quotaRootResolver);
- String convertToJson = quotaRatioToElasticSearchJson.convertToJson(event);
+ QuotaRatioToOpenSearchJson quotaRatioToOpenSearchJson = new QuotaRatioToOpenSearchJson(quotaRootResolver);
+ String convertToJson = quotaRatioToOpenSearchJson.convertToJson(event);
assertThatJson(convertToJson)
.when(IGNORING_ARRAY_ORDER)
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 27d881c108..d170eac992 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
@@ -27,7 +27,7 @@ import org.apache.james.backends.opensearch.OpenSearchHealthCheck;
import org.apache.james.backends.opensearch.ReactorElasticSearchClient;
import org.apache.james.core.healthcheck.HealthCheck;
import org.apache.james.mailbox.opensearch.ElasticSearchMailboxConfiguration;
-import org.apache.james.quota.search.opensearch.ElasticSearchQuotaConfiguration;
+import org.apache.james.quota.search.opensearch.OpenSearchQuotaConfiguration;
import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
@@ -51,7 +51,7 @@ public class OpenSearchClientModule extends AbstractModule {
@Provides
@Singleton
Set<IndexName> provideIndexNames(ElasticSearchMailboxConfiguration mailboxConfiguration,
- ElasticSearchQuotaConfiguration quotaConfiguration) {
+ OpenSearchQuotaConfiguration quotaConfiguration) {
return ImmutableSet.of(
mailboxConfiguration.getIndexMailboxName(),
quotaConfiguration.getIndexQuotaRatioName());
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 8b972fe284..5dc3ceb537 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
@@ -35,12 +35,12 @@ import org.apache.james.events.EventListener;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.quota.search.QuotaSearcher;
-import org.apache.james.quota.search.opensearch.ElasticSearchQuotaConfiguration;
-import org.apache.james.quota.search.opensearch.ElasticSearchQuotaSearcher;
+import org.apache.james.quota.search.opensearch.OpenSearchQuotaConfiguration;
+import org.apache.james.quota.search.opensearch.OpenSearchQuotaSearcher;
import org.apache.james.quota.search.opensearch.QuotaSearchIndexCreationUtil;
import org.apache.james.quota.search.opensearch.UserRoutingKeyFactory;
-import org.apache.james.quota.search.opensearch.events.ElasticSearchQuotaMailboxListener;
-import org.apache.james.quota.search.opensearch.json.QuotaRatioToElasticSearchJson;
+import org.apache.james.quota.search.opensearch.events.OpenSearchQuotaMailboxListener;
+import org.apache.james.quota.search.opensearch.json.QuotaRatioToOpenSearchJson;
import org.apache.james.utils.InitializationOperation;
import org.apache.james.utils.InitilizationOperationBuilder;
import org.apache.james.utils.PropertiesProvider;
@@ -55,15 +55,15 @@ import com.google.inject.multibindings.ProvidesIntoSet;
public class OpenSearchQuotaSearcherModule extends AbstractModule {
- static class ElasticSearchQuotaIndexCreator implements Startable {
+ static class OpenSearchQuotaIndexCreator implements Startable {
private final OpenSearchConfiguration configuration;
- private final ElasticSearchQuotaConfiguration quotaConfiguration;
+ private final OpenSearchQuotaConfiguration quotaConfiguration;
private final ReactorElasticSearchClient client;
@Inject
- ElasticSearchQuotaIndexCreator(OpenSearchConfiguration configuration,
- ElasticSearchQuotaConfiguration quotaConfiguration,
- ReactorElasticSearchClient client) {
+ OpenSearchQuotaIndexCreator(OpenSearchConfiguration configuration,
+ OpenSearchQuotaConfiguration quotaConfiguration,
+ ReactorOpenSearchClient client) {
this.configuration = configuration;
this.quotaConfiguration = quotaConfiguration;
this.client = client;
@@ -84,13 +84,13 @@ public class OpenSearchQuotaSearcherModule extends AbstractModule {
protected void configure() {
Multibinder.newSetBinder(binder(), EventListener.ReactiveGroupEventListener.class)
.addBinding()
- .to(ElasticSearchQuotaMailboxListener.class);
+ .to(OpenSearchQuotaMailboxListener.class);
}
@Provides
@Singleton
- public QuotaSearcher provideSearcher(ReactorElasticSearchClient client, ElasticSearchQuotaConfiguration configuration) {
- return new ElasticSearchQuotaSearcher(client,
+ public QuotaSearcher provideSearcher(ReactorElasticSearchClient client, OpenSearchQuotaConfiguration configuration) {
+ return new OpenSearchQuotaSearcher(client,
configuration.getReadAliasQuotaRatioName());
}
@@ -99,7 +99,7 @@ public class OpenSearchQuotaSearcherModule extends AbstractModule {
private OpenSearchQuotaConfiguration getOpenSearchQuotaConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
try {
Configuration configuration = propertiesProvider.getConfiguration(ELASTICSEARCH_CONFIGURATION_NAME);
- return ElasticSearchQuotaConfiguration.fromProperties(configuration);
+ return OpenSearchQuotaConfiguration.fromProperties(configuration);
} catch (FileNotFoundException e) {
LOGGER.warn("Could not find " + OPENSEARCH_CONFIGURATION_NAME + " configuration file. Providing a default OpenSearchQuotaConfiguration");
return OpenSearchQuotaConfiguration.DEFAULT_CONFIGURATION;
@@ -108,20 +108,20 @@ public class OpenSearchQuotaSearcherModule extends AbstractModule {
@Provides
@Singleton
- public ElasticSearchQuotaMailboxListener provideListener(ReactorElasticSearchClient client,
- ElasticSearchQuotaConfiguration configuration,
- QuotaRootResolver quotaRootResolver) {
- return new ElasticSearchQuotaMailboxListener(
+ public OpenSearchQuotaMailboxListener provideListener(ReactorElasticSearchClient client,
+ OpenSearchQuotaConfiguration configuration,
+ QuotaRootResolver quotaRootResolver) {
+ return new OpenSearchQuotaMailboxListener(
new OpenSearchIndexer(client,
configuration.getWriteAliasQuotaRatioName()),
- new QuotaRatioToElasticSearchJson(quotaRootResolver),
+ new QuotaRatioToOpenSearchJson(quotaRootResolver),
new UserRoutingKeyFactory(), quotaRootResolver);
}
@ProvidesIntoSet
- InitializationOperation createIndex(ElasticSearchQuotaIndexCreator instance) {
+ InitializationOperation createIndex(OpenSearchQuotaIndexCreator instance) {
return InitilizationOperationBuilder
- .forClass(ElasticSearchQuotaIndexCreator.class)
+ .forClass(OpenSearchQuotaIndexCreator.class)
.init(instance::createIndex);
}
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
index 8d64e1e567..06f5a6cdb5 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
@@ -34,12 +34,12 @@ import org.apache.james.domainlist.memory.MemoryDomainList;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.quota.search.QuotaSearchTestSystem;
-import org.apache.james.quota.search.opensearch.ElasticSearchQuotaSearcher;
-import org.apache.james.quota.search.opensearch.QuotaRatioElasticSearchConstants;
+import org.apache.james.quota.search.opensearch.OpenSearchQuotaSearcher;
+import org.apache.james.quota.search.opensearch.QuotaRatioOpenSearchConstants;
import org.apache.james.quota.search.opensearch.QuotaSearchIndexCreationUtil;
import org.apache.james.quota.search.opensearch.UserRoutingKeyFactory;
-import org.apache.james.quota.search.opensearch.events.ElasticSearchQuotaMailboxListener;
-import org.apache.james.quota.search.opensearch.json.QuotaRatioToElasticSearchJson;
+import org.apache.james.quota.search.opensearch.events.OpenSearchQuotaMailboxListener;
+import org.apache.james.quota.search.opensearch.json.QuotaRatioToOpenSearchJson;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
@@ -76,9 +76,9 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef
domainList.configure(DomainListConfiguration.DEFAULT);
MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(domainList);
- ElasticSearchQuotaMailboxListener listener = new ElasticSearchQuotaMailboxListener(
- new OpenSearchIndexer(client, QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS),
- new QuotaRatioToElasticSearchJson(resources.getQuotaRootResolver()),
+ OpenSearchQuotaMailboxListener listener = new OpenSearchQuotaMailboxListener(
+ new OpenSearchIndexer(client, QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_WRITE_ALIAS),
+ new QuotaRatioToOpenSearchJson(resources.getQuotaRootResolver()),
new UserRoutingKeyFactory(), resources.getQuotaRootResolver());
resources.getMailboxManager().getEventBus().register(listener);
@@ -90,8 +90,8 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef
resources.getMailboxManager(),
quotaComponents.getQuotaManager(),
resources.getDefaultUserQuotaRootResolver(),
- new ElasticSearchQuotaSearcher(client,
- QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS),
+ new OpenSearchQuotaSearcher(client,
+ QuotaRatioOpenSearchConstants.DEFAULT_QUOTA_RATIO_READ_ALIAS),
usersRepository,
domainList,
resources.getCurrentQuotaManager(),
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org