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/24 02:59:45 UTC
[james-project] 10/17: [Refactoring] make use of ifPresentOrElse to
replace some OptionalUtils.executeIfEmpty calls
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 e5c41459ca37102425eb1a6577e2d885ca159a79
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Apr 21 21:14:16 2020 +0200
[Refactoring] make use of ifPresentOrElse to replace some OptionalUtils.executeIfEmpty calls
---
.../james/mailbox/cassandra/mail/CassandraMessageMapper.java | 8 ++++----
.../org/apache/james/imap/processor/AbstractAuthProcessor.java | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
index fe6ebfc..97c10cd 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -49,7 +49,6 @@ import org.apache.james.mailbox.store.FlagsUpdateCalculator;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
-import org.apache.james.util.OptionalUtils;
import org.apache.james.util.ReactorUtils;
import org.apache.james.util.streams.Limit;
import org.slf4j.Logger;
@@ -219,9 +218,10 @@ public class CassandraMessageMapper implements MessageMapper {
private Mono<ComposedMessageIdWithMetaData> retrieveComposedId(CassandraId mailboxId, MessageUid uid) {
return messageIdDAO.retrieve(mailboxId, uid)
- .doOnNext(optional -> OptionalUtils.executeIfEmpty(optional,
- () -> LOGGER.warn("Could not retrieve message {} {}", mailboxId, uid)))
- .handle((t, sink) -> t.ifPresent(sink::next));
+ .handle((t, sink) ->
+ t.ifPresentOrElse(
+ sink::next,
+ () -> LOGGER.warn("Could not retrieve message {} {}", mailboxId, uid)));
}
@Override
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
index 198b101..c693f1f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
@@ -35,10 +35,8 @@ import org.apache.james.mailbox.exception.MailboxExistsException;
import org.apache.james.mailbox.exception.NotAdminException;
import org.apache.james.mailbox.exception.UserDoesNotExistException;
import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.metrics.api.MetricFactory;
-import org.apache.james.util.OptionalUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -130,9 +128,11 @@ public abstract class AbstractAuthProcessor<R extends ImapRequest> extends Abstr
LOGGER.debug("INBOX exists. No need to create it.");
} else {
try {
- Optional<MailboxId> mailboxId = mailboxManager.createMailbox(inboxPath, mailboxSession);
- OptionalUtils.executeIfEmpty(mailboxId, () -> LOGGER.warn("Provisioning INBOX successful. But no MailboxId have been returned."))
- .ifPresent(id -> LOGGER.info("Provisioning INBOX. {} created.", id));
+ mailboxManager
+ .createMailbox(inboxPath, mailboxSession)
+ .ifPresentOrElse(
+ id -> LOGGER.info("Provisioning INBOX. {} created.", id),
+ () -> LOGGER.warn("Provisioning INBOX successful. But no MailboxId have been returned."));
} catch (MailboxExistsException e) {
LOGGER.warn("Mailbox INBOX created by concurrent call. Safe to ignore this exception.");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org