Repository: james-project Updated Branches: refs/heads/master 7ac76b489 -> 44728d3fc
MPT-36 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/02d415c3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/02d415c3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/02d415c3 Branch: refs/heads/master Commit: 02d415c35f96e8b07607ff2a5b609fc7c0d8b7c6 Parents: 7ac76b4 Author: Antoine Duprat <[email protected]> Authored: Wed Feb 22 14:23:21 2017 +0100 Committer: Antoine Duprat <[email protected]> Committed: Mon Feb 27 11:51:37 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/james/mailbox/MessageManager.java | 2 -- .../james/mailbox/cassandra/mail/CassandraMessageMapper.java | 5 +++-- .../james/mailbox/cassandra/mail/AttachmentLoaderTest.java | 1 - .../james/mailbox/store/search/SimpleMessageSearchIndex.java | 1 - .../mailbox/store/search/AbstractMessageSearchIndexTest.java | 2 +- .../test/java/org/apache/james/util/OptionalConverterTest.java | 1 - .../jmap/DefaultMailboxesProvisioningFilterThreadTest.java | 1 - 7 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/02d415c3/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java index 972b33c..596cb82 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java @@ -40,8 +40,6 @@ import org.apache.james.mailbox.model.MessageResult.FetchGroup; import org.apache.james.mailbox.model.MessageResultIterator; import org.apache.james.mailbox.model.SearchQuery; -import com.google.common.base.Objects; - /** * Interface which represent a Mailbox * http://git-wip-us.apache.org/repos/asf/james-project/blob/02d415c3/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java index 47fb80d..1a93e26 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java @@ -167,8 +167,9 @@ public class CassandraMessageMapper implements MessageMapper { messageRepresentions = messageDAO.retrieveMessages(messageIds, fetchType, limit).join(); if (fetchType == FetchType.Body || fetchType == FetchType.Full) { return CompletableFutureUtil.allOf(messageRepresentions - .map(pair -> attachmentLoader.getAttachments(pair.getRight().collect(Guavate.toImmutableList())) - .thenApply(attachments -> Pair.of(pair.getLeft(), attachments)))) + .map((Pair<CassandraMessageDAO.MessageWithoutAttachment, Stream<CassandraMessageDAO.MessageAttachmentRepresentation>> pair) -> + attachmentLoader.getAttachments(pair.getRight().collect(Guavate.toImmutableList())) + .thenApply(attachments -> Pair.of(pair.getLeft(), attachments)))) .join() .map(Throwing.function(pair -> pair.getLeft() .toMailboxMessage(pair.getRight() http://git-wip-us.apache.org/repos/asf/james-project/blob/02d415c3/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java index 0474727..a5bb631 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/AttachmentLoaderTest.java @@ -32,7 +32,6 @@ import org.apache.james.mailbox.model.Attachment; import org.apache.james.mailbox.model.AttachmentId; import org.apache.james.mailbox.model.Cid; import org.apache.james.mailbox.model.MessageAttachment; -import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.util.OptionalConverter; import org.assertj.core.data.MapEntry; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/02d415c3/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java index a3660f4..d95b22a 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java @@ -20,7 +20,6 @@ package org.apache.james.mailbox.store.search; import java.util.ArrayList; import java.util.EnumSet; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; http://git-wip-us.apache.org/repos/asf/james-project/blob/02d415c3/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java index 4b1ef79..785e216 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java @@ -276,7 +276,7 @@ public abstract class AbstractMessageSearchIndexTest { SearchQuery searchQuery = new SearchQuery(); - ComposedMessageId addedAfterDuplicatedMessage = myFolderMessageManager.appendMessage( + myFolderMessageManager.appendMessage( ClassLoader.getSystemResourceAsStream("eml/mail.eml"), new Date(1406930400000L), session, http://git-wip-us.apache.org/repos/asf/james-project/blob/02d415c3/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; http://git-wip-us.apache.org/repos/asf/james-project/blob/02d415c3/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java index c486baa..162bdb2 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java @@ -22,7 +22,6 @@ import java.util.EnumSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.NotImplementedException; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
