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
The following commit(s) were added to refs/heads/master by this push:
new dbe4acd206 JAMES-3771 Fix elasticsearch -> opensearch typo (#1219)
dbe4acd206 is described below
commit dbe4acd206ce995c496923568ba7a4011948d16d
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Tue Oct 4 09:20:03 2022 +0700
JAMES-3771 Fix elasticsearch -> opensearch typo (#1219)
* JAMES-3771 Fix elasticsearch -> opensearch typo
* fixup! JAMES-3771 Fix elasticsearch -> opensearch typo
---
.../opensearch/OpenSearchMailboxConfiguration.java | 28 +++++------
.../OpenSearchMailboxConfigurationTest.java | 58 +++++++++++-----------
.../opensearch/OpenSearchQuotaConfiguration.java | 12 ++---
.../OpenSearchQuotaConfigurationTest.java | 18 +++----
4 files changed, 58 insertions(+), 58 deletions(-)
diff --git
a/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/OpenSearchMailboxConfiguration.java
b/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/OpenSearchMailboxConfiguration.java
index cb5eafd474..a3a0f7144b 100644
---
a/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/OpenSearchMailboxConfiguration.java
+++
b/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/OpenSearchMailboxConfiguration.java
@@ -78,13 +78,13 @@ public class OpenSearchMailboxConfiguration {
return new Builder();
}
- private static final String ELASTICSEARCH_INDEX_NAME =
"elasticsearch.index.name";
- private static final String ELASTICSEARCH_INDEX_MAILBOX_NAME =
"elasticsearch.index.mailbox.name";
- private static final String ELASTICSEARCH_ALIAS_READ_NAME =
"elasticsearch.alias.read.name";
- private static final String ELASTICSEARCH_ALIAS_WRITE_NAME =
"elasticsearch.alias.write.name";
- private static final String ELASTICSEARCH_ALIAS_READ_MAILBOX_NAME =
"elasticsearch.alias.read.mailbox.name";
- private static final String ELASTICSEARCH_ALIAS_WRITE_MAILBOX_NAME =
"elasticsearch.alias.write.mailbox.name";
- private static final String ELASTICSEARCH_INDEX_ATTACHMENTS =
"elasticsearch.indexAttachments";
+ private static final String OPENSEARCH_INDEX_NAME =
"opensearch.index.name";
+ private static final String OPENSEARCH_INDEX_MAILBOX_NAME =
"opensearch.index.mailbox.name";
+ private static final String OPENSEARCH_ALIAS_READ_NAME =
"opensearch.alias.read.name";
+ private static final String OPENSEARCH_ALIAS_WRITE_NAME =
"opensearch.alias.write.name";
+ private static final String OPENSEARCH_ALIAS_READ_MAILBOX_NAME =
"opensearch.alias.read.mailbox.name";
+ private static final String OPENSEARCH_ALIAS_WRITE_MAILBOX_NAME =
"opensearch.alias.write.mailbox.name";
+ private static final String OPENSEARCH_INDEX_ATTACHMENTS =
"opensearch.indexAttachments";
private static final boolean DEFAULT_INDEX_ATTACHMENTS = true;
public static final OpenSearchMailboxConfiguration DEFAULT_CONFIGURATION =
builder().build();
@@ -99,29 +99,29 @@ public class OpenSearchMailboxConfiguration {
}
static Optional<IndexName> computeMailboxIndexName(Configuration
configuration) {
- return
Optional.ofNullable(configuration.getString(ELASTICSEARCH_INDEX_MAILBOX_NAME))
+ return
Optional.ofNullable(configuration.getString(OPENSEARCH_INDEX_MAILBOX_NAME))
.map(IndexName::new)
- .or(() ->
Optional.ofNullable(configuration.getString(ELASTICSEARCH_INDEX_NAME))
+ .or(() ->
Optional.ofNullable(configuration.getString(OPENSEARCH_INDEX_NAME))
.map(IndexName::new));
}
static Optional<WriteAliasName> computeMailboxWriteAlias(Configuration
configuration) {
- return
Optional.ofNullable(configuration.getString(ELASTICSEARCH_ALIAS_WRITE_MAILBOX_NAME))
+ return
Optional.ofNullable(configuration.getString(OPENSEARCH_ALIAS_WRITE_MAILBOX_NAME))
.map(WriteAliasName::new)
- .or(() ->
Optional.ofNullable(configuration.getString(ELASTICSEARCH_ALIAS_WRITE_NAME))
+ .or(() ->
Optional.ofNullable(configuration.getString(OPENSEARCH_ALIAS_WRITE_NAME))
.map(WriteAliasName::new));
}
static Optional<ReadAliasName> computeMailboxReadAlias(Configuration
configuration) {
- return
Optional.ofNullable(configuration.getString(ELASTICSEARCH_ALIAS_READ_MAILBOX_NAME))
+ return
Optional.ofNullable(configuration.getString(OPENSEARCH_ALIAS_READ_MAILBOX_NAME))
.map(ReadAliasName::new)
- .or(() ->
Optional.ofNullable(configuration.getString(ELASTICSEARCH_ALIAS_READ_NAME))
+ .or(() ->
Optional.ofNullable(configuration.getString(OPENSEARCH_ALIAS_READ_NAME))
.map(ReadAliasName::new));
}
private static IndexAttachments provideIndexAttachments(Configuration
configuration) {
- if (configuration.getBoolean(ELASTICSEARCH_INDEX_ATTACHMENTS,
DEFAULT_INDEX_ATTACHMENTS)) {
+ if (configuration.getBoolean(OPENSEARCH_INDEX_ATTACHMENTS,
DEFAULT_INDEX_ATTACHMENTS)) {
return IndexAttachments.YES;
}
return IndexAttachments.NO;
diff --git
a/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchMailboxConfigurationTest.java
b/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchMailboxConfigurationTest.java
index 5809a67f8d..173360cbb1 100644
---
a/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchMailboxConfigurationTest.java
+++
b/mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchMailboxConfigurationTest.java
@@ -40,8 +40,8 @@ class OpenSearchMailboxConfigurationTest {
void getIndexMailboxNameShouldReturnOldConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.index.name", name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.index.name", name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -53,9 +53,9 @@ class OpenSearchMailboxConfigurationTest {
void getIndexMailboxNameShouldReturnNewConfiguredValueWhenBoth() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.index.name", "other");
- configuration.addProperty("elasticsearch.index.mailbox.name", name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.index.name", "other");
+ configuration.addProperty("opensearch.index.mailbox.name", name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -67,8 +67,8 @@ class OpenSearchMailboxConfigurationTest {
void getIndexMailboxNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.index.mailbox.name", name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.index.mailbox.name", name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -79,7 +79,7 @@ class OpenSearchMailboxConfigurationTest {
@Test
void getIndexMailboxNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -91,8 +91,8 @@ class OpenSearchMailboxConfigurationTest {
void getReadAliasMailboxNameShouldReturnOldConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.alias.read.name", name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.alias.read.name", name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -104,8 +104,8 @@ class OpenSearchMailboxConfigurationTest {
void getReadAliasMailboxNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.alias.read.mailbox.name",
name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.alias.read.mailbox.name", name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -117,9 +117,9 @@ class OpenSearchMailboxConfigurationTest {
void getReadAliasMailboxNameShouldReturnNewConfiguredValueWhenBoth() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.alias.read.mailbox.name",
name);
- configuration.addProperty("elasticsearch.alias.read.name", "other");
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.alias.read.mailbox.name", name);
+ configuration.addProperty("opensearch.alias.read.name", "other");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -130,7 +130,7 @@ class OpenSearchMailboxConfigurationTest {
@Test
void getReadAliasMailboxNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -142,8 +142,8 @@ class OpenSearchMailboxConfigurationTest {
void getWriteAliasMailboxNameShouldReturnOldConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.alias.write.name", name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.alias.write.name", name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -155,8 +155,8 @@ class OpenSearchMailboxConfigurationTest {
void getWriteAliasMailboxNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.alias.write.mailbox.name",
name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.alias.write.mailbox.name", name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -168,9 +168,9 @@ class OpenSearchMailboxConfigurationTest {
void getWriteAliasMailboxNameShouldReturnNewConfiguredValueWhenBoth() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.alias.write.mailbox.name",
name);
- configuration.addProperty("elasticsearch.alias.write.name", "other");
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.alias.write.mailbox.name", name);
+ configuration.addProperty("opensearch.alias.write.name", "other");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -181,7 +181,7 @@ class OpenSearchMailboxConfigurationTest {
@Test
void getWriteAliasMailboxNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -192,8 +192,8 @@ class OpenSearchMailboxConfigurationTest {
@Test
void getIndexAttachmentShouldReturnConfiguredValueWhenTrue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.indexAttachments", true);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.indexAttachments", true);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -204,8 +204,8 @@ class OpenSearchMailboxConfigurationTest {
@Test
void getIndexAttachmentShouldReturnConfiguredValueWhenFalse() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.indexAttachments", false);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.indexAttachments", false);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
@@ -216,7 +216,7 @@ class OpenSearchMailboxConfigurationTest {
@Test
void getIndexAttachmentShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchMailboxConfiguration elasticSearchConfiguration =
OpenSearchMailboxConfiguration.fromProperties(configuration);
diff --git
a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfiguration.java
b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfiguration.java
index c96244103c..d79e7e7089 100644
---
a/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfiguration.java
+++
b/mailbox/plugin/quota-search-opensearch/src/main/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfiguration.java
@@ -81,9 +81,9 @@ public class OpenSearchQuotaConfiguration {
return new Builder();
}
- public static final String ELASTICSEARCH_INDEX_QUOTA_RATIO_NAME =
"elasticsearch.index.quota.ratio.name";
- 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 String OPENSEARCH_INDEX_QUOTA_RATIO_NAME =
"opensearch.index.quota.ratio.name";
+ public static final String OPENSEARCH_ALIAS_READ_QUOTA_RATIO_NAME =
"opensearch.alias.read.quota.ratio.name";
+ public static final String OPENSEARCH_ALIAS_WRITE_QUOTA_RATIO_NAME =
"opensearch.alias.write.quota.ratio.name";
public static final OpenSearchQuotaConfiguration DEFAULT_CONFIGURATION =
builder().build();
@@ -96,17 +96,17 @@ public class OpenSearchQuotaConfiguration {
}
public static Optional<IndexName>
computeQuotaSearchIndexName(Configuration configuration) {
- return
Optional.ofNullable(configuration.getString(ELASTICSEARCH_INDEX_QUOTA_RATIO_NAME))
+ return
Optional.ofNullable(configuration.getString(OPENSEARCH_INDEX_QUOTA_RATIO_NAME))
.map(IndexName::new);
}
public static Optional<WriteAliasName>
computeQuotaSearchWriteAlias(Configuration configuration) {
- return
Optional.ofNullable(configuration.getString(ELASTICSEARCH_ALIAS_WRITE_QUOTA_RATIO_NAME))
+ return
Optional.ofNullable(configuration.getString(OPENSEARCH_ALIAS_WRITE_QUOTA_RATIO_NAME))
.map(WriteAliasName::new);
}
public static Optional<ReadAliasName>
computeQuotaSearchReadAlias(Configuration configuration) {
- return
Optional.ofNullable(configuration.getString(ELASTICSEARCH_ALIAS_READ_QUOTA_RATIO_NAME))
+ return
Optional.ofNullable(configuration.getString(OPENSEARCH_ALIAS_READ_QUOTA_RATIO_NAME))
.map(ReadAliasName::new);
}
diff --git
a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfigurationTest.java
b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfigurationTest.java
index e2b7f9d0c8..4b964f991f 100644
---
a/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfigurationTest.java
+++
b/mailbox/plugin/quota-search-opensearch/src/test/java/org/apache/james/quota/search/opensearch/OpenSearchQuotaConfigurationTest.java
@@ -33,8 +33,8 @@ class OpenSearchQuotaConfigurationTest {
void getReadAliasQuotaRatioNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.alias.read.quota.ratio.name",
name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.alias.read.quota.ratio.name",
name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchQuotaConfiguration elasticSearchConfiguration =
OpenSearchQuotaConfiguration.fromProperties(configuration);
@@ -45,7 +45,7 @@ class OpenSearchQuotaConfigurationTest {
@Test
void getReadAliasQuotaRatioNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchQuotaConfiguration elasticSearchConfiguration =
OpenSearchQuotaConfiguration.fromProperties(configuration);
@@ -57,8 +57,8 @@ class OpenSearchQuotaConfigurationTest {
void getWriteAliasQuotaRatioNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
-
configuration.addProperty("elasticsearch.alias.write.quota.ratio.name", name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.alias.write.quota.ratio.name",
name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchQuotaConfiguration elasticSearchConfiguration =
OpenSearchQuotaConfiguration.fromProperties(configuration);
@@ -69,7 +69,7 @@ class OpenSearchQuotaConfigurationTest {
@Test
void getWriteAliasQuotaRatioNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchQuotaConfiguration elasticSearchConfiguration =
OpenSearchQuotaConfiguration.fromProperties(configuration);
@@ -81,8 +81,8 @@ class OpenSearchQuotaConfigurationTest {
void getIndexQuotaRatioNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
- configuration.addProperty("elasticsearch.index.quota.ratio.name",
name);
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.index.quota.ratio.name", name);
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchQuotaConfiguration elasticSearchConfiguration =
OpenSearchQuotaConfiguration.fromProperties(configuration);
@@ -93,7 +93,7 @@ class OpenSearchQuotaConfigurationTest {
@Test
void getIndexQuotaRatioNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
+ configuration.addProperty("opensearch.hosts", "127.0.0.1");
OpenSearchQuotaConfiguration elasticSearchConfiguration =
OpenSearchQuotaConfiguration.fromProperties(configuration);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
