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:31 UTC
[james-project] 01/09: MAILBOX-383 WebAdmin server only needs to be
startable
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