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 2020/12/11 10:44:18 UTC
[james-project] 14/15: [REFACTORING] FlagsExtractor can be static
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 c208e8bb99ab089aba203fc744641ece57f9e770
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Dec 6 22:11:36 2020 +0700
[REFACTORING] FlagsExtractor can be static
---
.../mailbox/cassandra/mail/CassandraApplicableFlagDAO.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraMessageIdDAO.java | 2 +-
.../cassandra/mail/CassandraMessageIdToImapUidDAO.java | 2 +-
.../apache/james/mailbox/cassandra/mail/FlagsExtractor.java | 11 ++---------
4 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAO.java
index 2fdb846..26eaa6b 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAO.java
@@ -80,7 +80,7 @@ public class CassandraApplicableFlagDAO {
return cassandraAsyncExecutor.executeSingleRow(
select.bind()
.setUUID(MAILBOX_ID, mailboxId.asUuid()))
- .map(row -> new FlagsExtractor(row).getApplicableFlags());
+ .map(FlagsExtractor::getApplicableFlags);
}
public Mono<Void> updateApplicableFlags(CassandraId cassandraId, Set<String> toBeAdded) {
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
index 2574ed1..6d7f6bc 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
@@ -335,7 +335,7 @@ public class CassandraMessageIdDAO {
CassandraId.of(row.getUUID(MAILBOX_ID)),
messageIdFactory.of(row.getUUID(MESSAGE_ID)),
MessageUid.of(row.getLong(IMAP_UID))))
- .flags(new FlagsExtractor(row).getFlags())
+ .flags(FlagsExtractor.getFlags(row))
.modSeq(ModSeq.of(row.getLong(MOD_SEQ)))
.build();
}
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
index e12e2de..4c6ee7c 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
@@ -214,7 +214,7 @@ public class CassandraMessageIdToImapUidDAO {
CassandraId.of(row.getUUID(MAILBOX_ID)),
messageIdFactory.of(row.getUUID(MESSAGE_ID)),
MessageUid.of(row.getLong(IMAP_UID))))
- .flags(new FlagsExtractor(row).getFlags())
+ .flags(FlagsExtractor.getFlags(row))
.modSeq(ModSeq.of(row.getLong(MOD_SEQ)))
.build();
}
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java
index 873e438..c18d37c 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/FlagsExtractor.java
@@ -25,14 +25,7 @@ import org.apache.james.mailbox.cassandra.table.Flag;
import com.datastax.driver.core.Row;
public class FlagsExtractor {
-
- private final Row row;
-
- public FlagsExtractor(Row row) {
- this.row = row;
- }
-
- public Flags getFlags() {
+ public static Flags getFlags(Row row) {
Flags flags = new Flags();
for (String flag : Flag.ALL) {
if (row.getBool(flag)) {
@@ -44,7 +37,7 @@ public class FlagsExtractor {
return flags;
}
- public Flags getApplicableFlags() {
+ public static Flags getApplicableFlags(Row row) {
Flags flags = new Flags();
row.getSet(Flag.USER_FLAGS, String.class)
.forEach(flags::add);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org