This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push: new c5003bc Checkstyle and Eclipse warnings fixes c5003bc is described below commit c5003bcbdf11948ec1597ac46f17856df6f0e946 Author: Raphael Ouazana <raphael.ouaz...@linagora.com> AuthorDate: Tue Jun 25 16:49:34 2019 +0200 Checkstyle and Eclipse warnings fixes --- .../org/apache/james/backends/es/search/ScrolledSearch.java | 1 + .../org/apache/james/backends/es/DockerElasticSearch.java | 3 +-- .../mailbox/elasticsearch/ElasticSearchIntegrationTest.java | 1 - .../apache/james/mailbox/events/RabbitMQEventBusTest.java | 1 - .../ElasticSearchQuotaSearchTestSystemExtension.java | 2 -- .../test/java/org/apache/james/CassandraNodeConfTest.java | 2 -- .../apache/james/RabbitMQJamesServerReprocessingTest.java | 8 +++++--- .../james/modules/server/CamelMailetContainerModule.java | 4 ---- .../org/apache/james/GuiceJamesServerStartUpCheckTest.java | 2 -- .../test/java/org/apache/james/GuiceJamesServerTest.java | 2 -- .../java/org/apache/james/GuiceLifecycleHeathCheckTest.java | 2 -- .../java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java | 1 - .../java/org/apache/james/mailets/DKIMIntegrationTest.java | 2 -- .../james/transport/mailets/ExtractAttributeStub.java | 10 +++++----- .../james/mailetcontainer/impl/JamesMailSpoolerTest.java | 13 +++++++------ .../james/transport/matchers/AtLeastPriorityTest.java | 8 +++++--- .../apache/james/transport/matchers/AtMostPriorityTest.java | 7 +++++-- .../apache/james/transport/matchers/HasPriorityTest.java | 10 ++++++---- .../CassandraMailRepositoryWithFakeImplementationsTest.java | 2 -- 19 files changed, 35 insertions(+), 46 deletions(-) diff --git a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/search/ScrolledSearch.java b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/search/ScrolledSearch.java index bf015f6..3a083e0 100644 --- a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/search/ScrolledSearch.java +++ b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/search/ScrolledSearch.java @@ -102,6 +102,7 @@ public class ScrolledSearch { .flatMap(searchResponse -> Arrays.stream(searchResponse.getHits().getHits())); } + @SuppressWarnings("resource") public Stream<SearchResponse> searchResponses() { return new ScrollIterator(client, searchRequest) .stream(); diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java index 757369c..ffff560 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/DockerElasticSearch.java @@ -19,8 +19,6 @@ package org.apache.james.backends.es; -import static org.assertj.core.api.Assertions.assertThat; - import org.apache.http.HttpStatus; import org.apache.james.util.Host; import org.apache.james.util.docker.DockerContainer; @@ -29,6 +27,7 @@ import org.apache.james.util.docker.RateLimiters; import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy; import com.google.common.collect.ImmutableMap; + import feign.Feign; import feign.Logger; import feign.RequestLine; diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java index 0e02175..0b4f2be 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java @@ -26,7 +26,6 @@ import java.nio.charset.StandardCharsets; import java.time.ZoneId; import org.apache.james.backends.es.DockerElasticSearchRule; -import org.apache.james.backends.es.ElasticSearchConfiguration; import org.apache.james.backends.es.ElasticSearchIndexer; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSessionUtil; diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java index 49cfe24..a9ece3e 100644 --- a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java +++ b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java @@ -317,7 +317,6 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, class LifeCycleTest { private static final int THREAD_COUNT = 10; private static final int OPERATION_COUNT = 100000; - private static final int MAX_EVENT_DISPATCHED_COUNT = THREAD_COUNT * OPERATION_COUNT; private RabbitMQManagementAPI rabbitManagementAPI; diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java index 9bfe5ac..bdeaf8d 100644 --- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java +++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java @@ -23,10 +23,8 @@ import static org.mockito.Mockito.mock; import java.io.IOException; -import org.apache.james.backends.es.ClientProvider; import org.apache.james.backends.es.DockerElasticSearch; import org.apache.james.backends.es.DockerElasticSearchSingleton; -import org.apache.james.backends.es.ElasticSearchConfiguration; import org.apache.james.backends.es.ElasticSearchIndexer; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.memory.MemoryDomainList; diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java index 53aedfb..9edf24c 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java @@ -28,8 +28,6 @@ import java.nio.channels.SocketChannel; import java.nio.charset.Charset; import org.apache.james.backends.cassandra.init.configuration.ClusterConfiguration; -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.Host; diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java index 31ec83d..357f8db 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/RabbitMQJamesServerReprocessingTest.java @@ -70,9 +70,11 @@ class RabbitMQJamesServerReprocessingTest { @Test void reprocessingADeniedMailShouldNotLooseIt(GuiceJamesServer server) throws Exception { - new SMTPMessageSender("other.com") - .connect("127.0.0.1", server.getProbe(SmtpGuiceProbe.class).getSmtpPort()) - .sendMessage("den...@other.com", "a...@domain.tld"); + try (SMTPMessageSender smtpMessageSender = new SMTPMessageSender("other.com")) { + smtpMessageSender + .connect("127.0.0.1", server.getProbe(SmtpGuiceProbe.class).getSmtpPort()) + .sendMessage("den...@other.com", "a...@domain.tld"); + } MailRepositoryProbeImpl mailRepositoryProbe = server.getProbe(MailRepositoryProbeImpl.class); AWAIT.until(() -> mailRepositoryProbe.listMailKeys(SENDER_DENIED).size() == 1); diff --git a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java index 3d0aa24..7dba859 100644 --- a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java +++ b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java @@ -38,7 +38,6 @@ import org.apache.james.mailetcontainer.impl.JamesMailetContext; import org.apache.james.mailetcontainer.impl.MatcherMailetPair; import org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor; import org.apache.james.mailetcontainer.impl.camel.CamelMailetProcessor; -import org.apache.james.queue.api.MailQueueFactory; import org.apache.james.server.core.configuration.ConfigurationProvider; import org.apache.james.transport.mailets.RemoveMimeHeader; import org.apache.james.transport.matchers.All; @@ -101,7 +100,6 @@ public class CamelMailetContainerModule extends AbstractModule { private final CamelCompositeProcessor camelCompositeProcessor; private final JamesMailSpooler jamesMailSpooler; private final JamesMailetContext mailetContext; - private final MailQueueFactory<?> mailQueueFactory; private final DefaultProcessorsConfigurationSupplier defaultProcessorsConfigurationSupplier; private final Set<TransportProcessorCheck> transportProcessorCheckSet; @@ -110,14 +108,12 @@ public class CamelMailetContainerModule extends AbstractModule { CamelCompositeProcessor camelCompositeProcessor, JamesMailSpooler jamesMailSpooler, JamesMailetContext mailetContext, - MailQueueFactory<?> mailQueueFactory, Set<TransportProcessorCheck> transportProcessorCheckSet, DefaultProcessorsConfigurationSupplier defaultProcessorsConfigurationSupplier) { this.configurationProvider = configurationProvider; this.camelCompositeProcessor = camelCompositeProcessor; this.jamesMailSpooler = jamesMailSpooler; this.mailetContext = mailetContext; - this.mailQueueFactory = mailQueueFactory; this.transportProcessorCheckSet = transportProcessorCheckSet; this.defaultProcessorsConfigurationSupplier = defaultProcessorsConfigurationSupplier; } diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java index ad40b24..dc9bc4b 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerStartUpCheckTest.java @@ -26,8 +26,6 @@ import java.util.List; import java.util.stream.Stream; import org.apache.james.lifecycle.api.StartUpCheck; -import org.apache.james.mailbox.extractor.TextExtractor; -import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.BlobExportImplChoice; import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.Nested; diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java index 6e49658..4ad7122 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java @@ -6,8 +6,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.List; import org.apache.james.lifecycle.api.Startable; -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.ConfigurationPerformer; import org.junit.jupiter.api.Nested; diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java index 7e3878c..1a12e66 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java @@ -29,8 +29,6 @@ import java.util.concurrent.CountDownLatch; import javax.annotation.PreDestroy; import javax.inject.Inject; -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.WebAdminGuiceProbe; import org.apache.james.webadmin.WebAdminConfiguration; diff --git a/server/mailet/dkim/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java b/server/mailet/dkim/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java index 03f06dc..1b6754c 100644 --- a/server/mailet/dkim/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java +++ b/server/mailet/dkim/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java @@ -28,7 +28,6 @@ import java.util.Properties; import javax.mail.Session; import javax.mail.internet.MimeMessage; -import org.apache.james.jdkim.DKIMVerifier; import org.apache.james.jdkim.MockPublicKeyRecordRetriever; import org.apache.mailet.AttributeUtils; import org.apache.mailet.Mail; diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java index f686b66..6d3aa31 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java @@ -52,8 +52,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.google.inject.util.Modules; - public class DKIMIntegrationTest { private static final String FROM_LOCAL_PART = "fromUser"; diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ExtractAttributeStub.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ExtractAttributeStub.java index b5aecc0..5add691 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ExtractAttributeStub.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ExtractAttributeStub.java @@ -19,16 +19,16 @@ package org.apache.james.transport.mailets; +import java.util.Optional; +import java.util.function.Consumer; + +import javax.mail.MessagingException; + import org.apache.mailet.AttributeName; import org.apache.mailet.AttributeUtils; import org.apache.mailet.Mail; import org.apache.mailet.base.GenericMailet; -import javax.mail.MessagingException; - -import java.util.Optional; -import java.util.function.Consumer; - public class ExtractAttributeStub extends GenericMailet { private static Consumer<Optional<?>> dkimAuthResultInspector; diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailSpoolerTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailSpoolerTest.java index 783f57e..c26c001 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailSpoolerTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailSpoolerTest.java @@ -28,6 +28,12 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.util.ArrayList; +import java.util.Collection; +import java.util.function.Consumer; + +import javax.mail.MessagingException; + import org.apache.commons.configuration.plist.PropertyListConfiguration; import org.apache.james.mailetcontainer.api.MailProcessor; import org.apache.james.metrics.api.MetricFactory; @@ -39,13 +45,8 @@ import org.apache.mailet.base.test.FakeMail; import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; import org.junit.jupiter.api.Test; -import reactor.core.publisher.WorkQueueProcessor; -import javax.mail.MessagingException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; +import reactor.core.publisher.WorkQueueProcessor; class JamesMailSpoolerTest { private static final ConditionFactory CALMLY_AWAIT = Awaitility diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/AtLeastPriorityTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/AtLeastPriorityTest.java index 0b3d916..ff7960d 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/AtLeastPriorityTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/AtLeastPriorityTest.java @@ -18,11 +18,11 @@ ****************************************************************/ package org.apache.james.transport.matchers; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; + import javax.mail.MessagingException; -import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Before; -import org.junit.Test; import org.apache.james.core.MailAddress; import org.apache.james.queue.api.MailPrioritySupport; @@ -30,6 +30,8 @@ import org.apache.mailet.Attribute; import org.apache.mailet.AttributeValue; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; +import org.junit.Before; +import org.junit.Test; public class AtLeastPriorityTest { protected AtLeastPriority matcher; diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/AtMostPriorityTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/AtMostPriorityTest.java index cb9de9b..ef508e0 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/AtMostPriorityTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/AtMostPriorityTest.java @@ -18,19 +18,22 @@ ****************************************************************/ package org.apache.james.transport.matchers; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; + import javax.mail.MessagingException; + import org.apache.james.core.MailAddress; import org.apache.james.queue.api.MailPrioritySupport; import org.apache.mailet.Attribute; import org.apache.mailet.AttributeValue; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; -import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; -public class AtMostPriorityTest{ +public class AtMostPriorityTest { protected AtMostPriority matcher; protected MailAddress testRecipient; private final String condition = "5"; diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/HasPriorityTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/HasPriorityTest.java index d521db3..92ec67a 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/HasPriorityTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/HasPriorityTest.java @@ -18,18 +18,20 @@ ****************************************************************/ package org.apache.james.transport.matchers; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Collection; + +import javax.mail.MessagingException; + import org.apache.james.core.MailAddress; import org.apache.james.queue.api.MailPrioritySupport; import org.apache.mailet.Attribute; import org.apache.mailet.AttributeValue; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; - -import java.util.Collection; -import javax.mail.MessagingException; import org.junit.Before; import org.junit.Test; -import static org.assertj.core.api.Assertions.assertThat; public class HasPriorityTest { protected HasPriority matcher; diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java index 2ff4af2..4f0a73c 100644 --- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java +++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryWithFakeImplementationsTest.java @@ -49,8 +49,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.RegisterExtension; import com.datastax.driver.core.ResultSet; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org