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 2017/08/16 09:45:43 UTC
[10/18] james-project git commit: JAMES-2107 Run IntelliJ inspection:
"Optional::isPresent can be replaced by functional code"
JAMES-2107 Run IntelliJ inspection: "Optional::isPresent can be replaced by functional code"
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/34d63025
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/34d63025
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/34d63025
Branch: refs/heads/master
Commit: 34d63025ee93a782ebd3b10dff9aa5e1898324f2
Parents: 89a58da
Author: benwa <bt...@linagora.com>
Authored: Wed Aug 9 11:16:21 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 16 16:44:08 2017 +0700
----------------------------------------------------------------------
.../cassandra/mail/CassandraMessageIdToImapUidDAO.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/34d63025/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
index 7ca5349..169e32d 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
@@ -209,12 +209,11 @@ public class CassandraMessageIdToImapUidDAO {
}
private CompletableFuture<ResultSet> selectStatement(CassandraMessageId messageId, Optional<CassandraId> mailboxId) {
- if (mailboxId.isPresent()) {
- return cassandraAsyncExecutor.execute(select.bind()
+ return mailboxId
+ .map(cassandraId -> cassandraAsyncExecutor.execute(select.bind()
.setUUID(MESSAGE_ID, messageId.get())
- .setUUID(MAILBOX_ID, mailboxId.get().asUuid()));
- }
- return cassandraAsyncExecutor.execute(selectAll.bind()
- .setUUID(MESSAGE_ID, messageId.get()));
+ .setUUID(MAILBOX_ID, cassandraId.asUuid())))
+ .orElseGet(() -> cassandraAsyncExecutor.execute(selectAll.bind()
+ .setUUID(MESSAGE_ID, messageId.get())));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org