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 4f6529b36c411b89a2821f9e98bf2002f02d35aa Author: Benoit Tellier <[email protected]> AuthorDate: Tue Oct 27 13:48:37 2020 +0700 JAMES-3437 MemoryMailQueueFactory should be a singleton --- .../java/org/apache/james/modules/server/MemoryMailQueueModule.java | 3 ++- .../james/webadmin/integration/WebAdminServerIntegrationTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java index 8af5b16..8a05148 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java @@ -25,13 +25,14 @@ import org.apache.james.queue.memory.MemoryMailQueueFactory; import com.google.inject.AbstractModule; import com.google.inject.Provides; +import com.google.inject.Scopes; import com.google.inject.Singleton; public class MemoryMailQueueModule extends AbstractModule { @Override protected void configure() { - + bind(MemoryMailQueueFactory.class).in(Scopes.SINGLETON); } @Provides diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java index 992a2e9..1730a1d 100644 --- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java @@ -100,7 +100,8 @@ public abstract class WebAdminServerIntegrationTest { when() .get(MailQueueRoutes.BASE_URL) .then() - .statusCode(HttpStatus.OK_200); + .statusCode(HttpStatus.OK_200) + .body("", containsInAnyOrder("spool", "outgoing")); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
