JAMES-1925 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/8e9e40a8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8e9e40a8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8e9e40a8 Branch: refs/heads/master Commit: 8e9e40a847c0a652c137786d67490ee6a31cb494 Parents: f518297 Author: Antoine Duprat <[email protected]> Authored: Wed Feb 15 11:57:41 2017 +0100 Committer: Antoine Duprat <[email protected]> Committed: Wed Feb 15 13:12:39 2017 +0100 ---------------------------------------------------------------------- .../CassandraMailboxSessionMapperFactory.java | 11 +++-------- .../cassandra/modules/CassandraMailboxModule.java | 16 +++++++--------- .../cassandra/CassandraMailboxManagerTest.java | 1 - .../cassandra/CassandraSubscriptionManagerTest.java | 1 - .../cassandra/CassandraTestSystemFixture.java | 1 - .../mail/CassandraMailboxManagerAttachmentTest.java | 1 - .../cassandra/mail/CassandraMapperProvider.java | 1 - .../james/mailbox/store/StoreMessageIdManager.java | 1 - .../james/mailbox/store/quota/QuotaChecker.java | 1 - .../imapmailbox/cassandra/CassandraMailboxTest.java | 2 +- .../cassandra/host/CassandraHostSystem.java | 2 +- .../apache/james/util/CompletableFutureUtil.java | 2 +- .../apache/james/util/OptionalConverterTest.java | 1 - 13 files changed, 13 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java index 9d41a9c..07e51e7 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java @@ -22,7 +22,6 @@ package org.apache.james.mailbox.cassandra; import javax.inject.Inject; import javax.inject.Named; -import org.apache.james.backends.cassandra.init.CassandraTypesProvider; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.cassandra.mail.CassandraAnnotationMapper; import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentMapper; @@ -60,7 +59,6 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa private final Session session; private final UidProvider uidProvider; private final ModSeqProvider modSeqProvider; - private final CassandraTypesProvider typesProvider; private final CassandraMessageDAO messageDAO; private final CassandraMessageIdDAO messageIdDAO; private final CassandraMessageIdToImapUidDAO imapUidDAO; @@ -72,8 +70,7 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa private int maxRetry; @Inject - public CassandraMailboxSessionMapperFactory(UidProvider uidProvider, ModSeqProvider modSeqProvider, - Session session, CassandraTypesProvider typesProvider, + public CassandraMailboxSessionMapperFactory(UidProvider uidProvider, ModSeqProvider modSeqProvider, Session session, CassandraMessageDAO messageDAO, CassandraMessageIdDAO messageIdDAO, CassandraMessageIdToImapUidDAO imapUidDAO, CassandraMailboxCounterDAO mailboxCounterDAO, CassandraMailboxRecentsDAO mailboxRecentsDAO, CassandraMailboxDAO mailboxDAO, CassandraMailboxPathDAO mailboxPathDAO, @Named(CassandraMailboxDAO.MAX_ACL_RETRY) Integer maxRetry) { @@ -89,15 +86,13 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa this.mailboxPathDAO = mailboxPathDAO; this.indexTableHandler = new CassandraIndexTableHandler(mailboxRecentsDAO, mailboxCounterDAO); this.maxRetry = maxRetry; - this.typesProvider = typesProvider; } - public CassandraMailboxSessionMapperFactory(UidProvider uidProvider, ModSeqProvider modSeqProvider, - Session session, CassandraTypesProvider typesProvider, + public CassandraMailboxSessionMapperFactory(UidProvider uidProvider, ModSeqProvider modSeqProvider, Session session, CassandraMessageDAO messageDAO, CassandraMessageIdDAO messageIdDAO, CassandraMessageIdToImapUidDAO imapUidDAO, CassandraMailboxCounterDAO mailboxCounterDAO, CassandraMailboxRecentsDAO mailboxRecentsDAO, CassandraMailboxDAO mailboxDAO, CassandraMailboxPathDAO mailboxPathDAO) { - this(uidProvider, modSeqProvider, session, typesProvider, messageDAO, messageIdDAO, imapUidDAO, mailboxCounterDAO, + this(uidProvider, modSeqProvider, session, messageDAO, messageIdDAO, imapUidDAO, mailboxCounterDAO, mailboxRecentsDAO, mailboxDAO, mailboxPathDAO, DEFAULT_MAX_RETRY); } http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java index 566992a..80ec6a1 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java @@ -19,8 +19,11 @@ package org.apache.james.mailbox.cassandra.modules; -import com.datastax.driver.core.schemabuilder.SchemaBuilder; -import com.google.common.collect.ImmutableList; +import static com.datastax.driver.core.DataType.bigint; +import static com.datastax.driver.core.DataType.text; +import static com.datastax.driver.core.DataType.timeuuid; + +import java.util.List; import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -29,13 +32,8 @@ import org.apache.james.backends.cassandra.components.CassandraType; import org.apache.james.mailbox.cassandra.table.CassandraMailboxPathTable; import org.apache.james.mailbox.cassandra.table.CassandraMailboxTable; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static com.datastax.driver.core.DataType.bigint; -import static com.datastax.driver.core.DataType.text; -import static com.datastax.driver.core.DataType.timeuuid; +import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraMailboxModule implements CassandraModule { http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java index ab76b26..1a57076 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java @@ -94,7 +94,6 @@ public class CassandraMailboxManagerTest { CassandraMailboxSessionMapperFactory mapperFactory = new CassandraMailboxSessionMapperFactory(uidProvider, modSeqProvider, CASSANDRA.getConf(), - CASSANDRA.getTypesProvider(), messageDAO, messageIdDAO, imapUidDAO, http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java index 246b28d..29c0785 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java @@ -58,7 +58,6 @@ public class CassandraSubscriptionManagerTest extends AbstractSubscriptionManage new CassandraUidProvider(cassandra.getConf()), new CassandraModSeqProvider(cassandra.getConf()), cassandra.getConf(), - cassandra.getTypesProvider(), messageDAO, messageIdDAO, imapUidDAO, http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java index c18d540..a6f6214 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java @@ -80,7 +80,6 @@ public class CassandraTestSystemFixture { return new CassandraMailboxSessionMapperFactory(uidProvider, modSeqProvider, CASSANDRA.getConf(), - CASSANDRA.getTypesProvider(), messageDAO, messageIdDAO, imapUidDAO, http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java index 56f862d..e220626 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java @@ -68,7 +68,6 @@ public class CassandraMailboxManagerAttachmentTest extends AbstractMailboxManage new CassandraUidProvider(cassandra.getConf()), new CassandraModSeqProvider(cassandra.getConf()), cassandra.getConf(), - cassandra.getTypesProvider(), new CassandraMessageDAO(cassandra.getConf(), cassandra.getTypesProvider(), messageIdFactory), new CassandraMessageIdDAO(cassandra.getConf(), messageIdFactory), new CassandraMessageIdToImapUidDAO(cassandra.getConf(), messageIdFactory), http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java index 0342f18..a43fb88 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java @@ -102,7 +102,6 @@ public class CassandraMapperProvider implements MapperProvider { new CassandraUidProvider(cassandra.getConf()), cassandraModSeqProvider, cassandra.getConf(), - cassandra.getTypesProvider(), new CassandraMessageDAO(cassandra.getConf(), cassandra.getTypesProvider(), MESSAGE_ID_FACTORY), new CassandraMessageIdDAO(cassandra.getConf(), MESSAGE_ID_FACTORY), new CassandraMessageIdToImapUidDAO(cassandra.getConf(), MESSAGE_ID_FACTORY), http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java index cde6f3b..2a63dd5 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java @@ -37,7 +37,6 @@ import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.MailboxId; -import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageAttachment; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.MessageMetaData; http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaChecker.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaChecker.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaChecker.java index c5a73b4..25e768d 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaChecker.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaChecker.java @@ -21,7 +21,6 @@ package org.apache.james.mailbox.store.quota; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.OverQuotaException; -import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.quota.QuotaManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java index cc4d60d..ee8d4c9 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java @@ -20,7 +20,6 @@ package org.apache.james.mpt.imapmailbox.cassandra; import org.apache.james.mpt.imapmailbox.AbstractMailboxTest; -import org.apache.james.mpt.imapmailbox.suite.MailboxWithLongNameError; import org.apache.james.mpt.imapmailbox.suite.AuthenticatePlain; import org.apache.james.mpt.imapmailbox.suite.AuthenticatedState; import org.apache.james.mpt.imapmailbox.suite.ConcurrentSessions; @@ -32,6 +31,7 @@ import org.apache.james.mpt.imapmailbox.suite.FetchBodyStructure; import org.apache.james.mpt.imapmailbox.suite.FetchHeaders; import org.apache.james.mpt.imapmailbox.suite.Listing; import org.apache.james.mpt.imapmailbox.suite.MailboxAnnotation; +import org.apache.james.mpt.imapmailbox.suite.MailboxWithLongNameError; import org.apache.james.mpt.imapmailbox.suite.Move; import org.apache.james.mpt.imapmailbox.suite.NonAuthenticatedState; import org.apache.james.mpt.imapmailbox.suite.PartialFetch; http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java index 971139b..ea3e2ae 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java @@ -104,7 +104,7 @@ public class CassandraHostSystem extends JamesImapHostSystem { CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(session, typesProvider); CassandraMailboxSessionMapperFactory mapperFactory = new CassandraMailboxSessionMapperFactory(uidProvider, modSeqProvider, - session, typesProvider, messageDAO, messageIdDAO, imapUidDAO, mailboxCounterDAO, mailboxRecentsDAO, mailboxDAO, mailboxPathDAO); + session, messageDAO, messageIdDAO, imapUidDAO, mailboxCounterDAO, mailboxRecentsDAO, mailboxDAO, mailboxPathDAO); mailboxManager = new CassandraMailboxManager(mapperFactory, authenticator, authorizator, new JVMMailboxPathLocker(), new MessageParser(), messageIdFactory); QuotaRootResolver quotaRootResolver = new DefaultQuotaRootResolver(mapperFactory); http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/server/container/util-java8/src/main/java/org/apache/james/util/CompletableFutureUtil.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/CompletableFutureUtil.java b/server/container/util-java8/src/main/java/org/apache/james/util/CompletableFutureUtil.java index 2d114ab..651e1c6 100644 --- a/server/container/util-java8/src/main/java/org/apache/james/util/CompletableFutureUtil.java +++ b/server/container/util-java8/src/main/java/org/apache/james/util/CompletableFutureUtil.java @@ -26,7 +26,7 @@ public class CompletableFutureUtil { public static <T> CompletableFuture<Stream<T>> allOf(Stream<CompletableFuture<T>> futureStream) { return futureStream - .map(future -> future.thenApply(Stream::of)) + .map((CompletableFuture<T> future) -> future.thenApply(Stream::of)) .reduce((future1, future2) -> future1.thenCompose( stream1 -> future2.thenCompose( http://git-wip-us.apache.org/repos/asf/james-project/blob/8e9e40a8/server/container/util-java8/src/test/java/org/apache/james/util/OptionalConverterTest.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/OptionalConverterTest.java b/server/container/util-java8/src/test/java/org/apache/james/util/OptionalConverterTest.java index 5356f63..baa3aa0 100644 --- a/server/container/util-java8/src/test/java/org/apache/james/util/OptionalConverterTest.java +++ b/server/container/util-java8/src/test/java/org/apache/james/util/OptionalConverterTest.java @@ -21,7 +21,6 @@ package org.apache.james.util; import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; -import java.util.stream.Collectors; import org.junit.Rule; import org.junit.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
