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 ma...@apache.org on 2019/01/28 14:53:18 UTC
[03/12] james-project git commit: JAMES-2630 Migrate
CassandraAsyncExecutor.executeReturnExists consumers to Reactor
JAMES-2630 Migrate CassandraAsyncExecutor.executeReturnExists consumers to Reactor
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9c96e60d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9c96e60d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9c96e60d
Branch: refs/heads/master
Commit: 9c96e60d8cc098da07bb49e63008a3a8fa3565fa
Parents: ddb8236
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Wed Dec 12 14:21:46 2018 +0100
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Mon Jan 28 15:30:53 2019 +0100
----------------------------------------------------------------------
.../james/backends/cassandra/utils/CassandraAsyncExecutor.java | 4 ----
.../james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/9c96e60d/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java
index decfeda..61bd6f9 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java
@@ -60,10 +60,6 @@ public class CassandraAsyncExecutor {
.toFuture();
}
- public CompletableFuture<Boolean> executeReturnExists(Statement statement) {
- return executeReturnExistsReactor(statement).toFuture();
- }
-
public Mono<ResultSet> executeReactor(Statement statement) {
return Mono.defer(() -> Mono.fromFuture(FutureConverter
.toCompletableFuture(session.executeAsync(statement)))
http://git-wip-us.apache.org/repos/asf/james-project/blob/9c96e60d/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java
index a1986e1..6d65172 100644
--- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java
+++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/DeletedMailsDAO.java
@@ -70,10 +70,10 @@ public class DeletedMailsDAO {
}
Mono<Boolean> isDeleted(MailQueueName mailQueueName, MailKey mailKey) {
- return Mono.fromCompletionStage(executor.executeReturnExists(
+ return executor.executeReturnExists(
selectOne.bind()
.setString(QUEUE_NAME, mailQueueName.asString())
- .setString(MAIL_KEY, mailKey.getMailKey())));
+ .setString(MAIL_KEY, mailKey.getMailKey()));
}
Mono<Boolean> isStillEnqueued(MailQueueName mailQueueName, MailKey mailKey) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org