[james-project] 06/10: JAMES-2897 simplify select statement handling using the right helper methods

[btellier]

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 5facf235da8cd7a23773545d66a2d03e11a36000
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Tue Sep 10 16:42:11 2019 +0200

    JAMES-2897 simplify select statement handling using the right helper methods
---
 .../cassandra/mail/CassandraMessageIdToImapUidDAO.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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 95bf82c..1b0353a 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
@@ -56,9 +56,9 @@ import org.apache.james.mailbox.model.ComposedMessageId;
 import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData;
 
 import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Session;
+import com.datastax.driver.core.Statement;
 import com.datastax.driver.core.querybuilder.QueryBuilder;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
@@ -192,8 +192,8 @@ public class CassandraMessageIdToImapUidDAO {
     }
 
     public Flux<ComposedMessageIdWithMetaData> retrieve(CassandraMessageId 
messageId, Optional<CassandraId> mailboxId) {
-        return selectStatement(messageId, mailboxId)
-                .flatMapMany(cassandraUtils::convertToFlux)
+        return cassandraAsyncExecutor.executeRows(
+                    selectStatement(messageId, mailboxId))
                 .map(this::toComposedMessageIdWithMetadata);
     }
 
@@ -208,12 +208,11 @@ public class CassandraMessageIdToImapUidDAO {
                 .build();
     }
 
-    private Mono<ResultSet> selectStatement(CassandraMessageId messageId, 
Optional<CassandraId> mailboxId) {
+    private Statement selectStatement(CassandraMessageId messageId, 
Optional<CassandraId> mailboxId) {
         return mailboxId
-            .map(cassandraId -> cassandraAsyncExecutor.execute(select.bind()
+            .map(cassandraId -> select.bind()
                 .setUUID(MESSAGE_ID, messageId.get())
-                .setUUID(MAILBOX_ID, cassandraId.asUuid())))
-            .orElseGet(() -> cassandraAsyncExecutor.execute(selectAll.bind()
-                .setUUID(MESSAGE_ID, messageId.get())));
+                .setUUID(MAILBOX_ID, cassandraId.asUuid()))
+            .orElseGet(() -> selectAll.bind().setUUID(MESSAGE_ID, 
messageId.get()));
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org