Repository: james-project Updated Branches: refs/heads/master 33419f67a -> c4e25df08
JAMES-2092 Fix 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/c4e25df0 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c4e25df0 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c4e25df0 Branch: refs/heads/master Commit: c4e25df0828fe61960e56a5dde390283afbef5bb Parents: 3c6ff2c Author: Antoine Duprat <[email protected]> Authored: Fri Jul 7 10:46:15 2017 +0200 Committer: Antoine Duprat <[email protected]> Committed: Thu Jul 13 11:22:15 2017 +0200 ---------------------------------------------------------------------- .../apache/james/mailbox/model/SearchQuery.java | 1 - .../mail/CassandraAnnotationMapper.java | 1 - mailbox/elasticsearch/pom.xml | 1 - .../elasticsearch/MailboxMappingFactory.java | 4 +--- .../mailbox/hbase/mail/HBaseMessageMapper.java | 1 - .../inmemory/mail/InMemoryMailboxMapper.java | 1 - .../james/mailbox/store/ResultHeader.java | 1 - .../comparator/AbstractHeaderComparator.java | 1 - .../AbstractMessageIdManagerSideEffectTest.java | 17 --------------- mailbox/tika/pom.xml | 1 - .../james/transport/mailets/ClamAVScan.java | 22 +++++++++----------- .../AbstractMessageRangeProcessor.java | 1 - .../james/imap/processor/AppendProcessor.java | 1 - .../james/imap/processor/MyRightsProcessor.java | 1 - .../imap/processor/SystemMessageProcessor.java | 1 - .../imap/processor/base/UidMsnConverter.java | 1 - .../processor/base/SelectedMailboxImplTest.java | 6 +++--- .../james/core/MimeMessageWrapperTest.java | 1 - .../modules/mailbox/CassandraMailboxModule.java | 1 - .../util/concurrency/ConcurrentTestRunner.java | 6 +++--- .../sieve/cassandra/CassandraSieveDAO.java | 2 -- .../apache/james/transport/mailets/Sieve.java | 9 -------- .../apache/james/jmap/model/MailboxFactory.java | 1 - .../apache/james/jmap/model/MessageFactory.java | 1 - .../netty/AbstractConfigurableAsyncServer.java | 1 - .../activemq/ActiveMQMailQueueBlobTest.java | 1 - .../queue/jms/AbstractJMSMailQueueTest.java | 2 -- 27 files changed, 17 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java index ebfd6f1..911063b 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java @@ -36,7 +36,6 @@ import org.apache.james.mailbox.MessageUid; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; /** * <p> http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java index 92aca6d..2cea9d4 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAnnotationMapper.java @@ -33,7 +33,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.table.CassandraAnnotationTable; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml index 6c527af..b564a86 100644 --- a/mailbox/elasticsearch/pom.xml +++ b/mailbox/elasticsearch/pom.xml @@ -215,7 +215,6 @@ <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> - <version>1.0.0</version> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java index e87f575..142736c 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java @@ -32,6 +32,7 @@ import static org.apache.james.backends.es.NodeMappingFactory.NOT_ANALYZED; import static org.apache.james.backends.es.NodeMappingFactory.PROPERTIES; import static org.apache.james.backends.es.NodeMappingFactory.RAW; import static org.apache.james.backends.es.NodeMappingFactory.SNOWBALL; +import static org.apache.james.backends.es.NodeMappingFactory.STRING; import static org.apache.james.backends.es.NodeMappingFactory.TYPE; import static org.apache.james.mailbox.elasticsearch.json.JsonMessageConstants.BCC; import static org.apache.james.mailbox.elasticsearch.json.JsonMessageConstants.CC; @@ -63,9 +64,6 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import java.io.IOException; -import static org.apache.james.backends.es.NodeMappingFactory.STRING; - -import org.apache.james.backends.es.IndexCreationFactory; import org.apache.james.backends.es.NodeMappingFactory; import org.apache.james.mailbox.elasticsearch.json.JsonMessageConstants.EMailer; import org.apache.james.mailbox.elasticsearch.json.JsonMessageConstants.Property; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java index 10e65ae..6c0843f 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java @@ -48,7 +48,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; import javax.mail.Flags; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java index b85cdef..7e7eb8e 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java @@ -35,7 +35,6 @@ import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import com.google.common.base.Objects; -import com.google.common.base.Optional; public class InMemoryMailboxMapper implements MailboxMapper { http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java index d01c13f..f289fe9 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MessageResult; public final class ResultHeader implements MessageResult.Header { http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java index 37f2c0f..7c76209 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java @@ -23,7 +23,6 @@ import java.util.Comparator; import java.util.List; import java.util.Locale; -import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MessageResult.Header; import org.apache.james.mailbox.store.ResultUtils; import org.apache.james.mailbox.store.mail.model.MailboxMessage; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java index 5aa005e..8c84b8a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java @@ -30,7 +30,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.List; -import java.util.Map; import javax.mail.Flags; @@ -61,8 +60,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; public abstract class AbstractMessageIdManagerSideEffectTest { @@ -149,11 +146,6 @@ public abstract class AbstractMessageIdManagerSideEffectTest { messageIdManager.setInMailboxes(messageId, ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - MessageResult messageResult = FluentIterable - .from(messageIdManager.getMessages(ImmutableList.of(messageId), FetchGroupImpl.MINIMAL, session)) - .filter(inMailbox(mailbox1.getMailboxId())) - .get(0); - verify(dispatcher).added(eq(session), eq(mailbox1), any(MailboxMessage.class)); verifyNoMoreInteractions(dispatcher); } @@ -325,15 +317,6 @@ public abstract class AbstractMessageIdManagerSideEffectTest { when(quotaManager.getStorageQuota(any(QuotaRoot.class))).thenReturn(QuotaImpl.unlimited()); } - private Predicate<MessageResult> inMailbox(final MailboxId mailboxId) { - return new Predicate<MessageResult>() { - @Override - public boolean apply(MessageResult input) { - return input.getMailboxId().equals(mailboxId); - } - }; - } - private SimpleMessageMetaData fromMessageResult(MessageId messageId, MessageResult messageResult) { return new SimpleMessageMetaData(messageResult.getUid(), messageResult.getModSeq(), messageResult.getFlags(), messageResult.getSize(), messageResult.getInternalDate(), messageId); } http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailbox/tika/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml index 37fa418..5598582 100644 --- a/mailbox/tika/pom.xml +++ b/mailbox/tika/pom.xml @@ -209,7 +209,6 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <version>1.3.1</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java index e8fe602..5d3fc8e 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java @@ -20,26 +20,14 @@ package org.apache.james.transport.mailets; -import org.apache.commons.io.IOUtils; -import org.apache.mailet.Experimental; -import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; -import org.apache.mailet.base.GenericMailet; -import org.apache.mailet.base.RFC2822Headers; - -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.Reader; import java.io.StringWriter; -import java.io.Writer; import java.net.ConnectException; import java.net.InetAddress; import java.net.Socket; @@ -48,6 +36,16 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; + +import org.apache.commons.io.IOUtils; +import org.apache.mailet.Experimental; +import org.apache.mailet.Mail; +import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericMailet; +import org.apache.mailet.base.RFC2822Headers; + /** * <P>Does an antivirus scan check using a ClamAV daemon (CLAMD)</P> http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java index 7a58e67..8663bb4 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java @@ -43,7 +43,6 @@ import org.apache.james.mailbox.model.MessageRange; import org.apache.james.metrics.api.MetricFactory; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; public abstract class AbstractMessageRangeProcessor<M extends AbstractMessageRangeRequest> extends AbstractMailboxProcessor<M> { http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java index 5bc46fd..d57adf5 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java @@ -46,7 +46,6 @@ import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.metrics.api.MetricFactory; -import org.slf4j.Logger; public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> { http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java index d011ff5..2f1c89a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java @@ -40,7 +40,6 @@ import org.apache.james.mailbox.model.MailboxACL.MailboxACLRights; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights; import org.apache.james.metrics.api.MetricFactory; -import org.slf4j.Logger; /** * MYRIGHTS Processor. http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java index 07f881c..2e1c28e 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java @@ -27,7 +27,6 @@ import org.apache.james.imap.processor.base.AbstractChainedProcessor; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; -import org.slf4j.Logger; /** * Processes system messages unrelated to IMAP. http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UidMsnConverter.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UidMsnConverter.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UidMsnConverter.java index 9e09053..fe8c519 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UidMsnConverter.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UidMsnConverter.java @@ -21,7 +21,6 @@ package org.apache.james.imap.processor.base; import java.util.ArrayList; import java.util.Collections; -import java.util.LinkedHashSet; import java.util.List; import java.util.TreeSet; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java index 33c61e4..8d005d6 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java @@ -146,10 +146,10 @@ public class SelectedMailboxImplTest { }; } - private Answer generateEmitEventAnswer(final AtomicInteger success) { - return new Answer() { + private Answer<Iterator<MessageUid>> generateEmitEventAnswer(final AtomicInteger success) { + return new Answer<Iterator<MessageUid>>() { @Override - public Object answer(InvocationOnMock invocation) throws Throwable { + public Iterator<MessageUid> answer(InvocationOnMock invocation) throws Throwable { Object[] args = invocation.getArguments(); final MailboxListener mailboxListener = (MailboxListener) args[1]; executorService.submit(new Runnable() { http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java index 75a29ba..449eedc 100644 --- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java +++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java @@ -21,7 +21,6 @@ package org.apache.james.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java index 2d06dbb..eefecf2 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java @@ -33,7 +33,6 @@ import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory; import org.apache.james.mailbox.cassandra.CassandraSubscriptionManager; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; -import org.apache.james.mailbox.cassandra.mail.CassandraMailboxDAO; import org.apache.james.mailbox.cassandra.mail.CassandraMailboxMapper; import org.apache.james.mailbox.cassandra.mail.CassandraMessageDAO; import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdDAO; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java b/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java index cc06686..ff50490 100644 --- a/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java +++ b/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java @@ -75,7 +75,7 @@ public class ConcurrentTestRunner { private final CountDownLatch countDownLatch; private final BiConsumer biConsumer; private final ExecutorService executorService; - private final List<Future> futures; + private final List<Future<?>> futures; public ConcurrentTestRunner(int threadCount, int operationCount, BiConsumer biConsumer) { Preconditions.checkArgument(threadCount > 0, "Thread count should be strictly positive"); @@ -86,7 +86,7 @@ public class ConcurrentTestRunner { this.countDownLatch = new CountDownLatch(threadCount); this.biConsumer = biConsumer; this.executorService = Executors.newFixedThreadPool(threadCount); - this.futures = new ArrayList<Future>(); + this.futures = new ArrayList<Future<?>>(); } public ConcurrentTestRunner run() { @@ -97,7 +97,7 @@ public class ConcurrentTestRunner { } public ConcurrentTestRunner assertNoException() throws ExecutionException, InterruptedException { - for (Future future: futures) { + for (Future<?> future: futures) { future.get(); } return this; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java index f15dba5..9e3c7aa 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java @@ -33,11 +33,9 @@ import static org.apache.james.sieve.cassandra.tables.CassandraSieveTable.SIZE; import static org.apache.james.sieve.cassandra.tables.CassandraSieveTable.TABLE_NAME; import static org.apache.james.sieve.cassandra.tables.CassandraSieveTable.USER_NAME; - import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; import javax.inject.Inject; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java index 21225b0..4f61488 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java @@ -19,30 +19,21 @@ package org.apache.james.transport.mailets; -import java.util.ArrayList; -import java.util.List; - import javax.inject.Inject; import javax.mail.MessagingException; import org.apache.commons.logging.Log; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.sieverepository.api.SieveRepository; -import org.apache.james.transport.mailets.delivery.MailStore; import org.apache.james.transport.mailets.jsieve.CommonsLoggingAdapter; import org.apache.james.transport.mailets.jsieve.ResourceLocator; import org.apache.james.transport.mailets.jsieve.delivery.SieveExecutor; import org.apache.james.transport.mailets.jsieve.delivery.SievePoster; import org.apache.james.user.api.UsersRepository; -import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.base.GenericMailet; -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.ImmutableList; - /** * Execute Sieve scripts for incoming emails, and set the result of the execution as attributes of the mail */ http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java index 6f4e9b1..119de23 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java @@ -35,7 +35,6 @@ import org.apache.james.mailbox.model.MailboxCounters; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxMetaData; import org.apache.james.mailbox.model.MailboxPath; -import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java index 18f4695..b5e5e1d 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java @@ -21,7 +21,6 @@ package org.apache.james.jmap.model; import java.io.IOException; import java.io.InputStream; import java.time.Instant; -import java.time.ZoneId; import java.util.Collection; import java.util.Date; import java.util.List; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java index c1ebb81..d72d53e 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java @@ -337,7 +337,6 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe * @throws ConfigurationException */ protected void configureHelloName(Configuration handlerConfiguration) throws ConfigurationException { - StringBuilder infoBuffer; String hostName; try { hostName = InetAddress.getLocalHost().getHostName(); http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java index b360913..a85b831 100644 --- a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java +++ b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java @@ -26,7 +26,6 @@ import java.io.InputStream; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.commons.io.FileUtils; import org.apache.james.filesystem.api.FileSystem; -import org.apache.james.queue.jms.JMSMailQueue; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e25df0/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java index 52b1aef..1e8b0c5 100644 --- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java +++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java @@ -30,7 +30,6 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.Properties; import java.util.UUID; -import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import javax.jms.ConnectionFactory; @@ -49,7 +48,6 @@ import org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator; import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
