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 <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
