This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4c7a95a9228e6af4290d058e5ab2cb24dbc21117 Author: Benoit Tellier <[email protected]> AuthorDate: Tue May 19 16:43:31 2020 +0700 JAMES-3140 Remove unneeded module composition within Cassandra integration tests --- .../apache/james/AuthenticatedCassandraJamesServerTest.java | 4 ---- .../src/test/java/org/apache/james/CacheSessionTest.java | 4 +--- .../test/java/org/apache/james/CassandraJmapTestRule.java | 3 --- .../james/CassandraMailRepositoryIntegrationTest.java | 3 --- .../james/CassandraMessageIdManagerInjectionTest.java | 5 ----- .../src/test/java/org/apache/james/ESReporterTest.java | 3 --- .../java/org/apache/james/JamesCapabilitiesServerTest.java | 3 --- .../apache/james/JamesServerWithRetryConnectionTest.java | 3 --- .../JamesWithNonCompatibleElasticSearchServerTest.java | 3 --- .../test/java/org/apache/james/KeyspaceCreationTest.java | 13 ++++--------- .../mailbox/CassandraSchemaVersionStartUpCheckTest.java | 5 ----- .../jmap/cassandra/CassandraGetMessageListMethodTest.java | 4 +++- .../apache/james/jmap/cassandra/CassandraImapErrorTest.java | 3 --- .../james/jmap/cassandra/CassandraSendMDNMethodTest.java | 3 --- .../jmap/cassandra/CassandraSpamAssassinContractTest.java | 3 --- 15 files changed, 8 insertions(+), 54 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 ae84eab..4d8b3a9 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 @@ -47,8 +47,6 @@ class AuthenticatedCassandraJamesServerTest { .extension(new DockerElasticSearchExtension()) .extension(cassandraExtension) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule()) .overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE)) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandra.configurationBuilder(cassandraExtension.getCassandra().getHost()) @@ -66,8 +64,6 @@ class AuthenticatedCassandraJamesServerTest { .extension(cassandraExtension) .disableAutoStart() .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .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 cf2a0bd..7e2c394 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 @@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThatCode; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.init.configuration.InjectionNames; import org.apache.james.lifecycle.api.StartUpCheck; -import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.mailbox.CassandraCacheSessionModule; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -77,8 +76,7 @@ class CacheSessionTest { .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .combineWith(new CassandraCacheSessionModule()) - .overrideWith(new TestJMAPServerModule())) + .combineWith(new CassandraCacheSessionModule())) .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/CassandraJmapTestRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapTestRule.java index 5c2f7f9..87cbe45 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 @@ -21,8 +21,6 @@ package org.apache.james; import java.io.IOException; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.server.core.configuration.Configuration; @@ -63,7 +61,6 @@ public class CassandraJmapTestRule implements TestRule { .build(); return CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(guiceModuleTestRule.getModule()) 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 4a9a378..5cacc6f 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 @@ -23,8 +23,6 @@ import static org.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS; import java.util.concurrent.TimeUnit; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.protocols.SmtpGuiceProbe; @@ -53,7 +51,6 @@ class CassandraMailRepositoryIntegrationTest { .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestJMAPServerModule())) .build(); 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 d4e2373..eef7607 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 @@ -25,9 +25,6 @@ import javax.inject.Inject; import org.apache.james.lifecycle.api.Startable; import org.apache.james.mailbox.MessageIdManager; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; -import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.utils.InitializationOperation; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,8 +37,6 @@ class CassandraMessageIdManagerInjectionTest { .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .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/ESReporterTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java index dce9efe..0d244df 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 @@ -37,8 +37,6 @@ import org.apache.james.backends.es.ReactorElasticSearchClient; import org.apache.james.core.Username; import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.draft.JmapGuiceProbe; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestDockerESMetricReporterModule; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.protocols.ImapGuiceProbe; @@ -67,7 +65,6 @@ class ESReporterTest { .extension(elasticSearchExtension) .extension(new CassandraExtension()) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .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 061bc10..23d5767 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 @@ -28,8 +28,6 @@ import java.util.EnumSet; import org.apache.james.jmap.draft.JMAPModule; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -42,7 +40,6 @@ class JamesCapabilitiesServerTest { .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(MailboxManager.class).toInstance(mailboxManager))) .disableAutoStart() 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 34e2e4e..c376ea2 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 @@ -31,8 +31,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.util.concurrent.NamedThreadFactory; @@ -52,7 +50,6 @@ class JamesServerWithRetryConnectionTest { .extension(dockerElasticSearch) .extension(dockerCassandra) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .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 98a3f51..479053b 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 @@ -25,8 +25,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.backends.es.DockerElasticSearch; import org.apache.james.lifecycle.api.StartUpCheck; import org.apache.james.lifecycle.api.StartUpCheck.CheckResult; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.mailbox.ElasticSearchStartUpCheck; import org.apache.james.util.docker.Images; @@ -43,7 +41,6 @@ class JamesWithNonCompatibleElasticSearchServerTest { .extension(new DockerElasticSearchExtension(dockerES2)) .extension(new CassandraExtension()) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .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 c2cdf2d..c7a2c3f 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 @@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.backends.cassandra.DockerCassandraSingleton; import org.apache.james.backends.cassandra.init.configuration.ClusterConfiguration; -import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.mailbox.KeyspacesConfiguration; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -37,8 +36,7 @@ class KeyspaceCreationTest { JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) - .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule())) + .server(CassandraJamesServerMain::createServer) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandraSingleton.singleton.configurationBuilder() .createKeyspace() @@ -59,8 +57,7 @@ class KeyspaceCreationTest { JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) - .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule())) + .server(CassandraJamesServerMain::createServer) .overrideServerModule(binder -> binder.bind(KeyspacesConfiguration.class).toInstance(KeyspacesConfiguration.builder() .keyspace("non_existing_keyspace") .cacheKeyspace("cache_non_existing_keyspace") @@ -87,8 +84,7 @@ class KeyspaceCreationTest { JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) - .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule())) + .server(CassandraJamesServerMain::createServer) .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandraSingleton.singleton.configurationBuilder() .createKeyspace() @@ -115,8 +111,7 @@ class KeyspaceCreationTest { JamesServerExtension testExtension = new JamesServerBuilder<>(JamesServerBuilder.defaultConfigurationProvider()) .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) - .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(new TestJMAPServerModule())) + .server(CassandraJamesServerMain::createServer) .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/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/mailbox/CassandraSchemaVersionStartUpCheckTest.java index e64ec81..a4a8a36 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 @@ -40,9 +40,6 @@ import org.apache.james.StartUpChecksPerformer.StartUpChecksException; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO; import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager; import org.apache.james.backends.cassandra.versions.SchemaVersion; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; -import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.protocols.ImapGuiceProbe; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -64,8 +61,6 @@ class CassandraSchemaVersionStartUpCheckTest { .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) - .overrideWith(new TestJMAPServerModule()) .overrideWith(binder -> binder.bind(CassandraSchemaVersionDAO.class) .toInstance(versionDAO)) .overrideWith(binder -> binder.bind(CassandraSchemaVersionManager.class) 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 5741431..8b914d5 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 @@ -32,7 +32,9 @@ import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.draft.methods.integration.GetMessageListMethodTest; +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.model.MailboxConstants; +import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.junit.Ignore; import org.junit.Rule; @@ -49,7 +51,7 @@ public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest @Override protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule(), - new TestJMAPServerModule(), + binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class), TestJMAPServerModule.SearchModule.maximumMessages(LIMIT_TO_3_MESSAGES)); } 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 4f243ed..fe81740 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 @@ -32,8 +32,6 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.jmap.draft.JmapGuiceProbe; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.utils.DataProbeImpl; @@ -53,7 +51,6 @@ class CassandraImapErrorTest { .extension(new DockerElasticSearchExtension()) .extension(cassandraExtension) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .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/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 468d134..97b78de 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 @@ -26,9 +26,7 @@ import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.jmap.draft.methods.integration.SendMDNMethodTest; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; -import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.model.MessageId; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; @@ -39,7 +37,6 @@ public class CassandraSendMDNMethodTest extends SendMDNMethodTest { .extension(new DockerElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .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/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 4fb025a..429f47a 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 @@ -25,8 +25,6 @@ import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.jmap.draft.methods.integration.SpamAssassinContract; import org.apache.james.jmap.draft.methods.integration.SpamAssassinModuleExtension; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +38,6 @@ class CassandraSpamAssassinContractTest implements SpamAssassinContract { .extension(new CassandraExtension()) .extension(spamAssassinExtension) .server(configuration -> CassandraJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestJMAPServerModule())) .build(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
