JAMESâ2082 Replace a reduce by a `compose` The compose logic is more explicit than the reduce logic
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/24027cc2 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/24027cc2 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/24027cc2 Branch: refs/heads/master Commit: 24027cc2fd9b1a4ca3a693cbeba37fdef246eff1 Parents: 73b50e5 Author: benwa <btell...@linagora.com> Authored: Sun Jul 9 15:18:10 2017 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Mon Jul 10 14:23:59 2017 +0200 ---------------------------------------------------------------------- .../james/sieve/cassandra/CassandraSieveRepository.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/24027cc2/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java index 0490848..f07736e 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java @@ -40,7 +40,6 @@ import org.apache.james.sieverepository.api.exception.QuotaNotFoundException; import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; import org.apache.james.sieverepository.api.exception.StorageException; import org.apache.james.util.CompletableFutureUtil; -import org.apache.james.util.FluentFutureStream; import org.joda.time.DateTime; public class CassandraSieveRepository implements SieveRepository { @@ -242,11 +241,10 @@ public class CassandraSieveRepository implements SieveRepository { @Override public boolean hasQuota(String user) { - return FluentFutureStream.ofFutures( - cassandraSieveQuotaDAO.getQuota(user).thenApply(Optional::isPresent), - cassandraSieveQuotaDAO.getQuota().thenApply(Optional::isPresent)) - .reduce((b1, b2) -> b1 || b2) - .thenApply(Optional::get) + return CompletableFutureUtil.combine( + cassandraSieveQuotaDAO.getQuota(user).thenApply(Optional::isPresent), + cassandraSieveQuotaDAO.getQuota().thenApply(Optional::isPresent), + (b1, b2) -> b1 || b2) .join(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
