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 2020/04/29 09:02:40 UTC
[james-project] 04/05: MAILBOX-397 Mapper generation should not
throw
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2f46e34005210e0166664f6f87f8731d30f03791
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Apr 28 17:29:15 2020 +0700
MAILBOX-397 Mapper generation should not throw
---
.../CassandraMailboxSessionMapperFactory.java | 6 ++----
.../jpa/JPAMailboxSessionMapperFactory.java | 6 ++----
.../MaildirMailboxSessionMapperFactory.java | 16 +++++-----------
.../InMemoryMailboxSessionMapperFactory.java | 10 ++++------
.../james/vault/DeletedMessageVaultHook.java | 4 ++--
.../mailbox/spamassassin/SpamAssassinListener.java | 4 ++--
.../mailbox/store/MailboxSessionMapperFactory.java | 22 ++++++++++------------
.../james/mailbox/store/StoreMessageIdManager.java | 2 +-
.../store/event/MailboxAnnotationListener.java | 3 +--
9 files changed, 29 insertions(+), 44 deletions(-)
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
index d6f506e..c4177b6 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
@@ -51,7 +51,6 @@ import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider;
import org.apache.james.mailbox.cassandra.mail.CassandraUidProvider;
import org.apache.james.mailbox.cassandra.mail.CassandraUserMailboxRightsDAO;
import org.apache.james.mailbox.cassandra.user.CassandraSubscriptionMapper;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.mail.AnnotationMapper;
import org.apache.james.mailbox.store.mail.AttachmentMapper;
@@ -157,7 +156,7 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa
}
@Override
- public MessageIdMapper createMessageIdMapper(MailboxSession mailboxSession) throws MailboxException {
+ public MessageIdMapper createMessageIdMapper(MailboxSession mailboxSession) {
return new CassandraMessageIdMapper(getMailboxMapper(mailboxSession), mailboxDAO,
createAttachmentMapper(mailboxSession),
imapUidDAO, messageIdDAO, messageDAO, indexTableHandler, modSeqProvider,
@@ -190,8 +189,7 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa
}
@Override
- public AnnotationMapper createAnnotationMapper(MailboxSession mailboxSession)
- throws MailboxException {
+ public AnnotationMapper createAnnotationMapper(MailboxSession mailboxSession) {
return new CassandraAnnotationMapper(session, cassandraUtils);
}
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
index 3d5017b..cb7e010 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
@@ -25,7 +25,6 @@ import javax.persistence.EntityManagerFactory;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.backends.jpa.EntityManagerUtils;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.mail.JPAAnnotationMapper;
import org.apache.james.mailbox.jpa.mail.JPAMailboxMapper;
import org.apache.james.mailbox.jpa.mail.JPAMessageMapper;
@@ -68,7 +67,7 @@ public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory
}
@Override
- public MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException {
+ public MessageIdMapper createMessageIdMapper(MailboxSession session) {
throw new NotImplementedException("not implemented");
}
@@ -87,8 +86,7 @@ public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory
}
@Override
- public AnnotationMapper createAnnotationMapper(MailboxSession session)
- throws MailboxException {
+ public AnnotationMapper createAnnotationMapper(MailboxSession session) {
return new JPAAnnotationMapper(entityManagerFactory);
}
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java
index 811bde6..6bce054 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java
@@ -20,8 +20,6 @@ package org.apache.james.mailbox.maildir;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.exception.SubscriptionException;
import org.apache.james.mailbox.maildir.mail.MaildirMailboxMapper;
import org.apache.james.mailbox.maildir.mail.MaildirMessageMapper;
import org.apache.james.mailbox.maildir.user.MaildirSubscriptionMapper;
@@ -46,31 +44,27 @@ public class MaildirMailboxSessionMapperFactory extends
@Override
- public MailboxMapper createMailboxMapper(MailboxSession session)
- throws MailboxException {
+ public MailboxMapper createMailboxMapper(MailboxSession session) {
return new MaildirMailboxMapper(store, session);
}
@Override
- public MessageMapper createMessageMapper(MailboxSession session)
- throws MailboxException {
+ public MessageMapper createMessageMapper(MailboxSession session) {
return new MaildirMessageMapper(session, store);
}
@Override
- public MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException {
+ public MessageIdMapper createMessageIdMapper(MailboxSession session) {
throw new NotImplementedException("Not implemented");
}
@Override
- public SubscriptionMapper createSubscriptionMapper(MailboxSession session)
- throws SubscriptionException {
+ public SubscriptionMapper createSubscriptionMapper(MailboxSession session) {
return new MaildirSubscriptionMapper(store);
}
@Override
- public AnnotationMapper createAnnotationMapper(MailboxSession session)
- throws MailboxException {
+ public AnnotationMapper createAnnotationMapper(MailboxSession session) {
throw new NotImplementedException("Not implemented");
}
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
index 80b7a68..3513c66 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
@@ -20,7 +20,6 @@ package org.apache.james.mailbox.inmemory;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.exception.SubscriptionException;
import org.apache.james.mailbox.inmemory.mail.InMemoryAnnotationMapper;
import org.apache.james.mailbox.inmemory.mail.InMemoryAttachmentMapper;
import org.apache.james.mailbox.inmemory.mail.InMemoryMailboxMapper;
@@ -63,12 +62,12 @@ public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFac
}
@Override
- public MailboxMapper createMailboxMapper(MailboxSession session) throws MailboxException {
+ public MailboxMapper createMailboxMapper(MailboxSession session) {
return mailboxMapper;
}
@Override
- public InMemoryMessageMapper createMessageMapper(MailboxSession session) throws MailboxException {
+ public InMemoryMessageMapper createMessageMapper(MailboxSession session) {
return messageMapper;
}
@@ -78,7 +77,7 @@ public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFac
}
@Override
- public SubscriptionMapper createSubscriptionMapper(MailboxSession session) throws SubscriptionException {
+ public SubscriptionMapper createSubscriptionMapper(MailboxSession session) {
return subscriptionMapper;
}
@@ -94,8 +93,7 @@ public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFac
}
@Override
- public AnnotationMapper createAnnotationMapper(MailboxSession session)
- throws MailboxException {
+ public AnnotationMapper createAnnotationMapper(MailboxSession session) {
return annotationMapper;
}
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java
index cdb5071..ff536a8 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java
@@ -134,7 +134,7 @@ public class DeletedMessageVaultHook implements PreDeletionHook {
.then();
}
- private Mono<Void> appendToTheVault(DeletedMessageMailboxContext deletedMessageMailboxContext) throws MailboxException {
+ private Mono<Void> appendToTheVault(DeletedMessageMailboxContext deletedMessageMailboxContext) {
Optional<MailboxMessage> maybeMailboxMessage = mapperFactory.getMessageIdMapper(session)
.find(ImmutableList.of(deletedMessageMailboxContext.getMessageId()), MessageMapper.FetchType.Full).stream()
.findFirst();
@@ -165,7 +165,7 @@ public class DeletedMessageVaultHook implements PreDeletionHook {
return Pair.of(deletedMessageMetadata.getMessageId(), deletedMessageMetadata.getOwner());
}
- private Mono<Username> retrieveMailboxUser(MailboxId mailboxId) throws MailboxException {
+ private Mono<Username> retrieveMailboxUser(MailboxId mailboxId) {
return mapperFactory.getMailboxMapper(session)
.findMailboxByIdReactive(mailboxId)
.map(Mailbox::getUser);
diff --git a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
index cbaf551..4ccb808 100644
--- a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
+++ b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
@@ -116,7 +116,7 @@ public class SpamAssassinListener implements SpamEventListener {
}
}
- private void handleMessageMove(Event event, MailboxSession session, MessageMoveEvent messageMoveEvent) throws MailboxException {
+ private void handleMessageMove(Event event, MailboxSession session, MessageMoveEvent messageMoveEvent) {
if (isMessageMovedToSpamMailbox(messageMoveEvent)) {
LOGGER.debug("Spam event detected");
ImmutableList<InputStream> messages = retrieveMessages(messageMoveEvent, session);
@@ -147,7 +147,7 @@ public class SpamAssassinListener implements SpamEventListener {
}
}
- private ImmutableList<InputStream> retrieveMessages(MessageMoveEvent messageMoveEvent, MailboxSession session) throws MailboxException {
+ private ImmutableList<InputStream> retrieveMessages(MessageMoveEvent messageMoveEvent, MailboxSession session) {
return mapperFactory.getMessageIdMapper(session)
.find(messageMoveEvent.getMessageIds(), MessageMapper.FetchType.Full)
.stream()
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
index 358c415..af45560 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
@@ -20,8 +20,6 @@ package org.apache.james.mailbox.store;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.RequestAware;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.exception.SubscriptionException;
import org.apache.james.mailbox.store.mail.AnnotationMapper;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.MailboxMapperFactory;
@@ -48,7 +46,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
@Override
- public MessageMapper getMessageMapper(MailboxSession session) throws MailboxException {
+ public MessageMapper getMessageMapper(MailboxSession session) {
MessageMapper mapper = (MessageMapper) session.getAttributes().get(MESSAGEMAPPER);
if (mapper == null) {
mapper = createMessageMapper(session);
@@ -57,7 +55,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
return mapper;
}
- public MessageIdMapper getMessageIdMapper(MailboxSession session) throws MailboxException {
+ public MessageIdMapper getMessageIdMapper(MailboxSession session) {
MessageIdMapper mapper = (MessageIdMapper) session.getAttributes().get(MESSAGEIDMAPPER);
if (mapper == null) {
mapper = createMessageIdMapper(session);
@@ -66,7 +64,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
return mapper;
}
- public AnnotationMapper getAnnotationMapper(MailboxSession session) throws MailboxException {
+ public AnnotationMapper getAnnotationMapper(MailboxSession session) {
AnnotationMapper mapper = (AnnotationMapper)session.getAttributes().get(ANNOTATIONMAPPER);
if (mapper == null) {
mapper = createAnnotationMapper(session);
@@ -75,20 +73,20 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
return mapper;
}
- public abstract AnnotationMapper createAnnotationMapper(MailboxSession session) throws MailboxException;
+ public abstract AnnotationMapper createAnnotationMapper(MailboxSession session);
/**
* Create a {@link MessageMapper} instance which will get reused during the whole {@link MailboxSession}
*
* @return messageMapper
*/
- public abstract MessageMapper createMessageMapper(MailboxSession session) throws MailboxException;
+ public abstract MessageMapper createMessageMapper(MailboxSession session);
- public abstract MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException;
+ public abstract MessageIdMapper createMessageIdMapper(MailboxSession session);
@Override
- public MailboxMapper getMailboxMapper(MailboxSession session) throws MailboxException {
+ public MailboxMapper getMailboxMapper(MailboxSession session) {
MailboxMapper mapper = (MailboxMapper) session.getAttributes().get(MAILBOXMAPPER);
if (mapper == null) {
mapper = createMailboxMapper(session);
@@ -102,7 +100,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
*
* @return mailboxMapper
*/
- public abstract MailboxMapper createMailboxMapper(MailboxSession session) throws MailboxException;
+ public abstract MailboxMapper createMailboxMapper(MailboxSession session);
/**
* Create a {@link SubscriptionMapper} instance or return the one which exists for the {@link MailboxSession} already
@@ -110,7 +108,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
* @return mapper
*/
@Override
- public SubscriptionMapper getSubscriptionMapper(MailboxSession session) throws SubscriptionException {
+ public SubscriptionMapper getSubscriptionMapper(MailboxSession session) {
SubscriptionMapper mapper = (SubscriptionMapper) session.getAttributes().get(SUBSCRIPTIONMAPPER);
if (mapper == null) {
mapper = createSubscriptionMapper(session);
@@ -124,7 +122,7 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb
*
* @return subscriptionMapper
*/
- public abstract SubscriptionMapper createSubscriptionMapper(MailboxSession session) throws SubscriptionException;
+ public abstract SubscriptionMapper createSubscriptionMapper(MailboxSession session);
public abstract UidProvider getUidProvider();
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
index cb90c15..086cb43 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
@@ -270,7 +270,7 @@ public class StoreMessageIdManager implements MessageIdManager {
}
}
- private List<MailboxMessage> findRelatedMailboxMessages(MessageId messageId, MailboxSession mailboxSession) throws MailboxException {
+ private List<MailboxMessage> findRelatedMailboxMessages(MessageId messageId, MailboxSession mailboxSession) {
MessageIdMapper messageIdMapper = mailboxSessionMapperFactory.getMessageIdMapper(mailboxSession);
return messageIdMapper.find(ImmutableList.of(messageId), MessageMapper.FetchType.Metadata)
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
index 1b09103..a26717a 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
@@ -27,7 +27,6 @@ import org.apache.james.mailbox.SessionProvider;
import org.apache.james.mailbox.events.Event;
import org.apache.james.mailbox.events.Group;
import org.apache.james.mailbox.events.MailboxListener;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxAnnotation;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
@@ -55,7 +54,7 @@ public class MailboxAnnotationListener implements MailboxListener.GroupMailboxLi
}
@Override
- public void event(Event event) throws MailboxException {
+ public void event(Event event) {
if (event instanceof MailboxDeletion) {
MailboxSession mailboxSession = sessionProvider.createSystemSession(event.getUsername());
AnnotationMapper annotationMapper = mailboxSessionMapperFactory.getAnnotationMapper(mailboxSession);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org