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 fe4334cd3378493d3c09b229dca4750e434509d2 Author: Benoit Tellier <[email protected]> AuthorDate: Wed May 13 10:37:24 2020 +0700 JAMES-3168 TestJMAPServerModule: remove arbitrary default search limit Only tests that explicitly require it need to supply this value via separate guice module. Others can simply rely on application defaults. --- .../AuthenticatedCassandraJamesServerTest.java | 6 ++-- .../java/org/apache/james/CacheSessionTest.java | 2 +- .../org/apache/james/CassandraJamesServerTest.java | 2 +- .../apache/james/CassandraJmapJamesServerTest.java | 2 +- .../org/apache/james/CassandraJmapTestRule.java | 2 +- .../CassandraMailRepositoryIntegrationTest.java | 2 +- .../CassandraMessageIdManagerInjectionTest.java | 2 +- .../org/apache/james/CassandraNodeConfTest.java | 2 +- .../org/apache/james/CassandraWithTikaTest.java | 2 +- .../james/DefaultCassandraJamesServerTest.java | 2 +- .../test/java/org/apache/james/ESReporterTest.java | 2 +- .../apache/james/JamesCapabilitiesServerTest.java | 2 +- .../james/JamesServerWithRetryConnectionTest.java | 2 +- ...esWithNonCompatibleElasticSearchServerTest.java | 2 +- .../org/apache/james/KeyspaceCreationTest.java | 8 +++--- .../apache/james/WithCassandraBlobStoreTest.java | 2 +- .../CassandraSchemaVersionStartUpCheckTest.java | 2 +- .../apache/james/CassandraLdapJamesServerTest.java | 2 +- .../james/CassandraLdapJmapJamesServerTest.java | 2 +- .../james/CassandraRabbitMQAwsS3JmapTestRule.java | 2 +- .../james/CassandraRabbitMQJamesServerFixture.java | 2 +- .../james/CassandraRabbitMQSwiftJmapTestRule.java | 2 +- .../james/RabbitMQJamesServerReprocessingTest.java | 2 +- .../CassandraRabbitMQLdapJmapJamesServerTest.java | 2 +- .../apache/james/DefaultMemoryJamesServerTest.java | 2 +- .../james/GuiceJamesServerStartUpCheckTest.java | 2 +- .../org/apache/james/GuiceJamesServerTest.java | 2 +- .../apache/james/GuiceLifecycleHeathCheckTest.java | 2 +- .../org/apache/james/MemoryJamesServerTest.java | 2 +- .../apache/james/MemoryJmapJamesServerTest.java | 2 +- .../java/org/apache/james/MemoryJmapTestRule.java | 2 +- .../apache/james/WebAdminRoutesExtensionTest.java | 2 +- .../apache/james/modules/TestJMAPServerModule.java | 32 ++++++++++------------ .../apache/james/mailets/TemporaryJamesServer.java | 4 +-- .../CassandraGetMessageListMethodTest.java | 5 ++-- .../jmap/cassandra/CassandraImapErrorTest.java | 2 +- .../jmap/cassandra/CassandraSendMDNMethodTest.java | 2 +- .../CassandraSpamAssassinContractTest.java | 3 +- .../jmap/cassandra/cucumber/CassandraStepdefs.java | 2 +- .../memory/MemoryGetMessageListMethodTest.java | 4 +-- .../james/jmap/memory/MemorySendMDNMethodTest.java | 2 +- .../memory/MemorySpamAssassinContractTest.java | 4 +-- .../james/jmap/memory/cucumber/MemoryStepdefs.java | 2 +- .../RabbitMQAwsS3GetMessageListMethodTest.java | 5 ++-- .../rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java | 2 +- .../RabbitMQAwsS3SpamAssassinContractTest.java | 4 +-- .../cucumber/awss3/RabbitMQAwsS3Stepdefs.java | 2 +- .../rabbitmq/FixingGhostMailboxTest.java | 2 +- ...stViewProjectionHealthCheckIntegrationTest.java | 2 +- .../rabbitmq/RabbitMQForwardIntegrationTest.java | 2 +- ...RabbitMQReindexingWithEventDeadLettersTest.java | 2 +- ...RabbitMQDeletedMessageVaultIntegrationTest.java | 2 +- ...LinshareBlobExportMechanismIntegrationTest.java | 4 +-- ...stViewProjectionHealthCheckIntegrationTest.java | 2 +- .../memory/MemoryForwardIntegrationTest.java | 2 +- .../MemoryDeletedMessageVaultIntegrationTest.java | 2 +- ...LinshareBlobExportMechanismIntegrationTest.java | 2 +- 57 files changed, 80 insertions(+), 91 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 423658a..1e33c62 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 @@ -50,7 +50,7 @@ class AuthenticatedCassandraJamesServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandra.configurationBuilder(cassandraExtension.getCassandra().getHost()) @@ -70,7 +70,7 @@ class AuthenticatedCassandraJamesServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandra.configurationBuilder(cassandraExtension.getCassandra().getHost()) @@ -98,7 +98,7 @@ class AuthenticatedCassandraJamesServerTest { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandra.configurationBuilder(cassandraExtension.getCassandra().getHost()) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java index d689285..c139ccc 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CacheSessionTest.java @@ -79,7 +79,7 @@ class CacheSessionTest { .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE, new CassandraCacheSessionModule()) - .overrideWith(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .overrideServerModule(binder -> Multibinder.newSetBinder(binder, CassandraModule.class, Names.named(InjectionNames.CACHE)) .addBinding() .toInstance(CassandraModule.table(TABLE_NAME) 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 c068d55..2effd95 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 @@ -37,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 58c08d7..10bfab2 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 @@ -35,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 bc069b4..52dcb0c 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 @@ -67,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 1e2a7d8..ba2e94f 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 @@ -56,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(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .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 635c1d2..4b0f384 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 @@ -43,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 99d0d33..e2b730d 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 @@ -47,7 +47,7 @@ class CassandraNodeConfTest { .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .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 0fdde39..8ff2d6f 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 @@ -33,7 +33,7 @@ class CassandraWithTikaTest implements JamesServerContract { .extension(new DockerElasticSearchExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 66fb7ec..cf332a1 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 @@ -40,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 81aa4c0..ec6b532 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 @@ -70,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 294f151..046bb23 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 @@ -45,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 90e8e3f..941bf1f 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 @@ -55,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(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .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 e8d4036..e99948a 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 @@ -46,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(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .disableAutoStart() .build(); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java index 728c733..b1d9be6 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/KeyspaceCreationTest.java @@ -40,7 +40,7 @@ class KeyspaceCreationTest { .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandraSingleton.singleton.configurationBuilder() .createKeyspace() @@ -63,7 +63,7 @@ class KeyspaceCreationTest { .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .overrideServerModule(binder -> binder.bind(KeyspacesConfiguration.class).toInstance(KeyspacesConfiguration.builder() .keyspace("non_existing_keyspace") .cacheKeyspace("cache_non_existing_keyspace") @@ -92,7 +92,7 @@ class KeyspaceCreationTest { .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandraSingleton.singleton.configurationBuilder() .createKeyspace() @@ -121,7 +121,7 @@ class KeyspaceCreationTest { .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandraSingleton.singleton.configurationBuilder() .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 cc38611..fde036b 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 @@ -34,7 +34,7 @@ class WithCassandraBlobStoreTest implements JmapJamesServerContract, MailsShould .server(configuration -> GuiceJamesServer .forConfiguration(configuration) .combineWith(CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 24f0cb6..7209b48 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 @@ -66,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 478a742..d72008f 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 @@ -59,7 +59,7 @@ class CassandraLdapJamesServerTest implements JamesServerContract { .extension(new LdapTestExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraLdapJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 7c1ace8..494ce1a 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 @@ -31,7 +31,7 @@ class CassandraLdapJmapJamesServerTest implements JmapJamesServerContract { .extension(new LdapTestExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraLdapJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 3c61b09..249f05b 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 @@ -73,7 +73,7 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule { .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(binder -> binder.bind(BlobStoreChoosingConfiguration.class) .toInstance(BlobStoreChoosingConfiguration.objectStorage())) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 e683843..4984f55 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 @@ -29,7 +29,7 @@ public class CassandraRabbitMQJamesServerFixture { configuration -> GuiceJamesServer .forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 0138d0e..8a0de82 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 @@ -70,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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 d682d87..59c3ab8 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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 2a09d4e..307795e 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 @@ -93,7 +93,7 @@ class CassandraRabbitMQLdapJmapJamesServerTest { .extension(new LdapTestExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQLdapJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 12ef7f5..4cab899 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 @@ -36,7 +36,7 @@ class DefaultMemoryJamesServerTest { static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 6935f92..528090e 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 @@ -115,7 +115,7 @@ class GuiceJamesServerStartUpCheckTest { return new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .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 1fe4ec4..e629ce5 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 @@ -21,7 +21,7 @@ class GuiceJamesServerTest { return new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .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 254b58a..60373d4 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 @@ -50,7 +50,7 @@ class GuiceLifecycleHeathCheckTest { return new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 22e7ed0..af54b78 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 @@ -29,7 +29,7 @@ class MemoryJamesServerTest implements JamesServerContract { static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 a58428b..ce86dd0 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 @@ -37,7 +37,7 @@ class MemoryJmapJamesServerTest { return new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 ce03ef4..eca0512 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 @@ -45,7 +45,7 @@ public class MemoryJmapTestRule implements TestRule { .build(); return GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 63cbf46..2c21112 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 @@ -38,7 +38,7 @@ class WebAdminRoutesExtensionTest { static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 374d36a..d004632 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 @@ -20,7 +20,6 @@ package org.apache.james.modules; import java.io.FileNotFoundException; -import java.time.Duration; import java.util.Optional; import javax.inject.Singleton; @@ -29,7 +28,6 @@ import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.jmap.JMAPConfiguration; import org.apache.james.jmap.draft.JMAPDraftConfiguration; import org.apache.james.jmap.draft.methods.GetMessageListMethod; -import org.apache.james.mailbox.events.RetryBackoffConfiguration; import org.apache.james.modules.mailbox.FastRetryBackoffModule; import com.google.inject.AbstractModule; @@ -37,17 +35,23 @@ import com.google.inject.Provides; import com.google.inject.name.Names; public class TestJMAPServerModule extends AbstractModule { + public static class SearchModule extends AbstractModule { + public static final long LIMIT_TO_3_MESSAGES = 3; - 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 SearchModule maximumMessages(long maximumLimit) { + return new SearchModule(maximumLimit); + } - public static TestJMAPServerModule limitToTenMessages() { - return new TestJMAPServerModule(LIMIT_TO_10_MESSAGES); - } + private final long maximumLimit; + + public SearchModule(long maximumLimit) { + this.maximumLimit = maximumLimit; + } - public static TestJMAPServerModule maximumMessages(long maximumLimit) { - return new TestJMAPServerModule(maximumLimit); + @Override + protected void configure() { + bindConstant().annotatedWith(Names.named(GetMessageListMethod.MAXIMUM_LIMIT)).to(maximumLimit); + } } private static final String PUBLIC_PEM_KEY = @@ -101,17 +105,9 @@ public class TestJMAPServerModule extends AbstractModule { .jwtPublicKeyPem(Optional.of(PUBLIC_PEM_KEY)); } - private final long maximumLimit; - - private TestJMAPServerModule(long maximumLimit) { - this.maximumLimit = maximumLimit; - } - @Override protected void configure() { install(new FastRetryBackoffModule()); - - bindConstant().annotatedWith(Names.named(GetMessageListMethod.MAXIMUM_LIMIT)).to(maximumLimit); } @Provides 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 524adb7..5add5ad 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,8 +19,6 @@ 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; @@ -148,7 +146,7 @@ public class TemporaryJamesServer { .combineWith(serverBaseModule) .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class)) .overrideWith(additionalModules) - .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES)) + .overrideWith(new TestJMAPServerModule()) .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 c6dd719..5741431 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,7 +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 static org.apache.james.modules.TestJMAPServerModule.SearchModule.LIMIT_TO_3_MESSAGES; import java.io.IOException; import java.util.Date; @@ -49,7 +49,8 @@ public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest @Override protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule(), - TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES)); + new TestJMAPServerModule(), + TestJMAPServerModule.SearchModule.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 c55e31d..b789c13 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 @@ -55,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(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .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 429bfd6..6989142 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 @@ -43,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(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .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 a2d19ba..093ac2c 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,7 +19,6 @@ 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; @@ -45,6 +44,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(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES))) + .overrideWith(new TestJMAPServerModule())) .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 9517b7e..fb2e164 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(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestDockerESMetricReporterModule(elasticSearch.getDockerEs().getHttpHost())) .overrideWith(elasticSearch.getModule()) .overrideWith(cassandraServer.getModule()) 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 92e8510..ac9d068 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,7 +19,7 @@ package org.apache.james.jmap.memory; -import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_3_MESSAGES; +import static org.apache.james.modules.TestJMAPServerModule.SearchModule.LIMIT_TO_3_MESSAGES; import java.io.IOException; @@ -38,7 +38,7 @@ public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest { @Override protected GuiceJamesServer createJmapServer() throws IOException { - return memoryJmap.jmapServer(TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES)); + return memoryJmap.jmapServer(new TestJMAPServerModule(), TestJMAPServerModule.SearchModule.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 7074a7d..39c2675 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 @@ -41,7 +41,7 @@ public class MemorySendMDNMethodTest extends SendMDNMethodTest { JamesServerExtension testExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 e2404fd..1e6da62 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,8 +18,6 @@ ****************************************************************/ 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; @@ -40,7 +38,7 @@ class MemorySpamAssassinContractTest implements SpamAssassinContract { .extension(new SpamAssassinModuleExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES)) + .overrideWith(new TestJMAPServerModule()) .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 10aa3b3..0259cef 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(TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES), + .overrideWith(new TestJMAPServerModule(), (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 ad4dacd..ce89ea7 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,7 +19,7 @@ package org.apache.james.jmap.rabbitmq; -import static org.apache.james.modules.TestJMAPServerModule.LIMIT_TO_3_MESSAGES; +import static org.apache.james.modules.TestJMAPServerModule.SearchModule.LIMIT_TO_3_MESSAGES; import java.io.IOException; @@ -41,7 +41,8 @@ public class RabbitMQAwsS3GetMessageListMethodTest extends GetMessageListMethodT @Override protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule(), - TestJMAPServerModule.maximumMessages(LIMIT_TO_3_MESSAGES)); + new TestJMAPServerModule(), + TestJMAPServerModule.SearchModule.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 42520ec..f0a5270 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 @@ -46,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(TestJMAPServerModule.limitToTenMessages())) + .overrideWith(new TestJMAPServerModule())) .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 ae0fb4d..dad433b 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,8 +18,6 @@ ****************************************************************/ 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; @@ -48,7 +46,7 @@ class RabbitMQAwsS3SpamAssassinContractTest implements SpamAssassinContract { .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES))) + .overrideWith(new TestJMAPServerModule())) .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 3d466e5..972dea2 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 @@ -84,7 +84,7 @@ public class RabbitMQAwsS3Stepdefs { mainStepdefs.jmapServer = GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .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 f545818..6a81213 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 @@ -115,7 +115,7 @@ class FixingGhostMailboxTest { .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new WebadminIntegrationTestModule())) .build(); diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java index a351ee5..918eea9 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQFastViewProjectionHealthCheckIntegrationTest.java @@ -42,7 +42,7 @@ class RabbitMQFastViewProjectionHealthCheckIntegrationTest extends FastViewProje .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new WebadminIntegrationTestModule())) .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 8032dc5..1e1217a 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 @@ -42,7 +42,7 @@ class RabbitMQForwardIntegrationTest extends ForwardIntegrationTest { .extension(new RabbitMQExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new WebadminIntegrationTestModule())) .build(); } 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 bf5f7b4..2dbf39a 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 @@ -82,7 +82,7 @@ class RabbitMQReindexingWithEventDeadLettersTest { private static final JamesServerBuilder.ServerProvider CONFIGURATION_BUILDER = configuration -> GuiceJamesServer .forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(JmapJamesServerContract.DOMAIN_LIST_CONFIGURATION_MODULE) .overrideWith(new WebadminIntegrationTestModule()); diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java index f7ffd9c..7315009 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/vault/RabbitMQDeletedMessageVaultIntegrationTest.java @@ -46,7 +46,7 @@ class RabbitMQDeletedMessageVaultIntegrationTest extends DeletedMessageVaultInte .extension(new ClockExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new WebadminIntegrationTestModule())) .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 75b8d77..4ef4f8b 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,8 +19,6 @@ 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; @@ -51,7 +49,7 @@ class RabbitMQLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExp .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(TestJMAPServerModule.maximumMessages(LIMIT_TO_20_MESSAGES)) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(new WebadminIntegrationTestModule()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule())) 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 4c52fbb..368dbe7 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 @@ -33,7 +33,7 @@ class MemoryFastViewProjectionHealthCheckIntegrationTest extends FastViewProject static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new WebadminIntegrationTestModule())) .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 ae6d4be..710bb09 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 @@ -34,7 +34,7 @@ class MemoryForwardIntegrationTest extends ForwardIntegrationTest { static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new WebadminIntegrationTestModule())) .build(); } diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java index aa12b19..0fc9703 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/vault/MemoryDeletedMessageVaultIntegrationTest.java @@ -36,7 +36,7 @@ class MemoryDeletedMessageVaultIntegrationTest extends DeletedMessageVaultIntegr .extension(new ClockExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new WebadminIntegrationTestModule())) .build(); 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 090944b..aae0ec5 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 @@ -36,7 +36,7 @@ class MemoryLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExpor .extension(new LinshareGuiceExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) - .overrideWith(TestJMAPServerModule.limitToTenMessages()) + .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(new WebadminIntegrationTestModule())) .build(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
