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:54 UTC
[james-project] 01/26: JAMES-3771 MPT IMAP OpenSearch: Reword 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 cecdf75deb7727704e9dcb11f68e13b265b99da1
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Aug 5 10:08:52 2022 +0700
JAMES-3771 MPT IMAP OpenSearch: Reword ElasticSearch => OpenSearch
---
mpt/impl/imap-mailbox/{elasticsearch => opensearch}/.gitignore | 0
mpt/impl/imap-mailbox/{elasticsearch => opensearch}/pom.xml | 4 ++--
.../mpt/imapmailbox/elasticsearch/OpenSearchRecentTest.java} | 8 ++++----
.../elasticsearch/OpenSearchUidSearchOnIndexTest.java} | 6 +++---
.../mpt/imapmailbox/elasticsearch/host/OpenSearchHostSystem.java} | 6 +++---
.../mpt/imapmailbox/elasticsearch/host/PublicTemporaryFolder.java | 0
mpt/impl/imap-mailbox/pom.xml | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/mpt/impl/imap-mailbox/elasticsearch/.gitignore b/mpt/impl/imap-mailbox/opensearch/.gitignore
similarity index 100%
rename from mpt/impl/imap-mailbox/elasticsearch/.gitignore
rename to mpt/impl/imap-mailbox/opensearch/.gitignore
diff --git a/mpt/impl/imap-mailbox/elasticsearch/pom.xml b/mpt/impl/imap-mailbox/opensearch/pom.xml
similarity index 96%
rename from mpt/impl/imap-mailbox/elasticsearch/pom.xml
rename to mpt/impl/imap-mailbox/opensearch/pom.xml
index 55bb6f0b18..6a6eca01e8 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml
+++ b/mpt/impl/imap-mailbox/opensearch/pom.xml
@@ -27,8 +27,8 @@
<version>3.8.0-SNAPSHOT</version>
</parent>
- <artifactId>apache-james-mpt-imapmailbox-elasticsearch</artifactId>
- <name>Apache James :: MPT :: Imap Mailbox :: ElasticSearch</name>
+ <artifactId>apache-james-mpt-imapmailbox-opensearch</artifactId>
+ <name>Apache James :: MPT :: Imap Mailbox :: OpenSearch</name>
<dependencies>
<dependency>
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchRecentTest.java b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/OpenSearchRecentTest.java
similarity index 86%
rename from mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchRecentTest.java
rename to mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/OpenSearchRecentTest.java
index bd47223c21..0c6524988d 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchRecentTest.java
+++ b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/OpenSearchRecentTest.java
@@ -20,21 +20,21 @@
package org.apache.james.mpt.imapmailbox.elasticsearch;
import org.apache.james.mpt.api.ImapHostSystem;
-import org.apache.james.mpt.imapmailbox.elasticsearch.host.ElasticSearchHostSystem;
+import org.apache.james.mpt.imapmailbox.elasticsearch.host.OpenSearchHostSystem;
import org.apache.james.mpt.imapmailbox.suite.Recent;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
-@Disabled("MAILBOX-398 ElasticSearch backend do not take into account session recent messages")
-public class ElasticSearchRecentTest extends Recent {
+@Disabled("MAILBOX-398 OpenSearch backend do not take into account session recent messages")
+public class OpenSearchRecentTest extends Recent {
private ImapHostSystem system;
@Override
@BeforeEach
public void setUp() throws Exception {
- system = new ElasticSearchHostSystem();
+ system = new OpenSearchHostSystem();
system.beforeTest();
super.setUp();
}
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndexTest.java b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/OpenSearchUidSearchOnIndexTest.java
similarity index 89%
rename from mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndexTest.java
rename to mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/OpenSearchUidSearchOnIndexTest.java
index 5d3003ff08..fe7510499d 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchUidSearchOnIndexTest.java
+++ b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/OpenSearchUidSearchOnIndexTest.java
@@ -20,18 +20,18 @@
package org.apache.james.mpt.imapmailbox.elasticsearch;
import org.apache.james.mpt.api.ImapHostSystem;
-import org.apache.james.mpt.imapmailbox.elasticsearch.host.ElasticSearchHostSystem;
+import org.apache.james.mpt.imapmailbox.elasticsearch.host.OpenSearchHostSystem;
import org.apache.james.mpt.imapmailbox.suite.UidSearchOnIndex;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-public class ElasticSearchUidSearchOnIndexTest extends UidSearchOnIndex {
+public class OpenSearchUidSearchOnIndexTest extends UidSearchOnIndex {
private ImapHostSystem system;
@Override
@BeforeEach
public void setUp() throws Exception {
- system = new ElasticSearchHostSystem();
+ system = new OpenSearchHostSystem();
system.beforeTest();
super.setUp();
}
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/OpenSearchHostSystem.java
similarity index 99%
rename from mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
rename to mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/OpenSearchHostSystem.java
index a10d042732..7cacd53206 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
+++ b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/OpenSearchHostSystem.java
@@ -35,6 +35,8 @@ import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
import org.apache.james.imap.main.DefaultImapDecoderFactory;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.inmemory.InMemoryMessageId;
+import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.opensearch.IndexAttachments;
import org.apache.james.mailbox.opensearch.MailboxElasticSearchConstants;
import org.apache.james.mailbox.opensearch.MailboxIdRoutingKeyFactory;
@@ -44,8 +46,6 @@ import org.apache.james.mailbox.opensearch.json.MessageToElasticSearchJson;
import org.apache.james.mailbox.opensearch.query.CriterionConverter;
import org.apache.james.mailbox.opensearch.query.QueryConverter;
import org.apache.james.mailbox.opensearch.search.ElasticSearchSearcher;
-import org.apache.james.mailbox.inmemory.InMemoryMessageId;
-import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
@@ -57,7 +57,7 @@ import org.apache.james.mpt.host.JamesImapHostSystem;
import com.google.common.collect.ImmutableSet;
-public class ElasticSearchHostSystem extends JamesImapHostSystem {
+public class OpenSearchHostSystem extends JamesImapHostSystem {
private static final ImapFeatures SUPPORTED_FEATURES = ImapFeatures.of(Feature.NAMESPACE_SUPPORT,
Feature.MOD_SEQ_SEARCH);
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/PublicTemporaryFolder.java b/mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/PublicTemporaryFolder.java
similarity index 100%
rename from mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/PublicTemporaryFolder.java
rename to mpt/impl/imap-mailbox/opensearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/PublicTemporaryFolder.java
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index a819911438..b64e429bde 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -36,11 +36,11 @@
<module>cassandra</module>
<module>core</module>
<module>cyrus</module>
- <module>elasticsearch</module>
<module>external-james</module>
<module>inmemory</module>
<module>jpa</module>
<module>lucenesearch</module>
+ <module>opensearch</module>
<module>rabbitmq</module>
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org