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 bt...@apache.org on 2018/06/19 08:11:37 UTC
[09/11] james-project git commit: JAMES-2414 Somve various intelliJ
warnings
JAMES-2414 Somve various intelliJ warnings
- Uneeded exception
- FQDNs
- final qualifiers
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/71c4d395
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/71c4d395
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/71c4d395
Branch: refs/heads/master
Commit: 71c4d395ac20203a831e77de8fca28662192a078
Parents: 0c84c45
Author: benwa <bt...@linagora.com>
Authored: Mon Jun 18 10:18:59 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jun 19 15:09:53 2018 +0700
----------------------------------------------------------------------
.../james/mailbox/cassandra/CassandraMailboxManager.java | 5 ++---
.../james/mailbox/cassandra/CassandraMessageManager.java | 2 +-
.../org/apache/james/mailbox/hbase/HBaseMailboxManager.java | 4 ++--
.../org/apache/james/mailbox/hbase/HBaseMessageManager.java | 5 ++---
.../java/org/apache/james/mailbox/jcr/JCRMailboxManager.java | 7 +++----
.../java/org/apache/james/mailbox/jcr/JCRMessageManager.java | 4 ++--
.../java/org/apache/james/mailbox/jpa/JPAMessageManager.java | 6 +++---
.../james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java | 3 +--
.../james/mailbox/jpa/openjpa/OpenJPAMessageManager.java | 2 +-
.../apache/james/mailbox/inmemory/InMemoryMailboxManager.java | 3 +--
.../apache/james/mailbox/inmemory/InMemoryMessageManager.java | 3 ++-
.../org/apache/james/mailbox/store/StoreMessageManager.java | 3 +--
12 files changed, 21 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
index aded5ad..7b071a5 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
@@ -26,7 +26,6 @@ import javax.inject.Inject;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageId;
@@ -96,14 +95,14 @@ public class CassandraMailboxManager extends StoreMailboxManager {
}
@Override
- protected Mailbox doCreateMailbox(MailboxPath mailboxPath, MailboxSession session) throws MailboxException {
+ protected Mailbox doCreateMailbox(MailboxPath mailboxPath, MailboxSession session) {
SimpleMailbox cassandraMailbox = new SimpleMailbox(mailboxPath, randomUidValidity());
cassandraMailbox.setACL(MailboxACL.EMPTY);
return cassandraMailbox;
}
@Override
- protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) throws MailboxException {
+ protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) {
return new CassandraMessageManager(mapperFactory,
getMessageSearchIndex(),
getEventDispatcher(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java
index f396f1c..5ce4286 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java
@@ -54,7 +54,7 @@ public class CassandraMessageManager extends StoreMessageManager {
MailboxEventDispatcher dispatcher, MailboxPathLocker locker, Mailbox mailbox, QuotaManager quotaManager,
QuotaRootResolver quotaRootResolver, MessageParser messageParser, MessageId.Factory messageIdFactory,
BatchSizes batchSizes, ImmutableMailboxMessage.Factory immutableMailboxMessageFactory,
- StoreRightManager storeRightManager) throws MailboxException {
+ StoreRightManager storeRightManager) {
super(CassandraMailboxManager.MESSAGE_CAPABILITIES, mapperFactory, index, dispatcher, locker, mailbox,
quotaManager, quotaRootResolver, messageParser, messageIdFactory, batchSizes, immutableMailboxMessageFactory, storeRightManager);
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java
index eba9b3e..5606185 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java
@@ -74,7 +74,7 @@ public class HBaseMailboxManager extends StoreMailboxManager {
*/
public void deleteEverything(MailboxSession mailboxSession) throws MailboxException {
- final HBaseMailboxMapper mapper = (HBaseMailboxMapper) getMapperFactory().getMailboxMapper(mailboxSession);
+ HBaseMailboxMapper mapper = (HBaseMailboxMapper) getMapperFactory().getMailboxMapper(mailboxSession);
mapper.execute(Mapper.toTransaction(mapper::deleteAllMemberships));
mapper.execute(Mapper.toTransaction(mapper::deleteAllMailboxes));
@@ -86,7 +86,7 @@ public class HBaseMailboxManager extends StoreMailboxManager {
}
@Override
- protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) throws MailboxException {
+ protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) {
return new HBaseMessageManager(getMapperFactory(),
getMessageSearchIndex(),
getEventDispatcher(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
index 7e26219..be64742 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
@@ -22,7 +22,6 @@ import javax.mail.Flags;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
@@ -53,10 +52,10 @@ public class HBaseMessageManager extends StoreMessageManager {
MessageId.Factory messageIdFactory,
BatchSizes batchSizes,
ImmutableMailboxMessage.Factory immutableMailboxMessageFactory,
- StoreRightManager storeRightManager) throws MailboxException {
+ StoreRightManager storeRightManager) {
+
super(HBaseMailboxManager.DEFAULT_NO_MESSAGE_CAPABILITIES, mapperFactory, index, dispatcher, locker, mailbox, quotaManager,
quotaRootResolver, messageParser, messageIdFactory, batchSizes, immutableMailboxMessageFactory, storeRightManager);
-
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
index 42acd3d..373f947 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
@@ -22,7 +22,6 @@ import java.util.EnumSet;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jcr.mail.model.JCRMailbox;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageId;
@@ -63,7 +62,7 @@ public class JCRMailboxManager extends StoreMailboxManager implements JCRImapCon
}
@Override
- protected StoreMessageManager createMessageManager(Mailbox mailboxEntity, MailboxSession session) throws MailboxException {
+ protected StoreMessageManager createMessageManager(Mailbox mailboxEntity, MailboxSession session) {
return new JCRMessageManager(getMapperFactory(),
getMessageSearchIndex(),
getEventDispatcher(),
@@ -79,8 +78,8 @@ public class JCRMailboxManager extends StoreMailboxManager implements JCRImapCon
}
@Override
- protected Mailbox doCreateMailbox(MailboxPath path, MailboxSession session) throws MailboxException {
- return new org.apache.james.mailbox.jcr.mail.model.JCRMailbox(path, randomUidValidity());
+ protected Mailbox doCreateMailbox(MailboxPath path, MailboxSession session) {
+ return new JCRMailbox(path, randomUidValidity());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
index f859afd..1c50328 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
@@ -61,8 +61,8 @@ public class JCRMessageManager extends StoreMessageManager {
MessageId.Factory messageIdFactory,
BatchSizes batchSizes,
ImmutableMailboxMessage.Factory immutableMailboxMessageFactory,
- StoreRightManager storeRightManager)
- throws MailboxException {
+ StoreRightManager storeRightManager) {
+
super(JCRMailboxManager.DEFAULT_NO_MESSAGE_CAPABILITIES, mapperFactory, index, dispatcher, locker, mailbox, quotaManager,
quotaRootResolver, messageParser, messageIdFactory, batchSizes, immutableMailboxMessageFactory, storeRightManager);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
index 77feb6d..c19d0bc 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
@@ -52,16 +52,16 @@ public class JPAMessageManager extends StoreMessageManager {
public JPAMessageManager(MailboxSessionMapperFactory mapperFactory,
MessageSearchIndex index,
- final MailboxEventDispatcher dispatcher,
+ MailboxEventDispatcher dispatcher,
MailboxPathLocker locker,
- final Mailbox mailbox,
+ Mailbox mailbox,
QuotaManager quotaManager,
QuotaRootResolver quotaRootResolver,
MessageParser messageParser,
MessageId.Factory messageIdFactory,
BatchSizes batchSizes,
ImmutableMailboxMessage.Factory immutableMailboxMessageFactory,
- StoreRightManager storeRightManager) throws MailboxException {
+ StoreRightManager storeRightManager) {
super(JPAMailboxManager.DEFAULT_NO_MESSAGE_CAPABILITIES, mapperFactory, index, dispatcher, locker, mailbox,
quotaManager, quotaRootResolver, messageParser, messageIdFactory, batchSizes, immutableMailboxMessageFactory, storeRightManager);
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
index fcfde56..1c88d21 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
@@ -22,7 +22,6 @@ package org.apache.james.mailbox.jpa.openjpa;
import javax.inject.Inject;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.JPAMailboxManager;
import org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMessageManager.AdvancedFeature;
@@ -63,7 +62,7 @@ public class OpenJPAMailboxManager extends JPAMailboxManager {
}
@Override
- protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) throws MailboxException {
+ protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) {
return new OpenJPAMessageManager(getMapperFactory(),
getMessageSearchIndex(),
getEventDispatcher(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
index d6668c6..3863dcf 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
@@ -64,7 +64,7 @@ public class OpenJPAMessageManager extends JPAMessageManager {
MailboxPathLocker locker, Mailbox mailbox, AdvancedFeature f,
QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, MessageParser messageParser,
MessageId.Factory messageIdFactory, BatchSizes batchSizes,
- ImmutableMailboxMessage.Factory immutableMailboxMessageFactory, StoreRightManager storeRightManager) throws MailboxException {
+ ImmutableMailboxMessage.Factory immutableMailboxMessageFactory, StoreRightManager storeRightManager) {
super(mapperFactory, index, dispatcher, locker, mailbox, quotaManager, quotaRootResolver,
messageParser, messageIdFactory, batchSizes, immutableMailboxMessageFactory, storeRightManager);
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
index e2c51e2..5f02b28 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
@@ -25,7 +25,6 @@ import javax.inject.Inject;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.mailbox.store.Authorizator;
@@ -78,7 +77,7 @@ public class InMemoryMailboxManager extends StoreMailboxManager {
}
@Override
- protected StoreMessageManager createMessageManager(Mailbox mailbox, MailboxSession session) throws MailboxException {
+ protected StoreMessageManager createMessageManager(Mailbox mailbox, MailboxSession session) {
return new InMemoryMessageManager(getMapperFactory(),
getMessageSearchIndex(),
getEventDispatcher(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java
index 7bc1b13..d422f0d 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java
@@ -39,7 +39,8 @@ public class InMemoryMessageManager extends StoreMessageManager {
MessageId.Factory messageIdFactory,
BatchSizes batchSizes,
ImmutableMailboxMessage.Factory immutableMailboxMessageFactory,
- StoreRightManager storeRightManager) throws MailboxException {
+ StoreRightManager storeRightManager) {
+
super(InMemoryMailboxManager.MESSAGE_CAPABILITIES, mapperFactory, index, dispatcher, locker, mailbox, quotaManager, quotaRootResolver,
messageParser, messageIdFactory, batchSizes, immutableMailboxMessageFactory, storeRightManager);
this.mapperFactory = (InMemoryMailboxSessionMapperFactory) mapperFactory;
http://git-wip-us.apache.org/repos/asf/james-project/blob/71c4d395/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 cb0f22f..72274f6 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
@@ -158,8 +158,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
public StoreMessageManager(EnumSet<MailboxManager.MessageCapabilities> messageCapabilities, MailboxSessionMapperFactory mapperFactory, MessageSearchIndex index, MailboxEventDispatcher dispatcher,
MailboxPathLocker locker, Mailbox mailbox,
QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, MessageParser messageParser, MessageId.Factory messageIdFactory, BatchSizes batchSizes,
- ImmutableMailboxMessage.Factory immutableMailboxMessageFactory, StoreRightManager storeRightManager)
- throws MailboxException {
+ ImmutableMailboxMessage.Factory immutableMailboxMessageFactory, StoreRightManager storeRightManager) {
this.messageCapabilities = messageCapabilities;
this.mailbox = mailbox;
this.dispatcher = dispatcher;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org