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 dfbfcad422e78d5a74f1b789dacafdf8384b9477
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Tue Apr 21 11:37:08 2020 +0700
JAMES-3138 Rename resetCurrentQuotas to setCurrentQuotas
---
.../james/mailbox/quota/CurrentQuotaManager.java | 2 +-
.../cassandra/quota/CassandraCurrentQuotaManager.java | 2 +-
.../mailbox/jpa/quota/JpaCurrentQuotaManager.java | 2 +-
.../inmemory/quota/InMemoryCurrentQuotaManager.java | 2 +-
.../mailbox/store/quota/CurrentQuotaManagerTest.java | 18 +++++++++---------
.../quota/task/RecomputeCurrentQuotasService.java | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/mailbox/api/src/main/java/org/apache/james/mailbox/quota/CurrentQuotaManager.java
b/mailbox/api/src/main/java/org/apache/james/mailbox/quota/CurrentQuotaManager.java
index 8b0164e..b7a205f 100644
---
a/mailbox/api/src/main/java/org/apache/james/mailbox/quota/CurrentQuotaManager.java
+++
b/mailbox/api/src/main/java/org/apache/james/mailbox/quota/CurrentQuotaManager.java
@@ -41,6 +41,6 @@ public interface CurrentQuotaManager {
Publisher<Void> decrease(QuotaOperation quotaOperation);
- Publisher<Void> resetCurrentQuotas(QuotaOperation quotaOperation);
+ Publisher<Void> setCurrentQuotas(QuotaOperation quotaOperation);
}
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 fdb0e85..92c4200 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
@@ -115,7 +115,7 @@ public class CassandraCurrentQuotaManager implements
CurrentQuotaManager {
}
@Override
- public Mono<Void> resetCurrentQuotas(QuotaOperation quotaOperation) {
+ public Mono<Void> setCurrentQuotas(QuotaOperation quotaOperation) {
return Mono.from(getCurrentQuotas(quotaOperation.quotaRoot()))
.flatMap(storedQuotas -> {
if (!storedQuotas.equals(CurrentQuotas.from(quotaOperation))) {
diff --git
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java
index f297078..3e4c6d1 100644
---
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java
+++
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java
@@ -108,7 +108,7 @@ public class JpaCurrentQuotaManager implements
CurrentQuotaManager {
}
@Override
- public Mono<Void> resetCurrentQuotas(QuotaOperation quotaOperation) {
+ public Mono<Void> setCurrentQuotas(QuotaOperation quotaOperation) {
return Mono.fromCallable(() ->
getCurrentQuotas(quotaOperation.quotaRoot()))
.flatMap(storedQuotas -> Mono.fromRunnable(() ->
transactionRunner.run(
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 45c14cb..34a9be6 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
@@ -84,7 +84,7 @@ public class InMemoryCurrentQuotaManager implements
CurrentQuotaManager {
}
@Override
- public Mono<Void> resetCurrentQuotas(QuotaOperation quotaOperation) {
+ public Mono<Void> setCurrentQuotas(QuotaOperation quotaOperation) {
return Mono.from(getCurrentQuotas(quotaOperation.quotaRoot()))
.flatMap(storedQuotas -> {
if (!storedQuotas.equals(CurrentQuotas.from(quotaOperation))) {
diff --git
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/CurrentQuotaManagerTest.java
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/CurrentQuotaManagerTest.java
index b4dcf62..e331c95 100644
---
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/CurrentQuotaManagerTest.java
+++
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/CurrentQuotaManagerTest.java
@@ -103,39 +103,39 @@ public abstract class CurrentQuotaManagerTest {
}
@Test
- void resetCurrentQuotasShouldNoopWhenZeroAndNoData() {
+ void setCurrentQuotasShouldNoopWhenZeroAndNoData() {
QuotaOperation quotaOperation = new QuotaOperation(QUOTA_ROOT,
QuotaCountUsage.count(0), QuotaSizeUsage.size(0));
- Mono.from(testee.resetCurrentQuotas(quotaOperation)).block();
+ Mono.from(testee.setCurrentQuotas(quotaOperation)).block();
assertThat(Mono.from(testee.getCurrentQuotas(QUOTA_ROOT)).block())
.isEqualTo(CurrentQuotas.emptyQuotas());
}
@Test
- void resetCurrentQuotasShouldReInitQuotasWhenNothing() {
- Mono.from(testee.resetCurrentQuotas(RESET_QUOTA_OPERATION)).block();
+ void setCurrentQuotasShouldReInitQuotasWhenNothing() {
+ Mono.from(testee.setCurrentQuotas(RESET_QUOTA_OPERATION)).block();
assertThat(Mono.from(testee.getCurrentQuotas(QUOTA_ROOT)).block())
.isEqualTo(CURRENT_QUOTAS);
}
@Test
- void resetCurrentQuotasShouldReInitQuotasWhenData() {
+ void setCurrentQuotasShouldReInitQuotasWhenData() {
Mono.from(testee.increase(new QuotaOperation(QUOTA_ROOT,
QuotaCountUsage.count(20), QuotaSizeUsage.size(200)))).block();
- Mono.from(testee.resetCurrentQuotas(RESET_QUOTA_OPERATION)).block();
+ Mono.from(testee.setCurrentQuotas(RESET_QUOTA_OPERATION)).block();
assertThat(Mono.from(testee.getCurrentQuotas(QUOTA_ROOT)).block())
.isEqualTo(CURRENT_QUOTAS);
}
@Test
- void resetCurrentQuotasShouldBeIdempotent() {
+ void setCurrentQuotasShouldBeIdempotent() {
Mono.from(testee.increase(new QuotaOperation(QUOTA_ROOT,
QuotaCountUsage.count(20), QuotaSizeUsage.size(200)))).block();
- Mono.from(testee.resetCurrentQuotas(RESET_QUOTA_OPERATION)).block();
- Mono.from(testee.resetCurrentQuotas(RESET_QUOTA_OPERATION)).block();
+ Mono.from(testee.setCurrentQuotas(RESET_QUOTA_OPERATION)).block();
+ Mono.from(testee.setCurrentQuotas(RESET_QUOTA_OPERATION)).block();
assertThat(Mono.from(testee.getCurrentQuotas(QUOTA_ROOT)).block())
.isEqualTo(CURRENT_QUOTAS);
diff --git
a/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasService.java
b/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasService.java
index 46c8d3e..8508b8e 100644
---
a/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasService.java
+++
b/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasService.java
@@ -155,7 +155,7 @@ public class RecomputeCurrentQuotasService {
return Mono.fromCallable(() ->
currentQuotaCalculator.recalculateCurrentQuotas(quotaRoot, session))
.map(recalculatedQuotas -> QuotaOperation.from(quotaRoot,
recalculatedQuotas))
- .flatMap(quotaOperation ->
Mono.from(storeCurrentQuotaManager.resetCurrentQuotas(quotaOperation)))
+ .flatMap(quotaOperation ->
Mono.from(storeCurrentQuotaManager.setCurrentQuotas(quotaOperation)))
.then(Mono.just(Task.Result.COMPLETED))
.doOnNext(any -> {
LOGGER.info("Current quotas recomputed for {}", quotaRoot);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
