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 03d7d646c39ecb97586b02b1fa72798adeb99fee Author: Benoit Tellier <[email protected]> AuthorDate: Tue May 19 16:09:22 2020 +0700 JAMES-3140 MemoryJamesServerMain::createServer & use it in tests --- .../src/main/java/org/apache/james/MemoryJamesServerMain.java | 11 +++++++---- .../java/org/apache/james/DefaultMemoryJamesServerTest.java | 3 +-- .../org/apache/james/GuiceJamesServerStartUpCheckTest.java | 3 +-- .../src/test/java/org/apache/james/GuiceJamesServerTest.java | 3 +-- .../java/org/apache/james/GuiceLifecycleHeathCheckTest.java | 3 +-- .../james/LinshareBlobExportMechanismProvidingTest.java | 3 +-- .../src/test/java/org/apache/james/MemoryJamesServerTest.java | 3 +-- .../test/java/org/apache/james/MemoryJmapJamesServerTest.java | 3 +-- .../src/test/java/org/apache/james/MemoryJmapTestRule.java | 3 +-- .../java/org/apache/james/WebAdminRoutesExtensionTest.java | 3 +-- .../org/apache/james/jmap/memory/MemorySendMDNMethodTest.java | 4 +--- .../james/jmap/memory/MemorySpamAssassinContractTest.java | 5 +---- .../org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java | 4 +--- .../integration/memory/MemoryAuthorizedEndpointsTest.java | 5 +---- .../MemoryFastViewProjectionHealthCheckIntegrationTest.java | 4 +--- .../integration/memory/MemoryForwardIntegrationTest.java | 4 +--- .../integration/memory/MemoryJwtFilterIntegrationTest.java | 4 +--- .../integration/memory/MemoryUnauthorizedEndpointsTest.java | 4 +--- .../memory/MemoryWebAdminServerIntegrationTest.java | 4 +--- .../vault/MemoryDeletedMessageVaultIntegrationTest.java | 4 +--- .../MemoryLinshareBlobExportMechanismIntegrationTest.java | 4 +--- 21 files changed, 27 insertions(+), 57 deletions(-) diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java index aca4c6e..d0a30c2 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java @@ -139,12 +139,15 @@ public class MemoryJamesServerMain implements JamesServerMain { .build(); - GuiceJamesServer server = GuiceJamesServer.forConfiguration(configuration) - .combineWith(IN_MEMORY_SERVER_AGGREGATE_MODULE, - new FakeSearchMailboxModule(), - new JMXServerModule()); + GuiceJamesServer server = createServer(configuration) + .combineWith(new FakeSearchMailboxModule(), new JMXServerModule()); JamesServerMain.main(server); } + public static GuiceJamesServer createServer(Configuration configuration) { + return GuiceJamesServer.forConfiguration(configuration) + .combineWith(IN_MEMORY_SERVER_AGGREGATE_MODULE); + } + } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java index 19f1ef6..2b9d1bc 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java @@ -34,8 +34,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; class DefaultMemoryJamesServerTest { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(PropertiesProvider.class).to(FailingPropertiesProvider.class)) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java index 4dc1247..431a0ee 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java @@ -113,8 +113,7 @@ class GuiceJamesServerStartUpCheckTest { private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule())) .disableAutoStart(); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java index 398a52d..668811e 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java @@ -19,8 +19,7 @@ class GuiceJamesServerTest { private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule())) .disableAutoStart(); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java index fed501c..ea3ec9d 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java @@ -48,8 +48,7 @@ import reactor.core.scheduler.Schedulers; class GuiceLifecycleHeathCheckTest { private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.TEST_CONFIGURATION))); diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/LinshareBlobExportMechanismProvidingTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/LinshareBlobExportMechanismProvidingTest.java index 1974441..0068d0e 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/LinshareBlobExportMechanismProvidingTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/LinshareBlobExportMechanismProvidingTest.java @@ -31,8 +31,7 @@ class LinshareBlobExportMechanismProvidingTest { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(linshareGuiceExtension) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)) + .server(MemoryJamesServerMain::createServer) .build(); @Test diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java index 7f01fe1..2da10d6 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java @@ -27,8 +27,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryJamesServerTest implements JamesServerContract { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java index ffb3128..56ccb28 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java @@ -35,8 +35,7 @@ class MemoryJmapJamesServerTest { private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java index eca0512..c1e2697 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java @@ -43,8 +43,7 @@ public class MemoryJmapTestRule implements TestRule { .workingDirectory(temporaryFolder.newFolder()) .configurationFromClasspath() .build(); - return GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + return MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class)) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java index 76b19cf..0fd9ae8 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java @@ -36,8 +36,7 @@ import io.restassured.RestAssured; class WebAdminRoutesExtensionTest { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.builder() diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java index e1a7a69..ecdc794 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java @@ -21,7 +21,6 @@ package org.apache.james.jmap.memory; import java.util.concurrent.ThreadLocalRandom; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -39,8 +38,7 @@ public class MemorySendMDNMethodTest extends SendMDNMethodTest { @RegisterExtension JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class))) diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java index 315ccaf..f85001d 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -32,12 +31,10 @@ import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; class MemorySpamAssassinContractTest implements SpamAssassinContract { - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(new SpamAssassinModuleExtension()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class))) diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java index 0259cef..48471d5 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java @@ -21,7 +21,6 @@ package org.apache.james.jmap.memory.cucumber; import javax.inject.Inject; -import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.draft.methods.integration.cucumber.ImapStepdefs; import org.apache.james.jmap.draft.methods.integration.cucumber.MainStepdefs; @@ -59,8 +58,7 @@ public class MemoryStepdefs { .build(); mainStepdefs.messageIdFactory = new InMemoryMessageId.Factory(); - mainStepdefs.jmapServer = GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + mainStepdefs.jmapServer = MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule(), (binder) -> binder.bind(MessageId.Factory.class).toInstance(mainStepdefs.messageIdFactory)); mainStepdefs.init(); diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java index c1aa2f8..1b5a462 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin.integration.memory; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -29,11 +28,9 @@ import org.apache.james.webadmin.integration.WebadminIntegrationTestModule; import org.junit.jupiter.api.extension.RegisterExtension; class MemoryAuthorizedEndpointsTest extends AuthorizedEndpointsTest { - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new WebadminIntegrationTestModule()) .overrideWith(new UnauthorizedModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java index d575c09..5954865 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin.integration.memory; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -31,8 +30,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryFastViewProjectionHealthCheckIntegrationTest extends FastViewProjectionHealthCheckIntegrationContract { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(new WebadminIntegrationTestModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java index 6a157c3..e4925c7 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin.integration.memory; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -32,8 +31,7 @@ class MemoryForwardIntegrationTest extends ForwardIntegrationTest { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(new WebadminIntegrationTestModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java index 2ee1a30..c1aeca7 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin.integration.memory; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -34,8 +33,7 @@ class MemoryJwtFilterIntegrationTest extends JwtFilterIntegrationTest { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new WebadminIntegrationTestModule()) .overrideWith(binder -> binder.bind(AuthenticationFilter.class).to(JwtFilter.class)) .overrideWith(binder -> binder.bind(JwtConfiguration.class).toInstance(jwtConfiguration()))) diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java index 83a030a..1a56037 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin.integration.memory; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -33,8 +32,7 @@ class MemoryUnauthorizedEndpointsTest extends UnauthorizedEndpointsTest { @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new UnauthorizedModule()) .overrideWith(new WebadminIntegrationTestModule())) diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java index 05756dd..2c8a48a 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin.integration.memory; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -31,8 +30,7 @@ class MemoryWebAdminServerIntegrationTest extends WebAdminServerIntegrationTest @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new WebadminIntegrationTestModule())) .build(); } \ No newline at end of file diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java index 1dd785e..964745e 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin.integration.memory.vault; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -34,8 +33,7 @@ class MemoryDeletedMessageVaultIntegrationTest extends DeletedMessageVaultIntegr @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(new ClockExtension()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new WebadminIntegrationTestModule())) diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java index 547ddf0..738d911 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin.integration.memory.vault; -import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; @@ -34,8 +33,7 @@ class MemoryLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExpor @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(new LinshareGuiceExtension()) - .server(configuration -> GuiceJamesServer.forConfiguration(configuration) - .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) + .server(configuration -> MemoryJamesServerMain.createServer(configuration) .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new WebadminIntegrationTestModule())) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
