[james-project] 18/27: JAMES-3138 CassandraCurrentQuotaManager: Improve Reactor code style

[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 00160a4205d11e0e2a9f51fbbe6f0ed70614148f
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Sat Apr 25 11:15:58 2020 +0700

    JAMES-3138 CassandraCurrentQuotaManager: Improve Reactor code style
    
     - get rid of redundant Mono::from
     - filter rather than nested if
---
 .../cassandra/quota/CassandraCurrentQuotaManager.java        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java
 
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java
index 92c4200..675b3e2 100644
--- 
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java
+++ 
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java
@@ -116,13 +116,9 @@ public class CassandraCurrentQuotaManager implements 
CurrentQuotaManager {
 
     @Override
     public Mono<Void> setCurrentQuotas(QuotaOperation quotaOperation) {
-        return Mono.from(getCurrentQuotas(quotaOperation.quotaRoot()))
-            .flatMap(storedQuotas -> {
-                if (!storedQuotas.equals(CurrentQuotas.from(quotaOperation))) {
-                    return Mono.from(decrease(new 
QuotaOperation(quotaOperation.quotaRoot(), storedQuotas.count(), 
storedQuotas.size())))
-                        .then(Mono.from(increase(quotaOperation)));
-                }
-                return Mono.empty();
-            });
+        return getCurrentQuotas(quotaOperation.quotaRoot())
+            .filter(storedQuotas -> 
!storedQuotas.equals(CurrentQuotas.from(quotaOperation)))
+            .flatMap(storedQuotas -> decrease(new 
QuotaOperation(quotaOperation.quotaRoot(), storedQuotas.count(), 
storedQuotas.size()))
+                .then(increase(quotaOperation)));
     }
 }


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