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 0d5de68792e3d3e33313ca58bf1ae027e1d8fae8
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Thu May 14 18:28:00 2020 +0700
JAMES-3140 CassandraRabbitMQLdapJamesServerMain should not expose its module
Modules are chosen from the supplied configuration when creating the
GuiceJamesServer
---
.../james/CassandraRabbitMQJamesServerFixture.java | 4 ++--
.../org/apache/james/WithCassandraBlobStore.java | 2 +-
.../CassandraRabbitMQLdapJamesServerMain.java | 22 +++++++++-------------
.../CassandraRabbitMQLdapJmapJamesServerTest.java | 10 +++++++---
.../rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java | 16 ++++++++--------
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
index 8c57beb..daf7539 100644
---
a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
+++
b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java
@@ -26,7 +26,7 @@ import
org.apache.james.modules.blobstore.BlobStoreConfiguration;
public class CassandraRabbitMQJamesServerFixture {
- private static final
JamesServerBuilder.ServerProvider<CassandraRabbitMQJamesConfiguration>
CONFIGURATION_BUILDER =
+ private static final
JamesServerBuilder.ServerProvider<CassandraRabbitMQJamesConfiguration>
SERVER_PROVIDER =
configuration ->
CassandraRabbitMQJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
.overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE);
@@ -45,6 +45,6 @@ public class CassandraRabbitMQJamesServerFixture {
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(rabbitMQExtension)
- .server(CONFIGURATION_BUILDER);
+ .server(SERVER_PROVIDER);
}
}
diff --git
a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraBlobStore.java
b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraBlobStore.java
index ca9c115..bcb5118 100644
---
a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraBlobStore.java
+++
b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/WithCassandraBlobStore.java
@@ -47,7 +47,7 @@ public class WithCassandraBlobStore implements
BeforeAllCallback, AfterAllCallba
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.server(configuration ->
CassandraRabbitMQJamesServerMain.createServer(configuration)
- .overrideWith(TestJMAPServerModule.limitToTenMessages())
+ .overrideWith(new TestJMAPServerModule())
.overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE))
.build();
}
diff --git
a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/main/java/org/apache/james/CassandraRabbitMQLdapJamesServerMain.java
b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/main/java/org/apache/james/CassandraRabbitMQLdapJamesServerMain.java
index d667c64..41cfae5 100644
---
a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/main/java/org/apache/james/CassandraRabbitMQLdapJamesServerMain.java
+++
b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/main/java/org/apache/james/CassandraRabbitMQLdapJamesServerMain.java
@@ -23,9 +23,7 @@ import org.apache.james.data.LdapUsersRepositoryModule;
import org.apache.james.modules.blobstore.BlobStoreConfiguration;
import org.apache.james.modules.blobstore.BlobStoreModulesChooser;
import org.apache.james.modules.server.JMXServerModule;
-import org.apache.james.server.core.configuration.Configuration;
-import com.google.common.collect.ImmutableList;
import com.google.inject.Module;
import com.google.inject.util.Modules;
@@ -35,23 +33,21 @@ public class CassandraRabbitMQLdapJamesServerMain
implements JamesServerMain {
.with(new LdapUsersRepositoryModule());
public static void main(String[] args) throws Exception {
- Configuration configuration = Configuration.builder()
+ CassandraRabbitMQJamesConfiguration configuration =
CassandraRabbitMQJamesConfiguration.builder()
.useWorkingDirectoryEnvProperty()
.build();
- BlobStoreConfiguration blobStoreConfiguration =
BlobStoreConfiguration.parse(configuration);
-
- Module baseModule = baseModule(blobStoreConfiguration);
- GuiceJamesServer server =
GuiceJamesServer.forConfiguration(configuration)
- .combineWith(baseModule, new JMXServerModule());
+ GuiceJamesServer server = createServer(configuration)
+ .combineWith(new JMXServerModule());
JamesServerMain.main(server);
}
- public static Module baseModule(BlobStoreConfiguration
blobStoreConfiguration) {
- return Modules.combine(ImmutableList.<Module>builder()
- .add(MODULES)
-
.addAll(BlobStoreModulesChooser.chooseModules(blobStoreConfiguration))
- .build());
+ public static GuiceJamesServer
createServer(CassandraRabbitMQJamesConfiguration configuration) {
+ BlobStoreConfiguration blobStoreConfiguration =
configuration.blobstoreconfiguration();
+
+ return GuiceJamesServer.forConfiguration(configuration)
+ .combineWith(MODULES)
+
.combineWith(BlobStoreModulesChooser.chooseModules(blobStoreConfiguration));
}
}
diff --git
a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
index 15e8766..5a5f671 100644
---
a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
+++
b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java
@@ -80,13 +80,17 @@ class CassandraRabbitMQLdapJmapJamesServerTest {
}
JamesServerBuilder baseJamesServerExtensionBuilder(BlobStoreConfiguration
blobStoreConfiguration) {
- return new
JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider())
+ return new
JamesServerBuilder<CassandraRabbitMQJamesConfiguration>(tmpDir ->
+ CassandraRabbitMQJamesConfiguration.builder()
+ .workingDirectory(tmpDir)
+ .configurationFromClasspath()
+ .blobStore(blobStoreConfiguration)
+ .build())
.extension(new DockerElasticSearchExtension())
.extension(new CassandraExtension())
.extension(new RabbitMQExtension())
.extension(new LdapTestExtension())
- .server(configuration ->
GuiceJamesServer.forConfiguration(configuration)
-
.combineWith(CassandraRabbitMQLdapJamesServerMain.baseModule(blobStoreConfiguration))
+ .server(configuration ->
CassandraRabbitMQLdapJamesServerMain.createServer(configuration)
.overrideWith(new TestJMAPServerModule())
.overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE));
}
diff --git
a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
index 5928d55..cb04b94 100644
---
a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
+++
b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java
@@ -45,14 +45,14 @@ public class RabbitMQAwsS3SendMDNMethodTest extends
SendMDNMethodTest {
.configurationFromClasspath()
.blobStore(BlobStoreConfiguration.objectStorage())
.build())
- .extension(new DockerElasticSearchExtension())
- .extension(new CassandraExtension())
- .extension(new AwsS3BlobStoreExtension())
- .extension(new RabbitMQExtension())
- .server(configuration ->
CassandraRabbitMQJamesServerMain.createServer(configuration)
- .overrideWith(binder ->
binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
- .overrideWith(new TestJMAPServerModule()))
- .build();
+ .extension(new DockerElasticSearchExtension())
+ .extension(new CassandraExtension())
+ .extension(new AwsS3BlobStoreExtension())
+ .extension(new RabbitMQExtension())
+ .server(configuration ->
CassandraRabbitMQJamesServerMain.createServer(configuration)
+ .overrideWith(binder ->
binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
+ .overrideWith(new TestJMAPServerModule()))
+ .build();
@Override
protected MessageId randomMessageId() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
