JAMES-2202 Rename typo on ElasticSearch case
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4f663b2d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4f663b2d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4f663b2d Branch: refs/heads/master Commit: 4f663b2dd266670f9ed3859bbd9c98cdbe3405f6 Parents: f3b6ac5 Author: benwa <btell...@linagora.com> Authored: Wed Oct 25 15:51:03 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Wed Nov 1 17:54:21 2017 +0700 ---------------------------------------------------------------------- .../MailboxElasticSearchConstants.java | 31 ++++++++++++++++++++ .../MailboxElasticsearchConstants.java | 31 -------------------- .../elasticsearch/MailboxMappingFactory.java | 2 +- .../ElasticSearchIntegrationTest.java | 24 +++++++-------- .../host/ElasticSearchHostSystem.java | 22 +++++++------- .../smtp/host/CassandraJamesSmtpHostSystem.java | 4 +-- .../mailbox/ElasticSearchConfiguration.java | 8 ++--- .../mailbox/ElasticSearchMailboxModule.java | 6 ++-- .../apache/james/EmbeddedElasticSearchRule.java | 4 +-- .../james/JamesCapabilitiesServerTest.java | 4 +-- .../james/modules/TestElasticSearchModule.java | 12 ++++---- .../mailbox/ElasticSearchConfigurationTest.java | 8 ++--- .../cassandra/cucumber/CassandraStepdefs.java | 4 +-- 13 files changed, 80 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxElasticSearchConstants.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxElasticSearchConstants.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxElasticSearchConstants.java new file mode 100644 index 0000000..80c0584 --- /dev/null +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxElasticSearchConstants.java @@ -0,0 +1,31 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.mailbox.elasticsearch; + +import org.apache.james.backends.es.AliasName; +import org.apache.james.backends.es.IndexName; +import org.apache.james.backends.es.TypeName; + +public interface MailboxElasticSearchConstants { + AliasName DEFAULT_MAILBOX_WRITE_ALIAS = new AliasName("mailboxWriteAlias"); + AliasName DEFAULT_MAILBOX_READ_ALIAS = new AliasName("mailboxReadAlias"); + IndexName DEFAULT_MAILBOX_INDEX = new IndexName("mailbox"); + TypeName MESSAGE_TYPE = new TypeName("message"); +} http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxElasticsearchConstants.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxElasticsearchConstants.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxElasticsearchConstants.java deleted file mode 100644 index e1d87c2..0000000 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxElasticsearchConstants.java +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.mailbox.elasticsearch; - -import org.apache.james.backends.es.AliasName; -import org.apache.james.backends.es.IndexName; -import org.apache.james.backends.es.TypeName; - -public interface MailboxElasticsearchConstants { - AliasName DEFAULT_MAILBOX_WRITE_ALIAS = new AliasName("mailboxWriteAlias"); - AliasName DEFAULT_MAILBOX_READ_ALIAS = new AliasName("mailboxReadAlias"); - IndexName DEFAULT_MAILBOX_INDEX = new IndexName("mailbox"); - TypeName MESSAGE_TYPE = new TypeName("message"); -} http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java index 142736c..25a1639 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java @@ -80,7 +80,7 @@ public class MailboxMappingFactory { return jsonBuilder() .startObject() - .startObject(MailboxElasticsearchConstants.MESSAGE_TYPE.getValue()) + .startObject(MailboxElasticSearchConstants.MESSAGE_TYPE.getValue()) .startObject(PROPERTIES) .startObject(MESSAGE_ID) http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java index 4e18134..e380864 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java @@ -83,7 +83,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest private static final boolean IS_RECENT = true; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch= new EmbeddedElasticSearch(temporaryFolder, MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch= new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); @@ -111,12 +111,12 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest protected void initializeMailboxManager() throws Exception { Client client = NodeMappingFactory.applyMapping( new IndexCreationFactory() - .onIndex(MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX) - .addAlias( MailboxElasticsearchConstants.DEFAULT_MAILBOX_READ_ALIAS) - .addAlias( MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS) + .onIndex(MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX) + .addAlias( MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS) + .addAlias( MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS) .createIndexAndAliases(new TestingClientProvider(embeddedElasticSearch.getNode()).get()), - MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX, - MailboxElasticsearchConstants.MESSAGE_TYPE, + MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX, + MailboxElasticSearchConstants.MESSAGE_TYPE, MailboxMappingFactory.getMappingContent()); MailboxSessionMapperFactory mapperFactory = new InMemoryMailboxSessionMapperFactory(); @@ -127,14 +127,14 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest new DeleteByQueryPerformer(client, Executors.newSingleThreadExecutor(), BATCH_SIZE, - MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS, - MailboxElasticsearchConstants.MESSAGE_TYPE), - MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS, - MailboxElasticsearchConstants.MESSAGE_TYPE), + MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS, + MailboxElasticSearchConstants.MESSAGE_TYPE), + MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS, + MailboxElasticSearchConstants.MESSAGE_TYPE), new ElasticSearchSearcher(client, new QueryConverter(new CriterionConverter()), SEARCH_SIZE, new InMemoryId.Factory(), messageIdFactory, - MailboxElasticsearchConstants.DEFAULT_MAILBOX_READ_ALIAS, - MailboxElasticsearchConstants.MESSAGE_TYPE), + MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS, + MailboxElasticSearchConstants.MESSAGE_TYPE), new MessageToElasticSearchJson(textExtractor, ZoneId.of("Europe/Paris"), IndexAttachments.YES)); storeMailboxManager = new InMemoryMailboxManager( mapperFactory, http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java ---------------------------------------------------------------------- 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/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java index d83f96f..0817c25 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java +++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java @@ -42,7 +42,7 @@ import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.acl.UnionMailboxACLResolver; import org.apache.james.mailbox.elasticsearch.IndexAttachments; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.mailbox.elasticsearch.MailboxMappingFactory; import org.apache.james.mailbox.elasticsearch.events.ElasticSearchListeningMessageSearchIndex; import org.apache.james.mailbox.elasticsearch.json.MessageToElasticSearchJson; @@ -82,7 +82,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem { public void beforeTest() throws Exception { super.beforeTest(); this.tempDirectory = Files.createTempDirectory("elasticsearch"); - this.embeddedElasticSearch = new EmbeddedElasticSearch(tempDirectory, MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX); + this.embeddedElasticSearch = new EmbeddedElasticSearch(tempDirectory, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); embeddedElasticSearch.before(); initFields(); } @@ -96,12 +96,12 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem { private void initFields() { Client client = NodeMappingFactory.applyMapping( new IndexCreationFactory() - .onIndex(MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX) - .addAlias(MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS) - .addAlias(MailboxElasticsearchConstants.DEFAULT_MAILBOX_READ_ALIAS) + .onIndex(MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX) + .addAlias(MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS) + .addAlias(MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS) .createIndexAndAliases(new TestingClientProvider(embeddedElasticSearch.getNode()).get()), - MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX, - MailboxElasticsearchConstants.MESSAGE_TYPE, + MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX, + MailboxElasticSearchConstants.MESSAGE_TYPE, MailboxMappingFactory.getMappingContent()); InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory(); @@ -110,12 +110,12 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem { ElasticSearchListeningMessageSearchIndex searchIndex = new ElasticSearchListeningMessageSearchIndex( factory, new ElasticSearchIndexer(client, - new DeleteByQueryPerformer(client, Executors.newSingleThreadExecutor(), MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS, MailboxElasticsearchConstants.MESSAGE_TYPE), - MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS, - MailboxElasticsearchConstants.MESSAGE_TYPE), + new DeleteByQueryPerformer(client, Executors.newSingleThreadExecutor(), MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS, MailboxElasticSearchConstants.MESSAGE_TYPE), + MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS, + MailboxElasticSearchConstants.MESSAGE_TYPE), new ElasticSearchSearcher(client, new QueryConverter(new CriterionConverter()), new InMemoryId.Factory(), messageIdFactory, - MailboxElasticsearchConstants.DEFAULT_MAILBOX_READ_ALIAS, MailboxElasticsearchConstants.MESSAGE_TYPE), + MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS, MailboxElasticSearchConstants.MESSAGE_TYPE), new MessageToElasticSearchJson(new DefaultTextExtractor(), ZoneId.systemDefault(), IndexAttachments.YES)); MailboxACLResolver aclResolver = new UnionMailboxACLResolver(); http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java index 7b958f2..a7a3fbf 100644 --- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java +++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java @@ -26,7 +26,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.InMemoryDNSService; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.modules.CassandraJmapServerModule; import org.apache.james.modules.protocols.ProtocolHandlerModule; import org.apache.james.mpt.monitor.SystemLoggingMonitor; @@ -83,7 +83,7 @@ public class CassandraJamesSmtpHostSystem extends ExternalSessionFactory impleme inMemoryDNSService = new InMemoryDNSService(); folder = new TemporaryFolder(); folder.create(); - embeddedElasticSearch = new EmbeddedElasticSearch(folder.getRoot().toPath(), MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX); + embeddedElasticSearch = new EmbeddedElasticSearch(folder.getRoot().toPath(), MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); embeddedElasticSearch.before(); jamesServer = createJamesServer(); jamesServer.start(); http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java index 7d65618..8d95228 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java @@ -27,7 +27,7 @@ import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.james.backends.es.AliasName; import org.apache.james.backends.es.IndexName; import org.apache.james.mailbox.elasticsearch.IndexAttachments; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.util.Host; import com.google.common.annotations.VisibleForTesting; @@ -63,13 +63,13 @@ public class ElasticSearchConfiguration { AliasName readAlias = Optional.ofNullable(configuration.getString(ELASTICSEARCH_ALIAS_READ_NAME)) .map(AliasName::new) - .orElse(MailboxElasticsearchConstants.DEFAULT_MAILBOX_READ_ALIAS); + .orElse(MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS); AliasName writeAlias = Optional.ofNullable(configuration.getString(ELASTICSEARCH_ALIAS_WRITE_NAME)) .map(AliasName::new) - .orElse(MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS); + .orElse(MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS); IndexName indexName = Optional.ofNullable(configuration.getString(ELASTICSEARCH_INDEX_NAME)) .map(IndexName::new) - .orElse(MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX); + .orElse(MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); return new ElasticSearchConfiguration( hosts, http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java index d9e7858..1939523 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java @@ -36,7 +36,7 @@ import org.apache.james.backends.es.IndexName; import org.apache.james.backends.es.NodeMappingFactory; import org.apache.james.backends.es.TypeName; import org.apache.james.mailbox.elasticsearch.IndexAttachments; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.mailbox.elasticsearch.MailboxMappingFactory; import org.apache.james.mailbox.elasticsearch.events.ElasticSearchListeningMessageSearchIndex; import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex; @@ -61,7 +61,7 @@ public class ElasticSearchMailboxModule extends AbstractModule { @Override protected void configure() { - bind(TypeName.class).toInstance(MailboxElasticsearchConstants.MESSAGE_TYPE); + bind(TypeName.class).toInstance(MailboxElasticSearchConstants.MESSAGE_TYPE); bind(ElasticSearchListeningMessageSearchIndex.class).in(Scopes.SINGLETON); bind(MessageSearchIndex.class).to(ElasticSearchListeningMessageSearchIndex.class); bind(ListeningMessageSearchIndex.class).to(ElasticSearchListeningMessageSearchIndex.class); @@ -126,7 +126,7 @@ public class ElasticSearchMailboxModule extends AbstractModule { indexCreationFactory.createIndexAndAliases(client); return NodeMappingFactory.applyMapping(client, configuration.getIndexName(), - MailboxElasticsearchConstants.MESSAGE_TYPE, + MailboxElasticSearchConstants.MESSAGE_TYPE, MailboxMappingFactory.getMappingContent()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java index 5bef22e..028dc42 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java @@ -20,7 +20,7 @@ package org.apache.james; import org.apache.james.backends.es.EmbeddedElasticSearch; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.modules.TestElasticSearchModule; import org.elasticsearch.node.Node; import org.junit.rules.RuleChain; @@ -34,7 +34,7 @@ import com.google.inject.Module; public class EmbeddedElasticSearchRule implements GuiceModuleTestRule { private final TemporaryFolder temporaryFolder = new TemporaryFolder(); - private final EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX); + private final EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); private final RuleChain chain = RuleChain .outerRule(temporaryFolder) http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 383d781..5f561b5 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -29,7 +29,7 @@ import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.jmap.methods.GetMessageListMethod; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.modules.TestElasticSearchModule; import org.apache.james.modules.TestFilesystemModule; import org.apache.james.modules.TestJMAPServerModule; @@ -45,7 +45,7 @@ public class JamesCapabilitiesServerTest { private GuiceJamesServer server; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); private DockerCassandraRule cassandraServer = new DockerCassandraRule(); @Rule http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java index 5e30618..8cd728c 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java @@ -25,7 +25,7 @@ import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.backends.es.IndexCreationFactory; import org.apache.james.backends.es.NodeMappingFactory; import org.apache.james.backends.es.utils.TestingClientProvider; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.mailbox.elasticsearch.MailboxMappingFactory; import org.elasticsearch.client.Client; @@ -51,13 +51,13 @@ public class TestElasticSearchModule extends AbstractModule{ Client client = new TestingClientProvider(embeddedElasticSearch.getNode()).get(); new IndexCreationFactory() - .onIndex(MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX) - .addAlias(MailboxElasticsearchConstants.DEFAULT_MAILBOX_READ_ALIAS) - .addAlias(MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS) + .onIndex(MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX) + .addAlias(MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS) + .addAlias(MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS) .createIndexAndAliases(client); return NodeMappingFactory.applyMapping(client, - MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX, - MailboxElasticsearchConstants.MESSAGE_TYPE, + MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX, + MailboxElasticSearchConstants.MESSAGE_TYPE, MailboxMappingFactory.getMappingContent()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/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 f4b7765..514f967 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 @@ -29,7 +29,7 @@ import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.james.backends.es.AliasName; import org.apache.james.backends.es.IndexName; import org.apache.james.mailbox.elasticsearch.IndexAttachments; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.util.Host; import org.junit.Test; @@ -152,7 +152,7 @@ public class ElasticSearchConfigurationTest { ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); assertThat(elasticSearchConfiguration.getIndexName()) - .isEqualTo(MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX); + .isEqualTo(MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); } @Test @@ -176,7 +176,7 @@ public class ElasticSearchConfigurationTest { ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); assertThat(elasticSearchConfiguration.getReadAliasName()) - .isEqualTo(MailboxElasticsearchConstants.DEFAULT_MAILBOX_READ_ALIAS); + .isEqualTo(MailboxElasticSearchConstants.DEFAULT_MAILBOX_READ_ALIAS); } @@ -201,7 +201,7 @@ public class ElasticSearchConfigurationTest { ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); assertThat(elasticSearchConfiguration.getWriteAliasName()) - .isEqualTo(MailboxElasticsearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS); + .isEqualTo(MailboxElasticSearchConstants.DEFAULT_MAILBOX_WRITE_ALIAS); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/4f663b2d/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java index 684bf3b..22f60ea 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java @@ -31,7 +31,7 @@ import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; -import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.modules.CassandraJmapServerModule; import org.junit.rules.TemporaryFolder; @@ -46,7 +46,7 @@ public class CassandraStepdefs { private final MainStepdefs mainStepdefs; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticsearchConstants.DEFAULT_MAILBOX_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); private DockerCassandraRule cassandraServer = CucumberCassandraSingleton.cassandraServer; @Inject --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
