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:57 UTC
[james-project] 04/26: JAMES-3771 Guice for OpenSearch: 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 775bd5a31fff63d7dad43021d041eb82eb26d303
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Aug 5 10:18:06 2022 +0700
JAMES-3771 Guice for OpenSearch: ElasticSearch => OpenSearch
---
server/apps/cassandra-app/pom.xml | 2 +-
.../james/JamesWithNonCompatibleElasticSearchServerTest.java | 4 ++--
server/apps/distributed-app/pom.xml | 2 +-
server/apps/distributed-pop3-app/pom.xml | 2 +-
server/container/guice/{elasticsearch => opensearch}/pom.xml | 6 +++---
.../src/main/java/org/apache/james/SearchConfiguration.java | 0
.../src/main/java/org/apache/james/SearchModuleChooser.java | 8 ++++----
.../james/modules/mailbox/OpenSearchClientModule.java} | 2 +-
.../james/modules/mailbox/OpenSearchMailboxModule.java} | 8 ++++----
.../modules/mailbox/OpenSearchQuotaSearcherModule.java} | 12 ++++++------
.../james/modules/mailbox/OpenSearchStartUpCheck.java} | 12 +++++-------
.../james/modules/mailbox/TikaConfigurationReader.java | 0
.../org/apache/james/modules/mailbox/TikaMailboxModule.java | 0
.../test/java/org/apache/james/SearchConfigurationTest.java | 0
.../james/modules/mailbox/OpenSearchMailboxModuleTest.java} | 4 ++--
.../org/apache/james/modules/mailbox/SearchOverrideA.java | 0
.../org/apache/james/modules/mailbox/SearchOverrideB.java | 0
.../james/modules/mailbox/TikaConfigurationReaderTest.java | 0
.../src/test/resources/recursive/.keep | 0
server/container/guice/pom.xml | 12 ++++++------
20 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/server/apps/cassandra-app/pom.xml b/server/apps/cassandra-app/pom.xml
index d4d09c3739..25e168b90a 100644
--- a/server/apps/cassandra-app/pom.xml
+++ b/server/apps/cassandra-app/pom.xml
@@ -135,7 +135,7 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-elasticsearch</artifactId>
+ <artifactId>james-server-guice-opensearch</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
index cff8bda810..7e97c895d9 100644
--- a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
+++ b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
@@ -26,7 +26,7 @@ import org.apache.james.backends.opensearch.DockerOpenSearch;
import org.apache.james.lifecycle.api.StartUpCheck;
import org.apache.james.lifecycle.api.StartUpCheck.CheckResult;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.modules.mailbox.ElasticSearchStartUpCheck;
+import org.apache.james.modules.mailbox.OpenSearchStartUpCheck;
import org.apache.james.util.docker.Images;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
@@ -57,7 +57,7 @@ class JamesWithNonCompatibleElasticSearchServerTest {
StartUpChecksPerformer.StartUpChecksException.class,
ex -> assertThat(ex.getBadChecks())
.containsOnly(CheckResult.builder()
- .checkName(ElasticSearchStartUpCheck.CHECK_NAME)
+ .checkName(OpenSearchStartUpCheck.CHECK_NAME)
.resultType(StartUpCheck.ResultType.BAD)
.description("ES version(6.3.2) is not compatible with the recommendation(2.0.0)")
.build()));
diff --git a/server/apps/distributed-app/pom.xml b/server/apps/distributed-app/pom.xml
index 61724111cc..82115bc0b0 100644
--- a/server/apps/distributed-app/pom.xml
+++ b/server/apps/distributed-app/pom.xml
@@ -170,7 +170,7 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-elasticsearch</artifactId>
+ <artifactId>james-server-guice-opensearch</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git a/server/apps/distributed-pop3-app/pom.xml b/server/apps/distributed-pop3-app/pom.xml
index 1da2c13403..958c17392a 100644
--- a/server/apps/distributed-pop3-app/pom.xml
+++ b/server/apps/distributed-pop3-app/pom.xml
@@ -173,7 +173,7 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-elasticsearch</artifactId>
+ <artifactId>james-server-guice-opensearch</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git a/server/container/guice/elasticsearch/pom.xml b/server/container/guice/opensearch/pom.xml
similarity index 93%
rename from server/container/guice/elasticsearch/pom.xml
rename to server/container/guice/opensearch/pom.xml
index 9424cd0f8a..d5b24acefd 100644
--- a/server/container/guice/elasticsearch/pom.xml
+++ b/server/container/guice/opensearch/pom.xml
@@ -28,11 +28,11 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>james-server-guice-elasticsearch</artifactId>
+ <artifactId>james-server-guice-opensearch</artifactId>
<packaging>jar</packaging>
- <name>Apache James :: Server :: ElasticSearch - guice modules</name>
- <description>Guice injections for the ElasticSearch search engine</description>
+ <name>Apache James :: Server :: OpenSearch - guice modules</name>
+ <description>Guice injections for the OpenSearch search engine</description>
<properties>
<cassandra.includes>empty</cassandra.includes>
diff --git a/server/container/guice/elasticsearch/src/main/java/org/apache/james/SearchConfiguration.java b/server/container/guice/opensearch/src/main/java/org/apache/james/SearchConfiguration.java
similarity index 100%
rename from server/container/guice/elasticsearch/src/main/java/org/apache/james/SearchConfiguration.java
rename to server/container/guice/opensearch/src/main/java/org/apache/james/SearchConfiguration.java
diff --git a/server/container/guice/elasticsearch/src/main/java/org/apache/james/SearchModuleChooser.java b/server/container/guice/opensearch/src/main/java/org/apache/james/SearchModuleChooser.java
similarity index 96%
rename from server/container/guice/elasticsearch/src/main/java/org/apache/james/SearchModuleChooser.java
rename to server/container/guice/opensearch/src/main/java/org/apache/james/SearchModuleChooser.java
index bb83b7431c..5432f217e3 100644
--- a/server/container/guice/elasticsearch/src/main/java/org/apache/james/SearchModuleChooser.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/SearchModuleChooser.java
@@ -40,8 +40,8 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex;
-import org.apache.james.modules.mailbox.ElasticSearchClientModule;
-import org.apache.james.modules.mailbox.ElasticSearchMailboxModule;
+import org.apache.james.modules.mailbox.OpenSearchClientModule;
+import org.apache.james.modules.mailbox.OpenSearchMailboxModule;
import org.apache.james.modules.server.ReIndexingModule;
import org.apache.james.quota.search.QuotaSearcher;
import org.apache.james.quota.search.scanning.ScanningQuotaSearcher;
@@ -135,8 +135,8 @@ public class SearchModuleChooser {
switch (searchConfiguration.getImplementation()) {
case ElasticSearch:
return ImmutableList.of(
- new ElasticSearchClientModule(),
- new ElasticSearchMailboxModule(),
+ new OpenSearchClientModule(),
+ new OpenSearchMailboxModule(),
new ReIndexingModule());
case Scanning:
return ImmutableList.of(
diff --git a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchClientModule.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchClientModule.java
similarity index 97%
rename from server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchClientModule.java
rename to server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchClientModule.java
index 781f2f63e8..27d881c108 100644
--- a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchClientModule.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchClientModule.java
@@ -36,7 +36,7 @@ import com.google.inject.Scopes;
import com.google.inject.Singleton;
import com.google.inject.multibindings.Multibinder;
-public class ElasticSearchClientModule extends AbstractModule {
+public class OpenSearchClientModule extends AbstractModule {
@Override
protected void configure() {
diff --git a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchMailboxModule.java
similarity index 97%
rename from server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
rename to server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchMailboxModule.java
index ef0f70b31b..da06c65137 100644
--- a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchMailboxModule.java
@@ -67,7 +67,7 @@ import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.multibindings.ProvidesIntoSet;
-public class ElasticSearchMailboxModule extends AbstractModule {
+public class OpenSearchMailboxModule extends AbstractModule {
static class MailboxIndexCreator implements Startable {
@@ -93,13 +93,13 @@ public class ElasticSearchMailboxModule extends AbstractModule {
}
}
- private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchMailboxModule.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(OpenSearchMailboxModule.class);
public static final String ELASTICSEARCH_CONFIGURATION_NAME = "elasticsearch";
@Override
protected void configure() {
- install(new ElasticSearchQuotaSearcherModule());
+ install(new OpenSearchQuotaSearcherModule());
bind(ElasticSearchListeningMessageSearchIndex.class).in(Scopes.SINGLETON);
bind(MessageSearchIndex.class).to(ElasticSearchListeningMessageSearchIndex.class);
@@ -113,7 +113,7 @@ public class ElasticSearchMailboxModule extends AbstractModule {
Multibinder.newSetBinder(binder(), StartUpCheck.class)
.addBinding()
- .to(ElasticSearchStartUpCheck.class);
+ .to(OpenSearchStartUpCheck.class);
}
@Provides
diff --git a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchQuotaSearcherModule.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchQuotaSearcherModule.java
similarity index 90%
rename from server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchQuotaSearcherModule.java
rename to server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchQuotaSearcherModule.java
index 29315c4851..8b972fe284 100644
--- a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchQuotaSearcherModule.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchQuotaSearcherModule.java
@@ -19,7 +19,7 @@
package org.apache.james.modules.mailbox;
-import static org.apache.james.modules.mailbox.ElasticSearchMailboxModule.ELASTICSEARCH_CONFIGURATION_NAME;
+import static org.apache.james.modules.mailbox.OpenSearchMailboxModule.ELASTICSEARCH_CONFIGURATION_NAME;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -53,7 +53,7 @@ import com.google.inject.Singleton;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.multibindings.ProvidesIntoSet;
-public class ElasticSearchQuotaSearcherModule extends AbstractModule {
+public class OpenSearchQuotaSearcherModule extends AbstractModule {
static class ElasticSearchQuotaIndexCreator implements Startable {
private final OpenSearchConfiguration configuration;
@@ -78,7 +78,7 @@ public class ElasticSearchQuotaSearcherModule extends AbstractModule {
}
}
- private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchQuotaSearcherModule.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(OpenSearchQuotaSearcherModule.class);
@Override
protected void configure() {
@@ -96,13 +96,13 @@ public class ElasticSearchQuotaSearcherModule extends AbstractModule {
@Provides
@Singleton
- private ElasticSearchQuotaConfiguration getElasticSearchQuotaConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
+ private OpenSearchQuotaConfiguration getOpenSearchQuotaConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
try {
Configuration configuration = propertiesProvider.getConfiguration(ELASTICSEARCH_CONFIGURATION_NAME);
return ElasticSearchQuotaConfiguration.fromProperties(configuration);
} catch (FileNotFoundException e) {
- LOGGER.warn("Could not find " + ELASTICSEARCH_CONFIGURATION_NAME + " configuration file. Providing a default ElasticSearchQuotaConfiguration");
- return ElasticSearchQuotaConfiguration.DEFAULT_CONFIGURATION;
+ LOGGER.warn("Could not find " + OPENSEARCH_CONFIGURATION_NAME + " configuration file. Providing a default OpenSearchQuotaConfiguration");
+ return OpenSearchQuotaConfiguration.DEFAULT_CONFIGURATION;
}
}
diff --git a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchStartUpCheck.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchStartUpCheck.java
similarity index 89%
rename from server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchStartUpCheck.java
rename to server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchStartUpCheck.java
index 65b339504d..b545e72ecc 100644
--- a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/ElasticSearchStartUpCheck.java
+++ b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/OpenSearchStartUpCheck.java
@@ -23,27 +23,25 @@ import java.io.IOException;
import javax.inject.Inject;
-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.lifecycle.api.StartUpCheck;
import org.opensearch.Version;
import org.opensearch.client.RequestOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ElasticSearchStartUpCheck implements StartUpCheck {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(OpenSearchConfiguration.class);
+public class OpenSearchStartUpCheck implements StartUpCheck {
+ private static final Logger LOGGER = LoggerFactory.getLogger(OpenSearchStartUpCheck.class);
private static final Version RECOMMENDED_ES_VERSION = Version.V_2_0_0;
private static final String VERSION_CHECKING_ERROR_MESSAGE = "Error when checking ES version";
- public static final String CHECK_NAME = "ElasticSearchStartUpCheck";
+ public static final String CHECK_NAME = "OpenSearchStartUpCheck";
private final ReactorElasticSearchClient client;
@Inject
- private ElasticSearchStartUpCheck(ReactorElasticSearchClient client) {
+ private OpenSearchStartUpCheck(ReactorElasticSearchClient client) {
this.client = client;
}
diff --git a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/TikaConfigurationReader.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/TikaConfigurationReader.java
similarity index 100%
rename from server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/TikaConfigurationReader.java
rename to server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/TikaConfigurationReader.java
diff --git a/server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/TikaMailboxModule.java b/server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/TikaMailboxModule.java
similarity index 100%
rename from server/container/guice/elasticsearch/src/main/java/org/apache/james/modules/mailbox/TikaMailboxModule.java
rename to server/container/guice/opensearch/src/main/java/org/apache/james/modules/mailbox/TikaMailboxModule.java
diff --git a/server/container/guice/elasticsearch/src/test/java/org/apache/james/SearchConfigurationTest.java b/server/container/guice/opensearch/src/test/java/org/apache/james/SearchConfigurationTest.java
similarity index 100%
rename from server/container/guice/elasticsearch/src/test/java/org/apache/james/SearchConfigurationTest.java
rename to server/container/guice/opensearch/src/test/java/org/apache/james/SearchConfigurationTest.java
diff --git a/server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModuleTest.java b/server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/OpenSearchMailboxModuleTest.java
similarity index 97%
rename from server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModuleTest.java
rename to server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/OpenSearchMailboxModuleTest.java
index 026d8003cf..508a1f1252 100644
--- a/server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModuleTest.java
+++ b/server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/OpenSearchMailboxModuleTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
import com.google.inject.Guice;
-class ElasticSearchMailboxModuleTest {
+class OpenSearchMailboxModuleTest {
@Test
void test() {
GuiceGenericLoader genericLoader = new GuiceGenericLoader(
@@ -43,7 +43,7 @@ class ElasticSearchMailboxModuleTest {
new ExtendedClassLoader(RECURSIVE_CLASSPATH_FILE_SYSTEM),
ExtensionConfiguration.DEFAULT);
- Set<ListeningMessageSearchIndex.SearchOverride> searchOverrides = new ElasticSearchMailboxModule()
+ Set<ListeningMessageSearchIndex.SearchOverride> searchOverrides = new OpenSearchMailboxModule()
.provideSearchOverrides(genericLoader,
OpenSearchConfiguration.builder()
.addHost(Host.parseConfString("127.0.0.1", 9200))
diff --git a/server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/SearchOverrideA.java b/server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/SearchOverrideA.java
similarity index 100%
rename from server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/SearchOverrideA.java
rename to server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/SearchOverrideA.java
diff --git a/server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/SearchOverrideB.java b/server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/SearchOverrideB.java
similarity index 100%
rename from server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/SearchOverrideB.java
rename to server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/SearchOverrideB.java
diff --git a/server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/TikaConfigurationReaderTest.java b/server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/TikaConfigurationReaderTest.java
similarity index 100%
rename from server/container/guice/elasticsearch/src/test/java/org/apache/james/modules/mailbox/TikaConfigurationReaderTest.java
rename to server/container/guice/opensearch/src/test/java/org/apache/james/modules/mailbox/TikaConfigurationReaderTest.java
diff --git a/server/container/guice/elasticsearch/src/test/resources/recursive/.keep b/server/container/guice/opensearch/src/test/resources/recursive/.keep
similarity index 100%
rename from server/container/guice/elasticsearch/src/test/resources/recursive/.keep
rename to server/container/guice/opensearch/src/test/resources/recursive/.keep
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index d689d99ad0..45d0516cca 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -44,7 +44,6 @@
<module>data-cassandra</module>
<module>data-ldap</module>
<module>distributed</module>
- <module>elasticsearch</module>
<module>es-metric-reporter</module>
<module>jmx</module>
<module>jpa-common</module>
@@ -55,6 +54,7 @@
<module>mailrepository-cassandra</module>
<module>memory</module>
<module>onami</module>
+ <module>opensearch</module>
<module>protocols/imap</module>
<module>protocols/jmap</module>
<module>protocols/lmtp</module>
@@ -118,11 +118,6 @@
<artifactId>james-server-guice-distributed</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-elasticsearch</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-es-resporter</artifactId>
@@ -174,6 +169,11 @@
<artifactId>james-server-guice-memory</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-opensearch</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-pop</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org