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 15aa6985fa7f7c48dddd4a1356763a25c0c7b72e Author: Rene Cordier <[email protected]> AuthorDate: Tue Mar 19 11:43:38 2019 +0700 JAMES-2666 Rename SwarmGenericContainer into DockerGenericContainer --- .../es/ClientProviderImplConnectionTest.java | 6 +++--- .../apache/james/mailbox/tika/TikaContainer.java | 6 +++--- .../apache/james/DockerElasticSearchExtension.java | 6 +++--- .../james/JamesServerWithRetryConnectionTest.java | 4 ++-- .../metric/es/DockerElasticSearch2Extension.java | 8 ++++---- .../metric/es/DockerElasticSearch6Extension.java | 8 ++++---- .../apache/james/metric/es/ESReporterContract.java | 8 ++++---- .../james/user/ldap/LdapGenericContainer.java | 10 +++++----- .../mailets/AmqpForwardAttachmentTest.java | 4 ++-- .../transport/mailets/ContactExtractorTest.java | 4 ++-- .../mailets/ICSAttachmentWorkflowTest.java | 4 ++-- .../james/transport/mailets/SpamAssassinTest.java | 4 ++-- .../james/transport/mailets/amqp/AmqpRule.java | 6 +++--- .../java/org/apache/james/jmap/ContainerTest.java | 4 ++-- .../ReindexingWithEventDeadLettersTest.java | 4 ++-- ...cContainer.java => DockerGenericContainer.java} | 22 +++++++++++----------- .../main/java/org/apache/james/utils/FakeSmtp.java | 14 +++++++------- 17 files changed, 61 insertions(+), 61 deletions(-) diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java index ec3adf9..87d6f52 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java @@ -22,7 +22,7 @@ package org.apache.james.backends.es; import java.util.Optional; import java.util.concurrent.TimeUnit; -import org.apache.james.util.docker.SwarmGenericContainer; +import org.apache.james.util.docker.DockerGenericContainer; import org.awaitility.Awaitility; import org.elasticsearch.client.Client; import org.elasticsearch.index.query.QueryBuilders; @@ -39,12 +39,12 @@ public class ClientProviderImplConnectionTest { private static final int ES_APPLICATIVE_PORT = 9300; @Rule - public SwarmGenericContainer es1 = new SwarmGenericContainer(DOCKER_ES_IMAGE) + public DockerGenericContainer es1 = new DockerGenericContainer(DOCKER_ES_IMAGE) .withAffinityToContainer() .withExposedPorts(ES_APPLICATIVE_PORT); @Rule - public SwarmGenericContainer es2 = new SwarmGenericContainer(DOCKER_ES_IMAGE) + public DockerGenericContainer es2 = new DockerGenericContainer(DOCKER_ES_IMAGE) .withAffinityToContainer() .withExposedPorts(ES_APPLICATIVE_PORT); diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java index aa2c0fe..89e23fc 100644 --- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java +++ b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java @@ -21,9 +21,9 @@ package org.apache.james.mailbox.tika; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.junit.rules.ExternalResource; import org.testcontainers.containers.wait.strategy.Wait; @@ -34,10 +34,10 @@ public class TikaContainer extends ExternalResource { private static final int DEFAULT_TIKA_PORT = 9998; private static final int DEFAULT_TIMEOUT_IN_MS = Ints.checkedCast(TimeUnit.MINUTES.toMillis(3)); - private final SwarmGenericContainer tika; + private final DockerGenericContainer tika; public TikaContainer() { - tika = new SwarmGenericContainer(Images.TIKA) + tika = new DockerGenericContainer(Images.TIKA) .withExposedPorts(DEFAULT_TIKA_PORT) .waitingFor(Wait.forHttp("/tika").withRateLimiter(RateLimiters.TWENTIES_PER_SECOND)) .withStartupTimeout(Duration.ofSeconds(30)); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java index a25e34c..bfc755e 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchExtension.java @@ -21,7 +21,7 @@ package org.apache.james; import org.apache.james.backends.es.ElasticSearchConfiguration; import org.apache.james.util.Host; -import org.apache.james.util.docker.SwarmGenericContainer; +import org.apache.james.util.docker.DockerGenericContainer; import org.junit.jupiter.api.extension.ExtensionContext; import com.google.inject.Module; @@ -30,9 +30,9 @@ public class DockerElasticSearchExtension implements GuiceModuleTestExtension { public static final int ELASTIC_SEARCH_PORT = 9300; public static final int ELASTIC_SEARCH_HTTP_PORT = 9200; - private final SwarmGenericContainer elasticSearchContainer; + private final DockerGenericContainer elasticSearchContainer; - public DockerElasticSearchExtension(SwarmGenericContainer elasticSearchContainer) { + public DockerElasticSearchExtension(DockerGenericContainer elasticSearchContainer) { this.elasticSearchContainer = elasticSearchContainer; } 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 685f89a..85263de 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 @@ -39,8 +39,8 @@ 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; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; -import org.apache.james.util.docker.SwarmGenericContainer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -50,7 +50,7 @@ class JamesServerWithRetryConnectionTest { private static final int LIMIT_TO_10_MESSAGES = 10; private static final long WAITING_TIME = TimeUnit.MILLISECONDS.convert(10, TimeUnit.SECONDS); - private static SwarmGenericContainer elasticSearchContainer = new SwarmGenericContainer(Images.ELASTICSEARCH_2) + private static DockerGenericContainer elasticSearchContainer = new DockerGenericContainer(Images.ELASTICSEARCH_2) .withExposedPorts(ELASTIC_SEARCH_HTTP_PORT, ELASTIC_SEARCH_PORT); private static final DockerCassandraRule cassandraRule = new DockerCassandraRule(); diff --git a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearch2Extension.java b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearch2Extension.java index 3a0b076..691db66 100644 --- a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearch2Extension.java +++ b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearch2Extension.java @@ -18,9 +18,9 @@ ****************************************************************/ package org.apache.james.metric.es; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -30,10 +30,10 @@ import org.junit.jupiter.api.extension.ParameterResolver; import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy; public class DockerElasticSearch2Extension implements ParameterResolver, BeforeEachCallback, AfterEachCallback { - private final SwarmGenericContainer elasticSearchContainer; + private final DockerGenericContainer elasticSearchContainer; private DockerElasticSearch2Extension() { - this.elasticSearchContainer = new SwarmGenericContainer(Images.ELASTICSEARCH_2) + this.elasticSearchContainer = new DockerGenericContainer(Images.ELASTICSEARCH_2) .withAffinityToContainer() .withExposedPorts(ESReporterContract.ES_HTTP_PORT) .waitingFor(new HostPortWaitStrategy().withRateLimiter(RateLimiters.TWENTIES_PER_SECOND)); @@ -51,7 +51,7 @@ public class DockerElasticSearch2Extension implements ParameterResolver, BeforeE @Override public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException { - return (parameterContext.getParameter().getType() == SwarmGenericContainer.class); + return (parameterContext.getParameter().getType() == DockerGenericContainer.class); } @Override diff --git a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearch6Extension.java b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearch6Extension.java index ab63089..fb58eaf 100644 --- a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearch6Extension.java +++ b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/DockerElasticSearch6Extension.java @@ -18,9 +18,9 @@ ****************************************************************/ package org.apache.james.metric.es; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -30,10 +30,10 @@ import org.junit.jupiter.api.extension.ParameterResolver; import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy; public class DockerElasticSearch6Extension implements ParameterResolver, BeforeEachCallback, AfterEachCallback { - private final SwarmGenericContainer elasticSearchContainer; + private final DockerGenericContainer elasticSearchContainer; private DockerElasticSearch6Extension() { - this.elasticSearchContainer = new SwarmGenericContainer(Images.ELASTICSEARCH_6) + this.elasticSearchContainer = new DockerGenericContainer(Images.ELASTICSEARCH_6) .withEnv("discovery.type", "single-node") .withAffinityToContainer() .withExposedPorts(ESReporterContract.ES_HTTP_PORT) @@ -52,7 +52,7 @@ public class DockerElasticSearch6Extension implements ParameterResolver, BeforeE @Override public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException { - return (parameterContext.getParameter().getType() == SwarmGenericContainer.class); + return (parameterContext.getParameter().getType() == DockerGenericContainer.class); } @Override diff --git a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterContract.java b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterContract.java index 83ac4ed..3b0335f 100644 --- a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterContract.java +++ b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterContract.java @@ -32,7 +32,7 @@ import org.apache.james.metrics.api.TimeMetric; import org.apache.james.metrics.dropwizard.DropWizardMetricFactory; import org.apache.james.metrics.es.ESMetricReporter; import org.apache.james.metrics.es.ESReporterConfiguration; -import org.apache.james.util.docker.SwarmGenericContainer; +import org.apache.james.util.docker.DockerGenericContainer; import org.awaitility.Duration; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -54,7 +54,7 @@ abstract class ESReporterContract { private Timer timer; @BeforeEach - void setUp(SwarmGenericContainer esContainer) { + void setUp(DockerGenericContainer esContainer) { RestAssured.baseURI = String.format("http://%s:%d";, esContainer.getHostIp(), esContainer.getMappedPort(ES_HTTP_PORT)); await().atMost(Duration.ONE_MINUTE) .untilAsserted(() -> elasticSearchStarted()); @@ -80,7 +80,7 @@ abstract class ESReporterContract { } @Test - void esMetricReporterShouldProduceDocumentsOnAnElasticsearchContainer(SwarmGenericContainer esContainer) { + void esMetricReporterShouldProduceDocumentsOnAnElasticsearchContainer(DockerGenericContainer esContainer) { Metric metric = new DropWizardMetricFactory(registry).generate("probe"); TimerTask timerTask = new TimerTask() { @Override @@ -95,7 +95,7 @@ abstract class ESReporterContract { } @Test - void esMetricReporterShouldProduceDocumentsOnAnElasticsearchContainerWhenRecordingTimeMetric(SwarmGenericContainer esContainer) { + void esMetricReporterShouldProduceDocumentsOnAnElasticsearchContainerWhenRecordingTimeMetric(DockerGenericContainer esContainer) { TimeMetric metric = new DropWizardMetricFactory(registry).timer("itstime"); TimerTask timerTask = new TimerTask() { @Override diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java index 40ee62d..f2a53d7 100644 --- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java +++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.user.ldap; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.junit.rules.ExternalResource; import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy; import org.testcontainers.images.builder.ImageFromDockerfile; @@ -59,8 +59,8 @@ public class LdapGenericContainer extends ExternalResource { return new LdapGenericContainer(createContainer()); } - private SwarmGenericContainer createContainer() { - return new SwarmGenericContainer( + private DockerGenericContainer createContainer() { + return new DockerGenericContainer( new ImageFromDockerfile() .withFileFromClasspath("populate.ldif", "ldif-files/populate.ldif") .withFileFromClasspath("Dockerfile", "ldif-files/Dockerfile")) @@ -73,9 +73,9 @@ public class LdapGenericContainer extends ExternalResource { } } - private final SwarmGenericContainer container; + private final DockerGenericContainer container; - private LdapGenericContainer(SwarmGenericContainer container) { + private LdapGenericContainer(DockerGenericContainer container) { this.container = container; } diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java index b1ff14d..aec7593 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java @@ -39,9 +39,9 @@ import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; @@ -64,7 +64,7 @@ public class AmqpForwardAttachmentTest { private static final byte[] TEST_ATTACHMENT_CONTENT = "Test attachment content".getBytes(StandardCharsets.UTF_8); - public SwarmGenericContainer rabbitMqContainer = new SwarmGenericContainer(Images.RABBITMQ) + public DockerGenericContainer rabbitMqContainer = new DockerGenericContainer(Images.RABBITMQ) .withAffinityToContainer() .waitingFor(new HostPortWaitStrategy() .withRateLimiter(RateLimiters.TWENTIES_PER_SECOND)); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java index 216296a..9f49150 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java @@ -39,9 +39,9 @@ import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; import org.apache.james.transport.matchers.SMTPAuthSuccessful; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; @@ -65,7 +65,7 @@ public class ContactExtractorTest { public static final String EXCHANGE = "collector:email"; public static final String ROUTING_KEY = ""; - public SwarmGenericContainer rabbit = new SwarmGenericContainer(Images.RABBITMQ) + public DockerGenericContainer rabbit = new DockerGenericContainer(Images.RABBITMQ) .waitingFor(new HostPortWaitStrategy().withRateLimiter(RateLimiters.TWENTIES_PER_SECOND)); public AmqpRule amqpRule = new AmqpRule(rabbit, EXCHANGE, ROUTING_KEY); public TemporaryFolder folder = new TemporaryFolder(); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java index 0231813..681dc0a 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java @@ -44,9 +44,9 @@ import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; import org.apache.james.util.MimeMessageUtil; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; @@ -429,7 +429,7 @@ public class ICSAttachmentWorkflowTest { ""; @ClassRule - public static SwarmGenericContainer rabbitMqContainer = new SwarmGenericContainer(Images.RABBITMQ) + public static DockerGenericContainer rabbitMqContainer = new DockerGenericContainer(Images.RABBITMQ) .withAffinityToContainer() .waitingFor(new HostPortWaitStrategy().withRateLimiter(RateLimiters.TWENTIES_PER_SECOND)); @Rule diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java index a812472..52fc782 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java @@ -40,9 +40,9 @@ import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.spamassassin.SpamAssassinResult; import org.apache.james.transport.matchers.All; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; @@ -59,7 +59,7 @@ public class SpamAssassinTest { private static final String SPAM_CONTENT = "XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X"; @ClassRule - public static SwarmGenericContainer spamAssassinContainer = new SwarmGenericContainer(Images.SPAMASSASSIN) + public static DockerGenericContainer spamAssassinContainer = new DockerGenericContainer(Images.SPAMASSASSIN) .withExposedPorts(783) .withAffinityToContainer() .waitingFor(new HostPortWaitStrategy().withRateLimiter(RateLimiters.TWENTIES_PER_SECOND)); diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java index 1527888..c3bda87 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java @@ -25,7 +25,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.james.util.docker.SwarmGenericContainer; +import org.apache.james.util.docker.DockerGenericContainer; import org.awaitility.Awaitility; import org.junit.rules.ExternalResource; @@ -39,7 +39,7 @@ public class AmqpRule extends ExternalResource { private static final boolean AUTO_ACK = true; - private final SwarmGenericContainer rabbitMqContainer; + private final DockerGenericContainer rabbitMqContainer; private final String exchangeName; private final String routingKey; private Channel channel; @@ -47,7 +47,7 @@ public class AmqpRule extends ExternalResource { private Connection connection; private String amqpUri; - public AmqpRule(SwarmGenericContainer rabbitMqContainer, String exchangeName, String routingKey) { + public AmqpRule(DockerGenericContainer rabbitMqContainer, String exchangeName, String routingKey) { this.rabbitMqContainer = rabbitMqContainer; this.exchangeName = exchangeName; this.routingKey = routingKey; diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java index d95a891..b7674ca 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java @@ -26,9 +26,9 @@ import java.net.URISyntaxException; import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Response; import org.apache.http.client.utils.URIBuilder; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.junit.Rule; import org.junit.Test; import org.testcontainers.containers.wait.strategy.HttpWaitStrategy; @@ -36,7 +36,7 @@ import org.testcontainers.containers.wait.strategy.HttpWaitStrategy; public class ContainerTest { @Rule - public SwarmGenericContainer container = new SwarmGenericContainer(Images.NGINX) + public DockerGenericContainer container = new DockerGenericContainer(Images.NGINX) .withAffinityToContainer() .withExposedPorts(80) .waitingFor(new HttpWaitStrategy() diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java index 490cbcd..93413ac 100644 --- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java +++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/ReindexingWithEventDeadLettersTest.java @@ -47,8 +47,8 @@ import org.apache.james.modules.RabbitMQExtension; import org.apache.james.modules.SwiftBlobStoreExtension; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.objectstorage.PayloadCodecFactory; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; -import org.apache.james.util.docker.SwarmGenericContainer; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.JmapGuiceProbe; import org.apache.james.utils.WebAdminGuiceProbe; @@ -75,7 +75,7 @@ class ReindexingWithEventDeadLettersTest { .atMost(Duration.ONE_MINUTE) .await(); - private static SwarmGenericContainer elasticSearchContainer = new SwarmGenericContainer(Images.ELASTICSEARCH_2) + private static DockerGenericContainer elasticSearchContainer = new DockerGenericContainer(Images.ELASTICSEARCH_2) .withExposedPorts(ELASTIC_SEARCH_HTTP_PORT, ELASTIC_SEARCH_PORT); private static final JamesServerBuilder.ServerProvider CONFIGURATION_BUILDER = configuration -> GuiceJamesServer diff --git a/server/testing/src/main/java/org/apache/james/util/docker/SwarmGenericContainer.java b/server/testing/src/main/java/org/apache/james/util/docker/DockerGenericContainer.java similarity index 88% rename from server/testing/src/main/java/org/apache/james/util/docker/SwarmGenericContainer.java rename to server/testing/src/main/java/org/apache/james/util/docker/DockerGenericContainer.java index 2c4ccc1..62401fb 100644 --- a/server/testing/src/main/java/org/apache/james/util/docker/SwarmGenericContainer.java +++ b/server/testing/src/main/java/org/apache/james/util/docker/DockerGenericContainer.java @@ -40,15 +40,15 @@ import com.github.dockerjava.api.command.InspectContainerResponse; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -public class SwarmGenericContainer implements TestRule { - private static final Logger LOGGER = LoggerFactory.getLogger(SwarmGenericContainer.class); +public class DockerGenericContainer implements TestRule { + private static final Logger LOGGER = LoggerFactory.getLogger(DockerGenericContainer.class); private static final String DOCKER_CONTAINER = "DOCKER_CONTAINER"; private static final String NO_DOCKER_ENVIRONMENT = "Could not find a valid Docker environment."; private static final String SKIPPING_TEST_CAUTION = "Skipping all docker tests as no Docker environment was found"; private GenericContainer<?> container; - public SwarmGenericContainer(String dockerImageName) { + public DockerGenericContainer(String dockerImageName) { try { this.container = new GenericContainer<>(dockerImageName); } catch (IllegalStateException e) { @@ -56,7 +56,7 @@ public class SwarmGenericContainer implements TestRule { } } - public SwarmGenericContainer(ImageFromDockerfile imageFromDockerfile) { + public DockerGenericContainer(ImageFromDockerfile imageFromDockerfile) { try { this.container = new GenericContainer<>(imageFromDockerfile); } catch (IllegalStateException e) { @@ -71,7 +71,7 @@ public class SwarmGenericContainer implements TestRule { } } - public SwarmGenericContainer withAffinityToContainer() { + public DockerGenericContainer withAffinityToContainer() { String containerEnv = System.getenv(DOCKER_CONTAINER); if (Strings.isNullOrEmpty(containerEnv)) { LOGGER.warn("'DOCKER_CONTAINER' environment variable not found, dockering without affinity"); @@ -83,32 +83,32 @@ public class SwarmGenericContainer implements TestRule { return this; } - public SwarmGenericContainer withEnv(String key, String value) { + public DockerGenericContainer withEnv(String key, String value) { container.addEnv(key, value); return this; } - public SwarmGenericContainer withExposedPorts(Integer... ports) { + public DockerGenericContainer withExposedPorts(Integer... ports) { container.withExposedPorts(ports); return this; } - public SwarmGenericContainer portBinding(int hostPort, int dockerPort) { + public DockerGenericContainer portBinding(int hostPort, int dockerPort) { container.setPortBindings(ImmutableList.of("0.0.0.0:" + hostPort + ":" + dockerPort)); return this; } - public SwarmGenericContainer waitingFor(WaitStrategy waitStrategy) { + public DockerGenericContainer waitingFor(WaitStrategy waitStrategy) { container.waitingFor(waitStrategy); return this; } - public SwarmGenericContainer withStartupTimeout(Duration startupTimeout) { + public DockerGenericContainer withStartupTimeout(Duration startupTimeout) { container.withStartupTimeout(startupTimeout); return this; } - public SwarmGenericContainer withCommands(String... commands) { + public DockerGenericContainer withCommands(String... commands) { container.withCommand(commands); return this; } diff --git a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java index 8aa4571..c94e742 100644 --- a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java +++ b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java @@ -26,9 +26,9 @@ import static io.restassured.config.RestAssuredConfig.newConfig; import java.nio.charset.StandardCharsets; import java.util.function.Function; +import org.apache.james.util.docker.DockerGenericContainer; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.RateLimiters; -import org.apache.james.util.docker.SwarmGenericContainer; import org.awaitility.core.ConditionFactory; import org.junit.rules.TestRule; import org.junit.runner.Description; @@ -45,14 +45,14 @@ import io.restassured.specification.ResponseSpecification; public class FakeSmtp implements TestRule { public static FakeSmtp withSmtpPort(Integer smtpPort) { - SwarmGenericContainer container = fakeSmtpContainer() + DockerGenericContainer container = fakeSmtpContainer() .withCommands("node", "cli", "--listen", "80", "--smtp", smtpPort.toString()); return new FakeSmtp(container, smtpPort); } - private static SwarmGenericContainer fakeSmtpContainer() { - return new SwarmGenericContainer(Images.FAKE_SMTP) + private static DockerGenericContainer fakeSmtpContainer() { + return new DockerGenericContainer(Images.FAKE_SMTP) .withAffinityToContainer() .waitingFor(new HostPortWaitStrategy() .withRateLimiter(RateLimiters.TWENTIES_PER_SECOND)); @@ -60,14 +60,14 @@ public class FakeSmtp implements TestRule { private static final int SMTP_PORT = 25; private static final ResponseSpecification RESPONSE_SPECIFICATION = new ResponseSpecBuilder().build(); - private final SwarmGenericContainer container; + private final DockerGenericContainer container; private final Integer smtpPort; public FakeSmtp() { this(fakeSmtpContainer().withExposedPorts(SMTP_PORT), SMTP_PORT); } - private FakeSmtp(SwarmGenericContainer container, Integer smtpPort) { + private FakeSmtp(DockerGenericContainer container, Integer smtpPort) { this.smtpPort = smtpPort; this.container = container; } @@ -99,7 +99,7 @@ public class FakeSmtp implements TestRule { .build(); } - public SwarmGenericContainer getContainer() { + public DockerGenericContainer getContainer() { return container; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
