Fix some Eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a733ea89 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a733ea89 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a733ea89 Branch: refs/heads/master Commit: a733ea8955cba59d919d94037ed68ddc17326129 Parents: 259d628 Author: Raphael Ouazana <[email protected]> Authored: Thu Nov 15 16:43:33 2018 +0100 Committer: Benoit Tellier <[email protected]> Committed: Fri Nov 16 16:57:39 2018 +0700 ---------------------------------------------------------------------- .../ElasticSearchMailboxConfiguration.java | 1 - .../tika/ContentTypeFilteringTextExtractorTest.java | 3 ++- .../main/java/org/apache/mailet/AttributeValue.java | 6 +++--- .../api/src/main/java/org/apache/mailet/Mail.java | 1 - .../src/main/java/org/apache/mailet/Serializer.java | 5 ++++- .../apache/james/protocols/smtp/MailEnvelope.java | 1 - .../apache/james/protocols/smtp/hook/MailHook.java | 1 - .../apache/james/protocols/smtp/hook/RcptHook.java | 1 - .../apache/james/blob/union/UnionBlobStoreTest.java | 6 +++--- .../java/org/apache/james/server/core/MailImpl.java | 2 +- .../objectstorage/guice/DockerSwiftTestRule.java | 14 +------------- .../james/CassandraRabbitMQJamesServerTest.java | 16 ++++++++++------ .../james/modules/rabbitmq/RabbitMQModule.java | 1 + .../apache/james/util/CompletableFutureUtil.java | 6 +++--- .../cassandra-jmap-integration-testing/pom.xml | 1 - .../james/spamassassin/SpamAssassinExtension.java | 4 ++-- 16 files changed, 30 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchMailboxConfiguration.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchMailboxConfiguration.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchMailboxConfiguration.java index 86e46f4..3ce4cd5 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchMailboxConfiguration.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/ElasticSearchMailboxConfiguration.java @@ -115,7 +115,6 @@ public class ElasticSearchMailboxConfiguration { public static final int DEFAULT_NB_SHARDS = 5; public static final int DEFAULT_NB_REPLICA = 1; public static final int DEFAULT_PORT = 9300; - private static final String LOCALHOST = "127.0.0.1"; public static final Optional<Integer> DEFAULT_PORT_AS_OPTIONAL = Optional.of(DEFAULT_PORT); public static final ElasticSearchMailboxConfiguration DEFAULT_CONFIGURATION = builder().build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/ContentTypeFilteringTextExtractorTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/ContentTypeFilteringTextExtractorTest.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/ContentTypeFilteringTextExtractorTest.java index 194d621..95e838f 100644 --- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/ContentTypeFilteringTextExtractorTest.java +++ b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/ContentTypeFilteringTextExtractorTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.extractor.ParsedContent; @@ -54,7 +55,7 @@ public class ContentTypeFilteringTextExtractorTest { ImmutableSet.of("application/ics", "application/zip")); assertThat(contentTypeFilteringTextExtractor - .extractContent(IOUtils.toInputStream(""), "application/ics")) + .extractContent(IOUtils.toInputStream("", StandardCharsets.UTF_8), "application/ics")) .isEqualTo(ParsedContent.empty()); verifyNoMoreInteractions(textExtractor); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java b/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java index c3213fc..69c5971 100644 --- a/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java +++ b/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java @@ -93,7 +93,6 @@ public class AttributeValue<T> { return new AttributeValue<>(value, Serializer.URL_SERIALIZER); } - @SuppressWarnings({ "unchecked", "rawtypes" }) public static <T> AttributeValue<Optional<AttributeValue<T>>> of(Optional<AttributeValue<T>> value) { Preconditions.checkNotNull(value, "value should not be null"); return new AttributeValue<>(value, new Serializer.OptionalSerializer<>()); @@ -116,7 +115,7 @@ public class AttributeValue<T> { return new AttributeValue<>(value, new Serializer.FSTSerializer()); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public static AttributeValue<?> ofAny(Object value) { Preconditions.checkNotNull(value, "value should not be null"); if (value instanceof Boolean) { @@ -153,7 +152,7 @@ public class AttributeValue<T> { return of((URL) value); } if (value instanceof Optional) { - return of((Optional<?>) value); + return of((Optional) value); } if (value instanceof Serializable) { return ofSerializable((Serializable) value); @@ -213,6 +212,7 @@ public class AttributeValue<T> { } //FIXME : poor performance + @SuppressWarnings("unchecked") public AttributeValue<T> duplicate() { return (AttributeValue<T>) fromJson(toJson()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/mailet/api/src/main/java/org/apache/mailet/Mail.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/main/java/org/apache/mailet/Mail.java b/mailet/api/src/main/java/org/apache/mailet/Mail.java index 5508b82..afe75f8 100644 --- a/mailet/api/src/main/java/org/apache/mailet/Mail.java +++ b/mailet/api/src/main/java/org/apache/mailet/Mail.java @@ -148,7 +148,6 @@ public interface Mail extends Serializable, Cloneable { * @since Mailet API v3.2.0 * @return the sender of this message wrapped in an optional */ - @SuppressWarnings("deprecated") default MaybeSender getMaybeSender() { return MaybeSender.of(getSender()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/mailet/api/src/main/java/org/apache/mailet/Serializer.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/main/java/org/apache/mailet/Serializer.java b/mailet/api/src/main/java/org/apache/mailet/Serializer.java index ba73395..17855e4 100644 --- a/mailet/api/src/main/java/org/apache/mailet/Serializer.java +++ b/mailet/api/src/main/java/org/apache/mailet/Serializer.java @@ -80,7 +80,7 @@ public interface Serializer<T> { FLOAT_SERIALIZER, DOUBLE_SERIALIZER, MESSAGE_ID_DTO_SERIALIZER, - new Serializer.ArbitrarySerializableSerializer(), + new Serializer.ArbitrarySerializableSerializer<>(), URL_SERIALIZER, new CollectionSerializer<>(), new MapSerializer<>(), @@ -386,6 +386,7 @@ public interface Serializer<T> { return new ArrayNode(JsonNodeFactory.instance, jsons); } + @SuppressWarnings("unchecked") @Override public Optional<Collection<AttributeValue<U>>> deserialize(JsonNode json) { if (json instanceof ArrayNode) { @@ -416,6 +417,7 @@ public interface Serializer<T> { return new ObjectNode(JsonNodeFactory.instance, jsonMap); } + @SuppressWarnings("unchecked") @Override public Optional<Map<String, AttributeValue<U>>> deserialize(JsonNode json) { if (json instanceof ObjectNode) { @@ -447,6 +449,7 @@ public interface Serializer<T> { .orElse(NullNode.getInstance()); } + @SuppressWarnings("unchecked") @Override public Optional<Optional<AttributeValue<U>>> deserialize(JsonNode json) { if (json instanceof ObjectNode) { http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelope.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelope.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelope.java index 3cba413..915dd2f 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelope.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelope.java @@ -74,7 +74,6 @@ public interface MailEnvelope { * @since Mailet API v3.2.0 * @return the sender of this message wrapped in an optional */ - @SuppressWarnings("deprecated") default MaybeSender getMaybeSender() { return MaybeSender.of(getSender()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java index a1c48a8..0591f05 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java @@ -50,7 +50,6 @@ public interface MailHook extends Hook { * * @since James 3.2.0 */ - @SuppressWarnings("deprecated") default HookResult doMail(SMTPSession session, MaybeSender sender) { return doMail(session, sender.asOptional().orElse(MailAddress.nullSender())); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java index 49d0efa..7df7408 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java @@ -47,7 +47,6 @@ public interface RcptHook extends Hook { * * this strongly typed version smoothly handle null sender and should be prefered. */ - @SuppressWarnings("deprecated") default HookResult doRcpt(SMTPSession session, MaybeSender sender, MailAddress rcpt) { return doRcpt(session, sender.asOptional().orElse(null), rcpt); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java ---------------------------------------------------------------------- diff --git a/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java b/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java index e217957..c3aecb7 100644 --- a/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java +++ b/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java @@ -252,7 +252,7 @@ class UnionBlobStoreTest implements BlobStoreContract { class CurrentAndLegacyCouldNotComplete { - Stream<Function<UnionBlobStore, CompletableFuture>> blobStoreOperationsReturnFutures() { + Stream<Function<UnionBlobStore, CompletableFuture<?>>> blobStoreOperationsReturnFutures() { return Stream.of( blobStore -> blobStore.save(BLOB_CONTENT), blobStore -> blobStore.save(new ByteArrayInputStream(BLOB_CONTENT)), @@ -289,7 +289,7 @@ class UnionBlobStoreTest implements BlobStoreContract { @ParameterizedTest @MethodSource("blobStoresCauseThrowExceptions") void operationShouldThrow(UnionBlobStore blobStoreThrowsException, - Function<UnionBlobStore, CompletableFuture> blobStoreOperation) { + Function<UnionBlobStore, CompletableFuture<?>> blobStoreOperation) { assertThatThrownBy(() -> blobStoreOperation.apply(blobStoreThrowsException)) .isInstanceOf(RuntimeException.class); } @@ -297,7 +297,7 @@ class UnionBlobStoreTest implements BlobStoreContract { @ParameterizedTest @MethodSource("blobStoresCauseReturnExceptionallyFutures") void operationShouldReturnExceptionallyFuture(UnionBlobStore blobStoreReturnsExceptionallyFuture, - Function<UnionBlobStore, CompletableFuture> blobStoreOperation) { + Function<UnionBlobStore, CompletableFuture<?>> blobStoreOperation) { assertThat(blobStoreOperation.apply(blobStoreReturnsExceptionallyFuture)) .isCompletedExceptionally(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java index c168c7a..9eaf52a 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MailImpl.java @@ -427,7 +427,7 @@ public class MailImpl implements Disposable, Mail { } } - @SuppressWarnings({"unchecked", "deprecated"}) + @SuppressWarnings({"unchecked", "deprecation"}) private MailImpl(Mail mail, String newName) throws MessagingException { this(newName, mail.getSender(), mail.getRecipients(), mail.getMessage()); setRemoteHost(mail.getRemoteHost()); http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/guice/DockerSwiftTestRule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/guice/DockerSwiftTestRule.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/guice/DockerSwiftTestRule.java index b9e42a9..00c0884 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/guice/DockerSwiftTestRule.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/guice/DockerSwiftTestRule.java @@ -19,38 +19,26 @@ package org.apache.james.modules.objectstorage.guice; -import java.net.URI; -import java.net.URISyntaxException; import java.util.UUID; import org.apache.james.GuiceModuleTestRule; -import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.objectstorage.ContainerName; -import org.apache.james.blob.objectstorage.ObjectStorageBlobsDAO; -import org.apache.james.blob.objectstorage.PayloadCodec; -import org.apache.james.modules.objectstorage.ObjectStorageBlobConfiguration; import org.apache.james.blob.objectstorage.swift.Credentials; import org.apache.james.blob.objectstorage.swift.SwiftKeystone2ObjectStorage; -import org.apache.james.blob.objectstorage.swift.SwiftTempAuthObjectStorage; -import org.apache.james.blob.objectstorage.swift.SwiftTempAuthObjectStorage.Configuration; import org.apache.james.blob.objectstorage.swift.TenantName; import org.apache.james.blob.objectstorage.swift.UserName; +import org.apache.james.modules.objectstorage.ObjectStorageBlobConfiguration; import org.apache.james.modules.objectstorage.PayloadCodecFactory; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.testcontainers.containers.GenericContainer; -import com.github.fge.lambdas.Throwing; import com.google.inject.Module; -import com.google.inject.util.Modules; public class DockerSwiftTestRule implements GuiceModuleTestRule { private final PayloadCodecFactory payloadCodecFactory; private org.apache.james.blob.objectstorage.DockerSwiftRule swiftContainer = new org.apache.james.blob.objectstorage.DockerSwiftRule(); - private PayloadCodec payloadCodec; public DockerSwiftTestRule() { this(PayloadCodecFactory.DEFAULT); http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java index 1bf3aaf..f4f9885 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java @@ -50,15 +50,19 @@ class CassandraRabbitMQJamesServerTest { .addDomain(DOMAIN) .addUser(JAMES_USER, PASSWORD); - new SMTPMessageSender(Domain.LOCALHOST.asString()).connect(JAMES_SERVER_HOST, server.getProbe(SmtpGuiceProbe.class).getSmtpPort()) - .sendMessage("[email protected]", JAMES_USER); + try (SMTPMessageSender sender = new SMTPMessageSender(Domain.LOCALHOST.asString())) { + sender.connect(JAMES_SERVER_HOST, server.getProbe(SmtpGuiceProbe.class).getSmtpPort()) + .sendMessage("[email protected]", JAMES_USER); + } CALMLY_AWAIT.until(() -> server.getProbe(SpoolerProbe.class).processingFinished()); - new IMAPMessageReader().connect(JAMES_SERVER_HOST, server.getProbe(ImapGuiceProbe.class).getImapPort()) - .login(JAMES_USER, PASSWORD) - .select(IMAPMessageReader.INBOX) - .awaitMessage(CALMLY_AWAIT); + try (IMAPMessageReader reader = new IMAPMessageReader()) { + reader.connect(JAMES_SERVER_HOST, server.getProbe(ImapGuiceProbe.class).getImapPort()) + .login(JAMES_USER, PASSWORD) + .select(IMAPMessageReader.INBOX) + .awaitMessage(CALMLY_AWAIT); + } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/server/container/guice/rabbitmq/src/main/java/org/apache/james/modules/rabbitmq/RabbitMQModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/rabbitmq/src/main/java/org/apache/james/modules/rabbitmq/RabbitMQModule.java b/server/container/guice/rabbitmq/src/main/java/org/apache/james/modules/rabbitmq/RabbitMQModule.java index 3a04488..9f45f19 100644 --- a/server/container/guice/rabbitmq/src/main/java/org/apache/james/modules/rabbitmq/RabbitMQModule.java +++ b/server/container/guice/rabbitmq/src/main/java/org/apache/james/modules/rabbitmq/RabbitMQModule.java @@ -86,6 +86,7 @@ public class RabbitMQModule extends AbstractModule { cassandraModuleBinder.addBinding().toInstance(CassandraMailQueueViewModule.MODULE); bind(EventsourcingConfigurationManagement.class).in(Scopes.SINGLETON); + @SuppressWarnings("rawtypes") Multibinder<EventDTOModule> eventDTOModuleBinder = Multibinder.newSetBinder(binder(), EventDTOModule.class); eventDTOModuleBinder.addBinding().toInstance(CassandraMailQueueViewConfigurationModule.MAIL_QUEUE_VIEW_CONFIGURATION); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/server/container/util/src/main/java/org/apache/james/util/CompletableFutureUtil.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/CompletableFutureUtil.java b/server/container/util/src/main/java/org/apache/james/util/CompletableFutureUtil.java index 19bf712..c9e0fd8 100644 --- a/server/container/util/src/main/java/org/apache/james/util/CompletableFutureUtil.java +++ b/server/container/util/src/main/java/org/apache/james/util/CompletableFutureUtil.java @@ -40,6 +40,7 @@ public class CompletableFutureUtil { .orElse(CompletableFuture.completedFuture(Optional.empty()))); } + @SuppressWarnings("unchecked") public static <T> CompletableFuture<Stream<T>> allOf(Stream<CompletableFuture<T>> futureStream) { CompletableFuture<T>[] arrayOfFutures = futureStream.toArray(CompletableFuture[]::new); @@ -48,17 +49,16 @@ public class CompletableFutureUtil { .map(CompletableFuture::join)); } - @SuppressWarnings("unchecked") public static <R, T> CompletableFuture<Stream<R>> chainAll(Stream<T> futureStream, Function<T, CompletableFuture<R>> transformationToChain) { ImmutableList<T> elements = futureStream.collect(ImmutableList.toImmutableList()); ArrayList<R> results = new ArrayList<>(elements.size()); CompletableFuture<Void> futureEmptyStream = CompletableFuture.completedFuture(null); - BiFunction<CompletableFuture, Supplier<CompletableFuture<R>>, CompletableFuture> accumulator = + BiFunction<CompletableFuture<?>, Supplier<CompletableFuture<R>>, CompletableFuture<?>> accumulator = (future, supplier) -> future.thenCompose(any -> supplier.get().thenAccept(results::add)); - BinaryOperator<CompletableFuture> combiner = (f1, f2) -> f1.thenCompose(any -> f2); + BinaryOperator<CompletableFuture<?>> combiner = (f1, f2) -> f1.thenCompose(any -> f2); return elements.stream() .map(t -> (Supplier<CompletableFuture<R>>) (() -> transformationToChain.apply(t))) http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index e20863c..6a1c11f 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -215,7 +215,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.0</version> <configuration> <argLine>-Xms512m -Xmx1024m</argLine> <reuseForks>true</reuseForks> http://git-wip-us.apache.org/repos/asf/james-project/blob/a733ea89/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java ---------------------------------------------------------------------- diff --git a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java index 5018bd6..34c5b27 100644 --- a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java +++ b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java @@ -53,8 +53,8 @@ public class SpamAssassinExtension implements BeforeEachCallback, AfterEachCallb .withFileFromClasspath("run.sh", "docker/spamassassin/run.sh") .withFileFromClasspath("spamd.sh", "docker/spamassassin/spamd.sh") .withFileFromClasspath("rule-update.sh", "docker/spamassassin/rule-update.sh") - .withFileFromClasspath("bayes_pg.sql", "docker/spamassassin/bayes_pg.sql")) - .withStartupTimeout(STARTUP_TIMEOUT); + .withFileFromClasspath("bayes_pg.sql", "docker/spamassassin/bayes_pg.sql")); + spamAssassinContainer.withStartupTimeout(STARTUP_TIMEOUT); spamAssassinContainer.waitingFor(new SpamAssassinWaitStrategy(spamAssassinContainer, STARTUP_TIMEOUT)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
