Repository: james-project Updated Branches: refs/heads/master db703cd06 -> 4b3a42952
JAMES-1896 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/4b3a4295 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4b3a4295 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4b3a4295 Branch: refs/heads/master Commit: 4b3a4295293db821a61621be98b228bd1cdd5217 Parents: 9bc0442 Author: Antoine Duprat <[email protected]> Authored: Thu Dec 22 15:30:54 2016 +0100 Committer: Antoine Duprat <[email protected]> Committed: Fri Dec 23 11:10:04 2016 +0100 ---------------------------------------------------------------------- .../CassandraMessageIdManagerTestSystem.java | 1 - .../mailbox/inmemory/InMemoryMessageIdManager.java | 14 -------------- .../mailbox/store/mail/model/MessageIdMapperTest.java | 5 +---- .../cucumber/CassandraDownloadCucumberTest.java | 1 - .../cucumber/CassandraGetMessagesMethodTest.java | 1 - .../CassandraSetMailboxesMethodCucumberTest.java | 1 - .../cucumber/CassandraUploadCucumberTest.java | 1 - 7 files changed, 1 insertion(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4b3a4295/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java index b5faa01..b29a8d1 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java @@ -65,7 +65,6 @@ import com.google.common.base.Charsets; import com.google.common.base.Throwables; public class CassandraMessageIdManagerTestSystem extends MessageIdManagerTestSystem { - private static final long UID_VALIDITY = 18L; private static final CassandraCluster CASSANDRA = CassandraCluster.create(new CassandraModuleComposite( new CassandraAclModule(), http://git-wip-us.apache.org/repos/asf/james-project/blob/4b3a4295/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java index 4d40e1b..4de6ba9 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java @@ -45,7 +45,6 @@ import org.apache.james.mailbox.model.MessageResult.FetchGroup; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; -import com.google.common.base.Throwables; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -137,19 +136,6 @@ public class InMemoryMessageIdManager implements MessageIdManager { }; } - private Function<MailboxPath, MailboxId> getMailboxIdFromMailboxPath(final MailboxSession mailboxSession) { - return new Function<MailboxPath, MailboxId>() { - @Override - public MailboxId apply(MailboxPath input) { - try { - return mailboxManager.getMailbox(input, mailboxSession).getId(); - } catch (MailboxException e) { - throw Throwables.propagate(e); - } - } - }; - } - private MailboxQuery userMailboxes(MailboxSession mailboxSession) { return MailboxQuery.builder() .matchesAll() http://git-wip-us.apache.org/repos/asf/james-project/blob/4b3a4295/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java index 8df5433..a8b3da0 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java @@ -392,10 +392,7 @@ public class MessageIdMapperTest<T extends MapperProvider> { .add("userflag") .build(); - Map<MailboxId, UpdatedFlags> flags = sut.setFlags(messageId, ImmutableList.of(message1.getMailboxId()), newFlags, FlagsUpdateMode.REMOVE); - - long modSeq = mapperProvider.highestModSeq(benwaInboxMailbox); - UpdatedFlags expectedUpdatedFlags = new UpdatedFlags(message1.getUid(), modSeq, messageFlags, new Flags(Flags.Flag.RECENT)); + sut.setFlags(messageId, ImmutableList.of(message1.getMailboxId()), newFlags, FlagsUpdateMode.REMOVE); List<MailboxMessage> messages = sut.find(ImmutableList.of(messageId), MessageMapper.FetchType.Body); assertThat(messages).hasSize(1); http://git-wip-us.apache.org/repos/asf/james-project/blob/4b3a4295/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java index 55b28b2..e8c62e6 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java @@ -19,7 +19,6 @@ package org.apache.james.jmap.cassandra.cucumber; -import org.junit.Ignore; import org.junit.runner.RunWith; import cucumber.api.CucumberOptions; http://git-wip-us.apache.org/repos/asf/james-project/blob/4b3a4295/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java index 9d25378..f43d624 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java @@ -19,7 +19,6 @@ package org.apache.james.jmap.cassandra.cucumber; -import org.junit.Ignore; import org.junit.runner.RunWith; import cucumber.api.CucumberOptions; http://git-wip-us.apache.org/repos/asf/james-project/blob/4b3a4295/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java index 7bc43e6..3d0af24 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java @@ -19,7 +19,6 @@ package org.apache.james.jmap.cassandra.cucumber; -import org.junit.Ignore; import org.junit.runner.RunWith; import cucumber.api.CucumberOptions; http://git-wip-us.apache.org/repos/asf/james-project/blob/4b3a4295/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java index c54f778..10e5d6c 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java @@ -19,7 +19,6 @@ package org.apache.james.jmap.cassandra.cucumber; -import org.junit.Ignore; import org.junit.runner.RunWith; import cucumber.api.CucumberOptions; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
