You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/08/06 03:19:32 UTC
[james-project] 01/04: JAMES-3105 [REFACTORING] Using the
MailboxCounter.empty static method
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3a97764cad178cf39e4031516ec4542eb355e105
Author: Tung TRAN <vt...@linagora.com>
AuthorDate: Mon Aug 2 12:47:08 2021 +0700
JAMES-3105 [REFACTORING] Using the MailboxCounter.empty static method
---
.../apache/james/mailbox/model/MailboxCounters.java | 8 ++++++++
.../org/apache/james/mailbox/MailboxManagerTest.java | 6 +-----
.../james/mailbox/model/MailboxCountersTest.java | 6 +-----
.../cassandra/mail/CassandraMailboxCounterDAO.java | 10 +---------
.../mailbox/cassandra/mail/CassandraMessageMapper.java | 6 +-----
.../cassandra/mail/CassandraMailboxCounterDAOTest.java | 18 +++---------------
.../james/mailbox/store/StoreMailboxManager.java | 14 ++------------
.../james/mailbox/store/StoreMessageManager.java | 12 ++----------
.../james/jmap/draft/model/MailboxFactoryTest.java | 12 ++----------
.../james/webadmin/routes/UserMailboxesRoutesTest.java | 6 +-----
10 files changed, 22 insertions(+), 76 deletions(-)
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxCounters.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxCounters.java
index 854264d..0f136d4 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxCounters.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxCounters.java
@@ -80,6 +80,14 @@ public class MailboxCounters {
return mailboxId -> count -> unseen -> new Builder.FinalStage(count, unseen, mailboxId);
}
+ public static MailboxCounters empty(MailboxId mailboxId) {
+ return MailboxCounters.builder()
+ .mailboxId(mailboxId)
+ .count(0)
+ .unseen(0)
+ .build();
+ }
+
private final MailboxId mailboxId;
private final long count;
private final long unseen;
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
index 4cce073..81e8c5c 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
@@ -1524,11 +1524,7 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
.getMailboxCounters(session2);
assertThat(mailboxCounters)
- .isEqualTo(MailboxCounters.builder()
- .mailboxId(mailboxIdInbox1.get())
- .count(0)
- .unseen(0)
- .build());
+ .isEqualTo(MailboxCounters.empty(mailboxIdInbox1.get()));
}
@Test
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxCountersTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxCountersTest.java
index d08b988..2105c96 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxCountersTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxCountersTest.java
@@ -43,11 +43,7 @@ class MailboxCountersTest {
.unseen(0)
.build()
.sanitize())
- .isEqualTo(MailboxCounters.builder()
- .mailboxId(MAILBOX_ID)
- .count(0)
- .unseen(0)
- .build());
+ .isEqualTo(MailboxCounters.empty(MAILBOX_ID));
}
@Test
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
index 8c04502..0f1c242 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAO.java
@@ -118,7 +118,7 @@ public class CassandraMailboxCounterDAO {
CassandraId mailboxId = (CassandraId) counters.getMailboxId();
return retrieveMailboxCounters(mailboxId)
- .defaultIfEmpty(emptyCounters(mailboxId))
+ .defaultIfEmpty(MailboxCounters.empty(mailboxId))
.flatMap(storedCounters -> {
if (storedCounters.equals(counters)) {
return Mono.empty();
@@ -128,14 +128,6 @@ public class CassandraMailboxCounterDAO {
});
}
- private MailboxCounters emptyCounters(CassandraId mailboxId) {
- return MailboxCounters.builder()
- .mailboxId(mailboxId)
- .count(0)
- .unseen(0)
- .build();
- }
-
public Mono<Void> add(MailboxCounters counters) {
CassandraId mailboxId = (CassandraId) counters.getMailboxId();
return cassandraAsyncExecutor.executeVoid(
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
index 7e5f6ae..5f30513 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -165,11 +165,7 @@ public class CassandraMessageMapper implements MessageMapper {
public Mono<MailboxCounters> readMailboxCounters(CassandraId mailboxId) {
return mailboxCounterDAO.retrieveMailboxCounters(mailboxId)
- .defaultIfEmpty(MailboxCounters.builder()
- .mailboxId(mailboxId)
- .count(0)
- .unseen(0)
- .build());
+ .defaultIfEmpty(MailboxCounters.empty(mailboxId));
}
private void readRepair(Mailbox mailbox, MailboxCounters counters) {
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
index e00c0e0..cf83c2f 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxCounterDAOTest.java
@@ -242,11 +242,7 @@ class CassandraMailboxCounterDAOTest {
testee.decrementUnseenAndCount(MAILBOX_ID).block();
assertThat(testee.retrieveMailboxCounters(MAILBOX_ID).block())
- .isEqualTo(MailboxCounters.builder()
- .mailboxId(MAILBOX_ID)
- .count(0)
- .unseen(0)
- .build());
+ .isEqualTo(MailboxCounters.empty(MAILBOX_ID));
}
@Test
@@ -259,11 +255,7 @@ class CassandraMailboxCounterDAOTest {
@Test
void resetCountersShouldNoopWhenZeroAndNoData() {
- MailboxCounters counters = MailboxCounters.builder()
- .mailboxId(MAILBOX_ID)
- .count(0)
- .unseen(0)
- .build();
+ MailboxCounters counters = MailboxCounters.empty(MAILBOX_ID);
testee.resetCounters(counters).block();
@@ -273,11 +265,7 @@ class CassandraMailboxCounterDAOTest {
@Test
void resetCountersShouldNoopWhenZeroAndZeroData() {
- MailboxCounters counters = MailboxCounters.builder()
- .mailboxId(MAILBOX_ID)
- .count(0)
- .unseen(0)
- .build();
+ MailboxCounters counters = MailboxCounters.empty(MAILBOX_ID);
testee.incrementUnseen(MAILBOX_ID).block();
testee.decrementUnseen(MAILBOX_ID).block();
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index cf6816a..0c16ab3 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -697,24 +697,14 @@ public class StoreMailboxManager implements MailboxManager {
Map<MailboxPath, Boolean> parentMap = parentMap(mailboxes, session);
return mailboxFlux -> mailboxFlux
.map(Throwing.<Mailbox, MailboxMetaData>function(
- mailbox -> toMailboxMetadata(session, parentMap, mailbox, MailboxCounters
- .builder()
- .mailboxId(mailbox.getMailboxId())
- .count(0)
- .unseen(0)
- .build()))
+ mailbox -> toMailboxMetadata(session, parentMap, mailbox, MailboxCounters.empty(mailbox.getMailboxId())))
.sneakyThrow());
}
private Mono<MailboxCounters> retrieveCounters(MessageMapper messageMapper, Mailbox mailbox, MailboxSession session) {
return messageMapper.getMailboxCountersReactive(mailbox)
.filter(Throwing.<MailboxCounters>predicate(counter -> storeRightManager.hasRight(mailbox, Right.Read, session)).sneakyThrow())
- .switchIfEmpty(Mono.just(MailboxCounters
- .builder()
- .mailboxId(mailbox.getMailboxId())
- .count(0)
- .unseen(0)
- .build()));
+ .switchIfEmpty(Mono.just(MailboxCounters.empty(mailbox.getMailboxId())));
}
private Flux<Mailbox> searchMailboxes(MailboxQuery mailboxQuery, MailboxSession session, Right right) {
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index a67b551..b0ce1b3 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -224,11 +224,7 @@ public class StoreMessageManager implements MessageManager {
if (storeRightManager.hasRight(mailbox, MailboxACL.Right.Read, mailboxSession)) {
return mapperFactory.createMessageMapper(mailboxSession).getMailboxCounters(mailbox);
}
- return MailboxCounters.builder()
- .mailboxId(mailbox.getMailboxId())
- .count(0)
- .unseen(0)
- .build();
+ return MailboxCounters.empty(mailbox.getMailboxId());
}
@@ -237,11 +233,7 @@ public class StoreMessageManager implements MessageManager {
if (storeRightManager.hasRight(mailbox, MailboxACL.Right.Read, mailboxSession)) {
return mapperFactory.createMessageMapper(mailboxSession).getMailboxCountersReactive(mailbox);
}
- return Mono.just(MailboxCounters.builder()
- .mailboxId(mailbox.getMailboxId())
- .count(0)
- .unseen(0)
- .build());
+ return Mono.just(MailboxCounters.empty(mailbox.getMailboxId()));
}
/**
diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
index e2ee241..74cf8b0 100644
--- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
+++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MailboxFactoryTest.java
@@ -182,11 +182,7 @@ public class MailboxFactoryTest {
Optional<MailboxId> id = sut.getParentIdFromMailboxPath(mailboxPath,
Optional.of(ImmutableList.of(new MailboxMetaData(parentMailboxPath, parentId, DELIMITER,
MailboxMetaData.Children.CHILDREN_ALLOWED_BUT_UNKNOWN, MailboxMetaData.Selectability.NONE, new MailboxACL(),
- MailboxCounters.builder()
- .mailboxId(parentId)
- .count(0)
- .unseen(0)
- .build()))),
+ MailboxCounters.empty(parentId)))),
mailboxSession).block();
assertThat(id).contains(parentId);
}
@@ -223,11 +219,7 @@ public class MailboxFactoryTest {
MailboxMetaData.Children.NO_INFERIORS,
MailboxMetaData.Selectability.NONE,
MailboxACL.EMPTY,
- MailboxCounters.builder()
- .mailboxId(preLoadedId)
- .count(0)
- .unseen(0)
- .build()))))
+ MailboxCounters.empty(preLoadedId)))))
.build()
.block();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 5b26333..12f2a1d 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -130,11 +130,7 @@ import reactor.core.publisher.Mono;
class UserMailboxesRoutesTest {
public static MailboxMetaData testMetadata(MailboxPath path, MailboxId mailboxId, char delimiter) {
return new MailboxMetaData(path, mailboxId, delimiter, MailboxMetaData.Children.CHILDREN_ALLOWED_BUT_UNKNOWN, MailboxMetaData.Selectability.NONE, new MailboxACL(),
- MailboxCounters.builder()
- .mailboxId(mailboxId)
- .count(0)
- .unseen(0)
- .build());
+ MailboxCounters.empty(mailboxId));
}
private static final Username USERNAME = Username.of("username");
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org