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 e054fd98b721044ad66ab8954c5a24f2cbe5cc73 Author: Benoit Tellier <[email protected]> AuthorDate: Tue May 19 16:31:54 2020 +0700 JAMES-3140 JPAJamesServerTest::createServer & use it in tests --- .../main/java/org/apache/james/JPAJamesServerMain.java | 17 +++++++++++------ .../test/java/org/apache/james/JPAJamesServerTest.java | 5 ++--- ...erverWithAuthenticatedDatabaseSqlValidationTest.java | 3 +-- ...thNoDatabaseAuthenticaticationSqlValidationTest.java | 3 +-- .../org/apache/james/JamesCapabilitiesServerTest.java | 3 +-- .../main/java/org/apache/james/JPAJamesServerMain.java | 12 ++++++++---- .../test/java/org/apache/james/JPAJamesServerTest.java | 3 +-- .../test/java/org/apache/james/JPAJamesServerTest.java | 3 +-- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java index 2560e88..6e742c5 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java @@ -56,7 +56,7 @@ import com.google.inject.util.Modules; public class JPAJamesServerMain implements JamesServerMain { - public static final Module WEBADMIN = Modules.combine( + private static final Module WEBADMIN = Modules.combine( new WebAdminServerModule(), new DataRoutesModules(), new InconsistencyQuotasSolvingRoutesModule(), @@ -67,7 +67,7 @@ public class JPAJamesServerMain implements JamesServerMain { new SwaggerRoutesModule(), new SieveRoutesModule()); - public static final Module PROTOCOLS = Modules.combine( + private static final Module PROTOCOLS = Modules.combine( new IMAPServerModule(), new LMTPServerModule(), new ManageSieveServerModule(), @@ -76,7 +76,7 @@ public class JPAJamesServerMain implements JamesServerMain { new SMTPServerModule(), WEBADMIN); - public static final Module JPA_SERVER_MODULE = Modules.combine( + private static final Module JPA_SERVER_MODULE = Modules.combine( new ActiveMQQueueModule(), new DefaultProcessorsConfigurationProviderModule(), new ElasticSearchMetricReporterModule(), @@ -92,17 +92,22 @@ public class JPAJamesServerMain implements JamesServerMain { new MemoryDeadLetterModule(), new SpamAssassinListenerModule()); - public static final Module JPA_MODULE_AGGREGATE = Modules.combine(JPA_SERVER_MODULE, PROTOCOLS); + private static final Module JPA_MODULE_AGGREGATE = Modules.combine(JPA_SERVER_MODULE, PROTOCOLS); public static void main(String[] args) throws Exception { Configuration configuration = Configuration.builder() .useWorkingDirectoryEnvProperty() .build(); - GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPA_MODULE_AGGREGATE, new JMXServerModule()); + GuiceJamesServer server = createServer(configuration) + .combineWith(new JMXServerModule()); JamesServerMain.main(server); } + static GuiceJamesServer createServer(Configuration configuration) { + return GuiceJamesServer.forConfiguration(configuration) + .combineWith(JPA_MODULE_AGGREGATE); + } + } diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java index e9f4b65..6def258 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -26,8 +26,8 @@ import org.apache.james.modules.QuotaProbesImpl; import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.utils.DataProbeImpl; -import org.apache.james.utils.TestIMAPClient; import org.apache.james.utils.SMTPMessageSender; +import org.apache.james.utils.TestIMAPClient; import org.awaitility.Awaitility; import org.awaitility.Duration; import org.awaitility.core.ConditionFactory; @@ -41,8 +41,7 @@ class JPAJamesServerTest implements JamesServerContract { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPAJamesServerMain.JPA_MODULE_AGGREGATE) + .server(configuration -> JPAJamesServerMain.createServer(configuration) .overrideWith(new TestJPAConfigurationModule(), DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java index b5ff257..a32d885 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java @@ -25,8 +25,7 @@ class JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest extends JPAJamesS @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPAJamesServerMain.JPA_MODULE_AGGREGATE) + .server(configuration -> JPAJamesServerMain.createServer(configuration) .overrideWith(new TestJPAConfigurationModuleWithSqlValidation.WithDatabaseAuthentication(), DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); } diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java index 77f01cb..2bad2be 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java @@ -25,8 +25,7 @@ class JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest extends JP @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPAJamesServerMain.JPA_MODULE_AGGREGATE) + .server(configuration -> JPAJamesServerMain.createServer(configuration) .overrideWith(new TestJPAConfigurationModuleWithSqlValidation.NoDatabaseAuthentication(), DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); } diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 741b79c..3150e58 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -41,8 +41,7 @@ class JamesCapabilitiesServerTest { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPAJamesServerMain.JPA_MODULE_AGGREGATE) + .server(configuration -> JPAJamesServerMain.createServer(configuration) .overrideWith(new TestJPAConfigurationModule()) .overrideWith(binder -> binder.bind(MailboxManager.class).toInstance(mailboxManager()))) .build(); diff --git a/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java index e44b5ea..aeef5b6 100644 --- a/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java +++ b/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java @@ -41,7 +41,7 @@ import com.google.inject.util.Modules; public class JPAJamesServerMain implements JamesServerMain { - public static final Module PROTOCOLS = Modules.combine( + private static final Module PROTOCOLS = Modules.combine( new ProtocolHandlerModule(), new SMTPServerModule(), new WebAdminServerModule(), @@ -52,7 +52,7 @@ public class JPAJamesServerMain implements JamesServerMain { new DefaultProcessorsConfigurationProviderModule(), new TaskManagerModule()); - public static final Module JPA_SERVER_MODULE = Modules.combine( + private static final Module JPA_SERVER_MODULE = Modules.combine( new JPAEntityManagerModule(), new JPADataModule(), new ActiveMQQueueModule(), @@ -64,10 +64,14 @@ public class JPAJamesServerMain implements JamesServerMain { .useWorkingDirectoryEnvProperty() .build(); - GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPA_SERVER_MODULE, PROTOCOLS, new DKIMMailetModule()); + GuiceJamesServer server = createServer(configuration); JamesServerMain.main(server); } + public static GuiceJamesServer createServer(Configuration configuration) { + return GuiceJamesServer.forConfiguration(configuration) + .combineWith(JPA_SERVER_MODULE, PROTOCOLS, new DKIMMailetModule()); + } + } diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-smtp-mariadb/src/test/java/org/apache/james/JPAJamesServerTest.java index 6089ee7..3f7c42c 100644 --- a/server/container/guice/jpa-smtp-mariadb/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-smtp-mariadb/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -65,8 +65,7 @@ public class JPAJamesServerTest { .configurationFromClasspath() .build(); - return GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE, JPAJamesServerMain.PROTOCOLS) + return JPAJamesServerMain.createServer(configuration) .overrideWith(new TestJPAConfigurationModule(mariaDBUrl)); } diff --git a/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java index 71396eb..17a1124 100644 --- a/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -61,8 +61,7 @@ public class JPAJamesServerTest { .configurationFromClasspath() .build(); - return GuiceJamesServer.forConfiguration(configuration) - .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE, JPAJamesServerMain.PROTOCOLS) + return JPAJamesServerMain.createServer(configuration) .overrideWith( new TestJPAConfigurationModule(), (binder) -> binder.bind(EntityManagerFactory.class) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
