This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9b93168fd727f52b52dd3b79f7bfea326d16951f Author: Tran Tien Duc <[email protected]> AuthorDate: Fri Jan 10 11:51:04 2020 +0700 [Refactoring] Using TestJMAPServerModule factory methods to cleanup constants --- .../james/AuthenticatedCassandraJamesServerTest.java | 8 +++----- .../java/org/apache/james/CassandraJamesServerTest.java | 4 +--- .../org/apache/james/CassandraJmapJamesServerTest.java | 4 +--- .../test/java/org/apache/james/CassandraJmapTestRule.java | 3 +-- .../james/CassandraMailRepositoryIntegrationTest.java | 4 +--- .../james/CassandraMessageIdManagerInjectionTest.java | 4 +--- .../test/java/org/apache/james/CassandraNodeConfTest.java | 4 +--- .../test/java/org/apache/james/CassandraWithTikaTest.java | 4 +--- .../org/apache/james/DefaultCassandraJamesServerTest.java | 4 +--- .../src/test/java/org/apache/james/ESReporterTest.java | 4 +--- .../java/org/apache/james/JamesCapabilitiesServerTest.java | 4 +--- .../apache/james/JamesServerWithRetryConnectionTest.java | 3 +-- .../JamesWithNonCompatibleElasticSearchServerTest.java | 4 +--- .../java/org/apache/james/WithCassandraBlobStoreTest.java | 4 +--- .../mailbox/CassandraSchemaVersionStartUpCheckTest.java | 3 +-- .../org/apache/james/CassandraLdapJamesServerTest.java | 3 +-- .../org/apache/james/CassandraLdapJmapJamesServerTest.java | 4 +--- .../apache/james/CassandraRabbitMQAwsS3JmapTestRule.java | 3 +-- .../apache/james/CassandraRabbitMQJamesServerFixture.java | 4 +--- .../apache/james/CassandraRabbitMQSwiftJmapTestRule.java | 3 +-- .../apache/james/RabbitMQJamesServerReprocessingTest.java | 2 +- .../james/CassandraRabbitMQLdapJmapJamesServerTest.java | 4 +--- .../org/apache/james/DefaultMemoryJamesServerTest.java | 4 +--- .../org/apache/james/GuiceJamesServerStartUpCheckTest.java | 4 +--- .../test/java/org/apache/james/GuiceJamesServerTest.java | 4 +--- .../org/apache/james/GuiceLifecycleHeathCheckTest.java | 4 +--- .../test/java/org/apache/james/MemoryJamesServerTest.java | 4 +--- .../java/org/apache/james/MemoryJmapJamesServerTest.java | 4 +--- .../src/test/java/org/apache/james/MemoryJmapTestRule.java | 4 +--- .../java/org/apache/james/WebAdminRoutesExtensionTest.java | 4 +--- .../org/apache/james/modules/TestJMAPServerModule.java | 14 +++++++++++++- .../org/apache/james/mailets/TemporaryJamesServer.java | 6 +++--- .../jmap/cassandra/CassandraGetMessageListMethodTest.java | 3 ++- .../james/jmap/cassandra/CassandraImapErrorTest.java | 3 +-- .../james/jmap/cassandra/CassandraSendMDNMethodTest.java | 4 +--- .../jmap/cassandra/CassandraSpamAssassinContractTest.java | 4 ++-- .../james/jmap/cassandra/cucumber/CassandraStepdefs.java | 2 +- .../methods/integration/GetMessageListMethodTest.java | 1 - .../james/jmap/memory/MemoryGetMessageListMethodTest.java | 4 +++- .../apache/james/jmap/memory/MemorySendMDNMethodTest.java | 4 +--- .../james/jmap/memory/MemorySpamAssassinContractTest.java | 6 +++--- .../apache/james/jmap/memory/cucumber/MemoryStepdefs.java | 2 +- .../rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java | 4 +++- .../jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java | 4 +--- .../rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java | 6 +++--- .../rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java | 3 +-- .../integration/rabbitmq/FixingGhostMailboxTest.java | 3 +-- .../rabbitmq/RabbitMQAuthorizedEndpointsTest.java | 4 +--- .../rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java | 3 +-- .../rabbitmq/RabbitMQForwardIntegrationTest.java | 4 +--- .../integration/rabbitmq/RabbitMQJmapExtension.java | 6 +++--- .../rabbitmq/RabbitMQJwtFilterIntegrationTest.java | 4 +--- .../RabbitMQReindexingWithEventDeadLettersTest.java | 4 +--- .../rabbitmq/RabbitMQWebAdminServerIntegrationTest.java | 4 +--- ...itMQWebAdminServerTaskSerializationIntegrationTest.java | 4 +--- ...RabbitMQLinshareBlobExportMechanismIntegrationTest.java | 6 +++--- .../integration/memory/MemoryAuthorizedEndpointsTest.java | 4 +--- ...MemoryFastViewProjectionHealthCheckIntegrationTest.java | 4 +--- .../integration/memory/MemoryForwardIntegrationTest.java | 4 +--- .../integration/memory/MemoryJwtFilterIntegrationTest.java | 4 +--- .../memory/MemoryUnauthorizedEndpointsTest.java | 4 +--- .../memory/MemoryWebAdminServerIntegrationTest.java | 4 +--- .../MemoryLinshareBlobExportMechanismIntegrationTest.java | 4 +--- 63 files changed, 92 insertions(+), 164 deletions(-) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java index 3bb5636..9277651 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/AuthenticatedCassandraJamesServerTest.java @@ -34,8 +34,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; import com.google.inject.CreationException; class AuthenticatedCassandraJamesServerTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @Nested class AuthenticationTest implements JamesServerContract { @RegisterExtension @@ -45,7 +43,7 @@ class AuthenticatedCassandraJamesServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); } @@ -62,7 +60,7 @@ class AuthenticatedCassandraJamesServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(ClusterConfiguration.builder() @@ -94,7 +92,7 @@ class AuthenticatedCassandraJamesServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java index 5ded794..c068d55 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java @@ -30,8 +30,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; class CassandraJamesServerTest implements JamesServerContract { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -39,7 +37,7 @@ class CassandraJamesServerTest implements JamesServerContract { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java index 9255df1..58c08d7 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java @@ -28,8 +28,6 @@ import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; class CassandraJmapJamesServerTest implements JmapJamesServerContract { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -37,7 +35,7 @@ class CassandraJmapJamesServerTest implements JmapJamesServerContract { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); } diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java index 7d55af2..bc069b4 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java @@ -38,7 +38,6 @@ import com.google.inject.Module; public class CassandraJmapTestRule implements TestRule { - private static final int LIMIT_TO_10_MESSAGES = 10; private final TemporaryFolder temporaryFolder; public static CassandraJmapTestRule defaultTestRule() { @@ -68,7 +67,7 @@ public class CassandraJmapTestRule implements TestRule { return GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java index bc4f7b4..1e2a7d8 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java @@ -47,8 +47,6 @@ class CassandraMailRepositoryIntegrationTest { .with() .pollDelay(ONE_MILLISECOND) .await(); - private static final int LIMIT_TO_10_MESSAGES = 10; - private SMTPMessageSender smtpMessageSender = new SMTPMessageSender("other.com"); @RegisterExtension @@ -58,7 +56,7 @@ class CassandraMailRepositoryIntegrationTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .build(); @Test diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java index bb8e684..635c1d2 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java @@ -36,8 +36,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; import com.google.inject.multibindings.Multibinder; class CassandraMessageIdManagerInjectionTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -45,7 +43,7 @@ class CassandraMessageIdManagerInjectionTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> Multibinder.newSetBinder(binder, InitializationOperation.class) .addBinding() .to(CallMe.class))) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java index 396ddab..b80c9e1 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java @@ -40,15 +40,13 @@ import org.testcontainers.DockerClientFactory; class CassandraNodeConfTest { private static final int CASSANDRA_PORT = 9042; - private static final int LIMIT_TO_10_MESSAGES = 10; - private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .disableAutoStart(); } diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java index 6a5c3b3..0fdde39 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java @@ -25,8 +25,6 @@ import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; class CassandraWithTikaTest implements JamesServerContract { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() @@ -35,7 +33,7 @@ class CassandraWithTikaTest implements JamesServerContract { .extension(new DockerElasticSearchExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); } diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java index 2d48146..66fb7ec 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java @@ -33,8 +33,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; class DefaultCassandraJamesServerTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -42,7 +40,7 @@ class DefaultCassandraJamesServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(PropertiesProvider.class).to(FailingPropertiesProvider.class)) .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance((s, l) -> new BaseHierarchicalConfiguration()))) .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java index 8c63961..23e7cff 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java @@ -61,8 +61,6 @@ import io.restassured.http.ContentType; class ESReporterTest { private static final Logger LOGGER = LoggerFactory.getLogger(ESReporterTest.class); - private static final int LIMIT_TO_10_MESSAGES = 10; - static final DockerElasticSearchExtension elasticSearchExtension = new DockerElasticSearchExtension(); @RegisterExtension @@ -72,7 +70,7 @@ class ESReporterTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new TestDockerESMetricReporterModule(elasticSearchExtension.getDockerES().getHttpHost()))) .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 5bf599a..294f151 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -38,8 +38,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class JamesCapabilitiesServerTest { private static final MailboxManager mailboxManager = mock(MailboxManager.class); - private static final int LIMIT_MAX_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -47,7 +45,7 @@ class JamesCapabilitiesServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_MAX_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(MailboxManager.class).toInstance(mailboxManager))) .disableAutoStart() .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java index 8945a3c..90e8e3f 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java @@ -43,7 +43,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; class JamesServerWithRetryConnectionTest { - private static final int LIMIT_TO_10_MESSAGES = 10; private static final long WAITING_TIME = TimeUnit.MILLISECONDS.convert(10, TimeUnit.SECONDS); private static final DockerElasticSearchExtension dockerElasticSearch = new DockerElasticSearchExtension(); @@ -56,7 +55,7 @@ class JamesServerWithRetryConnectionTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .disableAutoStart() .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java index ebe9150..e8d4036 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesWithNonCompatibleElasticSearchServerTest.java @@ -37,8 +37,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class JamesWithNonCompatibleElasticSearchServerTest { - private static final int LIMIT_MAX_MESSAGES = 10; - static DockerElasticSearch dockerES2 = new DockerElasticSearch.NoAuth(Images.ELASTICSEARCH_2); @RegisterExtension @@ -48,7 +46,7 @@ class JamesWithNonCompatibleElasticSearchServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_MAX_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .disableAutoStart() .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java index 7157928..cc38611 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/WithCassandraBlobStoreTest.java @@ -26,8 +26,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class WithCassandraBlobStoreTest implements JmapJamesServerContract, MailsShouldBeWellReceived, JamesServerContract { - static int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -36,7 +34,7 @@ class WithCassandraBlobStoreTest implements JmapJamesServerContract, MailsShould .server(configuration -> GuiceJamesServer .forConfiguration(configuration) .combineWith(CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java index a653310..24f0cb6 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java @@ -52,7 +52,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; import reactor.core.publisher.Mono; class CassandraSchemaVersionStartUpCheckTest { - private static final int LIMIT_TO_10_MESSAGES = 10; private static final String LOCAL_HOST = "127.0.0.1"; private static final String EXPECTED_SERVER_CONNECTED_MESSAGE = "* OK JAMES IMAP4rev1 Server"; private static final SchemaVersion MIN_VERSION = new SchemaVersion(2); @@ -67,7 +66,7 @@ class CassandraSchemaVersionStartUpCheckTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(CassandraSchemaVersionDAO.class) .toInstance(versionDAO)) .overrideWith(binder -> binder.bind(CassandraSchemaVersionManager.class) diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java index 971c47e..478a742 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java +++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java @@ -39,7 +39,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; class CassandraLdapJamesServerTest implements JamesServerContract { - private static final int LIMIT_TO_10_MESSAGES = 10; private static Duration slowPacedPollInterval = ONE_HUNDRED_MILLISECONDS; private static ConditionFactory calmlyAwait = Awaitility.with() .pollInterval(slowPacedPollInterval) @@ -60,7 +59,7 @@ class CassandraLdapJamesServerTest implements JamesServerContract { .extension(new LdapTestExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraLdapJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java index 8d6d47f..7c1ace8 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java +++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java @@ -24,8 +24,6 @@ import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; class CassandraLdapJmapJamesServerTest implements JmapJamesServerContract { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -33,7 +31,7 @@ class CassandraLdapJmapJamesServerTest implements JmapJamesServerContract { .extension(new LdapTestExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraLdapJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); } diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java index 068d8b5..3c61b09 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java @@ -40,7 +40,6 @@ import com.google.inject.Module; public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule { - private static final int LIMIT_TO_10_MESSAGES = 10; public static final int TWO_SECONDS = 2000; private final TemporaryFolder temporaryFolder; @@ -74,7 +73,7 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule { .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(binder -> binder.bind(BlobStoreChoosingConfiguration.class) .toInstance(BlobStoreChoosingConfiguration.objectStorage())) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java index e779c72..e683843 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerFixture.java @@ -25,13 +25,11 @@ import org.apache.james.modules.TestJMAPServerModule; public class CassandraRabbitMQJamesServerFixture { - private static final int LIMIT_TO_10_MESSAGES = 10; - private static final JamesServerBuilder.ServerProvider CONFIGURATION_BUILDER = configuration -> GuiceJamesServer .forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE); public static JamesServerBuilder baseExtensionBuilder() { diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java index e9a78ed..0138d0e 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java @@ -38,7 +38,6 @@ import com.google.inject.Module; public class CassandraRabbitMQSwiftJmapTestRule implements TestRule { - private static final int LIMIT_TO_10_MESSAGES = 10; public static final int TWO_SECONDS = 2000; private final TemporaryFolder temporaryFolder; @@ -71,7 +70,7 @@ public class CassandraRabbitMQSwiftJmapTestRule implements TestRule { .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(new TestSwiftBlobStoreModule()) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) .overrideWith((binder -> binder.bind(CleanupTasksPerformer.class).asEagerSingleton())) diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java index 0316b93..d682d87 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java @@ -56,7 +56,7 @@ class RabbitMQJamesServerReprocessingTest { .server(configuration -> GuiceJamesServer .forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(10)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)) .overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java index bdff8d8..2a09d4e 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java @@ -40,8 +40,6 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; class CassandraRabbitMQLdapJmapJamesServerTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - interface UserFromLdapShouldLogin { @Test @@ -95,7 +93,7 @@ class CassandraRabbitMQLdapJmapJamesServerTest { .extension(new LdapTestExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQLdapJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE)); } } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java index 11af21d..12ef7f5 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java @@ -32,13 +32,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; class DefaultMemoryJamesServerTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(PropertiesProvider.class).to(FailingPropertiesProvider.class)) .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance((s, l) -> new BaseHierarchicalConfiguration()))) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java index dc9bc4b..6935f92 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java @@ -101,8 +101,6 @@ class GuiceJamesServerStartUpCheckTest { } } - private static final int LIMIT_TO_10_MESSAGES = 10; - interface StartUpCheckSuccessContract { @Test @@ -117,7 +115,7 @@ class GuiceJamesServerStartUpCheckTest { return new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .disableAutoStart(); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java index c9db260..1fe4ec4 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java @@ -17,13 +17,11 @@ import com.google.inject.multibindings.Multibinder; class GuiceJamesServerTest { private static final Logger LOGGER = LoggerFactory.getLogger(GuiceJamesServerTest.class); - private static final int LIMIT_TO_10_MESSAGES = 10; - private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .disableAutoStart(); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java index 40d2e0f..254b58a 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java @@ -46,13 +46,11 @@ import reactor.core.publisher.MonoProcessor; import reactor.core.scheduler.Schedulers; class GuiceLifecycleHeathCheckTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.TEST_CONFIGURATION))); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java index db9be8e..22e7ed0 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java @@ -25,13 +25,11 @@ import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; class MemoryJamesServerTest implements JamesServerContract { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .build(); diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java index dc68e42..17198e7 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java @@ -33,13 +33,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryJmapJamesServerTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - private static JamesServerBuilder extensionBuilder() { return new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)); } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java index 29c82be..ce03ef4 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java @@ -36,8 +36,6 @@ import com.google.inject.Module; public class MemoryJmapTestRule implements TestRule { - private static final int LIMIT_TO_10_MESSAGES = 10; - public TemporaryFolder temporaryFolder = new TemporaryFolder(); public GuiceJamesServer jmapServer(Module... modules) throws IOException { @@ -47,7 +45,7 @@ public class MemoryJmapTestRule implements TestRule { .build(); return GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class)) .overrideWith(modules); diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java index 5a1a8c1..63cbf46 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/WebAdminRoutesExtensionTest.java @@ -34,13 +34,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; import io.restassured.RestAssured; class WebAdminRoutesExtensionTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.builder() .additionalRoute(MyRoute.class.getCanonicalName()) diff --git a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java b/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java index 8252360..6f1c822 100644 --- a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java +++ b/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java @@ -34,6 +34,18 @@ import com.google.inject.name.Names; public class TestJMAPServerModule extends AbstractModule { + public static final long LIMIT_TO_10_MESSAGES = 10; + public static final long LIMIT_TO_3_MESSAGES = 3; + public static final int LIMIT_TO_20_MESSAGES = 20; + + public static TestJMAPServerModule limitToTenMessages() { + return new TestJMAPServerModule(LIMIT_TO_10_MESSAGES); + } + + public static TestJMAPServerModule maximumMessages(long maximumLimit) { + return new TestJMAPServerModule(maximumLimit); + } + private static final String PUBLIC_PEM_KEY = "-----BEGIN PUBLIC KEY-----\n" + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RfttZlaFNar/3GcU9RG\n" + @@ -88,7 +100,7 @@ public class TestJMAPServerModule extends AbstractModule { private final long maximumLimit; - public TestJMAPServerModule(long maximumLimit) { + private TestJMAPServerModule(long maximumLimit) { this.maximumLimit = maximumLimit; } diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java index 636ae33..323d166 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java @@ -19,6 +19,8 @@ package org.apache.james.mailets; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_3_MESSAGES; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -132,8 +134,6 @@ public class TemporaryJamesServer { "usersrepository.xml", "smime.p12"); - private static final int LIMIT_TO_3_MESSAGES = 3; - private final GuiceJamesServer jamesServer; private TemporaryJamesServer(File workingDir, MailetContainer mailetContainer, SmtpConfiguration smtpConfiguration, @@ -148,7 +148,7 @@ public class TemporaryJamesServer { .combineWith(serverBaseModule) .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class)) .overrideWith(additionalModules) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)) + .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES)) .overrideWith((binder) -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)); jamesServer.start(); diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java index 9a4b681..c6dd719 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java @@ -21,6 +21,7 @@ package org.apache.james.jmap.cassandra; import static io.restassured.RestAssured.given; import static org.apache.james.jmap.JMAPTestingConstants.ALICE; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_3_MESSAGES; import java.io.IOException; import java.util.Date; @@ -48,7 +49,7 @@ public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest @Override protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule(), - new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)); + TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES)); } @Override diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraImapErrorTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraImapErrorTest.java index a184d9c..c55e31d 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraImapErrorTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraImapErrorTest.java @@ -46,7 +46,6 @@ import io.restassured.RestAssured; class CassandraImapErrorTest { private static final String username = "username@" + DOMAIN; private static final String PASSWORD = "password"; - private static final long LIMIT_TO_10_MESSAGES = 10; private final CassandraExtension cassandraExtension = new CassandraExtension(); @RegisterExtension @@ -56,7 +55,7 @@ class CassandraImapErrorTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .build(); @BeforeEach diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java index d646c3b..429bfd6 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java @@ -36,8 +36,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; public class CassandraSendMDNMethodTest extends SendMDNMethodTest { - private static final long LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -45,7 +43,7 @@ public class CassandraSendMDNMethodTest extends SendMDNMethodTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .build(); @Override diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java index f4829ed..a2d19ba 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java @@ -19,6 +19,7 @@ package org.apache.james.jmap.cassandra; import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_20_MESSAGES; import org.apache.james.CassandraExtension; import org.apache.james.DockerElasticSearchExtension; @@ -34,7 +35,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class CassandraSpamAssassinContractTest implements SpamAssassinContract { - private static final int LIMIT_TO_20_MESSAGES = 20; private static final SpamAssassinModuleExtension spamAssassinExtension = new SpamAssassinModuleExtension(); @RegisterExtension @@ -45,6 +45,6 @@ class CassandraSpamAssassinContractTest implements SpamAssassinContract { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_20_MESSAGES))) + .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES))) .build(); } diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java index 1c30ec2..9517b7e 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java @@ -78,7 +78,7 @@ public class CassandraStepdefs { mainStepdefs.jmapServer = GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(new TestJMAPServerModule(10)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new TestDockerESMetricReporterModule(elasticSearch.getDockerEs().getHttpHost())) .overrideWith(elasticSearch.getModule()) .overrideWith(cassandraServer.getModule()) diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java index 28c454a..17d1aff 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java @@ -102,7 +102,6 @@ import com.github.fge.lambdas.Throwing; import io.restassured.RestAssured; public abstract class GetMessageListMethodTest { - public static final int LIMIT_TO_3_MESSAGES = 3; private static final String FORWARDED = "$Forwarded"; private static final ZoneId ZONE_ID = ZoneId.of("Europe/Paris"); public static final MailboxPath ALICE_MAILBOX = MailboxPath.forUser(ALICE, "mailbox"); diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java index 2e9c372..92e8510 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_3_MESSAGES; + import java.io.IOException; import org.apache.james.GuiceJamesServer; @@ -36,7 +38,7 @@ public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest { @Override protected GuiceJamesServer createJmapServer() throws IOException { - return memoryJmap.jmapServer(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)); + return memoryJmap.jmapServer(TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES)); } @Override diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java index 9fb0661..7074a7d 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java @@ -37,13 +37,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; public class MemorySendMDNMethodTest extends SendMDNMethodTest { - private static final long LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension JamesServerExtension testExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class))) .build(); diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java index 60b84de..e2404fd 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.jmap.memory; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_20_MESSAGES; + import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; @@ -33,14 +35,12 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemorySpamAssassinContractTest implements SpamAssassinContract { - private static final int LIMIT_TO_20_MESSAGES = 20; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new SpamAssassinModuleExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_20_MESSAGES)) + .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES)) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class))) .build(); diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java index 348dad2..10aa3b3 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java @@ -61,7 +61,7 @@ public class MemoryStepdefs { mainStepdefs.messageIdFactory = new InMemoryMessageId.Factory(); mainStepdefs.jmapServer = GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES), + .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES), (binder) -> binder.bind(MessageId.Factory.class).toInstance(mainStepdefs.messageIdFactory)); mainStepdefs.init(); } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java index 6ec57f7..ad4dacd 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.rabbitmq; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_3_MESSAGES; + import java.io.IOException; import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule; @@ -39,7 +41,7 @@ public class RabbitMQAwsS3GetMessageListMethodTest extends GetMessageListMethodT @Override protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule(), - new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)); + TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES)); } @Override diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java index 6715826..42520ec 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java @@ -37,8 +37,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; public class RabbitMQAwsS3SendMDNMethodTest extends SendMDNMethodTest { - private static final long LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -48,7 +46,7 @@ public class RabbitMQAwsS3SendMDNMethodTest extends SendMDNMethodTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))) + .overrideWith(TestJMAPServerModule.limitToTenMessages())) .build(); @Override diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java index 6844226..ae0fb4d 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.jmap.rabbitmq; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_20_MESSAGES; + import org.apache.james.CassandraExtension; import org.apache.james.CassandraRabbitMQJamesServerMain; import org.apache.james.DockerElasticSearchExtension; @@ -35,8 +37,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class RabbitMQAwsS3SpamAssassinContractTest implements SpamAssassinContract { - private static final int LIMIT_TO_20_MESSAGES = 20; - private static final SpamAssassinModuleExtension spamAssassinExtension = new SpamAssassinModuleExtension(); @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() @@ -48,7 +48,7 @@ class RabbitMQAwsS3SpamAssassinContractTest implements SpamAssassinContract { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_20_MESSAGES))) + .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES))) .build(); } diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java index b9bf3ef..3d466e5 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java @@ -54,7 +54,6 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class RabbitMQAwsS3Stepdefs { - private static final int JMAP_GET_MESSAGE_LIST_MAXIMUM_LIMIT = 10; private final MainStepdefs mainStepdefs; private final ImapStepdefs imapStepdefs; private final TemporaryFolder temporaryFolder = new TemporaryFolder(); @@ -85,7 +84,7 @@ public class RabbitMQAwsS3Stepdefs { mainStepdefs.jmapServer = GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(JMAP_GET_MESSAGE_LIST_MAXIMUM_LIMIT)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new TestDockerESMetricReporterModule(elasticSearch.getDockerEs().getHttpHost())) .overrideWith(new TestRabbitMQModule(rabbitMQServer.dockerRabbitMQ())) .overrideWith(swiftServer.getModule()) diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java index d4f6bc7..7c28cd7 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java @@ -91,7 +91,6 @@ import io.restassured.specification.RequestSpecification; @Category(BasicFeature.class) class FixingGhostMailboxTest { - private static final int LIMIT_TO_10_MESSAGES = 10; private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; private static final String FIRST_MAILBOX = ARGUMENTS + ".list[0]"; @@ -112,7 +111,7 @@ class FixingGhostMailboxTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java index 7b07885..cd5707d 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQAuthorizedEndpointsTest.java @@ -38,8 +38,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; @Category(BasicFeature.class) class RabbitMQAuthorizedEndpointsTest extends AuthorizedEndpointsTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -48,7 +46,7 @@ class RabbitMQAuthorizedEndpointsTest extends AuthorizedEndpointsTest { .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new UnauthorizedModule()) .overrideWith(new WebadminIntergrationTestModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java index bb761dc..3954f41 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java @@ -158,7 +158,6 @@ class RabbitMQEventDeadLettersIntegrationTest { } } - private static final int LIMIT_TO_10_MESSAGES = 10; private static final RetryEventsListenerExtension EVENT_EXTENSION = new RetryEventsListenerExtension(); @RegisterExtension @@ -170,7 +169,7 @@ class RabbitMQEventDeadLettersIntegrationTest { .extension(EVENT_EXTENSION) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java index 10a6afb..9335647 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQForwardIntegrationTest.java @@ -34,8 +34,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class RabbitMQForwardIntegrationTest extends ForwardIntegrationTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -44,7 +42,7 @@ class RabbitMQForwardIntegrationTest extends ForwardIntegrationTest { .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule())) .build(); } diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java index c5edb92..c98ca94 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.webadmin.integration.rabbitmq; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_20_MESSAGES; + import java.io.IOException; import java.util.Optional; import java.util.function.Consumer; @@ -128,8 +130,6 @@ public class RabbitMQJmapExtension implements BeforeAllCallback, AfterAllCallbac } } - private static final int LIMIT_TO_20_MESSAGES = 20; - private final TemporaryFolder temporaryFolder; private final DockerAwsS3TestRule dockerAwsS3TestRule; private final DockerCassandraRule cassandra; @@ -158,7 +158,7 @@ public class RabbitMQJmapExtension implements BeforeAllCallback, AfterAllCallbac return GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_20_MESSAGES)) + .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES)) .overrideWith(new TestDockerESMetricReporterModule(elasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(cassandra.getModule()) .overrideWith(elasticSearchRule.getModule()) diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java index 8dc787c..4db4bbb 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJwtFilterIntegrationTest.java @@ -37,8 +37,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class RabbitMQJwtFilterIntegrationTest extends JwtFilterIntegrationTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -47,7 +45,7 @@ class RabbitMQJwtFilterIntegrationTest extends JwtFilterIntegrationTest { .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(binder -> binder.bind(AuthenticationFilter.class).to(JwtFilter.class)) .overrideWith(binder -> binder.bind(JwtConfiguration.class).toInstance(jwtConfiguration())) .overrideWith(new WebadminIntergrationTestModule())) diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java index a18ce3a..16da6d8 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java @@ -79,12 +79,10 @@ class RabbitMQReindexingWithEventDeadLettersTest { private static final DockerElasticSearchExtension dockerElasticSearch = new DockerElasticSearchExtension().withRequestTimeout(java.time.Duration.ofSeconds(1)); - private static final int LIMIT_TO_10_MESSAGES = 10; - private static final JamesServerBuilder.ServerProvider CONFIGURATION_BUILDER = configuration -> GuiceJamesServer .forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE) .overrideWith(new WebadminIntergrationTestModule()); diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java index dabfb7b..2093ec0 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java @@ -57,8 +57,6 @@ import io.restassured.http.ContentType; @Category(BasicFeature.class) class RabbitMQWebAdminServerIntegrationTest extends WebAdminServerIntegrationTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -67,7 +65,7 @@ class RabbitMQWebAdminServerIntegrationTest extends WebAdminServerIntegrationTes .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java index 289be30..daf35ef 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java @@ -96,8 +96,6 @@ import io.restassured.http.ContentType; @Category(BasicFeature.class) class RabbitMQWebAdminServerTaskSerializationIntegrationTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -106,7 +104,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest { .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java index de281a0..ed251b9 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQLinshareBlobExportMechanismIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.webadmin.integration.rabbitmq.vault; +import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_20_MESSAGES; + import org.apache.james.CassandraExtension; import org.apache.james.CassandraRabbitMQJamesServerMain; import org.apache.james.DockerElasticSearchExtension; @@ -39,8 +41,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class RabbitMQLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExportMechanismIntegrationTest { - private static final int LIMIT_TO_20_MESSAGES = 20; - @RegisterExtension static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension()) @@ -51,7 +51,7 @@ class RabbitMQLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExp .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_20_MESSAGES)) + .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES)) .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(new WebadminIntergrationTestModule()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule())) diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java index 7692f45..1b76dc1 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryAuthorizedEndpointsTest.java @@ -31,13 +31,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryAuthorizedEndpointsTest extends AuthorizedEndpointsTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule()) .overrideWith(new UnauthorizedModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java index 22feb5d..c62857b 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryFastViewProjectionHealthCheckIntegrationTest.java @@ -29,13 +29,11 @@ import org.apache.james.webadmin.integration.WebadminIntergrationTestModule; import org.junit.jupiter.api.extension.RegisterExtension; class MemoryFastViewProjectionHealthCheckIntegrationTest extends FastViewProjectionHealthCheckIntegrationContract { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule())) .build(); } \ No newline at end of file diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java index 180f525..ee19678 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryForwardIntegrationTest.java @@ -30,13 +30,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryForwardIntegrationTest extends ForwardIntegrationTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule())) .build(); } diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java index 98beb9b..40ddc43 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryJwtFilterIntegrationTest.java @@ -33,13 +33,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryJwtFilterIntegrationTest extends JwtFilterIntegrationTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule()) .overrideWith(binder -> binder.bind(AuthenticationFilter.class).to(JwtFilter.class)) .overrideWith(binder -> binder.bind(JwtConfiguration.class).toInstance(jwtConfiguration()))) diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java index b02df73..224b2a1 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUnauthorizedEndpointsTest.java @@ -32,13 +32,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryUnauthorizedEndpointsTest extends UnauthorizedEndpointsTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new UnauthorizedModule()) .overrideWith(new WebadminIntergrationTestModule())) diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java index 2989f56..90ba37b 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryWebAdminServerIntegrationTest.java @@ -30,13 +30,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryWebAdminServerIntegrationTest extends WebAdminServerIntegrationTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - @RegisterExtension static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new WebadminIntergrationTestModule())) .build(); } \ No newline at end of file diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java index 959d768..9071d9c 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryLinshareBlobExportMechanismIntegrationTest.java @@ -32,8 +32,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; class MemoryLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExportMechanismIntegrationTest { - private static final int LIMIT_TO_10_MESSAGES = 10; - private static final LinshareGuiceExtension linshareGuiceExtension = new LinshareGuiceExtension(); @RegisterExtension @@ -41,7 +39,7 @@ class MemoryLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExpor .extension(linshareGuiceExtension) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(TestJMAPServerModule.limitToTenMessages()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new WebadminIntergrationTestModule())) .build(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
