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 e73dfb8e9696c2e9b7975d756a16965a56426826 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Sat Apr 25 11:19:29 2020 +0700 JAMES-3138 InMemoryCurrentQuotaManager: Improve reactor code style - get rid of redundant Mono::from - filter rather than nested if --- .../mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java index 34a9be6..8521557 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java @@ -85,14 +85,10 @@ public class InMemoryCurrentQuotaManager 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))); } private Mono<Void> updateQuota(QuotaRoot quotaRoot, UnaryOperator<CurrentQuotas> quotaFunction) { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org