Repository: james-project Updated Branches: refs/heads/master 11071d5cc -> fdc98fbcc
remove eclipse warnings introduced recently Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fdc98fbc Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fdc98fbc Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fdc98fbc Branch: refs/heads/master Commit: fdc98fbcc6f32db359398e92c1b768bf1dd78bfd Parents: 11071d5 Author: Matthieu Baechler <[email protected]> Authored: Mon Mar 7 15:14:17 2016 +0100 Committer: Matthieu Baechler <[email protected]> Committed: Mon Mar 7 15:14:17 2016 +0100 ---------------------------------------------------------------------- .../inmemory/manager/InMemoryIntegrationResources.java | 3 --- .../org/apache/james/mailbox/store/MessageBatcher.java | 1 - .../apache/james/mailbox/store/StoreMessageManager.java | 6 +----- .../apache/james/mailbox/store/MessageBatcherTest.java | 2 +- .../java/org/apache/james/mpt/smtp/SmtpTestModule.java | 1 - .../james/imap/decode/parser/CopyCommandParser.java | 4 ---- .../imap/message/request/AbstractMessageRangeRequest.java | 1 - .../apache/james/sieverepository/api/SieveRepository.java | 1 - .../sieverepository/file/SieveDefaultRepository.java | 1 - .../org/apache/james/transport/mailets/SieveMailet.java | 10 +++++----- 10 files changed, 7 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java index b9c6f9d..a1d5104 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java @@ -26,7 +26,6 @@ import org.apache.james.mailbox.acl.UnionMailboxACLResolver; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.inmemory.InMemoryMailboxManager; -import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory; import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager; import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager; import org.apache.james.mailbox.manager.IntegrationResources; @@ -34,7 +33,6 @@ import org.apache.james.mailbox.manager.ManagerTestResources; import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; -import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.MockAuthenticator; import org.apache.james.mailbox.store.NoMailboxPathLocker; import org.apache.james.mailbox.store.StoreMailboxManager; @@ -52,7 +50,6 @@ public class InMemoryIntegrationResources implements IntegrationResources { public MailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver) throws MailboxException { MockAuthenticator mockAuthenticator = new MockAuthenticator(); mockAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS); - MailboxSessionMapperFactory<InMemoryId> factory = new InMemoryMailboxSessionMapperFactory(); final StoreMailboxManager<InMemoryId> manager = new InMemoryMailboxManager( mockAuthenticator, new NoMailboxPathLocker(), http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java index 0631f02..d4e3d6a 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MessageRange; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.msgpack.core.Preconditions; public class MessageBatcher { http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java index 6b842bb..75ecafb 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java @@ -51,7 +51,6 @@ import org.apache.james.mailbox.exception.ReadOnlyException; import org.apache.james.mailbox.exception.UnsupportedRightException; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxACL.MailboxACLRights; -import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageMetaData; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.model.MessageResult.FetchGroup; @@ -65,8 +64,8 @@ import org.apache.james.mailbox.store.event.MailboxEventDispatcher; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; import org.apache.james.mailbox.store.mail.MessageMapperFactory; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.mail.model.Mailbox; +import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage; @@ -84,9 +83,6 @@ import org.apache.james.mime4j.stream.MimeConfig; import org.apache.james.mime4j.stream.MimeTokenStream; import org.apache.james.mime4j.stream.RecursionMode; -import com.google.common.base.Function; -import com.google.common.collect.Iterators; - /** * Base class for {@link org.apache.james.mailbox.MessageManager} * implementations. http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java index 7de44ee..6d6f455 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java @@ -65,7 +65,7 @@ public class MessageBatcherTest { @Test(expected = IllegalArgumentException.class) public void messageBatcherShouldThrowOnNegativeBatchSize() throws Exception { - MessageBatcher messageBatcher = new MessageBatcher(-1); + new MessageBatcher(-1); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java index 76ac6e9..6a0203d 100644 --- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java +++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java @@ -19,7 +19,6 @@ package org.apache.james.mpt.smtp; import java.io.IOException; -import java.util.Optional; import org.apache.james.CassandraJamesServerMain; import org.apache.james.backends.cassandra.CassandraCluster; http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java index 0487839..331898c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/CopyCommandParser.java @@ -20,12 +20,8 @@ package org.apache.james.imap.decode.parser; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; -import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.message.IdRange; -import org.apache.james.imap.api.process.ImapSession; -import org.apache.james.imap.decode.ImapRequestLineReader; import org.apache.james.imap.message.request.CopyRequest; -import org.apache.james.protocols.imap.DecodingException; /** * Parse COPY commands http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractMessageRangeRequest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractMessageRangeRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractMessageRangeRequest.java index a6c56c1..21bbdd9 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractMessageRangeRequest.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/AbstractMessageRangeRequest.java @@ -26,7 +26,6 @@ import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.message.IdRange; import com.google.common.base.Objects; -import com.google.common.hash.HashCode; public abstract class AbstractMessageRangeRequest extends AbstractImapRequest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java index f85cbb6..1806077 100644 --- a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java +++ b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java @@ -21,7 +21,6 @@ package org.apache.james.sieverepository.api; import java.io.InputStream; -import java.util.Date; import java.util.List; import org.apache.james.sieverepository.api.exception.DuplicateException; http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java index bd2aebe..469b8c3 100644 --- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java @@ -24,7 +24,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import java.util.Date; import java.util.List; import javax.inject.Inject; http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc98fbc/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java index e0678e3..dcf6f26 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java @@ -18,6 +18,11 @@ ****************************************************************/ package org.apache.james.transport.mailets; +import java.util.Date; + +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; + import org.apache.james.core.MimeMessageInputStream; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; @@ -26,7 +31,6 @@ import org.apache.james.mailbox.exception.BadCredentialsException; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.sieverepository.api.SieveRepository; import org.apache.james.transport.util.MailetContextLog; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; @@ -37,10 +41,6 @@ import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.MailetConfig; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import java.util.Date; - /** * Contains resource bindings. */ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
