You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/05/27 02:10:32 UTC
[james-project] 07/10: JAMES-3140
CassandraJamesServerMain::createServer & use it in tests
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 0b965dd2629ef329cb73ec8f79248589f9e051b3
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue May 19 16:29:17 2020 +0700
JAMES-3140 CassandraJamesServerMain::createServer & use it in tests
---
.../java/org/apache/james/CassandraJamesServerMain.java | 10 +++++++---
.../apache/james/AuthenticatedCassandraJamesServerTest.java | 10 +++-------
.../src/test/java/org/apache/james/CacheSessionTest.java | 5 ++---
.../java/org/apache/james/CassandraJamesServerTest.java | 4 +---
.../java/org/apache/james/CassandraJmapJamesServerTest.java | 5 +----
.../test/java/org/apache/james/CassandraJmapTestRule.java | 5 +----
.../james/CassandraMailRepositoryIntegrationTest.java | 4 +---
.../james/CassandraMessageIdManagerInjectionTest.java | 4 +---
.../test/java/org/apache/james/CassandraNodeConfTest.java | 4 +---
.../test/java/org/apache/james/CassandraWithTikaTest.java | 5 +----
.../org/apache/james/DefaultCassandraJamesServerTest.java | 4 +---
.../src/test/java/org/apache/james/ESReporterTest.java | 4 +---
.../java/org/apache/james/JamesCapabilitiesServerTest.java | 4 +---
.../apache/james/JamesServerWithRetryConnectionTest.java | 4 +---
.../JamesWithNonCompatibleElasticSearchServerTest.java | 4 +---
.../test/java/org/apache/james/KeyspaceCreationTest.java | 13 ++++---------
.../java/org/apache/james/WithCassandraBlobStoreTest.java | 4 +---
.../mailbox/CassandraSchemaVersionStartUpCheckTest.java | 5 ++---
.../java/org/apache/james/CassandraLdapJamesServerMain.java | 11 +++++++----
.../java/org/apache/james/CassandraLdapJamesServerTest.java | 5 ++---
.../org/apache/james/CassandraLdapJmapJamesServerTest.java | 3 +--
.../apache/james/jmap/cassandra/CassandraImapErrorTest.java | 5 ++---
.../james/jmap/cassandra/CassandraSendMDNMethodTest.java | 7 ++-----
.../jmap/cassandra/CassandraSpamAssassinContractTest.java | 7 ++-----
.../james/jmap/cassandra/cucumber/CassandraStepdefs.java | 7 ++-----
25 files changed, 49 insertions(+), 94 deletions(-)
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
index f4370d3..8ecdf1a 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
@@ -155,7 +155,7 @@ public class CassandraJamesServerMain implements JamesServerMain {
PLUGINS,
new DKIMMailetModule());
- public static Module ALL_BUT_JMX_CASSANDRA_MODULE = Modules.combine(
+ protected static Module ALL_BUT_JMX_CASSANDRA_MODULE = Modules.combine(
new CassandraBlobStoreModule(),
REQUIRE_TASK_MANAGER_MODULE,
new TaskManagerModule(),
@@ -167,10 +167,14 @@ public class CassandraJamesServerMain implements JamesServerMain {
.useWorkingDirectoryEnvProperty()
.build();
- GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE, new JMXServerModule());
+ GuiceJamesServer server = createServer(configuration)
+ .combineWith(new JMXServerModule());
JamesServerMain.main(server);
}
+ public static GuiceJamesServer createServer(Configuration configuration) {
+ return GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE);
+ }
}
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java
index f88f3b3..ae84eab 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java
@@ -19,7 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.apache.james.JamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -47,8 +46,7 @@ class AuthenticatedCassandraJamesServerTest {
JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(cassandraExtension)
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
@@ -67,8 +65,7 @@ class AuthenticatedCassandraJamesServerTest {
.extension(new DockerElasticSearchExtension())
.extension(cassandraExtension)
.disableAutoStart()
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
@@ -95,8 +92,7 @@ class AuthenticatedCassandraJamesServerTest {
.extension(new DockerElasticSearchExtension())
.extension(cassandraExtension)
.disableAutoStart()
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java
index 29fbf2d..cf2a0bd 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java
@@ -20,7 +20,6 @@
package org.apache.james;
import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThatCode;
import org.apache.james.backends.cassandra.components.CassandraModule;
@@ -77,8 +76,8 @@ class CacheSessionTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE, new CassandraCacheSessionModule())
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
+ .combineWith(new CassandraCacheSessionModule())
.overrideWith(new TestJMAPServerModule()))
.overrideServerModule(binder -> Multibinder.newSetBinder(binder, CassandraModule.class, Names.named(InjectionNames.CACHE))
.addBinding()
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
index e985dd3..9ad366a 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
@@ -19,7 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.extractor.TextExtractor;
@@ -34,8 +33,7 @@ class CassandraJamesServerTest implements JamesServerContract {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java
index e213d3e..70befac 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java
@@ -19,8 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
-
import org.apache.james.jmap.draft.JmapJamesServerContract;
import org.apache.james.mailbox.extractor.TextExtractor;
import org.apache.james.mailbox.store.search.PDFTextExtractor;
@@ -32,8 +30,7 @@ class CassandraJmapJamesServerTest implements JmapJamesServerContract {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java
index 52dcb0c..5c2f7f9 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java
@@ -19,8 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
-
import java.io.IOException;
import org.apache.james.mailbox.extractor.TextExtractor;
@@ -64,8 +62,7 @@ public class CassandraJmapTestRule implements TestRule {
.configurationFromClasspath()
.build();
- return GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ return CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost()))
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
index 17b1c16..4a9a378 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java
@@ -19,7 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS;
import java.util.concurrent.TimeUnit;
@@ -53,8 +52,7 @@ class CassandraMailRepositoryIntegrationTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule()))
.build();
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
index a0ef4e4..d4e2373 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
@@ -19,7 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThatCode;
import javax.inject.Inject;
@@ -40,8 +39,7 @@ class CassandraMessageIdManagerInjectionTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(binder -> Multibinder.newSetBinder(binder, InitializationOperation.class)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java
index 2350dce..d6460af 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -45,8 +44,7 @@ class CassandraNodeConfTest {
return new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
.disableAutoStart();
}
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java
index 8f83f5e..4d822c6 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java
@@ -19,8 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
-
import org.apache.james.modules.TestJMAPServerModule;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -31,8 +29,7 @@ class CassandraWithTikaTest implements JamesServerContract {
.extension(new CassandraExtension())
.extension(new TikaExtension())
.extension(new DockerElasticSearchExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
.build();
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
index c431e1d..bd3a158 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java
@@ -19,7 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
@@ -37,8 +36,7 @@ class DefaultCassandraJamesServerTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(binder -> binder.bind(PropertiesProvider.class).to(FailingPropertiesProvider.class))
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
index 53713ed..dce9efe 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
@@ -21,7 +21,6 @@ package org.apache.james;
import static io.restassured.RestAssured.given;
import static io.restassured.config.EncoderConfig.encoderConfig;
import static io.restassured.config.RestAssuredConfig.newConfig;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.awaitility.Awaitility.await;
@@ -67,8 +66,7 @@ class ESReporterTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(elasticSearchExtension)
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(new TestDockerESMetricReporterModule(elasticSearchExtension.getDockerES().getHttpHost())))
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 6cacc2c..061bc10 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
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -42,8 +41,7 @@ class JamesCapabilitiesServerTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(binder -> binder.bind(MailboxManager.class).toInstance(mailboxManager)))
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
index 280ab2d..34e2e4e 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java
@@ -19,7 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -52,8 +51,7 @@ class JamesServerWithRetryConnectionTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(dockerElasticSearch)
.extension(dockerCassandra)
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule()))
.disableAutoStart()
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
index 643f471..98a3f51 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java
@@ -19,7 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -43,8 +42,7 @@ class JamesWithNonCompatibleElasticSearchServerTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension(dockerES2))
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule()))
.disableAutoStart()
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java
index fd85c37..c2cdf2d 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java
@@ -19,7 +19,6 @@
package org.apache.james;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -38,8 +37,7 @@ class KeyspaceCreationTest {
JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
.overrideServerModule(binder -> binder.bind(ClusterConfiguration.class)
.toInstance(DockerCassandraSingleton.singleton.configurationBuilder()
@@ -61,8 +59,7 @@ class KeyspaceCreationTest {
JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
.overrideServerModule(binder -> binder.bind(KeyspacesConfiguration.class).toInstance(KeyspacesConfiguration.builder()
.keyspace("non_existing_keyspace")
@@ -90,8 +87,7 @@ class KeyspaceCreationTest {
JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
.overrideServerModule(binder -> binder.bind(ClusterConfiguration.class)
.toInstance(DockerCassandraSingleton.singleton.configurationBuilder()
@@ -119,8 +115,7 @@ class KeyspaceCreationTest {
JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule()))
.overrideServerModule(binder -> binder.bind(ClusterConfiguration.class)
.toInstance(DockerCassandraSingleton.singleton.configurationBuilder()
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java
index 596f913..86cdfc2 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java
@@ -31,9 +31,7 @@ class WithCassandraBlobStoreTest implements JmapJamesServerContract, MailsShould
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new SpamAssassinModuleExtension())
- .server(configuration -> GuiceJamesServer
- .forConfiguration(configuration)
- .combineWith(CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
.overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE))
.build();
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java
index e73b77c..e64ec81 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.modules.mailbox;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
@@ -32,6 +31,7 @@ import java.nio.charset.Charset;
import java.util.Optional;
import org.apache.james.CassandraExtension;
+import org.apache.james.CassandraJamesServerMain;
import org.apache.james.DockerElasticSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
@@ -63,8 +63,7 @@ class CassandraSchemaVersionStartUpCheckTest {
static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule())
.overrideWith(binder -> binder.bind(CassandraSchemaVersionDAO.class)
diff --git a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
index 9dbfd9a..a84f51d 100644
--- a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
+++ b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/CassandraLdapJamesServerMain.java
@@ -29,8 +29,7 @@ import com.google.inject.Module;
import com.google.inject.util.Modules;
public class CassandraLdapJamesServerMain implements JamesServerMain {
-
- public static final Module MODULES = Modules.override(ALL_BUT_JMX_CASSANDRA_MODULE)
+ private static final Module MODULES = Modules.override(ALL_BUT_JMX_CASSANDRA_MODULE)
.with(new LdapUsersRepositoryModule());
public static void main(String[] args) throws Exception {
@@ -38,10 +37,14 @@ public class CassandraLdapJamesServerMain implements JamesServerMain {
.useWorkingDirectoryEnvProperty()
.build();
- GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration)
- .combineWith(MODULES, new JMXServerModule());
+ GuiceJamesServer server = createServer(configuration)
+ .combineWith(new JMXServerModule());
JamesServerMain.main(server);
}
+ static GuiceJamesServer createServer(Configuration configuration) {
+ return GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(MODULES);
+ }
}
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
index a0f773a..f1fba58 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
+++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java
@@ -29,9 +29,9 @@ import org.apache.james.core.Domain;
import org.apache.james.modules.TestJMAPServerModule;
import org.apache.james.modules.protocols.ImapGuiceProbe;
import org.apache.james.modules.protocols.SmtpGuiceProbe;
-import org.apache.james.utils.TestIMAPClient;
import org.apache.james.utils.SMTPMessageSender;
import org.apache.james.utils.SpoolerProbe;
+import org.apache.james.utils.TestIMAPClient;
import org.awaitility.Awaitility;
import org.awaitility.Duration;
import org.awaitility.core.ConditionFactory;
@@ -57,8 +57,7 @@ class CassandraLdapJamesServerTest implements JamesServerContract {
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new LdapTestExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(CassandraLdapJamesServerMain.MODULES)
+ .server(configuration -> CassandraLdapJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
.build();
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
index 31d0943..3bbb46a 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
+++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java
@@ -29,8 +29,7 @@ class CassandraLdapJmapJamesServerTest implements JmapJamesServerContract {
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new LdapTestExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(CassandraLdapJamesServerMain.MODULES)
+ .server(configuration -> CassandraLdapJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
.build();
diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraImapErrorTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraImapErrorTest.java
index d8b849d..4f243ed 100644
--- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraImapErrorTest.java
+++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraImapErrorTest.java
@@ -19,7 +19,6 @@
package org.apache.james.jmap.cassandra;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
import static org.apache.james.jmap.JMAPTestingConstants.DOMAIN;
import static org.apache.james.jmap.JMAPTestingConstants.LOCALHOST_IP;
import static org.apache.james.jmap.JMAPTestingConstants.jmapRequestSpecBuilder;
@@ -27,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.commons.net.imap.IMAPClient;
import org.apache.james.CassandraExtension;
+import org.apache.james.CassandraJamesServerMain;
import org.apache.james.DockerElasticSearchExtension;
import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
@@ -52,8 +52,7 @@ class CassandraImapErrorTest {
JamesServerExtension serverExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(cassandraExtension)
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule()))
.build();
diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java
index 72a756e..468d134 100644
--- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java
+++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java
@@ -19,11 +19,9 @@
package org.apache.james.jmap.cassandra;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
-
import org.apache.james.CassandraExtension;
+import org.apache.james.CassandraJamesServerMain;
import org.apache.james.DockerElasticSearchExtension;
-import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.draft.methods.integration.SendMDNMethodTest;
@@ -40,8 +38,7 @@ public class CassandraSendMDNMethodTest extends SendMDNMethodTest {
JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule()))
.build();
diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java
index b188a2c..4fb025a 100644
--- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java
+++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java
@@ -18,11 +18,9 @@
****************************************************************/
package org.apache.james.jmap.cassandra;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
-
import org.apache.james.CassandraExtension;
+import org.apache.james.CassandraJamesServerMain;
import org.apache.james.DockerElasticSearchExtension;
-import org.apache.james.GuiceJamesServer;
import org.apache.james.JamesServerBuilder;
import org.apache.james.JamesServerExtension;
import org.apache.james.jmap.draft.methods.integration.SpamAssassinContract;
@@ -41,8 +39,7 @@ class CassandraSpamAssassinContractTest implements SpamAssassinContract {
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(spamAssassinExtension)
- .server(configuration -> GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ .server(configuration -> CassandraJamesServerMain.createServer(configuration)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule()))
.build();
diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
index fb2e164..cde2a08 100644
--- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
+++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
@@ -19,18 +19,16 @@
package org.apache.james.jmap.cassandra.cucumber;
-import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
-
import java.util.Arrays;
import javax.inject.Inject;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.james.CassandraJamesServerMain;
import org.apache.james.CleanupTasksPerformer;
import org.apache.james.DockerCassandraRule;
import org.apache.james.DockerElasticSearchRule;
-import org.apache.james.GuiceJamesServer;
import org.apache.james.jmap.draft.methods.integration.cucumber.ImapStepdefs;
import org.apache.james.jmap.draft.methods.integration.cucumber.MainStepdefs;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
@@ -76,8 +74,7 @@ public class CassandraStepdefs {
.configurationFromClasspath()
.build();
- mainStepdefs.jmapServer = GuiceJamesServer.forConfiguration(configuration)
- .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
+ mainStepdefs.jmapServer = CassandraJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
.overrideWith(new TestDockerESMetricReporterModule(elasticSearch.getDockerEs().getHttpHost()))
.overrideWith(elasticSearch.getModule())
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org