You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2017/10/18 12:18:51 UTC
[7/8] james-project git commit: MAILBOX-312 Silent some Eclipse
warnings
MAILBOX-312 Silent some 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/6d4e32cb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6d4e32cb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6d4e32cb
Branch: refs/heads/master
Commit: 6d4e32cb5d7f2a2295a4930c9035bec609e261c7
Parents: 7f0d94f
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Tue Oct 17 15:49:29 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Wed Oct 18 14:18:05 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/james/mailbox/MailboxManagerTest.java | 10 +++++-----
.../james/mailbox/manager/ManagerTestResources.java | 10 +++++-----
.../james/mailbox/manager/QuotaMessageManagerTest.java | 6 +++---
.../search/LuceneMailboxMessageSearchIndexTest.java | 1 -
.../manager/InMemoryQuotaMailboxMessageManagerTest.java | 7 ++++---
.../mailbox/store/search/SimpleMessageSearchIndex.java | 1 -
.../james/mailbox/store/StoreMailboxManagerTest.java | 2 --
.../store/search/AbstractMessageSearchIndexTest.java | 3 ---
.../apache/james/imap/processor/DeleteACLProcessor.java | 1 -
.../transport/mailets/delivery/MailboxAppenderTest.java | 3 ++-
.../jmap/methods/SetMessagesDestructionProcessor.java | 1 -
.../apache/james/jmap/model/mailbox/MailboxNamespace.java | 1 +
12 files changed, 20 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
index 0528872..d4e722d 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
@@ -657,7 +657,7 @@ public abstract class MailboxManagerTest {
MailboxId delegatedMailboxId = mailboxManager.createMailbox(delegatedMailboxPath, sessionFromDelegater).get();
MessageManager delegatedMessageManager = mailboxManager.getMailbox(delegatedMailboxId, sessionFromDelegater);
- MessageId messageId = delegatedMessageManager.appendMessage(
+ delegatedMessageManager.appendMessage(
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()),
new Date(),
sessionFromDelegater,
@@ -692,7 +692,7 @@ public abstract class MailboxManagerTest {
MailboxId otherMailboxId = mailboxManager.createMailbox(otherMailboxPath, sessionFromDelegater).get();
MessageManager otherMailboxManager = mailboxManager.getMailbox(otherMailboxId, sessionFromDelegater);
- MessageId messageId = otherMailboxManager.appendMessage(
+ otherMailboxManager.appendMessage(
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()),
new Date(),
sessionFromDelegater,
@@ -719,7 +719,7 @@ public abstract class MailboxManagerTest {
MailboxId otherMailboxId = mailboxManager.createMailbox(otherMailboxPath, sessionFromDelegater).get();
MessageManager otherMessageManager = mailboxManager.getMailbox(otherMailboxId, sessionFromDelegater);
- MessageId messageId = otherMessageManager.appendMessage(
+ otherMessageManager.appendMessage(
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()),
new Date(),
sessionFromDelegater,
@@ -746,7 +746,7 @@ public abstract class MailboxManagerTest {
MailboxId otherMailboxId = mailboxManager.createMailbox(otherMailboxPath, session).get();
MessageManager otherMessageManager = mailboxManager.getMailbox(otherMailboxId, session);
- MessageId messageId = otherMessageManager.appendMessage(
+ otherMessageManager.appendMessage(
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()),
new Date(),
session,
@@ -773,7 +773,7 @@ public abstract class MailboxManagerTest {
MailboxId otherMailboxId = mailboxManager.createMailbox(otherMailboxPath, session).get();
MessageManager otherMessageManager = mailboxManager.getMailbox(otherMailboxId, session);
- MessageId messageId = otherMessageManager.appendMessage(
+ otherMessageManager.appendMessage(
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()),
new Date(),
session,
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
index 46edcb3..4a7bc0b 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
@@ -41,14 +41,14 @@ import org.apache.james.mailbox.quota.QuotaRootResolver;
/**
* Provide an initialized Mailbox environment where we can run managers tests
*/
-public class ManagerTestResources {
+public class ManagerTestResources<T extends MailboxManager> {
public static final String USER = "user@domain.org";
public static final String USER_PASS = "pass";
public static final String OTHER_USER = "otherUser@domain.org";
public static final String OTHER_USER_PASS = "otherPass";
- private MailboxManager mailboxManager;
+ private T mailboxManager;
private MailboxPath inbox;
private MessageManager messageManager;
@@ -61,9 +61,9 @@ public class ManagerTestResources {
private GroupMembershipResolver groupMembershipResolver;
private QuotaRootResolver quotaRootResolver;
- private IntegrationResources integrationResources;
+ private IntegrationResources<T> integrationResources;
- public ManagerTestResources(IntegrationResources integrationResources) throws Exception {
+ public ManagerTestResources(IntegrationResources<T> integrationResources) throws Exception {
this.integrationResources = integrationResources;
maxQuotaManager = integrationResources.createMaxQuotaManager();
groupMembershipResolver = integrationResources.createGroupMembershipResolver();
@@ -121,7 +121,7 @@ public class ManagerTestResources {
return session;
}
- public IntegrationResources getIntegrationResources() {
+ public IntegrationResources<T> getIntegrationResources() {
return integrationResources;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java
index f8cd26c..85931b7 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerTest.java
@@ -41,9 +41,9 @@ import javax.mail.Flags;
* Tests are performed with sufficient rights to ensure all underlying functions behave well.
* Quota are adjusted and we check that exceptions are well thrown.
*/
-public abstract class QuotaMessageManagerTest {
+public abstract class QuotaMessageManagerTest<T extends MailboxManager> {
- private ManagerTestResources resources;
+ private ManagerTestResources<T> resources;
private MessageManager messageManager;
private MailboxManager mailboxManager;
@@ -54,7 +54,7 @@ public abstract class QuotaMessageManagerTest {
private MailboxPath inbox;
private MailboxPath subFolder;
- protected abstract ManagerTestResources createResources() throws Exception;
+ protected abstract ManagerTestResources<T> createResources() throws Exception;
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
index 7439b8a..6d57fd7 100644
--- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
+++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
@@ -39,7 +39,6 @@ import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.model.MultimailboxesSearchQuery;
import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.mailbox.model.SearchQuery.AddressType;
import org.apache.james.mailbox.model.SearchQuery.DateResolution;
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java
index 8542a6b..2f3a0c9 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryQuotaMailboxMessageManagerTest.java
@@ -20,6 +20,7 @@ package org.apache.james.mailbox.inmemory.manager;
import org.apache.james.mailbox.manager.ManagerTestResources;
import org.apache.james.mailbox.manager.QuotaMessageManagerTest;
+import org.apache.james.mailbox.store.StoreMailboxManager;
/**
* Test for quota support upon basic MailboxMessage manager operation.
@@ -27,11 +28,11 @@ import org.apache.james.mailbox.manager.QuotaMessageManagerTest;
* Tests are performed with sufficient rights to ensure all underlying functions behave well.
* Quota are adjusted and we check that exceptions are well thrown.
*/
-public class InMemoryQuotaMailboxMessageManagerTest extends QuotaMessageManagerTest {
+public class InMemoryQuotaMailboxMessageManagerTest extends QuotaMessageManagerTest<StoreMailboxManager> {
@Override
- protected ManagerTestResources createResources() throws Exception {
- return new ManagerTestResources(new InMemoryIntegrationResources());
+ protected ManagerTestResources<StoreMailboxManager> createResources() throws Exception {
+ return new ManagerTestResources<StoreMailboxManager>(new InMemoryIntegrationResources());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/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 a4f57b6..bd72981 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
@@ -22,7 +22,6 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Optional;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.stream.Stream;
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
index 656fdd3..2e2b8fb 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
@@ -40,10 +40,8 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.MessageId.Factory;
import org.apache.james.mailbox.model.TestId;
-import org.apache.james.mailbox.model.search.MailboxNameExpression;
import org.apache.james.mailbox.model.search.MailboxQuery;
import org.apache.james.mailbox.model.search.PrefixedRegex;
-import org.apache.james.mailbox.model.search.PrefixedWildcard;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/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 4e117ce..7b4676e 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
@@ -37,11 +37,8 @@ import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.ComposedMessageId;
-import org.apache.james.mailbox.model.MailboxACL;
-import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.model.MultimailboxesSearchQuery;
import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.mailbox.model.SearchQuery.AddressType;
import org.apache.james.mailbox.model.SearchQuery.DateResolution;
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
index 0394a05..8526bf0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
@@ -38,7 +38,6 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
import org.apache.james.mailbox.exception.UnsupportedRightException;
import org.apache.james.mailbox.model.MailboxACL;
-import org.apache.james.mailbox.model.MailboxACL.EditMode;
import org.apache.james.mailbox.model.MailboxACL.EntryKey;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.metrics.api.MetricFactory;
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
index 1c26351..166ab55 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
@@ -33,6 +33,7 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.model.MessageResultIterator;
+import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.mailet.base.test.MimeMessageBuilder;
import org.junit.After;
import org.junit.Before;
@@ -65,7 +66,7 @@ public class MailboxAppenderTest {
integrationResources = new InMemoryIntegrationResources();
integrationResources.init();
- mailboxManager = new ManagerTestResources(integrationResources).getMailboxManager();
+ mailboxManager = new ManagerTestResources<StoreMailboxManager>(integrationResources).getMailboxManager();
testee = new MailboxAppender(mailboxManager);
session = mailboxManager.createSystemSession("TEST");
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesDestructionProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesDestructionProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesDestructionProcessor.java
index 74108e0..5a0a647 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesDestructionProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesDestructionProcessor.java
@@ -38,7 +38,6 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.metrics.api.MetricFactory;
-import org.apache.james.metrics.api.TimeMetric;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/james-project/blob/6d4e32cb/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxNamespace.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxNamespace.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxNamespace.java
index 8c3cfb9..75d4133 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxNamespace.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxNamespace.java
@@ -33,6 +33,7 @@ public class MailboxNamespace {
Delegated("Delegated"),
Personal("Personal");
+ @SuppressWarnings("unused")
private final String type;
Type(String type) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org