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 ab6a9c1b8f6b224d0b84d284494054ede6fb20cc Author: Benoit Tellier <[email protected]> AuthorDate: Tue May 19 16:47:49 2020 +0700 JAMES-3140 Remove unneeded module composition within Distributed integration tests --- .../java/org/apache/james/CassandraRabbitMQAwsS3JmapTestRule.java | 3 --- .../java/org/apache/james/CassandraRabbitMQSwiftJmapTestRule.java | 3 --- .../james/jmap/rabbitmq/RabbitMQAwsS3GetMessageListMethodTest.java | 4 +++- .../apache/james/jmap/rabbitmq/RabbitMQAwsS3SendMDNMethodTest.java | 3 --- .../james/jmap/rabbitmq/RabbitMQAwsS3SpamAssassinContractTest.java | 3 --- .../james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java | 3 --- 6 files changed, 3 insertions(+), 16 deletions(-) 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 2dbaf51..ccd7ae5 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 @@ -22,8 +22,6 @@ package org.apache.james; import java.io.IOException; import org.apache.james.backends.rabbitmq.DockerRabbitMQSingleton; -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.TestRabbitMQModule; @@ -68,7 +66,6 @@ public class CassandraRabbitMQAwsS3JmapTestRule implements TestRule { .build(); return CassandraRabbitMQJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(new TestJMAPServerModule()) .overrideWith(new TestDockerESMetricReporterModule(dockerElasticSearchRule.getDockerEs().getHttpHost())) 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 2ed747f..cf4d2b4 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 @@ -22,8 +22,6 @@ package org.apache.james; import java.io.IOException; import org.apache.james.backends.rabbitmq.DockerRabbitMQSingleton; -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.TestRabbitMQModule; @@ -67,7 +65,6 @@ public class CassandraRabbitMQSwiftJmapTestRule implements TestRule { .build(); return CassandraRabbitMQJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestRabbitMQModule(DockerRabbitMQSingleton.SINGLETON)) .overrideWith(new DockerSwiftTestRule().getModule()) .overrideWith(new TestJMAPServerModule()) 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 ce89ea7..ab9c87f 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 @@ -27,6 +27,8 @@ import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule; 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.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; import org.junit.Rule; @@ -41,7 +43,7 @@ public class RabbitMQAwsS3GetMessageListMethodTest extends GetMessageListMethodT @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/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 7233fb9..9f526b1 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 @@ -27,9 +27,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.AwsS3BlobStoreExtension; import org.apache.james.modules.RabbitMQExtension; import org.apache.james.modules.TestJMAPServerModule; @@ -50,7 +48,6 @@ public class RabbitMQAwsS3SendMDNMethodTest extends SendMDNMethodTest { .extension(new AwsS3BlobStoreExtension()) .extension(new RabbitMQExtension()) .server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .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/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 3856cc8..e8f6fbe 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 @@ -26,8 +26,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.AwsS3BlobStoreExtension; import org.apache.james.modules.RabbitMQExtension; import org.apache.james.modules.TestJMAPServerModule; @@ -50,7 +48,6 @@ class RabbitMQAwsS3SpamAssassinContractTest implements SpamAssassinContract { .extension(new AwsS3BlobStoreExtension()) .extension(spamAssassinExtension) .server(configuration -> CassandraRabbitMQJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestJMAPServerModule())) .build(); } diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java index de4760a..8790c35 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQJmapExtension.java @@ -30,8 +30,6 @@ import org.apache.james.DockerCassandraRule; import org.apache.james.DockerElasticSearchRule; import org.apache.james.GuiceJamesServer; import org.apache.james.backends.rabbitmq.DockerRabbitMQSingleton; -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.TestRabbitMQModule; import org.apache.james.modules.blobstore.BlobStoreConfiguration; @@ -155,7 +153,6 @@ public class RabbitMQJmapExtension implements BeforeAllCallback, AfterAllCallbac .build(); return CassandraRabbitMQJamesServerMain.createServer(configuration) - .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestDockerESMetricReporterModule(elasticSearchRule.getDockerEs().getHttpHost())) .overrideWith(cassandra.getModule()) .overrideWith(elasticSearchRule.getModule()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
