JAMES-2469 Fasten Embedded ElasticSearch Avoid waiting 100ms for nothing upon start and stop, avoid a ~10ms request upon stop.
The files were dropped anyway, so the 'partial' (we do use several indexes) DeleteIndex query was useless, I removed it. Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9b8e48a6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9b8e48a6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9b8e48a6 Branch: refs/heads/master Commit: 9b8e48a6ca7d5bfe63dd4365611654b1aa178f27 Parents: 74d5418 Author: benwa <[email protected]> Authored: Sun Jul 15 14:27:05 2018 +0700 Committer: benwa <[email protected]> Committed: Wed Jul 25 09:35:48 2018 +0700 ---------------------------------------------------------------------- .../backends/es/ElasticSearchIndexerTest.java | 2 +- .../backends/es/EmbeddedElasticSearch.java | 31 +++++--------------- .../backends/es/IndexCreationFactoryTest.java | 2 +- .../backends/es/NodeMappingFactoryTest.java | 2 +- .../backends/es/search/ScrollIterableTest.java | 2 +- .../ElasticSearchIntegrationTest.java | 2 +- ...ticSearchQuotaSearchTestSystemExtension.java | 2 +- .../ElasticSearchQuotaMailboxListenerTest.java | 2 +- .../host/ElasticSearchHostSystem.java | 2 +- .../apache/james/EmbeddedElasticSearchRule.java | 3 +- .../james/JamesCapabilitiesServerTest.java | 3 +- .../jmap/cassandra/CassandraJmapExtension.java | 3 +- .../cassandra/cucumber/CassandraStepdefs.java | 3 +- .../ElasticSearchQuotaSearchExtension.java | 2 +- 14 files changed, 20 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java index 544389d..ee37e80 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java @@ -45,7 +45,7 @@ public class ElasticSearchIndexerTest { private static final WriteAliasName ALIAS_NAME = new WriteAliasName("alias_name"); private static final TypeName TYPE_NAME = new TypeName("type_name"); private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java index 19002b5..721d9e7 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java @@ -26,7 +26,6 @@ import java.io.IOException; import java.nio.file.Path; import java.util.function.Supplier; -import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.admin.indices.flush.FlushAction; import org.elasticsearch.action.admin.indices.flush.FlushRequestBuilder; import org.elasticsearch.client.Client; @@ -34,17 +33,11 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; import org.junit.rules.ExternalResource; import org.junit.rules.TemporaryFolder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.jayway.awaitility.Duration; public class EmbeddedElasticSearch extends ExternalResource { - - private static final Logger LOGGER = LoggerFactory.getLogger(EmbeddedElasticSearch.class); - private final Supplier<Path> folder; - private final IndexName indexName; private Node node; private static Path createTempDir(TemporaryFolder temporaryFolder) { @@ -55,17 +48,16 @@ public class EmbeddedElasticSearch extends ExternalResource { } } - public EmbeddedElasticSearch(TemporaryFolder temporaryFolder, IndexName indexName) { - this(() -> EmbeddedElasticSearch.createTempDir(temporaryFolder), indexName); + public EmbeddedElasticSearch(TemporaryFolder temporaryFolder) { + this(() -> EmbeddedElasticSearch.createTempDir(temporaryFolder)); } - public EmbeddedElasticSearch(Path folder, IndexName indexName) { - this(() -> folder, indexName); + public EmbeddedElasticSearch(Path folder) { + this(() -> folder); } - private EmbeddedElasticSearch(Supplier<Path> folder, IndexName indexName) { + private EmbeddedElasticSearch(Supplier<Path> folder) { this.folder = folder; - this.indexName = indexName; } @Override @@ -76,20 +68,10 @@ public class EmbeddedElasticSearch extends ExternalResource { .build()) .node(); node.start(); - awaitForElasticSearch(); } @Override public void after() { - awaitForElasticSearch(); - try (Client client = node.client()) { - client.admin() - .indices() - .delete(new DeleteIndexRequest(indexName.getValue())) - .actionGet(); - } catch (Exception e) { - LOGGER.warn("Error while closing ES connection", e); - } node.close(); } @@ -102,7 +84,8 @@ public class EmbeddedElasticSearch extends ExternalResource { * This method ensure that ElasticSearch service is up and indices are updated */ public void awaitForElasticSearch() { - await().atMost(Duration.TEN_SECONDS).until(this::flush); + await().atMost(Duration.TEN_SECONDS) + .until(this::flush); } private boolean flush() { http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java index 012914e..1c9f1d8 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java @@ -33,7 +33,7 @@ public class IndexCreationFactoryTest { public static final ReadAliasName ALIAS_NAME = new ReadAliasName("alias"); private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java index d6920af..50e2f1e 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java @@ -36,7 +36,7 @@ public class NodeMappingFactoryTest { public static final TypeName TYPE_NAME = new TypeName("type"); private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java index c9bb496..4c65a9b 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java @@ -57,7 +57,7 @@ public class ScrollIterableTest { public static final TypeName TYPE_NAME = new TypeName("messages"); private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/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 e8b8aae..f237799 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 @@ -64,7 +64,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest private static final int SEARCH_SIZE = 1; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java index ecefaf7..cf35a03 100644 --- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java +++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java @@ -47,7 +47,7 @@ import org.junit.rules.TemporaryFolder; public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterResolver, BeforeEachCallback, AfterEachCallback { private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @Override public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException { http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java index 076e956..a9ef7de 100644 --- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java +++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java @@ -53,7 +53,7 @@ public class ElasticSearchQuotaMailboxListenerTest { private static final Event EVENT = () -> MAILBOX_SESSION; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @Rule public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/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 0e68773..7feed5d 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 @@ -76,7 +76,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); embeddedElasticSearch.before(); initFields(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/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 028dc42..3c6848a 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,6 @@ package org.apache.james; import org.apache.james.backends.es.EmbeddedElasticSearch; -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 +33,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); private final RuleChain chain = RuleChain .outerRule(temporaryFolder) http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/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 2b39d71..c55e634 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 @@ -31,7 +31,6 @@ 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.modules.TestElasticSearchModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.server.core.configuration.Configuration; @@ -48,7 +47,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); @ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule(); http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java index 9a4297c..3adc452 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java @@ -27,7 +27,6 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.jmap.methods.integration.JamesWithSpamAssassin; import org.apache.james.jmap.methods.integration.SpamAssassinModule; -import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestESMetricReporterModule; @@ -60,7 +59,7 @@ public class CassandraJmapExtension implements BeforeAllCallback, AfterAllCallba public CassandraJmapExtension() { this.temporaryFolder = new TemporaryFolder(); this.cassandra = new DockerCassandraRule(); - this.elasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); + this.elasticSearch = new EmbeddedElasticSearch(temporaryFolder); this.spamAssassinExtension = new SpamAssassinExtension(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/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 4c53770..d67daa7 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 @@ -34,7 +34,6 @@ import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.jmap.methods.integration.cucumber.ImapStepdefs; 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.extractor.TextExtractor; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; import org.apache.james.modules.TestESMetricReporterModule; @@ -57,7 +56,7 @@ public class CassandraStepdefs { private final MainStepdefs mainStepdefs; private final ImapStepdefs imapStepdefs; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); private DockerCassandraRule cassandraServer = CucumberCassandraSingleton.cassandraServer; @Inject http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java index d9a9e24..48f25f0 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java @@ -51,7 +51,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef private WebAdminQuotaSearchTestSystem restQuotaSearchTestSystem; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @Override public void beforeEach(ExtensionContext context) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
