http://git-wip-us.apache.org/repos/asf/james-project/blob/3ae482a7/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/ElasticSearchConfigurationTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/ElasticSearchConfigurationTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/ElasticSearchConfigurationTest.java index 9c1a3fc..e6b13d3 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/ElasticSearchConfigurationTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/ElasticSearchConfigurationTest.java @@ -134,7 +134,7 @@ public class ElasticSearchConfigurationTest { } @Test - public void getIndexNameShouldReturnConfiguredValue() throws ConfigurationException { + public void getIndexMailboxNameShouldReturnOldConfiguredValue() throws ConfigurationException { PropertiesConfiguration configuration = new PropertiesConfiguration(); String name = "name"; configuration.addProperty("elasticsearch.index.name", name); @@ -142,23 +142,50 @@ public class ElasticSearchConfigurationTest { ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); - assertThat(elasticSearchConfiguration.getIndexName()) + assertThat(elasticSearchConfiguration.getIndexMailboxName()) .isEqualTo(new IndexName(name)); } @Test - public void getIndexNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException { + public void getIndexMailboxNameShouldReturnNewConfiguredValueWhenBoth() throws ConfigurationException { 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"); + + ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); + + assertThat(elasticSearchConfiguration.getIndexMailboxName()) + .isEqualTo(new IndexName(name)); + } + + @Test + public void getIndexMailboxNameShouldReturnConfiguredValue() throws ConfigurationException { + PropertiesConfiguration configuration = new PropertiesConfiguration(); + String name = "name"; + configuration.addProperty("elasticsearch.index.mailbox.name", name); configuration.addProperty("elasticsearch.hosts", "127.0.0.1"); ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); - assertThat(elasticSearchConfiguration.getIndexName()) + assertThat(elasticSearchConfiguration.getIndexMailboxName()) + .isEqualTo(new IndexName(name)); + } + + @Test + public void getIndexMailboxNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException { + PropertiesConfiguration configuration = new PropertiesConfiguration(); + configuration.addProperty("elasticsearch.hosts", "127.0.0.1"); + + ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); + + assertThat(elasticSearchConfiguration.getIndexMailboxName()) .isEqualTo(MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); } @Test - public void getReadAliasNameShouldReturnConfiguredValue() throws ConfigurationException { + public void getReadAliasMailboxNameShouldReturnOldConfiguredValue() throws ConfigurationException { PropertiesConfiguration configuration = new PropertiesConfiguration(); String name = "name"; configuration.addProperty("elasticsearch.alias.read.name", name); @@ -166,24 +193,50 @@ public class ElasticSearchConfigurationTest { ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); - assertThat(elasticSearchConfiguration.getReadAliasName()) + assertThat(elasticSearchConfiguration.getReadAliasMailboxName()) .isEqualTo(new AliasName(name)); } @Test - public void getReadAliasNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException { + public void getReadAliasMailboxNameShouldReturnConfiguredValue() throws ConfigurationException { PropertiesConfiguration configuration = new PropertiesConfiguration(); + String name = "name"; + configuration.addProperty("elasticsearch.alias.read.mailbox.name", name); configuration.addProperty("elasticsearch.hosts", "127.0.0.1"); ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); - assertThat(elasticSearchConfiguration.getReadAliasName()) - .isEqualTo(MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS); + assertThat(elasticSearchConfiguration.getReadAliasMailboxName()) + .isEqualTo(new AliasName(name)); } + @Test + public void getReadAliasMailboxNameShouldReturnNewConfiguredValueWhenBoth() throws ConfigurationException { + 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"); + + ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); + + assertThat(elasticSearchConfiguration.getReadAliasMailboxName()) + .isEqualTo(new AliasName(name)); + } @Test - public void getWriteAliasNameNameShouldReturnConfiguredValue() throws ConfigurationException { + public void getReadAliasMailboxNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException { + PropertiesConfiguration configuration = new PropertiesConfiguration(); + configuration.addProperty("elasticsearch.hosts", "127.0.0.1"); + + ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); + + assertThat(elasticSearchConfiguration.getReadAliasMailboxName()) + .isEqualTo(MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS); + } + + @Test + public void getWriteAliasMailboxNameShouldReturnOldConfiguredValue() throws ConfigurationException { PropertiesConfiguration configuration = new PropertiesConfiguration(); String name = "name"; configuration.addProperty("elasticsearch.alias.write.name", name); @@ -191,18 +244,45 @@ public class ElasticSearchConfigurationTest { ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); - assertThat(elasticSearchConfiguration.getWriteAliasName()) + assertThat(elasticSearchConfiguration.getWriteAliasMailboxName()) + .isEqualTo(new AliasName(name)); + } + + @Test + public void getWriteAliasMailboxNameShouldReturnConfiguredValue() throws ConfigurationException { + PropertiesConfiguration configuration = new PropertiesConfiguration(); + String name = "name"; + configuration.addProperty("elasticsearch.alias.write.mailbox.name", name); + configuration.addProperty("elasticsearch.hosts", "127.0.0.1"); + + ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); + + assertThat(elasticSearchConfiguration.getWriteAliasMailboxName()) + .isEqualTo(new AliasName(name)); + } + + @Test + public void getWriteAliasMailboxNameShouldReturnNewConfiguredValueWhenBoth() throws ConfigurationException { + 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"); + + ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); + + assertThat(elasticSearchConfiguration.getWriteAliasMailboxName()) .isEqualTo(new AliasName(name)); } @Test - public void getWriteAliasNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException { + public void getWriteAliasMailboxNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException { PropertiesConfiguration configuration = new PropertiesConfiguration(); configuration.addProperty("elasticsearch.hosts", "127.0.0.1"); ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); - assertThat(elasticSearchConfiguration.getWriteAliasName()) + assertThat(elasticSearchConfiguration.getWriteAliasMailboxName()) .isEqualTo(MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS); }
http://git-wip-us.apache.org/repos/asf/james-project/blob/3ae482a7/src/site/xdoc/server/config-elasticsearch.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/server/config-elasticsearch.xml b/src/site/xdoc/server/config-elasticsearch.xml index b5ca6c8..d1fb181 100644 --- a/src/site/xdoc/server/config-elasticsearch.xml +++ b/src/site/xdoc/server/config-elasticsearch.xml @@ -56,13 +56,24 @@ <dd>Number of shards for index provisionned by James</dd> <dt><strong>elasticsearch.nb.replica</strong></dt> <dd>Number of replica for index provisionned by James</dd> + <dt><strong>elasticsearch.index.mailbox.name</strong></dt> + <dd>Name of the mailbox index backed by the alias. It will be created if missing.</dd> <dt><strong>elasticsearch.index.name</strong></dt> - <dd>Name of the index backed by the alias. It will be created if missing.</dd> + <dd><strong>Deprecated</strong> Use <strong>elasticsearch.index.mailbox.name</strong> instead. <br/> + Name of the mailbox index backed by the alias. It will be created if missing.</dd> + <dt><strong>elasticsearch.alias.read.mailbox.name</strong></dt> + <dd>Name of the alias to use by Apache James for mailbox reads. It will be created if missing. + The target of the alias is the index name configured above.</dd> <dt><strong>elasticsearch.alias.read.name</strong></dt> - <dd>Name of the alias to use by Apache James for reads. It will be created if missing. + <dd><strong>Deprecated</strong> Use <strong>elasticsearch.alias.read.mailbox.name</strong> instead. <br/> + Name of the alias to use by Apache James for mailbox reads. It will be created if missing. + The target of the alias is the index name configured above.</dd> + <dt><strong>elasticsearch.alias.write.mailbox.name</strong></dt> + <dd>Name of the alias to use by Apache James for mailbox writes. It will be created if missing. The target of the alias is the index name configured above.</dd> <dt><strong>elasticsearch.alias.write.name</strong></dt> - <dd>Name of the alias to use by Apache James for writes. It will be created if missing. + <dd><strong>Deprecated</strong> Use <strong>elasticsearch.alias.write.mailbox.name</strong> instead. <br/> + Name of the alias to use by Apache James for mailbox writes. It will be created if missing. The target of the alias is the index name configured above.</dd> <dt><strong>elasticsearch.retryConnection.maxRetries</strong></dt> <dd>Number of retries when connecting the cluster</dd> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
