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 ro...@apache.org on 2019/06/11 13:22:30 UTC
[james-project] branch master updated (389d0a5 -> c2e1953)
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 389d0a5 Merge remote-tracking branch 'blackheaven/spooler-bug'
new 91050f9 MAILBOX-383 WebAdmin server only needs to be startable
new aed1344 MAILBOX-383 DropWizardInitializer only needs to be startable
new b2c8d5a MAILBOX-383 JMAPServer only needs to be startable
new 4fb8bbf JAMES-2314 awaitInitializationis already called in `WebAdminServer::start`
new 6980ef4 JAMES-2314 WebAdminUtils.createWebAdminServer should call start
new bf94ead JAMES-2314 Fix some IntelliJ warnings in WebAdmin tests
new 76823c7 Revert "JAMES-2314 WebAdminUtils.createWebAdminServer should call start"
new 7f97086 JAMES-2314 WebAdminServer::start should be more fluent
new c2e1953 JAMES-2314 Always rely on NoopMetricFactory in WebAdmin tests
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modules/server/DropWizardMetricsModule.java | 16 +----
.../james/modules/protocols/JMAPServerModule.java | 5 +-
.../james/modules/server/WebAdminServerModule.java | 8 +--
.../org/apache/james/utils/WebAdminGuiceProbe.java | 1 -
.../java/org/apache/james/jmap/JMAPServer.java | 9 +--
.../routes/CassandraMappingsRoutesTest.java | 14 ++--
.../routes/CassandraMigrationRoutesTest.java | 44 +++++-------
.../org/apache/james/webadmin/WebAdminServer.java | 25 ++-----
.../apache/james/webadmin/WebAdminServerTest.java | 12 ++--
.../org/apache/james/webadmin/WebAdminUtils.java | 6 +-
.../james/webadmin/routes/ErrorRoutesTest.java | 9 +--
.../webadmin/routes/HealthCheckRoutesTest.java | 13 +---
.../james/webadmin/routes/TasksRoutesTest.java | 12 +---
.../james/webadmin/routes/AliasRoutesTest.java | 11 +--
.../routes/DLPConfigurationRoutesTest.java | 10 +--
.../webadmin/routes/DomainMappingsRoutesTest.java | 11 +--
.../james/webadmin/routes/DomainsRoutesTest.java | 11 +--
.../james/webadmin/routes/ForwardRoutesTest.java | 11 +--
.../james/webadmin/routes/GroupsRoutesTest.java | 13 ++--
.../webadmin/routes/SieveQuotaRoutesTest.java | 13 ++--
.../webadmin/routes/SieveScriptRoutesTest.java | 44 +++++-------
.../james/webadmin/routes/UsersRoutesTest.java | 11 +--
.../routes/DeletedMessagesVaultRoutesTest.java | 11 +--
.../DomainQuotaRoutesNoVirtualHostingTest.java | 10 +--
.../routes/EventDeadLettersRoutesTest.java | 12 ++--
.../webadmin/routes/ReindexingRoutesTest.java | 30 ++++----
.../webadmin/routes/UserMailboxesRoutesTest.java | 10 +--
.../routes/WebAdminQuotaSearchTestSystem.java | 12 +---
.../james/webadmin/routes/MailQueueRoutesTest.java | 81 ++++++++++------------
.../routes/MailRepositoriesRoutesTest.java | 10 +--
30 files changed, 165 insertions(+), 320 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 07/09: Revert "JAMES-2314
WebAdminUtils.createWebAdminServer should call start"
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 76823c7e0d307d763954f4f12f2b6c1344dd6bfb
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Jun 6 16:43:44 2019 +0700
Revert "JAMES-2314 WebAdminUtils.createWebAdminServer should call start"
This reverts commit f8cd3c0d675b0c3aca894dd66769ae8a7a73a454.
---
.../james/webadmin/routes/CassandraMappingsRoutesTest.java | 2 ++
.../james/webadmin/routes/CassandraMigrationRoutesTest.java | 2 ++
.../test/java/org/apache/james/webadmin/WebAdminServerTest.java | 9 +++++----
.../src/test/java/org/apache/james/webadmin/WebAdminUtils.java | 6 ------
.../java/org/apache/james/webadmin/routes/ErrorRoutesTest.java | 1 +
.../org/apache/james/webadmin/routes/HealthCheckRoutesTest.java | 2 ++
.../java/org/apache/james/webadmin/routes/TasksRoutesTest.java | 2 ++
.../java/org/apache/james/webadmin/routes/AliasRoutesTest.java | 1 +
.../apache/james/webadmin/routes/DLPConfigurationRoutesTest.java | 1 +
.../apache/james/webadmin/routes/DomainMappingsRoutesTest.java | 1 +
.../java/org/apache/james/webadmin/routes/DomainsRoutesTest.java | 1 +
.../java/org/apache/james/webadmin/routes/ForwardRoutesTest.java | 1 +
.../java/org/apache/james/webadmin/routes/GroupsRoutesTest.java | 1 +
.../org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java | 1 +
.../org/apache/james/webadmin/routes/SieveScriptRoutesTest.java | 1 +
.../java/org/apache/james/webadmin/routes/UsersRoutesTest.java | 1 +
.../webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java | 1 +
.../webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java | 1 +
.../apache/james/webadmin/routes/EventDeadLettersRoutesTest.java | 1 +
.../org/apache/james/webadmin/routes/ReindexingRoutesTest.java | 1 +
.../apache/james/webadmin/routes/UserMailboxesRoutesTest.java | 1 +
.../james/webadmin/routes/WebAdminQuotaSearchTestSystem.java | 1 +
.../org/apache/james/webadmin/routes/MailQueueRoutesTest.java | 4 +++-
.../apache/james/webadmin/routes/MailRepositoriesRoutesTest.java | 1 +
24 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index 0f8f8f7..b1afff9 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -83,6 +83,8 @@ class CassandraMappingsRoutesTest {
new CassandraMappingsRoutes(cassandraMappingsService, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
+ webAdminServer.start();
+
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMappingsRoutes.ROOT_PATH)
.build();
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index 1db9388..38e8b50 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -87,6 +87,8 @@ public class CassandraMigrationRoutesTest {
taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
+ webAdminServer.start();
+
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMigrationRoutes.VERSION_BASE)
.build();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
index 3605c93..523b0bf 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
@@ -28,15 +28,16 @@ import org.junit.Test;
public class WebAdminServerTest {
@Test
- public void getPortShouldThrowWhenNotConfigured() {
- WebAdminServer server = WebAdminUtils.createNotStartedWebAdminServer(new DefaultMetricFactory());
- assertThatThrownBy(server::getPort)
+ public void getPortShouldThrowWhenNotConfigured() throws Exception {
+ WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
+ assertThatThrownBy(() -> server.getPort())
.isInstanceOf(IllegalStateException.class);
}
@Test
- public void getPortShouldReturnPortWhenConfigured() {
+ public void getPortShouldReturnPortWhenConfigured() throws Exception {
WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
+ server.start();
Port port = server.getPort();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
index 06b402c..b5a02fa 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
@@ -41,12 +41,6 @@ import io.restassured.specification.RequestSpecification;
public class WebAdminUtils {
public static WebAdminServer createWebAdminServer(MetricFactory metricFactory, Routes... routes) {
- WebAdminServer webAdminServer = createNotStartedWebAdminServer(metricFactory, routes);
- webAdminServer.start();
- return webAdminServer;
- }
-
- public static WebAdminServer createNotStartedWebAdminServer(MetricFactory metricFactory, Routes... routes) {
return new WebAdminServer(WebAdminConfiguration.TEST_CONFIGURATION,
privateRoutes(routes),
publicRoutes(routes),
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
index 28c3659..d5e8916 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
@@ -51,6 +51,7 @@ public class ErrorRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new NoopMetricFactory(),
new ErrorRoutes());
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(ErrorRoutes.BASE_URL)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
index b15f6a4..1082494 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
@@ -81,6 +81,8 @@ public class HealthCheckRoutesTest {
new DefaultMetricFactory(),
new HealthCheckRoutes(healthChecks, new JsonTransformer()));
+ webAdminServer.start();
+
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(HealthCheckRoutes.HEALTHCHECK)
.build();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index 92877ce..ac290bc 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -59,6 +59,8 @@ class TasksRoutesTest {
new DefaultMetricFactory(),
new TasksRoutes(taskManager, new JsonTransformer()));
+ webAdminServer.start();
+
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(TasksRoutes.BASE)
.build();
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
index 20a8eb8..e511fb3 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
@@ -85,6 +85,7 @@ class AliasRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
aliasRoutes);
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/aliases")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index 1448f6c..2ddb946 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -70,6 +70,7 @@ class DLPConfigurationRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new DLPConfigurationRoutes(dlpConfigurationStore, domainList, new JsonTransformer()));
+ webAdminServer.start();
requestSpecification = buildRequestSpecification(webAdminServer);
}
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
index d24bd9f..ff19744 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
@@ -79,6 +79,7 @@ class DomainMappingsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
domainMappingsRoutes);
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DOMAIN_MAPPINGS)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
index 0812fc9..dbb2857 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
@@ -70,6 +70,7 @@ class DomainsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new DomainsRoutes(domainList, domainAliasService, new JsonTransformer()));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DomainsRoutes.DOMAINS)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
index 566fa27..70c2ba5 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -84,6 +84,7 @@ class ForwardRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
forwardRoutes);
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/forwards")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index cfe0a15..510112e 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -82,6 +82,7 @@ class GroupsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
groupsRoutes);
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/groups")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
index bab9849..53fe916 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
@@ -51,6 +51,7 @@ class SieveQuotaRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new SieveQuotaRoutes(sieveRepository, new JsonTransformer()));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
index d2333d9..a8f396d 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
@@ -90,6 +90,7 @@ class SieveScriptRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new SieveScriptRoutes(sieveRepository, usersRepository));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils
.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
index 5a67c33..dbe92e9 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
@@ -63,6 +63,7 @@ class UsersRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new UserRoutes(new UserService(usersRepository), new JsonTransformer()));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(UserRoutes.USERS)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index 4558c93..b471d34 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -187,6 +187,7 @@ class DeletedMessagesVaultRoutesTest {
new TasksRoutes(taskManager, jsonTransformer),
new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DeletedMessagesVaultRoutes.ROOT_PATH)
.log(LogDetail.METHOD)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
index 8238385..576c8fc 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
@@ -63,6 +63,7 @@ class DomainQuotaRoutesNoVirtualHostingTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new NoopMetricFactory(),
domainQuotaRoutes);
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
index c3e73cc..0ed07fd 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
@@ -126,6 +126,7 @@ class EventDeadLettersRoutesTest {
new DefaultMetricFactory(),
new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
index cdaa89c..95faeaf 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
@@ -105,6 +105,7 @@ class ReindexingRoutesTest {
new InMemoryMessageId.Factory(),
new MessageIdReIndexerImpl(mailboxManager, mailboxManager.getMapperFactory(), searchIndex),
jsonTransformer));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 890323d..6f93d5f 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -76,6 +76,7 @@ class UserMailboxesRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer()));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(USERS_BASE + SEPARATOR + USERNAME + SEPARATOR + UserMailboxesRoutes.MAILBOXES)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
index ad56bcb..cee2514 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
@@ -66,6 +66,7 @@ public class WebAdminQuotaSearchTestSystem {
userQuotaRoutes,
domainQuotaRoutes,
globalQuotaRoutes);
+ this.webAdminServer.start();
this.requestSpecBuilder = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index 45f2db1..da87397 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -89,10 +89,12 @@ class MailQueueRoutesTest {
TaskManager taskManager = new MemoryTaskManager();
JsonTransformer jsonTransformer = new JsonTransformer();
- return WebAdminUtils.createWebAdminServer(
+ WebAdminServer server = WebAdminUtils.createWebAdminServer(
new NoopMetricFactory(),
new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager),
new TasksRoutes(taskManager, jsonTransformer));
+ server.start();
+ return server;
}
RequestSpecification buildRequestSpecification(WebAdminServer server) {
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 184e801..01e172c 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -127,6 +127,7 @@ public class MailRepositoriesRoutesTest {
new MailRepositoriesRoutes(repositoryStoreService,
jsonTransformer, reprocessingService, taskManager),
new TasksRoutes(taskManager, jsonTransformer));
+ webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(MailRepositoriesRoutes.MAIL_REPOSITORIES)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/09: MAILBOX-383 WebAdmin server only needs to be
startable
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 91050f9071e82c9db153fa91abffb41cfdefd791
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 5 15:17:59 2019 +0700
MAILBOX-383 WebAdmin server only needs to be startable
No configuration operation actually takes place so `Configurable` implementation is inapropriate...
---
.../apache/james/modules/server/WebAdminServerModule.java | 8 +-------
.../james/webadmin/routes/CassandraMappingsRoutesTest.java | 3 +--
.../james/webadmin/routes/CassandraMigrationRoutesTest.java | 3 +--
.../main/java/org/apache/james/webadmin/WebAdminServer.java | 12 ++++--------
.../java/org/apache/james/webadmin/WebAdminServerTest.java | 2 +-
.../org/apache/james/webadmin/routes/ErrorRoutesTest.java | 3 +--
.../apache/james/webadmin/routes/HealthCheckRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/TasksRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/AliasRoutesTest.java | 3 +--
.../james/webadmin/routes/DLPConfigurationRoutesTest.java | 3 +--
.../james/webadmin/routes/DomainMappingsRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/DomainsRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/ForwardRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/GroupsRoutesTest.java | 3 +--
.../apache/james/webadmin/routes/SieveQuotaRoutesTest.java | 3 +--
.../apache/james/webadmin/routes/SieveScriptRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/UsersRoutesTest.java | 3 +--
.../vault/routes/DeletedMessagesVaultRoutesTest.java | 3 +--
.../routes/DomainQuotaRoutesNoVirtualHostingTest.java | 3 +--
.../james/webadmin/routes/EventDeadLettersRoutesTest.java | 3 +--
.../apache/james/webadmin/routes/ReindexingRoutesTest.java | 3 +--
.../james/webadmin/routes/UserMailboxesRoutesTest.java | 3 +--
.../james/webadmin/routes/WebAdminQuotaSearchTestSystem.java | 4 +---
.../apache/james/webadmin/routes/MailQueueRoutesTest.java | 3 +--
.../james/webadmin/routes/MailRepositoriesRoutesTest.java | 3 +--
25 files changed, 28 insertions(+), 61 deletions(-)
diff --git a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java
index ce2a2cd..45643f6 100644
--- a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java
+++ b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java
@@ -20,14 +20,12 @@
package org.apache.james.modules.server;
import static org.apache.james.webadmin.WebAdminConfiguration.DISABLED_CONFIGURATION;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import java.io.FileNotFoundException;
import java.util.List;
import java.util.Optional;
import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.jwt.JwtTokenVerifier;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.utils.ConfigurationPerformer;
@@ -137,11 +135,7 @@ public class WebAdminServerModule extends AbstractModule {
@Override
public void initModule() {
- try {
- webAdminServer.configure(NO_CONFIGURATION);
- } catch (ConfigurationException e) {
- throw new RuntimeException(e);
- }
+ webAdminServer.start();
}
@Override
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index 235ea27..7fab886 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -22,7 +22,6 @@ package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
@@ -85,7 +84,7 @@ class CassandraMappingsRoutesTest {
new CassandraMappingsRoutes(cassandraMappingsService, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index 8307081..c41794b 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -22,7 +22,6 @@ package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
@@ -87,7 +86,7 @@ public class CassandraMigrationRoutesTest {
taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
index 1080cf3..0a2c357 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
@@ -31,9 +31,7 @@ import java.util.Set;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.Startable;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.util.Port;
import org.apache.james.webadmin.authentication.AuthenticationFilter;
@@ -53,10 +51,9 @@ import com.google.common.base.Preconditions;
import spark.Service;
-public class WebAdminServer implements Configurable {
-
+public class WebAdminServer implements Startable {
private static final Logger LOGGER = LoggerFactory.getLogger(WebAdminServer.class);
- public static final HierarchicalConfiguration NO_CONFIGURATION = null;
+
public static final int DEFAULT_PORT = 8080;
private final WebAdminConfiguration configuration;
@@ -79,8 +76,7 @@ public class WebAdminServer implements Configurable {
this.service = Service.ignite();
}
- @Override
- public void configure(HierarchicalConfiguration config) throws ConfigurationException {
+ public void start() {
if (configuration.isEnabled()) {
service.port(configuration.getPort().get().getValue());
configureExceptionHanding();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
index abb72a9..523b0bf 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
@@ -37,7 +37,7 @@ public class WebAdminServerTest {
@Test
public void getPortShouldReturnPortWhenConfigured() throws Exception {
WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
- server.configure(WebAdminServer.NO_CONFIGURATION);
+ server.start();
Port port = server.getPort();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
index bc7918c..0f2979f 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
@@ -20,7 +20,6 @@
package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.when;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.apache.james.webadmin.routes.ErrorRoutes.INTERNAL_SERVER_ERROR;
import static org.apache.james.webadmin.routes.ErrorRoutes.INVALID_ARGUMENT_EXCEPTION;
import static org.apache.james.webadmin.routes.ErrorRoutes.JSON_EXTRACT_EXCEPTION;
@@ -52,7 +51,7 @@ public class ErrorRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new NoopMetricFactory(),
new ErrorRoutes());
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
index 084efcf..2b522e4 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
@@ -22,7 +22,6 @@ package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
@@ -83,7 +82,7 @@ public class HealthCheckRoutesTest {
new DefaultMetricFactory(),
new HealthCheckRoutes(healthChecks, new JsonTransformer()));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index c345466..cb9f724 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -22,7 +22,6 @@ package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
@@ -60,7 +59,7 @@ class TasksRoutesTest {
new DefaultMetricFactory(),
new TasksRoutes(taskManager, new JsonTransformer()));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
index 3f590dc..7390e20 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
@@ -23,7 +23,6 @@ import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.is;
@@ -86,7 +85,7 @@ class AliasRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
aliasRoutes);
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index e2d4c40..6f029a3 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -27,7 +27,6 @@ import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS;
import static org.apache.james.webadmin.Constants.JSON_CONTENT_TYPE;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.any;
@@ -71,7 +70,7 @@ class DLPConfigurationRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new DLPConfigurationRoutes(dlpConfigurationStore, domainList, new JsonTransformer()));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
requestSpecification = buildRequestSpecification(webAdminServer);
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
index 313f9a2..a980fc5 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
@@ -24,7 +24,6 @@ import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.put;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.apache.james.webadmin.routes.DomainMappingsRoutes.DOMAIN_MAPPINGS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
@@ -80,7 +79,7 @@ class DomainMappingsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
domainMappingsRoutes);
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
index 7be1f92..95d71cf 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
@@ -23,7 +23,6 @@ import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -71,7 +70,7 @@ class DomainsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new DomainsRoutes(domainList, domainAliasService, new JsonTransformer()));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
index 9a1e007..3c6a667 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -23,7 +23,6 @@ import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.is;
@@ -85,7 +84,7 @@ class ForwardRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
forwardRoutes);
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index cd9f6e7..775930b 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -23,7 +23,6 @@ import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.mockito.ArgumentMatchers.any;
@@ -83,7 +82,7 @@ class GroupsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
groupsRoutes);
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
index 27dbee3..6d8df14 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
@@ -20,7 +20,6 @@
package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.core.User;
@@ -52,7 +51,7 @@ public class SieveQuotaRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new SieveQuotaRoutes(sieveRepository, new JsonTransformer()));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
index 25f26ad..de59250 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
@@ -21,7 +21,6 @@ package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.hamcrest.Matchers.equalTo;
@@ -96,7 +95,7 @@ public class SieveScriptRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new SieveScriptRoutes(sieveRepository, usersRepository));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
index a3e4855..a18920d 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
@@ -22,7 +22,6 @@ package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
@@ -64,7 +63,7 @@ class UsersRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new UserRoutes(new UserService(usersRepository), new JsonTransformer()));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index adb1e8c..d362c18 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -37,7 +37,6 @@ import static org.apache.james.vault.DeletedMessageFixture.USER;
import static org.apache.james.vault.DeletedMessageFixture.USER_2;
import static org.apache.james.vault.DeletedMessageVaultSearchContract.MESSAGE_ID_GENERATOR;
import static org.apache.james.webadmin.Constants.SEPARATOR;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.apache.james.webadmin.vault.routes.DeletedMessagesVaultRoutes.MESSAGE_PATH_PARAM;
import static org.apache.james.webadmin.vault.routes.DeletedMessagesVaultRoutes.USERS;
import static org.apache.james.webadmin.vault.routes.DeletedMessagesVaultRoutes.USER_PATH;
@@ -188,7 +187,7 @@ class DeletedMessagesVaultRoutesTest {
new TasksRoutes(taskManager, jsonTransformer),
new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DeletedMessagesVaultRoutes.ROOT_PATH)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
index b1500c3..0fa665e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
@@ -20,7 +20,6 @@
package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import org.apache.james.core.Domain;
import org.apache.james.dnsservice.api.InMemoryDNSService;
@@ -63,7 +62,7 @@ class DomainQuotaRoutesNoVirtualHostingTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new NoopMetricFactory(),
domainQuotaRoutes);
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
index b12d308..9ab4215 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
@@ -23,7 +23,6 @@ import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Java6Assertions.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.hasSize;
@@ -127,7 +126,7 @@ class EventDeadLettersRoutesTest {
new DefaultMetricFactory(),
new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
index b63c3d5..b07f35b 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
@@ -22,7 +22,6 @@ package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
@@ -106,7 +105,7 @@ class ReindexingRoutesTest {
new InMemoryMessageId.Factory(),
new MessageIdReIndexerImpl(mailboxManager, mailboxManager.getMapperFactory(), searchIndex),
jsonTransformer));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 0e4401a..85c3b9e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -22,7 +22,6 @@ package org.apache.james.webadmin.routes;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.apache.james.webadmin.routes.UserMailboxesRoutes.USERS_BASE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.is;
@@ -77,7 +76,7 @@ class UserMailboxesRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer()));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
index 49c70e4..b145aa1 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
@@ -19,8 +19,6 @@
package org.apache.james.webadmin.routes;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
-
import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.quota.search.QuotaSearchTestSystem;
import org.apache.james.webadmin.WebAdminServer;
@@ -68,7 +66,7 @@ public class WebAdminQuotaSearchTestSystem {
userQuotaRoutes,
domainQuotaRoutes,
globalQuotaRoutes);
- this.webAdminServer.configure(NO_CONFIGURATION);
+ this.webAdminServer.start();
this.webAdminServer.await();
this.requestSpecBuilder = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index 8986bff..a1f7c58 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -24,7 +24,6 @@ import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
import static io.restassured.config.EncoderConfig.encoderConfig;
import static io.restassured.config.RestAssuredConfig.newConfig;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.apache.mailet.base.MailAddressFixture.SENDER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.empty;
@@ -94,7 +93,7 @@ public class MailQueueRoutesTest {
new NoopMetricFactory(),
new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager),
new TasksRoutes(taskManager, jsonTransformer));
- server.configure(NO_CONFIGURATION);
+ server.start();
server.await();
return server;
}
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 6264892..3fa38c4 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -25,7 +25,6 @@ import static io.restassured.RestAssured.with;
import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS;
-import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -128,7 +127,7 @@ public class MailRepositoriesRoutesTest {
new MailRepositoriesRoutes(repositoryStoreService,
jsonTransformer, reprocessingService, taskManager),
new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.start();
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 03/09: MAILBOX-383 JMAPServer only needs to be
startable
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b2c8d5a4edf9c0f2917d5448486e26aa6b2b8da8
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 5 15:22:52 2019 +0700
MAILBOX-383 JMAPServer only needs to be startable
No configuration operation actually takes place so `Configurable` implementation is inapropriate...
---
.../org/apache/james/modules/protocols/JMAPServerModule.java | 5 +----
.../jmap/src/main/java/org/apache/james/jmap/JMAPServer.java | 9 +++------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java
index 972c721..f51549c 100644
--- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java
+++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java
@@ -22,7 +22,6 @@ package org.apache.james.modules.protocols;
import java.security.Security;
import java.util.List;
-import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.jmap.JMAPConfiguration;
import org.apache.james.jmap.JMAPModule;
import org.apache.james.jmap.JMAPServer;
@@ -42,8 +41,6 @@ import com.google.inject.multibindings.Multibinder;
public class JMAPServerModule extends AbstractModule {
- private static final HierarchicalConfiguration NULL_CONFIGURATION = null;
-
@Override
protected void configure() {
install(new JMAPModule());
@@ -71,7 +68,7 @@ public class JMAPServerModule extends AbstractModule {
try {
if (jmapConfiguration.isEnabled()) {
signatureHandler.init();
- server.configure(NULL_CONFIGURATION);
+ server.start();
registerPEMWithSecurityProvider();
}
} catch (Exception e) {
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServer.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServer.java
index 2881e68..efde946 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServer.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServer.java
@@ -27,12 +27,10 @@ import java.util.Optional;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.http.jetty.Configuration;
import org.apache.james.http.jetty.Configuration.Builder;
import org.apache.james.http.jetty.JettyHttpServer;
-import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.Startable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.zalando.logbook.DefaultHttpLogWriter;
@@ -42,7 +40,7 @@ import org.zalando.logbook.servlet.LogbookFilter;
import com.github.fge.lambdas.Throwing;
-public class JMAPServer implements Configurable {
+public class JMAPServer implements Startable {
private static final Logger HTTP_JMAP_LOGGER = LoggerFactory.getLogger("http.jmap");
private final Optional<JettyHttpServer> server;
@@ -104,8 +102,7 @@ public class JMAPServer implements Configurable {
.build();
}
- @Override
- public void configure(HierarchicalConfiguration config) throws ConfigurationException {
+ public void start() {
server.ifPresent(Throwing.consumer(JettyHttpServer::start).sneakyThrow());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 06/09: JAMES-2314 Fix some IntelliJ warnings in
WebAdmin tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit bf94eadb2b1778a957c1a95071f93f844ed211d2
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 5 15:53:41 2019 +0700
JAMES-2314 Fix some IntelliJ warnings in WebAdmin tests
---
.../routes/CassandraMigrationRoutesTest.java | 29 +++++-----
.../webadmin/routes/HealthCheckRoutesTest.java | 3 +-
.../james/webadmin/routes/TasksRoutesTest.java | 2 +-
.../james/webadmin/routes/GroupsRoutesTest.java | 2 +-
.../webadmin/routes/SieveScriptRoutesTest.java | 35 +++++-------
.../webadmin/routes/UserMailboxesRoutesTest.java | 2 +-
.../james/webadmin/routes/MailQueueRoutesTest.java | 66 +++++++++++-----------
.../routes/MailRepositoriesRoutesTest.java | 2 +-
8 files changed, 67 insertions(+), 74 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index d94b2f7..1db9388 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -86,14 +86,14 @@ public class CassandraMigrationRoutesTest {
new CassandraMigrationRoutes(new CassandraMigrationService(schemaVersionDAO, allMigrationClazz, LATEST_VERSION),
taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
-
+
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMigrationRoutes.VERSION_BASE)
.build();
}
@Before
- public void setUp() throws Exception {
+ public void setUp() {
createServer();
}
@@ -104,7 +104,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void getShouldReturnTheCurrentVersion() throws Exception {
+ public void getShouldReturnTheCurrentVersion() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(CURRENT_VERSION)));
Integer version =
@@ -121,8 +121,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void getShouldReturnTheLatestVersionWhenSetUpTheLatestVersion() throws Exception {
-
+ public void getShouldReturnTheLatestVersionWhenSetUpTheLatestVersion() {
Integer version =
when()
.get("/latest")
@@ -138,7 +137,7 @@ public class CassandraMigrationRoutesTest {
@Ignore
@Test
- public void postShouldReturnConflictWhenMigrationOnRunning() throws Exception {
+ public void postShouldReturnConflictWhenMigrationOnRunning() {
when()
.post("/upgrade")
.then()
@@ -146,7 +145,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void postShouldReturnErrorCodeWhenInvalidVersion() throws Exception {
+ public void postShouldReturnErrorCodeWhenInvalidVersion() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(OLDER_VERSION)));
Map<String, Object> errors = given()
@@ -171,7 +170,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void postShouldDoMigrationToNewVersion() throws Exception {
+ public void postShouldDoMigrationToNewVersion() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(OLDER_VERSION)));
String taskId = with()
@@ -193,7 +192,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void postShouldCreateTaskWhenCurrentVersionIsNewerThan() throws Exception {
+ public void postShouldCreateTaskWhenCurrentVersionIsNewerThan() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(CURRENT_VERSION)));
String taskId = given()
@@ -212,7 +211,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void postShouldNotUpdateVersionWhenCurrentVersionIsNewerThan() throws Exception {
+ public void postShouldNotUpdateVersionWhenCurrentVersionIsNewerThan() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(CURRENT_VERSION)));
String taskId = given()
@@ -231,7 +230,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void postShouldDoMigrationToLatestVersion() throws Exception {
+ public void postShouldDoMigrationToLatestVersion() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(OLDER_VERSION)));
String taskId = with()
@@ -250,7 +249,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void postShouldReturnTaskIdAndLocation() throws Exception {
+ public void postShouldReturnTaskIdAndLocation() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(OLDER_VERSION)));
when()
@@ -261,7 +260,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void createdTaskShouldHaveDetails() throws Exception {
+ public void createdTaskShouldHaveDetails() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(OLDER_VERSION)));
String taskId = with()
@@ -284,7 +283,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void postShouldCreateTaskWhenItIsUpToDate() throws Exception {
+ public void postShouldCreateTaskWhenItIsUpToDate() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(LATEST_VERSION)));
String taskId = with()
@@ -301,7 +300,7 @@ public class CassandraMigrationRoutesTest {
}
@Test
- public void postShouldNotUpdateVersionWhenItIsUpToDate() throws Exception {
+ public void postShouldNotUpdateVersionWhenItIsUpToDate() {
when(schemaVersionDAO.getCurrentSchemaVersion()).thenReturn(Mono.just(Optional.of(LATEST_VERSION)));
String taskId = with()
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
index 5117d96..b15f6a4 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
@@ -27,7 +27,6 @@ import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-import java.net.MalformedURLException;
import java.util.HashSet;
import java.util.Set;
@@ -379,7 +378,7 @@ public class HealthCheckRoutesTest {
}
@Test
- public void performHealthCheckShouldWorkWithEscapedPathParam() throws MalformedURLException {
+ public void performHealthCheckShouldWorkWithEscapedPathParam() {
healthChecks.add(healthCheck(Result.healthy(COMPONENT_NAME_3)));
// disable URL encoding
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index d3a57fc..92877ce 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -52,7 +52,7 @@ class TasksRoutesTest {
private WebAdminServer webAdminServer;
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
taskManager = new MemoryTaskManager();
webAdminServer = WebAdminUtils.createWebAdminServer(
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index 7119c80..cfe0a15 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -675,7 +675,7 @@ class GroupsRoutesTest {
}
@Test
- void getShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception {
+ void getShouldReturnErrorWhenRuntimeExceptionIsThrown() {
doThrow(RuntimeException.class)
.when(memoryRecipientRewriteTable)
.getStoredMappings(any());
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
index d53e461..d2333d9 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
@@ -32,7 +32,6 @@ import java.io.InputStream;
import java.net.URL;
import java.nio.charset.StandardCharsets;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.io.IOUtils;
import org.apache.james.core.User;
import org.apache.james.filesystem.api.FileSystem;
@@ -42,10 +41,8 @@ import org.apache.james.sieverepository.api.ScriptContent;
import org.apache.james.sieverepository.api.ScriptName;
import org.apache.james.sieverepository.api.SieveRepository;
import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
-import org.apache.james.sieverepository.api.exception.StorageException;
import org.apache.james.sieverepository.file.SieveFileRepository;
import org.apache.james.user.api.UsersRepository;
-import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -58,17 +55,15 @@ import org.junit.jupiter.api.extension.ExtendWith;
import io.restassured.RestAssured;
@ExtendWith(TemporaryFolderExtension.class)
-public class SieveScriptRoutesTest {
+class SieveScriptRoutesTest {
- private FileSystem fileSystem;
private WebAdminServer webAdminServer;
private SieveRepository sieveRepository;
- private UsersRepository usersRepository;
private String sieveContent;
@BeforeEach
- public void setUp(TemporaryFolderExtension.TemporaryFolder temporaryFolder) throws ConfigurationException, IOException, UsersRepositoryException {
- this.fileSystem = new FileSystem() {
+ void setUp(TemporaryFolderExtension.TemporaryFolder temporaryFolder) throws Exception {
+ FileSystem fileSystem = new FileSystem() {
@Override
public File getBasedir() {
return temporaryFolder.getTempDir();
@@ -86,7 +81,7 @@ public class SieveScriptRoutesTest {
};
sieveRepository = new SieveFileRepository(fileSystem);
- usersRepository = MemoryUsersRepository.withoutVirtualHosting();
+ UsersRepository usersRepository = MemoryUsersRepository.withoutVirtualHosting();
usersRepository.addUser("userA", "password");
URL sieveResource = ClassLoader.getSystemResource("sieve/my_sieve");
@@ -102,12 +97,12 @@ public class SieveScriptRoutesTest {
}
@AfterEach
- public void tearDown() {
+ void tearDown() {
webAdminServer.destroy();
}
@Test
- public void defineAddActiveSieveScriptShouldReturnNotFoundWhenUserNotExisted() throws IOException {
+ void defineAddActiveSieveScriptShouldReturnNotFoundWhenUserNotExisted() {
given()
.pathParam("userName", "unknown")
.pathParam("scriptName", "scriptA")
@@ -119,7 +114,7 @@ public class SieveScriptRoutesTest {
}
@Test
- public void defineAddActiveSieveScriptShouldReturnNotFoundWhenScriptNameIsWhiteSpace() throws IOException {
+ void defineAddActiveSieveScriptShouldReturnNotFoundWhenScriptNameIsWhiteSpace() {
String errorBody =
"{\"statusCode\": 400," +
" \"type\":\"InvalidArgument\"," +
@@ -141,7 +136,7 @@ public class SieveScriptRoutesTest {
}
@Test
- public void defineAddActiveSieveScriptShouldReturnNotFoundWhenUserNameWhiteSpace() {
+ void defineAddActiveSieveScriptShouldReturnNotFoundWhenUserNameWhiteSpace() {
String errorBody =
"{\"statusCode\": 400," +
" \"type\":\"InvalidArgument\"," +
@@ -163,7 +158,7 @@ public class SieveScriptRoutesTest {
}
@Test
- public void defineAddActiveSieveScriptShouldReturnBadRequestWhenScriptIsNotSet() {
+ void defineAddActiveSieveScriptShouldReturnBadRequestWhenScriptIsNotSet() {
given()
.pathParam("userName", "userA")
.pathParam("scriptName", "scriptA")
@@ -174,7 +169,7 @@ public class SieveScriptRoutesTest {
}
@Test
- public void defineAddActiveSieveScriptShouldReturnSucceededWhenScriptIsWhiteSpace() throws ScriptNotFoundException, StorageException, IOException {
+ void defineAddActiveSieveScriptShouldReturnSucceededWhenScriptIsWhiteSpace() throws Exception {
given()
.pathParam("userName", "userA")
.pathParam("scriptName", "scriptA")
@@ -190,7 +185,7 @@ public class SieveScriptRoutesTest {
}
@Test
- public void defineAddActiveSieveScriptAddScriptSucceededOneWhenNotAddActivateParam() throws Exception {
+ void defineAddActiveSieveScriptAddScriptSucceededOneWhenNotAddActivateParam() throws Exception {
given()
.pathParam("userName", "userA")
.pathParam("scriptName", "scriptA")
@@ -206,7 +201,7 @@ public class SieveScriptRoutesTest {
}
@Test
- public void defineAddActiveSieveScriptSetActiveTrueWhenAddActivateParamTrue() throws Exception {
+ void defineAddActiveSieveScriptSetActiveTrueWhenAddActivateParamTrue() throws Exception {
given()
.pathParam("userName", "userA")
.pathParam("scriptName", "scriptA")
@@ -223,7 +218,7 @@ public class SieveScriptRoutesTest {
}
@Test
- public void defineAddActiveSieveScriptGetActiveShouldThrowsExceptionWhenAddActivateParamFalse() {
+ void defineAddActiveSieveScriptGetActiveShouldThrowsExceptionWhenAddActivateParamFalse() {
given()
.pathParam("userName", "userA")
.pathParam("scriptName", "scriptA")
@@ -239,7 +234,7 @@ public class SieveScriptRoutesTest {
}
@Test
- public void defineAddActiveSieveScriptInvokeShouldReturnBadRequestWhenAddActivateParamWithNotBooleanValue() {
+ void defineAddActiveSieveScriptInvokeShouldReturnBadRequestWhenAddActivateParamWithNotBooleanValue() {
given()
.pathParam("userName", "userA")
.pathParam("scriptName", "scriptA")
@@ -252,7 +247,7 @@ public class SieveScriptRoutesTest {
.body("message", equalTo("Invalid activate query parameter"));
}
- protected ScriptContent getScriptContent(InputStream inputStream) throws IOException {
+ ScriptContent getScriptContent(InputStream inputStream) throws IOException {
return new ScriptContent(IOUtils.toString(inputStream, StandardCharsets.UTF_8));
}
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 4441d10..890323d 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -63,9 +63,9 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
class UserMailboxesRoutesTest {
-
private static final String USERNAME = "username";
private static final String MAILBOX_NAME = "myMailboxName";
+
private WebAdminServer webAdminServer;
private UsersRepository usersRepository;
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index 5f30300..45f2db1 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -66,7 +66,7 @@ import io.restassured.builder.RequestSpecBuilder;
import io.restassured.http.ContentType;
import io.restassured.specification.RequestSpecification;
-public class MailQueueRoutesTest {
+class MailQueueRoutesTest {
static final String FIRST_QUEUE = "first one";
static final String SECOND_QUEUE = "second one";
@@ -106,7 +106,7 @@ public class MailQueueRoutesTest {
}
@BeforeEach
- public void setUp() throws Exception {
+ void setUp() {
mailQueueFactory = new MemoryMailQueueFactory(new RawMailQueueItemDecoratorFactory());
webAdminServer = createServer(mailQueueFactory);
RestAssured.requestSpecification = buildRequestSpecification(webAdminServer);
@@ -114,7 +114,7 @@ public class MailQueueRoutesTest {
}
@AfterEach
- public void tearDown() {
+ void tearDown() {
webAdminServer.destroy();
}
@@ -124,7 +124,7 @@ public class MailQueueRoutesTest {
@Nested
class DataValidation {
@Test
- public void listMailsShouldReturnBadRequestWhenLimitIsLessThanZero() throws Exception {
+ void listMailsShouldReturnBadRequestWhenLimitIsLessThanZero() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -136,7 +136,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnBadRequestWhenLimitEqualsToZero() throws Exception {
+ void listMailsShouldReturnBadRequestWhenLimitEqualsToZero() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -148,7 +148,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnBadRequestWhenLimitIsInvalid() throws Exception {
+ void listMailsShouldReturnBadRequestWhenLimitIsInvalid() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -164,7 +164,7 @@ public class MailQueueRoutesTest {
class HttpBodies {
@Test
- public void listAllMailQueuesShouldReturnEmptyWhenNone() {
+ void listAllMailQueuesShouldReturnEmptyWhenNone() {
List<String> actual = when()
.get()
.then()
@@ -179,7 +179,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void listAllMailQueuesShouldReturnSingleElementListWhenOnlyOneMailQueue() {
+ void listAllMailQueuesShouldReturnSingleElementListWhenOnlyOneMailQueue() {
mailQueueFactory.createQueue(FIRST_QUEUE);
List<String> actual = when()
@@ -196,7 +196,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void listAllMailQueuesShouldReturnListWhenSeveralMailQueues() {
+ void listAllMailQueuesShouldReturnListWhenSeveralMailQueues() {
mailQueueFactory.createQueue(FIRST_QUEUE);
mailQueueFactory.createQueue(SECOND_QUEUE);
mailQueueFactory.createQueue(THIRD_QUEUE);
@@ -216,7 +216,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnEmptyListWhenNoMails() {
+ void listMailsShouldReturnEmptyListWhenNoMails() {
mailQueueFactory.createQueue(FIRST_QUEUE);
when()
@@ -348,7 +348,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void getMailQueueShouldReturnNotFoundWhenMailQueueDoesntExist() {
+ void getMailQueueShouldReturnNotFoundWhenMailQueueDoesntExist() {
when()
.get(FIRST_QUEUE)
.then()
@@ -363,7 +363,7 @@ public class MailQueueRoutesTest {
class DataValidation {
@Test
- public void forcingDelayedMailsDeliveryShouldReturnNoContent() throws Exception {
+ void forcingDelayedMailsDeliveryShouldReturnNoContent() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -376,7 +376,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryForUnknownQueueShouldReturnNotFound() throws Exception {
+ void forcingDelayedMailsDeliveryForUnknownQueueShouldReturnNotFound() {
given()
.queryParam("delayed", "true")
.body("{\"delayed\": \"false\"}")
@@ -387,7 +387,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryRequiresDelayedParameter() throws Exception {
+ void forcingDelayedMailsDeliveryRequiresDelayedParameter() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -399,7 +399,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryShouldRejectFalseDelayedParam() throws Exception {
+ void forcingDelayedMailsDeliveryShouldRejectFalseDelayedParam() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -412,7 +412,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryShouldRejectNonBooleanDelayedParam() throws Exception {
+ void forcingDelayedMailsDeliveryShouldRejectNonBooleanDelayedParam() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -425,7 +425,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryShouldRejectRequestWithoutBody() throws Exception {
+ void forcingDelayedMailsDeliveryShouldRejectRequestWithoutBody() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -437,7 +437,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryShouldRejectRequestWithoutDelayedParameter() throws Exception {
+ void forcingDelayedMailsDeliveryShouldRejectRequestWithoutDelayedParameter() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -450,7 +450,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryShouldAcceptRequestWithUnknownFields() throws Exception {
+ void forcingDelayedMailsDeliveryShouldAcceptRequestWithUnknownFields() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -466,7 +466,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryShouldRejectMalformedJsonPayload() throws Exception {
+ void forcingDelayedMailsDeliveryShouldRejectMalformedJsonPayload() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -479,7 +479,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryShouldRejectTrueDelayedAttribute() throws Exception {
+ void forcingDelayedMailsDeliveryShouldRejectTrueDelayedAttribute() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -492,7 +492,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void forcingDelayedMailsDeliveryShouldRejectStringDelayedAttribute() throws Exception {
+ void forcingDelayedMailsDeliveryShouldRejectStringDelayedAttribute() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -539,7 +539,7 @@ public class MailQueueRoutesTest {
class DataValidation {
@Test
- public void deleteMailsShouldReturnNotFoundWhenMailQueueDoesntExist() {
+ void deleteMailsShouldReturnNotFoundWhenMailQueueDoesntExist() {
when()
.delete(FIRST_QUEUE + "/mails")
.then()
@@ -547,7 +547,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldReturnBadRequestWhenSenderIsInvalid() {
+ void deleteMailsShouldReturnBadRequestWhenSenderIsInvalid() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -559,7 +559,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldReturnBadRequestWhenRecipientIsInvalid() {
+ void deleteMailsShouldReturnBadRequestWhenRecipientIsInvalid() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
@@ -571,7 +571,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldReturnBadRequestWhenAllParametersAreGiven() throws Exception {
+ void deleteMailsShouldReturnBadRequestWhenAllParametersAreGiven() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
.param("sender", "sender@james.org")
@@ -584,7 +584,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldReturnBadRequestWhenTwoParametersAreGiven() throws Exception {
+ void deleteMailsShouldReturnBadRequestWhenTwoParametersAreGiven() {
mailQueueFactory.createQueue(FIRST_QUEUE);
given()
.param("sender", "sender@james.org")
@@ -600,7 +600,7 @@ public class MailQueueRoutesTest {
class HttpBodies {
@Test
- public void deleteMailsTasksShouldCompleteWhenSenderIsValid() throws Exception {
+ void deleteMailsTasksShouldCompleteWhenSenderIsValid() {
mailQueueFactory.createQueue(FIRST_QUEUE);
String taskId = with()
@@ -618,7 +618,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldCompleteWhenNameIsValid() {
+ void deleteMailsShouldCompleteWhenNameIsValid() {
mailQueueFactory.createQueue(FIRST_QUEUE);
String taskId = with()
@@ -636,7 +636,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldCompleteWhenRecipientIsValid() {
+ void deleteMailsShouldCompleteWhenRecipientIsValid() {
mailQueueFactory.createQueue(FIRST_QUEUE);
String taskId = with()
@@ -912,7 +912,7 @@ public class MailQueueRoutesTest {
class ClearMail {
@Test
- public void clearMailQueueShouldReturnNotFoundWhenMailQueueDoesNotExist() throws Exception {
+ void clearMailQueueShouldReturnNotFoundWhenMailQueueDoesNotExist() {
mailQueueFactory.createQueue(FIRST_QUEUE);
when()
@@ -922,7 +922,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void clearMailQueueShouldCompleteWhenNoQueryParameters() {
+ void clearMailQueueShouldCompleteWhenNoQueryParameters() {
mailQueueFactory.createQueue(FIRST_QUEUE);
String taskId = with()
@@ -976,7 +976,7 @@ public class MailQueueRoutesTest {
}
@Test
- public void clearMailQueueShouldDeleteAllMailsInQueueWhenNoQueryParameters() throws Exception {
+ void clearMailQueueShouldDeleteAllMailsInQueueWhenNoQueryParameters() throws Exception {
MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(FakeMail.builder()
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index b4291a7..184e801 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -154,7 +154,7 @@ public class MailRepositoriesRoutesTest {
}
@Test
- public void putMailRepositoryShouldReturnOkWhenRepositoryAlreadyExists() throws Exception {
+ public void putMailRepositoryShouldReturnOkWhenRepositoryAlreadyExists() {
given()
.params("protocol", "memory")
.when()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 09/09: JAMES-2314 Always rely on NoopMetricFactory
in WebAdmin tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c2e19536445d4e26e2535694d8ddc5684d0d8416
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Jun 7 11:03:35 2019 +0700
JAMES-2314 Always rely on NoopMetricFactory in WebAdmin tests
The metricFactory is unused. We can thus simplify WebAdminServer creation in tests.
---
.../apache/james/webadmin/routes/CassandraMappingsRoutesTest.java | 2 --
.../apache/james/webadmin/routes/CassandraMigrationRoutesTest.java | 2 --
.../test/java/org/apache/james/webadmin/WebAdminServerTest.java | 5 ++---
.../src/test/java/org/apache/james/webadmin/WebAdminUtils.java | 6 +++---
.../java/org/apache/james/webadmin/routes/ErrorRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/HealthCheckRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/TasksRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/AliasRoutesTest.java | 3 +--
.../apache/james/webadmin/routes/DLPConfigurationRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/DomainsRoutesTest.java | 4 +---
.../java/org/apache/james/webadmin/routes/ForwardRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/GroupsRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/SieveScriptRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/UsersRoutesTest.java | 5 +----
.../webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java | 2 --
.../webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java | 3 +--
.../apache/james/webadmin/routes/EventDeadLettersRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/ReindexingRoutesTest.java | 2 --
.../org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java | 2 --
.../james/webadmin/routes/WebAdminQuotaSearchTestSystem.java | 7 +------
.../java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java | 2 --
.../apache/james/webadmin/routes/MailRepositoriesRoutesTest.java | 2 --
24 files changed, 20 insertions(+), 57 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index 0a226e2..2ffa702 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -30,7 +30,6 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.utils.CassandraUtils;
import org.apache.james.core.Domain;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.rrt.cassandra.CassandraMappingsSourcesDAO;
import org.apache.james.rrt.cassandra.CassandraRRTModule;
import org.apache.james.rrt.cassandra.CassandraRecipientRewriteTableDAO;
@@ -79,7 +78,6 @@ class CassandraMappingsRoutesTest {
JsonTransformer jsonTransformer = new JsonTransformer();
taskManager = new MemoryTaskManager();
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
new CassandraMappingsRoutes(cassandraMappingsService, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer))
.start();
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index 4879748..5e09109 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -42,7 +42,6 @@ import org.apache.james.backends.cassandra.migration.Migration;
import org.apache.james.backends.cassandra.migration.MigrationTask;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO;
import org.apache.james.backends.cassandra.versions.SchemaVersion;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.task.MemoryTaskManager;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -82,7 +81,6 @@ public class CassandraMigrationRoutesTest {
taskManager = new MemoryTaskManager();
JsonTransformer jsonTransformer = new JsonTransformer();
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
new CassandraMigrationRoutes(new CassandraMigrationService(schemaVersionDAO, allMigrationClazz, LATEST_VERSION),
taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer))
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
index 26ba38b..70a6149 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
@@ -21,7 +21,6 @@ package org.apache.james.webadmin;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.util.Port;
import org.junit.Test;
@@ -29,14 +28,14 @@ public class WebAdminServerTest {
@Test
public void getPortShouldThrowWhenNotConfigured() {
- WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
+ WebAdminServer server = WebAdminUtils.createWebAdminServer();
assertThatThrownBy(server::getPort)
.isInstanceOf(IllegalStateException.class);
}
@Test
public void getPortShouldReturnPortWhenConfigured() {
- WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory()).start();
+ WebAdminServer server = WebAdminUtils.createWebAdminServer().start();
Port port = server.getPort();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
index b5a02fa..e5bde5e 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
@@ -27,7 +27,7 @@ import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Set;
-import org.apache.james.metrics.api.MetricFactory;
+import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.util.Port;
import org.apache.james.webadmin.authentication.NoAuthenticationFilter;
@@ -40,12 +40,12 @@ import io.restassured.specification.RequestSpecification;
public class WebAdminUtils {
- public static WebAdminServer createWebAdminServer(MetricFactory metricFactory, Routes... routes) {
+ public static WebAdminServer createWebAdminServer(Routes... routes) {
return new WebAdminServer(WebAdminConfiguration.TEST_CONFIGURATION,
privateRoutes(routes),
publicRoutes(routes),
new NoAuthenticationFilter(),
- metricFactory);
+ new NoopMetricFactory());
}
private static Set<Routes> privateRoutes(Routes[] routes) {
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
index b0d6d16..65ebc70 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
@@ -31,7 +31,6 @@ import static org.eclipse.jetty.http.HttpStatus.NOT_FOUND_404;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
-import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
import org.apache.james.webadmin.utils.ErrorResponder;
@@ -48,7 +47,7 @@ public class ErrorRoutesTest {
@Before
public void setUp() throws Exception {
- webAdminServer = WebAdminUtils.createWebAdminServer(new NoopMetricFactory(), new ErrorRoutes())
+ webAdminServer = WebAdminUtils.createWebAdminServer(new ErrorRoutes())
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
index 1f6b737..3cd8e49 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
@@ -34,7 +34,6 @@ import org.apache.james.core.healthcheck.ComponentName;
import org.apache.james.core.healthcheck.HealthCheck;
import org.apache.james.core.healthcheck.Result;
import org.apache.james.core.healthcheck.ResultStatus;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
import org.apache.james.webadmin.utils.JsonTransformer;
@@ -77,7 +76,7 @@ public class HealthCheckRoutesTest {
@Before
public void setUp() throws Exception {
healthChecks = new HashSet<>();
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), new HealthCheckRoutes(healthChecks, new JsonTransformer()))
+ webAdminServer = WebAdminUtils.createWebAdminServer(new HealthCheckRoutes(healthChecks, new JsonTransformer()))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index 2f0ece7..1a693dc 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -31,7 +31,6 @@ import static org.hamcrest.Matchers.not;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.task.MemoryTaskManager;
import org.apache.james.task.Task;
import org.apache.james.task.TaskId;
@@ -55,7 +54,7 @@ class TasksRoutesTest {
void setUp() {
taskManager = new MemoryTaskManager();
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), new TasksRoutes(taskManager, new JsonTransformer()))
+ webAdminServer = WebAdminUtils.createWebAdminServer(new TasksRoutes(taskManager, new JsonTransformer()))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
index a0d6d66..0ee03d1 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
@@ -41,7 +41,6 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.MappingSource;
import org.apache.james.rrt.memory.MemoryRecipientRewriteTable;
@@ -82,7 +81,7 @@ class AliasRoutesTest {
private WebAdminServer webAdminServer;
private void createServer(AliasRoutes aliasRoutes) {
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), aliasRoutes)
+ webAdminServer = WebAdminUtils.createWebAdminServer(aliasRoutes)
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index 5fb19ca..10710a8 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -41,7 +41,6 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.memory.MemoryDomainList;
import org.apache.james.eventsourcing.eventstore.memory.InMemoryEventStore;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
import org.apache.james.webadmin.utils.JsonTransformer;
@@ -67,7 +66,7 @@ class DLPConfigurationRoutesTest {
private EventSourcingDLPConfigurationStore dlpStore;
private void createServer(DLPConfigurationStore dlpConfigurationStore, DomainList domainList) {
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(),
+ webAdminServer = WebAdminUtils.createWebAdminServer(
new DLPConfigurationRoutes(dlpConfigurationStore, domainList, new JsonTransformer()))
.start();
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
index c6ca75e..c2c2bce 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
@@ -41,7 +41,6 @@ import java.util.function.Function;
import org.apache.james.core.Domain;
import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.Mapping;
import org.apache.james.rrt.lib.MappingSource;
@@ -76,7 +75,7 @@ class DomainMappingsRoutesTest {
private DomainList domainList;
private void createServer(DomainMappingsRoutes domainMappingsRoutes) {
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), domainMappingsRoutes)
+ webAdminServer = WebAdminUtils.createWebAdminServer(domainMappingsRoutes)
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
index b103450..640e473 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
@@ -41,7 +41,6 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.rrt.memory.MemoryRecipientRewriteTable;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -67,8 +66,7 @@ class DomainsRoutesTest {
private void createServer(DomainList domainList) {
DomainAliasService domainAliasService = new DomainAliasService(new MemoryRecipientRewriteTable(), domainList);
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(),
- new DomainsRoutes(domainList, domainAliasService, new JsonTransformer()))
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DomainsRoutes(domainList, domainAliasService, new JsonTransformer()))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
index 0cf385e..9b49f06 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -42,7 +42,6 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.Mapping;
import org.apache.james.rrt.lib.MappingSource;
@@ -81,7 +80,7 @@ class ForwardRoutesTest {
private WebAdminServer webAdminServer;
private void createServer(ForwardRoutes forwardRoutes) {
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), forwardRoutes)
+ webAdminServer = WebAdminUtils.createWebAdminServer(forwardRoutes)
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index 8b0d907..af8092a 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -40,7 +40,6 @@ import org.apache.james.core.User;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.Mapping;
import org.apache.james.rrt.lib.MappingSource;
@@ -79,7 +78,7 @@ class GroupsRoutesTest {
private WebAdminServer webAdminServer;
private void createServer(GroupsRoutes groupsRoutes) {
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), groupsRoutes)
+ webAdminServer = WebAdminUtils.createWebAdminServer(groupsRoutes)
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
index a9d6498..1bb159b 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
@@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.core.User;
import org.apache.james.core.quota.QuotaSize;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.sieverepository.api.SieveQuotaRepository;
import org.apache.james.sieverepository.memory.InMemorySieveQuotaRepository;
import org.apache.james.webadmin.WebAdminServer;
@@ -48,7 +47,7 @@ class SieveQuotaRoutesTest {
@BeforeEach
void setUp() {
sieveRepository = new InMemorySieveQuotaRepository();
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), new SieveQuotaRoutes(sieveRepository, new JsonTransformer()))
+ webAdminServer = WebAdminUtils.createWebAdminServer(new SieveQuotaRoutes(sieveRepository, new JsonTransformer()))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
index cd506ba..472a7c8 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
@@ -36,7 +36,6 @@ import org.apache.commons.io.IOUtils;
import org.apache.james.core.User;
import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.junit.TemporaryFolderExtension;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.sieverepository.api.ScriptContent;
import org.apache.james.sieverepository.api.ScriptName;
import org.apache.james.sieverepository.api.SieveRepository;
@@ -87,7 +86,7 @@ class SieveScriptRoutesTest {
URL sieveResource = ClassLoader.getSystemResource("sieve/my_sieve");
sieveContent = IOUtils.toString(sieveResource, StandardCharsets.UTF_8);
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), new SieveScriptRoutes(sieveRepository, usersRepository))
+ webAdminServer = WebAdminUtils.createWebAdminServer(new SieveScriptRoutes(sieveRepository, usersRepository))
.start();
RestAssured.requestSpecification = WebAdminUtils
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
index 4406772..6476048 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
@@ -33,7 +33,6 @@ import java.util.Map;
import org.apache.james.core.Domain;
import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.api.model.User;
@@ -60,9 +59,7 @@ class UsersRoutesTest {
private WebAdminServer webAdminServer;
private void createServer(UsersRepository usersRepository) {
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new UserRoutes(new UserService(usersRepository), new JsonTransformer()))
+ webAdminServer = WebAdminUtils.createWebAdminServer(new UserRoutes(new UserService(usersRepository), new JsonTransformer()))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index dc335c9..3df3aa4 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -98,7 +98,6 @@ import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.model.MultimailboxesSearchQuery;
import org.apache.james.mailbox.model.SearchQuery;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.task.MemoryTaskManager;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.vault.DeletedMessage;
@@ -183,7 +182,6 @@ class DeletedMessagesVaultRoutesTest {
usersRepository = createUsersRepository();
MessageId.Factory messageIdFactory = new InMemoryMessageId.Factory();
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
new TasksRoutes(taskManager, jsonTransformer),
new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory))
.start();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
index f3d859b..ec83566 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
@@ -25,7 +25,6 @@ import org.apache.james.core.Domain;
import org.apache.james.dnsservice.api.InMemoryDNSService;
import org.apache.james.domainlist.memory.MemoryDomainList;
import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
-import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -60,7 +59,7 @@ class DomainQuotaRoutesNoVirtualHostingTest {
QuotaModule quotaModule = new QuotaModule();
MemoryUsersRepository usersRepository = MemoryUsersRepository.withoutVirtualHosting();
DomainQuotaRoutes domainQuotaRoutes = new DomainQuotaRoutes(memoryDomainList, domainQuotaService, usersRepository, new JsonTransformer(quotaModule), ImmutableSet.of(quotaModule));
- webAdminServer = WebAdminUtils.createWebAdminServer(new NoopMetricFactory(), domainQuotaRoutes)
+ webAdminServer = WebAdminUtils.createWebAdminServer(domainQuotaRoutes)
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
index 28986a6..b21b137 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
@@ -49,7 +49,6 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.event.EventFactory;
import org.apache.james.mailbox.util.EventCollector;
import org.apache.james.metrics.api.NoopMetricFactory;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.task.MemoryTaskManager;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -122,7 +121,7 @@ class EventDeadLettersRoutesTest {
EventDeadLettersService service = new EventDeadLettersService(redeliverService, deadLetters);
taskManager = new MemoryTaskManager();
- webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(),
+ webAdminServer = WebAdminUtils.createWebAdminServer(
new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer))
.start();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
index 00a48fc..65ea398 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
@@ -46,7 +46,6 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.task.MemoryTaskManager;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -93,7 +92,6 @@ class ReindexingRoutesTest {
JsonTransformer jsonTransformer = new JsonTransformer();
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
new TasksRoutes(taskManager, jsonTransformer),
new ReindexingRoutes(
taskManager,
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 7f03a8e..ec57e55 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -44,7 +44,6 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxMetaData;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.search.MailboxQuery;
-import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -74,7 +73,6 @@ class UserMailboxesRoutesTest {
when(usersRepository.contains(USERNAME)).thenReturn(true);
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer()))
.start();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
index 032f501..c3e622a 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
@@ -19,7 +19,6 @@
package org.apache.james.webadmin.routes;
-import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.quota.search.QuotaSearchTestSystem;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -61,11 +60,7 @@ public class WebAdminQuotaSearchTestSystem {
new GlobalQuotaService(quotaSearchTestSystem.getMaxQuotaManager()),
jsonTransformer);
- this.webAdminServer = WebAdminUtils.createWebAdminServer(
- new NoopMetricFactory(),
- userQuotaRoutes,
- domainQuotaRoutes,
- globalQuotaRoutes)
+ this.webAdminServer = WebAdminUtils.createWebAdminServer(userQuotaRoutes, domainQuotaRoutes, globalQuotaRoutes)
.start();
this.requestSpecBuilder = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index e7e3800..005adda 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -38,7 +38,6 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.james.core.MailAddress;
-import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.queue.api.Mails;
import org.apache.james.queue.api.ManageableMailQueue;
import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory;
@@ -90,7 +89,6 @@ class MailQueueRoutesTest {
JsonTransformer jsonTransformer = new JsonTransformer();
return WebAdminUtils.createWebAdminServer(
- new NoopMetricFactory(),
new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager),
new TasksRoutes(taskManager, jsonTransformer))
.start();
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 3823453..9156d62 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -59,7 +59,6 @@ import org.apache.james.mailrepository.memory.MemoryMailRepository;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryProvider;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryStore;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryUrlStore;
-import org.apache.james.metrics.api.NoopMetricFactory;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.ManageableMailQueue;
import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory;
@@ -123,7 +122,6 @@ public class MailRepositoriesRoutesTest {
ReprocessingService reprocessingService = new ReprocessingService(queueFactory, repositoryStoreService);
webAdminServer = WebAdminUtils.createWebAdminServer(
- new NoopMetricFactory(),
new MailRepositoriesRoutes(repositoryStoreService,
jsonTransformer, reprocessingService, taskManager),
new TasksRoutes(taskManager, jsonTransformer))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/09: MAILBOX-383 DropWizardInitializer only needs
to be startable
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit aed1344cb86f8fac49fd1146fa588b3579b8bc69
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 5 15:19:52 2019 +0700
MAILBOX-383 DropWizardInitializer only needs to be startable
No configuration operation actually takes place so `Configurable` implementation is inapropriate...
---
.../james/modules/server/DropWizardMetricsModule.java | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java
index 473f400..662f9c1 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java
@@ -21,9 +21,6 @@ package org.apache.james.modules.server;
import java.util.List;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.metrics.api.GaugeRegistry;
import org.apache.james.metrics.api.MetricFactory;
@@ -57,8 +54,6 @@ public class DropWizardMetricsModule extends AbstractModule {
@Singleton
public static class DropWizardConfigurationPerformer implements ConfigurationPerformer {
- public static final HierarchicalConfiguration NO_CONFIGURATION = null;
-
private final DropWizardInitializer dropWizardInitializer;
@Inject
@@ -68,11 +63,7 @@ public class DropWizardMetricsModule extends AbstractModule {
@Override
public void initModule() {
- try {
- dropWizardInitializer.configure(NO_CONFIGURATION);
- } catch (ConfigurationException e) {
- throw new RuntimeException(e);
- }
+ dropWizardInitializer.start();
}
@Override
@@ -81,7 +72,7 @@ public class DropWizardMetricsModule extends AbstractModule {
}
}
- public static class DropWizardInitializer implements Configurable {
+ public static class DropWizardInitializer implements Startable {
private final DropWizardMetricFactory dropWizardMetricFactory;
private final DropWizardJVMMetrics dropWizardJVMMetrics;
@@ -91,8 +82,7 @@ public class DropWizardMetricsModule extends AbstractModule {
this.dropWizardJVMMetrics = dropWizardJVMMetrics;
}
- @Override
- public void configure(HierarchicalConfiguration config) throws ConfigurationException {
+ public void start() {
dropWizardMetricFactory.start();
dropWizardJVMMetrics.start();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 05/09: JAMES-2314
WebAdminUtils.createWebAdminServer should call start
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6980ef45ff8be1a0bced3db9c85327bb5eb9e7fb
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 5 15:47:01 2019 +0700
JAMES-2314 WebAdminUtils.createWebAdminServer should call start
This avoids having to specify the start call in each test class
---
.../james/webadmin/routes/CassandraMappingsRoutesTest.java | 2 --
.../james/webadmin/routes/CassandraMigrationRoutesTest.java | 4 +---
.../test/java/org/apache/james/webadmin/WebAdminServerTest.java | 9 ++++-----
.../src/test/java/org/apache/james/webadmin/WebAdminUtils.java | 6 ++++++
.../java/org/apache/james/webadmin/routes/ErrorRoutesTest.java | 1 -
.../org/apache/james/webadmin/routes/HealthCheckRoutesTest.java | 2 --
.../java/org/apache/james/webadmin/routes/TasksRoutesTest.java | 2 --
.../java/org/apache/james/webadmin/routes/AliasRoutesTest.java | 1 -
.../apache/james/webadmin/routes/DLPConfigurationRoutesTest.java | 1 -
.../apache/james/webadmin/routes/DomainMappingsRoutesTest.java | 1 -
.../java/org/apache/james/webadmin/routes/DomainsRoutesTest.java | 1 -
.../java/org/apache/james/webadmin/routes/ForwardRoutesTest.java | 1 -
.../java/org/apache/james/webadmin/routes/GroupsRoutesTest.java | 1 -
.../org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java | 1 -
.../org/apache/james/webadmin/routes/SieveScriptRoutesTest.java | 1 -
.../java/org/apache/james/webadmin/routes/UsersRoutesTest.java | 1 -
.../webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java | 1 -
.../webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java | 1 -
.../apache/james/webadmin/routes/EventDeadLettersRoutesTest.java | 1 -
.../org/apache/james/webadmin/routes/ReindexingRoutesTest.java | 1 -
.../apache/james/webadmin/routes/UserMailboxesRoutesTest.java | 1 -
.../james/webadmin/routes/WebAdminQuotaSearchTestSystem.java | 1 -
.../org/apache/james/webadmin/routes/MailQueueRoutesTest.java | 4 +---
.../apache/james/webadmin/routes/MailRepositoriesRoutesTest.java | 1 -
24 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index b1afff9..0f8f8f7 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -83,8 +83,6 @@ class CassandraMappingsRoutesTest {
new CassandraMappingsRoutes(cassandraMappingsService, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.start();
-
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMappingsRoutes.ROOT_PATH)
.build();
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index 6f8c093..d94b2f7 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -86,9 +86,7 @@ public class CassandraMigrationRoutesTest {
new CassandraMigrationRoutes(new CassandraMigrationService(schemaVersionDAO, allMigrationClazz, LATEST_VERSION),
taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
-
- webAdminServer.start();
-
+
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMigrationRoutes.VERSION_BASE)
.build();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
index 523b0bf..3605c93 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
@@ -28,16 +28,15 @@ import org.junit.Test;
public class WebAdminServerTest {
@Test
- public void getPortShouldThrowWhenNotConfigured() throws Exception {
- WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
- assertThatThrownBy(() -> server.getPort())
+ public void getPortShouldThrowWhenNotConfigured() {
+ WebAdminServer server = WebAdminUtils.createNotStartedWebAdminServer(new DefaultMetricFactory());
+ assertThatThrownBy(server::getPort)
.isInstanceOf(IllegalStateException.class);
}
@Test
- public void getPortShouldReturnPortWhenConfigured() throws Exception {
+ public void getPortShouldReturnPortWhenConfigured() {
WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
- server.start();
Port port = server.getPort();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
index b5a02fa..06b402c 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
@@ -41,6 +41,12 @@ import io.restassured.specification.RequestSpecification;
public class WebAdminUtils {
public static WebAdminServer createWebAdminServer(MetricFactory metricFactory, Routes... routes) {
+ WebAdminServer webAdminServer = createNotStartedWebAdminServer(metricFactory, routes);
+ webAdminServer.start();
+ return webAdminServer;
+ }
+
+ public static WebAdminServer createNotStartedWebAdminServer(MetricFactory metricFactory, Routes... routes) {
return new WebAdminServer(WebAdminConfiguration.TEST_CONFIGURATION,
privateRoutes(routes),
publicRoutes(routes),
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
index d5e8916..28c3659 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
@@ -51,7 +51,6 @@ public class ErrorRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new NoopMetricFactory(),
new ErrorRoutes());
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(ErrorRoutes.BASE_URL)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
index 17ed35c..5117d96 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
@@ -82,8 +82,6 @@ public class HealthCheckRoutesTest {
new DefaultMetricFactory(),
new HealthCheckRoutes(healthChecks, new JsonTransformer()));
- webAdminServer.start();
-
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(HealthCheckRoutes.HEALTHCHECK)
.build();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index aaaea2c..d3a57fc 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -59,8 +59,6 @@ class TasksRoutesTest {
new DefaultMetricFactory(),
new TasksRoutes(taskManager, new JsonTransformer()));
- webAdminServer.start();
-
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(TasksRoutes.BASE)
.build();
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
index e511fb3..20a8eb8 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
@@ -85,7 +85,6 @@ class AliasRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
aliasRoutes);
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/aliases")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index 2ddb946..1448f6c 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -70,7 +70,6 @@ class DLPConfigurationRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new DLPConfigurationRoutes(dlpConfigurationStore, domainList, new JsonTransformer()));
- webAdminServer.start();
requestSpecification = buildRequestSpecification(webAdminServer);
}
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
index ff19744..d24bd9f 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
@@ -79,7 +79,6 @@ class DomainMappingsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
domainMappingsRoutes);
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DOMAIN_MAPPINGS)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
index dbb2857..0812fc9 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
@@ -70,7 +70,6 @@ class DomainsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new DomainsRoutes(domainList, domainAliasService, new JsonTransformer()));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DomainsRoutes.DOMAINS)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
index 70c2ba5..566fa27 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -84,7 +84,6 @@ class ForwardRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
forwardRoutes);
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/forwards")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index 8c99c13..7119c80 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -82,7 +82,6 @@ class GroupsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
groupsRoutes);
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/groups")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
index 53fe916..bab9849 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
@@ -51,7 +51,6 @@ class SieveQuotaRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new SieveQuotaRoutes(sieveRepository, new JsonTransformer()));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
index 3658666..d53e461 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
@@ -95,7 +95,6 @@ public class SieveScriptRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new SieveScriptRoutes(sieveRepository, usersRepository));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils
.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
index dbe92e9..5a67c33 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
@@ -63,7 +63,6 @@ class UsersRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new UserRoutes(new UserService(usersRepository), new JsonTransformer()));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(UserRoutes.USERS)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index b471d34..4558c93 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -187,7 +187,6 @@ class DeletedMessagesVaultRoutesTest {
new TasksRoutes(taskManager, jsonTransformer),
new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DeletedMessagesVaultRoutes.ROOT_PATH)
.log(LogDetail.METHOD)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
index 576c8fc..8238385 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
@@ -63,7 +63,6 @@ class DomainQuotaRoutesNoVirtualHostingTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new NoopMetricFactory(),
domainQuotaRoutes);
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
index 0ed07fd..c3e73cc 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
@@ -126,7 +126,6 @@ class EventDeadLettersRoutesTest {
new DefaultMetricFactory(),
new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
index 95faeaf..cdaa89c 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
@@ -105,7 +105,6 @@ class ReindexingRoutesTest {
new InMemoryMessageId.Factory(),
new MessageIdReIndexerImpl(mailboxManager, mailboxManager.getMapperFactory(), searchIndex),
jsonTransformer));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 27190b5..4441d10 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -76,7 +76,6 @@ class UserMailboxesRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer()));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(USERS_BASE + SEPARATOR + USERNAME + SEPARATOR + UserMailboxesRoutes.MAILBOXES)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
index cee2514..ad56bcb 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
@@ -66,7 +66,6 @@ public class WebAdminQuotaSearchTestSystem {
userQuotaRoutes,
domainQuotaRoutes,
globalQuotaRoutes);
- this.webAdminServer.start();
this.requestSpecBuilder = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index 26004bb..5f30300 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -89,12 +89,10 @@ public class MailQueueRoutesTest {
TaskManager taskManager = new MemoryTaskManager();
JsonTransformer jsonTransformer = new JsonTransformer();
- WebAdminServer server = WebAdminUtils.createWebAdminServer(
+ return WebAdminUtils.createWebAdminServer(
new NoopMetricFactory(),
new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager),
new TasksRoutes(taskManager, jsonTransformer));
- server.start();
- return server;
}
RequestSpecification buildRequestSpecification(WebAdminServer server) {
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 2d9f935..b4291a7 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -127,7 +127,6 @@ public class MailRepositoriesRoutesTest {
new MailRepositoriesRoutes(repositoryStoreService,
jsonTransformer, reprocessingService, taskManager),
new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(MailRepositoriesRoutes.MAIL_REPOSITORIES)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 08/09: JAMES-2314 WebAdminServer::start should be
more fluent
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 7f97086eb9f9b647faa93daa84e8f2f0492dd351
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Jun 6 16:49:09 2019 +0700
JAMES-2314 WebAdminServer::start should be more fluent
---
.../routes/CassandraMappingsRoutesTest.java | 9 ++++----
.../routes/CassandraMigrationRoutesTest.java | 11 +++++----
.../org/apache/james/webadmin/WebAdminServer.java | 11 +++------
.../apache/james/webadmin/WebAdminServerTest.java | 9 ++++----
.../james/webadmin/routes/ErrorRoutesTest.java | 6 ++---
.../webadmin/routes/HealthCheckRoutesTest.java | 7 ++----
.../james/webadmin/routes/TasksRoutesTest.java | 7 ++----
.../james/webadmin/routes/AliasRoutesTest.java | 6 ++---
.../routes/DLPConfigurationRoutesTest.java | 7 +++---
.../webadmin/routes/DomainMappingsRoutesTest.java | 6 ++---
.../james/webadmin/routes/DomainsRoutesTest.java | 7 +++---
.../james/webadmin/routes/ForwardRoutesTest.java | 6 ++---
.../james/webadmin/routes/GroupsRoutesTest.java | 6 ++---
.../webadmin/routes/SieveQuotaRoutesTest.java | 6 ++---
.../webadmin/routes/SieveScriptRoutesTest.java | 6 ++---
.../james/webadmin/routes/UsersRoutesTest.java | 6 ++---
.../routes/DeletedMessagesVaultRoutesTest.java | 9 ++++----
.../DomainQuotaRoutesNoVirtualHostingTest.java | 6 ++---
.../routes/EventDeadLettersRoutesTest.java | 9 ++++----
.../webadmin/routes/ReindexingRoutesTest.java | 26 +++++++++++-----------
.../webadmin/routes/UserMailboxesRoutesTest.java | 6 ++---
.../routes/WebAdminQuotaSearchTestSystem.java | 10 ++++-----
.../james/webadmin/routes/MailQueueRoutesTest.java | 11 +++++----
.../routes/MailRepositoriesRoutesTest.java | 4 ++--
24 files changed, 81 insertions(+), 116 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index b1afff9..0a226e2 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -79,11 +79,10 @@ class CassandraMappingsRoutesTest {
JsonTransformer jsonTransformer = new JsonTransformer();
taskManager = new MemoryTaskManager();
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new CassandraMappingsRoutes(cassandraMappingsService, taskManager, jsonTransformer),
- new TasksRoutes(taskManager, jsonTransformer));
-
- webAdminServer.start();
+ new DefaultMetricFactory(),
+ new CassandraMappingsRoutes(cassandraMappingsService, taskManager, jsonTransformer),
+ new TasksRoutes(taskManager, jsonTransformer))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMappingsRoutes.ROOT_PATH)
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index 38e8b50..4879748 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -82,12 +82,11 @@ public class CassandraMigrationRoutesTest {
taskManager = new MemoryTaskManager();
JsonTransformer jsonTransformer = new JsonTransformer();
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new CassandraMigrationRoutes(new CassandraMigrationService(schemaVersionDAO, allMigrationClazz, LATEST_VERSION),
- taskManager, jsonTransformer),
- new TasksRoutes(taskManager, jsonTransformer));
-
- webAdminServer.start();
+ new DefaultMetricFactory(),
+ new CassandraMigrationRoutes(new CassandraMigrationService(schemaVersionDAO, allMigrationClazz, LATEST_VERSION),
+ taskManager, jsonTransformer),
+ new TasksRoutes(taskManager, jsonTransformer))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMigrationRoutes.VERSION_BASE)
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
index 9474e10..5929968 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
@@ -47,8 +47,6 @@ import org.apache.james.webadmin.utils.JsonExtractException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-
import spark.Service;
public class WebAdminServer implements Startable {
@@ -62,9 +60,7 @@ public class WebAdminServer implements Startable {
private final Service service;
private final AuthenticationFilter authenticationFilter;
private final MetricFactory metricFactory;
- private Port port;
- // Spark do not allow to retrieve allocated port when using a random port. Thus we generate the port.
@Inject
protected WebAdminServer(WebAdminConfiguration configuration, Set<Routes> routesList, Set<PublicRoutes> publicRoutes, AuthenticationFilter authenticationFilter,
MetricFactory metricFactory) {
@@ -76,7 +72,7 @@ public class WebAdminServer implements Startable {
this.service = Service.ignite();
}
- public void start() {
+ public WebAdminServer start() {
if (configuration.isEnabled()) {
service.port(configuration.getPort().get().getValue());
configureExceptionHanding();
@@ -92,9 +88,9 @@ public class WebAdminServer implements Startable {
});
publicRoutes.forEach(routes -> routes.define(service));
service.awaitInitialization();
- port = new Port(service.port());
LOGGER.info("Web admin server started");
}
+ return this;
}
private void configureMDC() {
@@ -173,7 +169,6 @@ public class WebAdminServer implements Startable {
}
public Port getPort() {
- Preconditions.checkState(port != null, "WebAdminServer should be configured.");
- return port;
+ return new Port(service.port());
}
}
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
index 523b0bf..26ba38b 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
@@ -28,16 +28,15 @@ import org.junit.Test;
public class WebAdminServerTest {
@Test
- public void getPortShouldThrowWhenNotConfigured() throws Exception {
+ public void getPortShouldThrowWhenNotConfigured() {
WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
- assertThatThrownBy(() -> server.getPort())
+ assertThatThrownBy(server::getPort)
.isInstanceOf(IllegalStateException.class);
}
@Test
- public void getPortShouldReturnPortWhenConfigured() throws Exception {
- WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
- server.start();
+ public void getPortShouldReturnPortWhenConfigured() {
+ WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory()).start();
Port port = server.getPort();
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
index d5e8916..b0d6d16 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
@@ -48,10 +48,8 @@ public class ErrorRoutesTest {
@Before
public void setUp() throws Exception {
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new NoopMetricFactory(),
- new ErrorRoutes());
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new NoopMetricFactory(), new ErrorRoutes())
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(ErrorRoutes.BASE_URL)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
index 1082494..1f6b737 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
@@ -77,11 +77,8 @@ public class HealthCheckRoutesTest {
@Before
public void setUp() throws Exception {
healthChecks = new HashSet<>();
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new HealthCheckRoutes(healthChecks, new JsonTransformer()));
-
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), new HealthCheckRoutes(healthChecks, new JsonTransformer()))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(HealthCheckRoutes.HEALTHCHECK)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index ac290bc..2f0ece7 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -55,11 +55,8 @@ class TasksRoutesTest {
void setUp() {
taskManager = new MemoryTaskManager();
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new TasksRoutes(taskManager, new JsonTransformer()));
-
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), new TasksRoutes(taskManager, new JsonTransformer()))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(TasksRoutes.BASE)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
index e511fb3..a0d6d66 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
@@ -82,10 +82,8 @@ class AliasRoutesTest {
private WebAdminServer webAdminServer;
private void createServer(AliasRoutes aliasRoutes) {
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- aliasRoutes);
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), aliasRoutes)
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/aliases")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index 2ddb946..5fb19ca 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -67,10 +67,9 @@ class DLPConfigurationRoutesTest {
private EventSourcingDLPConfigurationStore dlpStore;
private void createServer(DLPConfigurationStore dlpConfigurationStore, DomainList domainList) {
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new DLPConfigurationRoutes(dlpConfigurationStore, domainList, new JsonTransformer()));
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(),
+ new DLPConfigurationRoutes(dlpConfigurationStore, domainList, new JsonTransformer()))
+ .start();
requestSpecification = buildRequestSpecification(webAdminServer);
}
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
index ff19744..c6ca75e 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
@@ -76,10 +76,8 @@ class DomainMappingsRoutesTest {
private DomainList domainList;
private void createServer(DomainMappingsRoutes domainMappingsRoutes) {
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- domainMappingsRoutes);
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), domainMappingsRoutes)
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DOMAIN_MAPPINGS)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
index dbb2857..b103450 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
@@ -67,10 +67,9 @@ class DomainsRoutesTest {
private void createServer(DomainList domainList) {
DomainAliasService domainAliasService = new DomainAliasService(new MemoryRecipientRewriteTable(), domainList);
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new DomainsRoutes(domainList, domainAliasService, new JsonTransformer()));
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(),
+ new DomainsRoutes(domainList, domainAliasService, new JsonTransformer()))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DomainsRoutes.DOMAINS)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
index 70c2ba5..0cf385e 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -81,10 +81,8 @@ class ForwardRoutesTest {
private WebAdminServer webAdminServer;
private void createServer(ForwardRoutes forwardRoutes) {
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- forwardRoutes);
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), forwardRoutes)
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/forwards")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index 510112e..8b0d907 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -79,10 +79,8 @@ class GroupsRoutesTest {
private WebAdminServer webAdminServer;
private void createServer(GroupsRoutes groupsRoutes) {
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- groupsRoutes);
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), groupsRoutes)
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/groups")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
index 53fe916..a9d6498 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
@@ -48,10 +48,8 @@ class SieveQuotaRoutesTest {
@BeforeEach
void setUp() {
sieveRepository = new InMemorySieveQuotaRepository();
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new SieveQuotaRoutes(sieveRepository, new JsonTransformer()));
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), new SieveQuotaRoutes(sieveRepository, new JsonTransformer()))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
index a8f396d..cd506ba 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
@@ -87,10 +87,8 @@ class SieveScriptRoutesTest {
URL sieveResource = ClassLoader.getSystemResource("sieve/my_sieve");
sieveContent = IOUtils.toString(sieveResource, StandardCharsets.UTF_8);
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new SieveScriptRoutes(sieveRepository, usersRepository));
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(), new SieveScriptRoutes(sieveRepository, usersRepository))
+ .start();
RestAssured.requestSpecification = WebAdminUtils
.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
index dbe92e9..4406772 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
@@ -61,9 +61,9 @@ class UsersRoutesTest {
private void createServer(UsersRepository usersRepository) {
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new UserRoutes(new UserService(usersRepository), new JsonTransformer()));
- webAdminServer.start();
+ new DefaultMetricFactory(),
+ new UserRoutes(new UserService(usersRepository), new JsonTransformer()))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(UserRoutes.USERS)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index b471d34..dc335c9 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -183,11 +183,10 @@ class DeletedMessagesVaultRoutesTest {
usersRepository = createUsersRepository();
MessageId.Factory messageIdFactory = new InMemoryMessageId.Factory();
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new TasksRoutes(taskManager, jsonTransformer),
- new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory));
-
- webAdminServer.start();
+ new DefaultMetricFactory(),
+ new TasksRoutes(taskManager, jsonTransformer),
+ new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DeletedMessagesVaultRoutes.ROOT_PATH)
.log(LogDetail.METHOD)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
index 576c8fc..f3d859b 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
@@ -60,10 +60,8 @@ class DomainQuotaRoutesNoVirtualHostingTest {
QuotaModule quotaModule = new QuotaModule();
MemoryUsersRepository usersRepository = MemoryUsersRepository.withoutVirtualHosting();
DomainQuotaRoutes domainQuotaRoutes = new DomainQuotaRoutes(memoryDomainList, domainQuotaService, usersRepository, new JsonTransformer(quotaModule), ImmutableSet.of(quotaModule));
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new NoopMetricFactory(),
- domainQuotaRoutes);
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new NoopMetricFactory(), domainQuotaRoutes)
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
index 0ed07fd..28986a6 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
@@ -122,11 +122,10 @@ class EventDeadLettersRoutesTest {
EventDeadLettersService service = new EventDeadLettersService(redeliverService, deadLetters);
taskManager = new MemoryTaskManager();
- webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer),
- new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.start();
+ webAdminServer = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory(),
+ new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer),
+ new TasksRoutes(taskManager, jsonTransformer))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
index 95faeaf..00a48fc 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
@@ -93,19 +93,19 @@ class ReindexingRoutesTest {
JsonTransformer jsonTransformer = new JsonTransformer();
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new TasksRoutes(taskManager, jsonTransformer),
- new ReindexingRoutes(
- taskManager,
- new PreviousReIndexingService(taskManager),
- mailboxIdFactory,
- reIndexer,
- jsonTransformer),
- new MessageIdReindexingRoutes(taskManager,
- new InMemoryMessageId.Factory(),
- new MessageIdReIndexerImpl(mailboxManager, mailboxManager.getMapperFactory(), searchIndex),
- jsonTransformer));
- webAdminServer.start();
+ new DefaultMetricFactory(),
+ new TasksRoutes(taskManager, jsonTransformer),
+ new ReindexingRoutes(
+ taskManager,
+ new PreviousReIndexingService(taskManager),
+ mailboxIdFactory,
+ reIndexer,
+ jsonTransformer),
+ new MessageIdReindexingRoutes(taskManager,
+ new InMemoryMessageId.Factory(),
+ new MessageIdReIndexerImpl(mailboxManager, mailboxManager.getMapperFactory(), searchIndex),
+ jsonTransformer))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 6f93d5f..7f03a8e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -74,9 +74,9 @@ class UserMailboxesRoutesTest {
when(usersRepository.contains(USERNAME)).thenReturn(true);
webAdminServer = WebAdminUtils.createWebAdminServer(
- new DefaultMetricFactory(),
- new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer()));
- webAdminServer.start();
+ new DefaultMetricFactory(),
+ new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer()))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(USERS_BASE + SEPARATOR + USERNAME + SEPARATOR + UserMailboxesRoutes.MAILBOXES)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
index cee2514..032f501 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
@@ -62,11 +62,11 @@ public class WebAdminQuotaSearchTestSystem {
jsonTransformer);
this.webAdminServer = WebAdminUtils.createWebAdminServer(
- new NoopMetricFactory(),
- userQuotaRoutes,
- domainQuotaRoutes,
- globalQuotaRoutes);
- this.webAdminServer.start();
+ new NoopMetricFactory(),
+ userQuotaRoutes,
+ domainQuotaRoutes,
+ globalQuotaRoutes)
+ .start();
this.requestSpecBuilder = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index da87397..e7e3800 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -89,12 +89,11 @@ class MailQueueRoutesTest {
TaskManager taskManager = new MemoryTaskManager();
JsonTransformer jsonTransformer = new JsonTransformer();
- WebAdminServer server = WebAdminUtils.createWebAdminServer(
- new NoopMetricFactory(),
- new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager),
- new TasksRoutes(taskManager, jsonTransformer));
- server.start();
- return server;
+ return WebAdminUtils.createWebAdminServer(
+ new NoopMetricFactory(),
+ new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager),
+ new TasksRoutes(taskManager, jsonTransformer))
+ .start();
}
RequestSpecification buildRequestSpecification(WebAdminServer server) {
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 01e172c..3823453 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -126,8 +126,8 @@ public class MailRepositoriesRoutesTest {
new NoopMetricFactory(),
new MailRepositoriesRoutes(repositoryStoreService,
jsonTransformer, reprocessingService, taskManager),
- new TasksRoutes(taskManager, jsonTransformer));
- webAdminServer.start();
+ new TasksRoutes(taskManager, jsonTransformer))
+ .start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(MailRepositoriesRoutes.MAIL_REPOSITORIES)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 04/09: JAMES-2314 awaitInitializationis already
called in `WebAdminServer::start`
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4fb8bbfbd2d267c7a3b95286385fbe22846e6ebc
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 5 15:40:12 2019 +0700
JAMES-2314 awaitInitializationis already called in `WebAdminServer::start`
Thus the await method is useless.
---
.../src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java | 1 -
.../apache/james/webadmin/routes/CassandraMappingsRoutesTest.java | 4 +---
.../apache/james/webadmin/routes/CassandraMigrationRoutesTest.java | 5 ++---
.../src/main/java/org/apache/james/webadmin/WebAdminServer.java | 4 ----
.../test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java | 1 -
.../java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java | 1 -
.../test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java | 1 -
.../test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/DomainsRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/ForwardRoutesTest.java | 3 +--
.../test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java | 5 ++---
.../java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java | 1 -
.../test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java | 3 +--
.../james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java | 1 -
.../james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java | 2 +-
.../org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java | 3 +--
.../java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java | 1 -
.../apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java | 1 -
.../java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java | 3 +--
.../org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java | 1 -
24 files changed, 16 insertions(+), 43 deletions(-)
diff --git a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
index f5c64ab..beeb147 100644
--- a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
+++ b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
@@ -33,7 +33,6 @@ public class WebAdminGuiceProbe implements GuiceProbe {
}
public Port getWebAdminPort() {
- webAdminServer.await();
return webAdminServer.getPort();
}
}
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index 7fab886..b1afff9 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.utils.CassandraUtils;
@@ -70,7 +69,7 @@ class CassandraMappingsRoutesTest {
static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraRRTModule.MODULE);
@BeforeEach
- void setUp(CassandraCluster cassandra) throws ConfigurationException {
+ void setUp(CassandraCluster cassandra) {
cassandraRecipientRewriteTableDAO = new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
cassandraMappingsSourcesDAO = new CassandraMappingsSourcesDAO(cassandra.getConf());
mappingsSourcesMigration = new MappingsSourcesMigration(cassandraRecipientRewriteTableDAO, cassandraMappingsSourcesDAO);
@@ -85,7 +84,6 @@ class CassandraMappingsRoutesTest {
new TasksRoutes(taskManager, jsonTransformer));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMappingsRoutes.ROOT_PATH)
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index c41794b..6f8c093 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -54,6 +54,7 @@ import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableMap;
+
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import reactor.core.publisher.Mono;
@@ -66,7 +67,7 @@ public class CassandraMigrationRoutesTest {
private CassandraSchemaVersionDAO schemaVersionDAO;
private MemoryTaskManager taskManager;
- private void createServer() throws Exception {
+ private void createServer() {
Migration successfulMigration = mock(Migration.class);
when(successfulMigration.run()).thenReturn(Migration.Result.COMPLETED);
@@ -87,8 +88,6 @@ public class CassandraMigrationRoutesTest {
new TasksRoutes(taskManager, jsonTransformer));
webAdminServer.start();
- webAdminServer.await();
-
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(CassandraMigrationRoutes.VERSION_BASE)
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
index 0a2c357..9474e10 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
@@ -172,10 +172,6 @@ public class WebAdminServer implements Startable {
}
}
- public void await() {
- service.awaitInitialization();
- }
-
public Port getPort() {
Preconditions.checkState(port != null, "WebAdminServer should be configured.");
return port;
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
index 0f2979f..d5e8916 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
@@ -52,7 +52,6 @@ public class ErrorRoutesTest {
new NoopMetricFactory(),
new ErrorRoutes());
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(ErrorRoutes.BASE_URL)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
index 2b522e4..17ed35c 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
@@ -83,7 +83,6 @@ public class HealthCheckRoutesTest {
new HealthCheckRoutes(healthChecks, new JsonTransformer()));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(HealthCheckRoutes.HEALTHCHECK)
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index cb9f724..aaaea2c 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -60,7 +60,6 @@ class TasksRoutesTest {
new TasksRoutes(taskManager, new JsonTransformer()));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(TasksRoutes.BASE)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
index 7390e20..e511fb3 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java
@@ -81,12 +81,11 @@ class AliasRoutesTest {
private WebAdminServer webAdminServer;
- private void createServer(AliasRoutes aliasRoutes) throws Exception {
+ private void createServer(AliasRoutes aliasRoutes) {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
aliasRoutes);
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/aliases")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index 6f029a3..2ddb946 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -66,12 +66,11 @@ class DLPConfigurationRoutesTest {
private WebAdminServer webAdminServer;
private EventSourcingDLPConfigurationStore dlpStore;
- private void createServer(DLPConfigurationStore dlpConfigurationStore, DomainList domainList) throws Exception {
+ private void createServer(DLPConfigurationStore dlpConfigurationStore, DomainList domainList) {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new DLPConfigurationRoutes(dlpConfigurationStore, domainList, new JsonTransformer()));
webAdminServer.start();
- webAdminServer.await();
requestSpecification = buildRequestSpecification(webAdminServer);
}
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
index a980fc5..ff19744 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
@@ -75,12 +75,11 @@ class DomainMappingsRoutesTest {
private WebAdminServer webAdminServer;
private DomainList domainList;
- private void createServer(DomainMappingsRoutes domainMappingsRoutes) throws Exception {
+ private void createServer(DomainMappingsRoutes domainMappingsRoutes) {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
domainMappingsRoutes);
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DOMAIN_MAPPINGS)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
index 95d71cf..dbb2857 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
@@ -65,13 +65,12 @@ class DomainsRoutesTest {
private WebAdminServer webAdminServer;
- private void createServer(DomainList domainList) throws Exception {
+ private void createServer(DomainList domainList) {
DomainAliasService domainAliasService = new DomainAliasService(new MemoryRecipientRewriteTable(), domainList);
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new DomainsRoutes(domainList, domainAliasService, new JsonTransformer()));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DomainsRoutes.DOMAINS)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
index 3c6a667..70c2ba5 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -80,12 +80,11 @@ class ForwardRoutesTest {
private WebAdminServer webAdminServer;
- private void createServer(ForwardRoutes forwardRoutes) throws Exception {
+ private void createServer(ForwardRoutes forwardRoutes) {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
forwardRoutes);
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/forwards")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index 775930b..8c99c13 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -78,12 +78,11 @@ class GroupsRoutesTest {
private WebAdminServer webAdminServer;
- private void createServer(GroupsRoutes groupsRoutes) throws Exception {
+ private void createServer(GroupsRoutes groupsRoutes) {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
groupsRoutes);
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath("address/groups")
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
index 6d8df14..53fe916 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
-public class SieveQuotaRoutesTest {
+class SieveQuotaRoutesTest {
private static final User USER_A = User.fromUsername("userA");
@@ -46,13 +46,12 @@ public class SieveQuotaRoutesTest {
private SieveQuotaRepository sieveRepository;
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
sieveRepository = new InMemorySieveQuotaRepository();
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new SieveQuotaRoutes(sieveRepository, new JsonTransformer()));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
index de59250..3658666 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveScriptRoutesTest.java
@@ -96,7 +96,6 @@ public class SieveScriptRoutesTest {
new DefaultMetricFactory(),
new SieveScriptRoutes(sieveRepository, usersRepository));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils
.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
index a18920d..dbe92e9 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
@@ -59,12 +59,11 @@ class UsersRoutesTest {
private static final String USERNAME = "username@" + DOMAIN.name();
private WebAdminServer webAdminServer;
- private void createServer(UsersRepository usersRepository) throws Exception {
+ private void createServer(UsersRepository usersRepository) {
webAdminServer = WebAdminUtils.createWebAdminServer(
new DefaultMetricFactory(),
new UserRoutes(new UserService(usersRepository), new JsonTransformer()));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(UserRoutes.USERS)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index d362c18..b471d34 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -188,7 +188,6 @@ class DeletedMessagesVaultRoutesTest {
new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(DeletedMessagesVaultRoutes.ROOT_PATH)
.log(LogDetail.METHOD)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
index 0fa665e..576c8fc 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
@@ -39,6 +39,7 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import com.google.common.collect.ImmutableSet;
+
import io.restassured.RestAssured;
class DomainQuotaRoutesNoVirtualHostingTest {
@@ -63,7 +64,6 @@ class DomainQuotaRoutesNoVirtualHostingTest {
new NoopMetricFactory(),
domainQuotaRoutes);
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
index 9ab4215..0ed07fd 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
@@ -113,7 +113,7 @@ class EventDeadLettersRoutesTest {
private MemoryTaskManager taskManager;
@BeforeEach
- void beforeEach() throws Exception {
+ void beforeEach() {
deadLetters = new MemoryEventDeadLetters();
JsonTransformer jsonTransformer = new JsonTransformer();
EventSerializer eventSerializer = new EventSerializer(new InMemoryId.Factory(), new InMemoryMessageId.Factory());
@@ -127,7 +127,6 @@ class EventDeadLettersRoutesTest {
new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
index b07f35b..95faeaf 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
@@ -78,7 +78,7 @@ class ReindexingRoutesTest {
private InMemoryMailboxManager mailboxManager;
@BeforeEach
- void beforeEach() throws Exception {
+ void beforeEach() {
mailboxManager = InMemoryIntegrationResources.defaultResources().getMailboxManager();
MemoryTaskManager taskManager = new MemoryTaskManager();
InMemoryId.Factory mailboxIdFactory = new InMemoryId.Factory();
@@ -106,7 +106,6 @@ class ReindexingRoutesTest {
new MessageIdReIndexerImpl(mailboxManager, mailboxManager.getMapperFactory(), searchIndex),
jsonTransformer));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 85c3b9e..27190b5 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -77,7 +77,6 @@ class UserMailboxesRoutesTest {
new DefaultMetricFactory(),
new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer()));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(USERS_BASE + SEPARATOR + USERNAME + SEPARATOR + UserMailboxesRoutes.MAILBOXES)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
index b145aa1..cee2514 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
@@ -67,7 +67,6 @@ public class WebAdminQuotaSearchTestSystem {
domainQuotaRoutes,
globalQuotaRoutes);
this.webAdminServer.start();
- this.webAdminServer.await();
this.requestSpecBuilder = WebAdminUtils.buildRequestSpecification(webAdminServer)
.build();
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index a1f7c58..26004bb 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -85,7 +85,7 @@ public class MailQueueRoutesTest {
MemoryMailQueueFactory mailQueueFactory;
- WebAdminServer createServer(MemoryMailQueueFactory mailQueueFactory) throws Exception {
+ WebAdminServer createServer(MemoryMailQueueFactory mailQueueFactory) {
TaskManager taskManager = new MemoryTaskManager();
JsonTransformer jsonTransformer = new JsonTransformer();
@@ -94,7 +94,6 @@ public class MailQueueRoutesTest {
new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager),
new TasksRoutes(taskManager, jsonTransformer));
server.start();
- server.await();
return server;
}
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 3fa38c4..2d9f935 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -128,7 +128,6 @@ public class MailRepositoriesRoutesTest {
jsonTransformer, reprocessingService, taskManager),
new TasksRoutes(taskManager, jsonTransformer));
webAdminServer.start();
- webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
.setBasePath(MailRepositoriesRoutes.MAIL_REPOSITORIES)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org