You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/03/09 16:07:46 UTC
[james-project] 15/17: JAMES-3074 Enforce UidValidity to be always
valid
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 b077642e4e25fb001cb3f1ee902ab01a9934b752
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Feb 26 15:00:54 2020 +0700
JAMES-3074 Enforce UidValidity to be always valid
We handle invalid values before creating the UidValidity POJO hence
there are no longer reasons not to do a strong validation here
---
.../org/apache/james/mailbox/model/UidValidity.java | 6 +-----
.../mailbox/model/MailboxAssertingToolTest.java | 4 ++--
.../apache/james/mailbox/model/UidValidityTest.java | 21 ++++++++++-----------
.../james/mailbox/backup/MailboxMessageFixture.java | 8 ++++----
.../mailbox/cassandra/mail/CassandraMailboxDAO.java | 2 +-
.../mail/CassandraIndexTableHandlerTest.java | 2 +-
.../mail/CassandraMailboxCounterDAOTest.java | 2 +-
.../cassandra/mail/CassandraMailboxDAOTest.java | 4 ++--
.../mail/CassandraMailboxMapperConcurrencyTest.java | 2 +-
.../cassandra/mail/CassandraMailboxMapperTest.java | 2 +-
.../cassandra/mail/CassandraModSeqProviderTest.java | 2 +-
.../cassandra/mail/CassandraUidProviderTest.java | 2 +-
.../mail/migration/MailboxPathV2MigrationTest.java | 2 +-
.../task/RecomputeMailboxCountersServiceTest.java | 2 +-
.../james/mailbox/jpa/mail/model/JPAMailbox.java | 2 +-
.../search/LuceneMailboxMessageSearchIndexTest.java | 6 +++---
.../apache/james/mailbox/maildir/MaildirFolder.java | 2 +-
.../spamassassin/SpamAssassinListenerTest.java | 2 +-
.../james/mailbox/store/StoreRightManagerTest.java | 2 +-
.../store/mail/model/ListMailboxAssertTest.java | 2 +-
.../store/mail/model/ListMessageAssertTest.java | 2 +-
.../store/mail/model/MailboxMapperACLTest.java | 2 +-
.../mailbox/store/mail/model/MailboxMapperTest.java | 2 +-
.../store/mail/model/MessageIdMapperTest.java | 2 +-
.../mailbox/store/mail/model/MessageMapperTest.java | 2 +-
.../mailbox/store/mail/model/MessageMoveTest.java | 2 +-
.../mail/model/MessageWithAttachmentMapperTest.java | 2 +-
.../quota/DefaultUserQuotaRootResolverTest.java | 4 ++--
.../james/mailbox/store/quota/QuotaCheckerTest.java | 2 +-
.../parser/AbstractSelectionCommandParser.java | 2 +-
.../encode/MailboxStatusResponseEncoderTest.java | 2 +-
.../james/imap/processor/CopyProcessorTest.java | 2 +-
.../james/imap/processor/MoveProcessorTest.java | 2 +-
.../processor/base/MailboxEventAnalyserTest.java | 2 +-
.../adapter/mailbox/MailboxManagementTest.java | 2 +-
35 files changed, 52 insertions(+), 57 deletions(-)
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/UidValidity.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/UidValidity.java
index 05d65a9..1c1401c 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/UidValidity.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/UidValidity.java
@@ -46,7 +46,7 @@ public class UidValidity {
static UidValidity fromSupplier(Supplier<Long> longSupplier) {
long randomValue = Math.abs(longSupplier.get());
long sanitizedRandomValue = 1 + (randomValue % (UPPER_EXCLUSIVE_BOUND - 1));
- return ofValid(sanitizedRandomValue);
+ return of(sanitizedRandomValue);
}
/**
@@ -56,10 +56,6 @@ public class UidValidity {
* Strongly favor uses of {@link #ofValid(long)}
*/
public static UidValidity of(long uidValidity) {
- return new UidValidity(uidValidity);
- }
-
- public static UidValidity ofValid(long uidValidity) {
Preconditions.checkArgument(isValid(uidValidity), "uidValidity needs to be a non-zero unsigned 32-bit integer");
return new UidValidity(uidValidity);
}
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertingToolTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertingToolTest.java
index a88498e..aa7c7ff 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertingToolTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxAssertingToolTest.java
@@ -31,8 +31,8 @@ class MailboxAssertingToolTest {
private static final Username USER = Username.of("user");
private static final Username USER1 = Username.of("user1");
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
- private static final UidValidity UID_VALIDITY_2 = UidValidity.ofValid(43);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(42);
+ private static final UidValidity UID_VALIDITY_2 = UidValidity.of(43);
private static final TestId MAILBOX_ID = TestId.of(24);
@Nested
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/UidValidityTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/UidValidityTest.java
index 89e25a4..34fc0e5 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/UidValidityTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/UidValidityTest.java
@@ -21,6 +21,7 @@ package org.apache.james.mailbox.model;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.stream.IntStream;
@@ -45,23 +46,21 @@ class UidValidityTest {
}
@Test
- void zeroUidValidityShouldBeInvalid() {
- assertThat(UidValidity.of(0).isValid()).isFalse();
+ void ofShouldThrowWhenZero() {
+ assertThatThrownBy(() -> UidValidity.of(0))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- void negativeUidValidityShouldBeInvalid() {
- assertThat(UidValidity.of(-1).isValid()).isFalse();
+ void ofShouldThrowWhenNegative() {
+ assertThatThrownBy(() -> UidValidity.of(-1))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- void tooBigUidValidityShouldBeInvalid() {
- assertThat(UidValidity.of(4294967296L).isValid()).isFalse();
- }
-
- @Test
- void idValidityShouldBeValid() {
- assertThat(UidValidity.of(42).isValid()).isTrue();
+ void ofShouldThrowWhenTooBig() {
+ assertThatThrownBy(() -> UidValidity.of(4294967296L))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java
index f833839..50f8a76 100644
--- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java
+++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/MailboxMessageFixture.java
@@ -101,10 +101,10 @@ public interface MailboxMessageFixture {
MailboxPath MAILBOX_PATH_USER1_MAILBOX2 = MailboxPath.forUser(USER, MAILBOX_2_NAME);
MailboxPath MAILBOX_PATH_OTHER_USER_MAILBOX1 = MailboxPath.forUser(OTHER_USER, MAILBOX_OTHER_USER_NAME);
- Mailbox MAILBOX_1 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX1, UidValidity.ofValid(42), MAILBOX_ID_1);
- Mailbox MAILBOX_1_OTHER_USER = new Mailbox(MAILBOX_PATH_OTHER_USER_MAILBOX1, UidValidity.ofValid(42), MAILBOX_ID_11);
- Mailbox MAILBOX_1_SUB_1 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX1_SUB_1, UidValidity.ofValid(420), TestId.of(11L));
- Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX2, UidValidity.ofValid(43), MAILBOX_ID_2);
+ Mailbox MAILBOX_1 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX1, UidValidity.of(42), MAILBOX_ID_1);
+ Mailbox MAILBOX_1_OTHER_USER = new Mailbox(MAILBOX_PATH_OTHER_USER_MAILBOX1, UidValidity.of(42), MAILBOX_ID_11);
+ Mailbox MAILBOX_1_SUB_1 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX1_SUB_1, UidValidity.of(420), TestId.of(11L));
+ Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_USER1_MAILBOX2, UidValidity.of(43), MAILBOX_ID_2);
List<MailboxAnnotation> NO_ANNOTATION = ImmutableList.of();
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
index 87c9505..6daf88e 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
@@ -166,7 +166,7 @@ public class CassandraMailboxDAO {
return updateUidValidity(cassandraId, newUidValidity)
.then(Mono.just(newUidValidity));
}
- return Mono.just(UidValidity.ofValid(uidValidityAsLong));
+ return Mono.just(UidValidity.of(uidValidityAsLong));
}
/**
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
index 4ba6fbb..ae090d1 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandlerTest.java
@@ -61,7 +61,7 @@ class CassandraIndexTableHandlerTest {
private static final CassandraId MAILBOX_ID = CassandraId.timeBased();
private static final MessageUid MESSAGE_UID = MessageUid.of(18L);
private static final CassandraMessageId CASSANDRA_MESSAGE_ID = new CassandraMessageId.Factory().generate();
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(15);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(15);
private static final ModSeq MODSEQ = ModSeq.of(17);
@RegisterExtension
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 62aeb01..46451c0 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
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraMailboxCounterDAOTest {
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(15);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(15);
private static final CassandraId MAILBOX_ID = CassandraId.timeBased();
@RegisterExtension
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
index 54d0134..3fc20cf 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java
@@ -51,8 +51,8 @@ import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
class CassandraMailboxDAOTest {
- private static final UidValidity UID_VALIDITY_1 = UidValidity.ofValid(145);
- private static final UidValidity UID_VALIDITY_2 = UidValidity.ofValid(147);
+ private static final UidValidity UID_VALIDITY_1 = UidValidity.of(145);
+ private static final UidValidity UID_VALIDITY_2 = UidValidity.of(147);
private static final Username USER = Username.of("user");
private static final MailboxPath NEW_MAILBOX_PATH = MailboxPath.forUser(USER, "xyz");
private static CassandraId CASSANDRA_ID_1 = CassandraId.timeBased();
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
index c239e4c..54e7290 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraMailboxMapperConcurrencyTest {
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(52);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(52);
private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(Username.of("user"), "name");
private static final int THREAD_COUNT = 10;
private static final int OPERATION_COUNT = 10;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index 2a044ec..d16a079 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@ -62,7 +62,7 @@ import com.github.fge.lambdas.runnable.ThrowingRunnable;
import reactor.core.publisher.Mono;
class CassandraMailboxMapperTest {
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(52);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(52);
private static final Username USER = Username.of("user");
private static final CassandraId MAILBOX_ID = CassandraId.timeBased();
private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(USER, "name");
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
index 9d25206..6c328a4 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java
@@ -56,7 +56,7 @@ class CassandraModSeqProviderTest {
void setUp(CassandraCluster cassandra) {
modSeqProvider = new CassandraModSeqProvider(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION);
MailboxPath path = new MailboxPath("gsoc", Username.of("ieugen"), "Trash");
- mailbox = new Mailbox(path, UidValidity.ofValid(1234), CASSANDRA_ID);
+ mailbox = new Mailbox(path, UidValidity.of(1234), CASSANDRA_ID);
}
@Test
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
index 53bcdc1..80c43b0 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java
@@ -56,7 +56,7 @@ class CassandraUidProviderTest {
void setUp(CassandraCluster cassandra) {
uidProvider = new CassandraUidProvider(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION);
MailboxPath path = new MailboxPath("gsoc", Username.of("ieugen"), "Trash");
- mailbox = new Mailbox(path, UidValidity.ofValid(1234), CASSANDRA_ID);
+ mailbox = new Mailbox(path, UidValidity.of(1234), CASSANDRA_ID);
}
@Test
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
index 7412e05..82ee289 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
@@ -50,7 +50,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class MailboxPathV2MigrationTest {
private static final MailboxPath MAILBOX_PATH_1 = MailboxPath.forUser(Username.of("bob"), "Important");
- private static final UidValidity UID_VALIDITY_1 = UidValidity.ofValid(452);
+ private static final UidValidity UID_VALIDITY_1 = UidValidity.of(452);
private static final CassandraId MAILBOX_ID_1 = CassandraId.timeBased();
public static final CassandraModule MODULES = CassandraModule.aggregateModules(
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersServiceTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersServiceTest.java
index 334f7b4..79b9c94 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersServiceTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersServiceTest.java
@@ -55,7 +55,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
class RecomputeMailboxCountersServiceTest {
- private static final UidValidity UID_VALIDITY_1 = UidValidity.ofValid(145);
+ private static final UidValidity UID_VALIDITY_1 = UidValidity.of(145);
private static final Username USER = Username.of("user");
private static final MailboxPath MAILBOX_PATH = MailboxPath.forUser(USER, "abc");
private static final CassandraMessageId.Factory MESSAGE_ID_FACTORY = new CassandraMessageId.Factory();
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
index d775974..2bedbe5 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
@@ -143,7 +143,7 @@ public class JPAMailbox {
private UidValidity sanitizeUidValidity() {
if (UidValidity.isValid(uidValidity)) {
- return UidValidity.ofValid(uidValidity);
+ return UidValidity.of(uidValidity);
}
UidValidity sanitizedUidValidity = UidValidity.generate();
// Update storage layer thanks to JPA magics!
diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
index 1b45f08..6ff52fb 100644
--- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
+++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
@@ -62,9 +62,9 @@ class LuceneMailboxMessageSearchIndexTest {
static final TestId TEST_ID_3 = TestId.of(2);
static final Username BOB = Username.of("bob");
- Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.ofValid(18), TEST_ID_1);
- Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.ofValid(19), TEST_ID_2);
- Mailbox mailbox3 = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.ofValid(12), TEST_ID_3);
+ Mailbox mailbox = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.of(18), TEST_ID_1);
+ Mailbox mailbox2 = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.of(19), TEST_ID_2);
+ Mailbox mailbox3 = new Mailbox(MailboxPath.forUser(BOB, "box"), UidValidity.of(12), TEST_ID_3);
LuceneMessageSearchIndex index;
MailboxSession session;
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
index 88148ff..6475c3e 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
@@ -290,7 +290,7 @@ public class MaildirFolder {
if (!UidValidity.isValid(uidValidityValue)) {
return resetUidValidity();
}
- return UidValidity.ofValid(uidValidityValue);
+ return UidValidity.of(uidValidityValue);
}
/**
diff --git a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
index f4bdc90..4227d3b 100644
--- a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
+++ b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
@@ -61,7 +61,7 @@ import org.junit.jupiter.api.Test;
class SpamAssassinListenerTest {
static final Username USER = Username.of("user");
static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER);
- static final UidValidity UID_VALIDITY = UidValidity.ofValid(43);
+ static final UidValidity UID_VALIDITY = UidValidity.of(43);
static final TestMessageId MESSAGE_ID = TestMessageId.of(45);
SpamAssassin spamAssassin;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java
index 008c170..7aa4a76 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreRightManagerTest.java
@@ -59,7 +59,7 @@ import org.junit.jupiter.api.Test;
class StoreRightManagerTest {
static final MailboxId MAILBOX_ID = TestId.of(42);
- static final UidValidity UID_VALIDITY = UidValidity.ofValid(3421L);
+ static final UidValidity UID_VALIDITY = UidValidity.of(3421L);
StoreRightManager storeRightManager;
MailboxSession aliceSession;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
index 97963f6..0d158a6 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssertTest.java
@@ -40,7 +40,7 @@ class ListMailboxAssertTest {
static final String NAME = "name";
static final Username USER = Username.of("user");
static final String NAMESPACE = "namespace";
- static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ static final UidValidity UID_VALIDITY = UidValidity.of(42);
static final MailboxId MAILBOX_ID_1 = TestId.of(1);
static final MailboxId MAILBOX_ID_2 = TestId.of(2);
static final Mailbox MAILBOX_1 = new Mailbox(new MailboxPath(NAMESPACE, USER, NAME), UID_VALIDITY, MAILBOX_ID_1);
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
index 63b2cbd..99318de 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssertTest.java
@@ -50,7 +50,7 @@ class ListMessageAssertTest {
static final String BODY_CONTENT2 = "Subject: Test2 \n\nBody2\n.\n";
static final String BODY_CONTENT1 = "Subject: Test1 \n\nBody1\n.\n";
static final int BODY_START = 16;
- static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ static final UidValidity UID_VALIDITY = UidValidity.of(42);
static final MailboxId MAILBOX_ID = TestId.of(1);
static final MessageUid MESSAGE_UID = MessageUid.of(2);
static final MessageId MESSAGE_ID = new DefaultMessageId();
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
index 7776c6a..744892f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableMap;
public abstract class MailboxMapperACLTest {
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(42);
private static final boolean POSITIVE = true;
private static final boolean NEGATIVE = !POSITIVE;
private static final Username USER = Username.of("user");
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
index a25c765..98bf41a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java
@@ -49,7 +49,7 @@ import org.junit.jupiter.api.Test;
public abstract class MailboxMapperTest {
private static final char DELIMITER = '.';
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(42);
private static final Username BENWA = Username.of("benwa");
protected static final MailboxPath benwaInboxPath = MailboxPath.forUser(BENWA, "INBOX");
private static final MailboxPath benwaWorkPath = MailboxPath.forUser(BENWA, "INBOX" + DELIMITER + "work");
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
index a14b98d..731f35a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
@@ -65,7 +65,7 @@ public abstract class MessageIdMapperTest {
private static final char DELIMITER = '.';
private static final int BODY_START = 16;
- protected static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ protected static final UidValidity UID_VALIDITY = UidValidity.of(42);
private MessageMapper messageMapper;
private MailboxMapper mailboxMapper;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
index 14341ee..44b45b8 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
@@ -70,7 +70,7 @@ public abstract class MessageMapperTest {
private static final char DELIMITER = '.';
private static final int LIMIT = 10;
private static final int BODY_START = 16;
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(42);
private static final String USER_FLAG = "userFlag";
private static final String CUSTOMS_USER_FLAGS_VALUE = "CustomsFlags";
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
index 7ef5380..4542f2f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java
@@ -48,7 +48,7 @@ public abstract class MessageMoveTest {
private static final char DELIMITER = '.';
private static final int LIMIT = 10;
private static final int BODY_START = 16;
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(42);
private MapperProvider mapperProvider;
private MessageMapper messageMapper;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
index b096fd1..f10a0b6 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java
@@ -55,7 +55,7 @@ public abstract class MessageWithAttachmentMapperTest {
private static final int LIMIT = 10;
private static final int BODY_START = 16;
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(42);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(42);
private MapperProvider mapperProvider;
private MessageMapper messageMapper;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
index 82cf761..d744e15 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolverTest.java
@@ -49,9 +49,9 @@ class DefaultUserQuotaRootResolverTest {
static final Username BENWA = Username.of("benwa");
static final MailboxId MAILBOX_ID = TestId.of(42);
static final MailboxPath MAILBOX_PATH = MailboxPath.inbox(BENWA);
- static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UidValidity.ofValid(10), MAILBOX_ID);
+ static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UidValidity.of(10), MAILBOX_ID);
static final MailboxPath MAILBOX_PATH_2 = MailboxPath.forUser(BENWA, "test");
- static final Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_2, UidValidity.ofValid(10), MAILBOX_ID);
+ static final Mailbox MAILBOX_2 = new Mailbox(MAILBOX_PATH_2, UidValidity.of(10), MAILBOX_ID);
static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("#private&benwa", Optional.empty());
static final MailboxSession MAILBOX_SESSION = null;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
index 35a764d..9c09ab2 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
@@ -49,7 +49,7 @@ class QuotaCheckerTest {
static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("benwa", Optional.empty());
static final MailboxId MAILBOX_ID = TestId.of(42);
static final MailboxPath MAILBOX_PATH = MailboxPath.inbox(Username.of("benwa"));
- static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UidValidity.ofValid(10), MAILBOX_ID);
+ static final Mailbox MAILBOX = new Mailbox(MAILBOX_PATH, UidValidity.of(10), MAILBOX_ID);
QuotaRootResolver mockedQuotaRootResolver;
QuotaManager mockedQuotaManager;
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
index 1bd3841..d183a29 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/AbstractSelectionCommandParser.java
@@ -133,7 +133,7 @@ public abstract class AbstractSelectionCommandParser extends AbstractImapCommand
private UidValidity sanitizeUidValidity(long uidValidityAsNumber) {
if (UidValidity.isValid(uidValidityAsNumber)) {
- return UidValidity.ofValid(uidValidityAsNumber);
+ return UidValidity.of(uidValidityAsNumber);
} else {
// The UidValidity cached by the client is invalid
// We know that the backend will regenerate it
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
index 5ad5417..110feee 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
@@ -51,7 +51,7 @@ public class MailboxStatusResponseEncoderTest {
final Long messages = 2L;
final Long recent = 3L;
final MessageUid uidNext = MessageUid.of(5);
- final UidValidity uidValidity = UidValidity.ofValid(7L);
+ final UidValidity uidValidity = UidValidity.of(7L);
final Long unseen = 11L;
final String mailbox = "A mailbox named desire";
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
index 11876d4..2b4bb63 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
@@ -60,7 +60,7 @@ import com.google.common.collect.Lists;
public class CopyProcessorTest {
private static final Username USERNAME = Username.of("username");
private static final MailboxPath INBOX = MailboxPath.inbox(USERNAME);
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(58L);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(58L);
private CopyProcessor testee;
private ImapProcessor mockNextProcessor;
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
index 3c91299..7837f48 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
@@ -63,7 +63,7 @@ import com.google.common.collect.Lists;
public class MoveProcessorTest {
private static final Username USERNAME = Username.of("username");
private static final MailboxPath INBOX = MailboxPath.inbox(USERNAME);
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(58L);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(58L);
private MoveProcessor testee;
private ImapProcessor mockNextProcessor;
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
index 0fca17c..736a0f3 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
@@ -117,7 +117,7 @@ public class MailboxEventAnalyserTest {
private static final char PATH_DELIMITER = '.';
private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", USER, "name");
private static final TestId MAILBOX_ID = TestId.of(36);
- private static final UidValidity UID_VALIDITY = UidValidity.ofValid(1024);
+ private static final UidValidity UID_VALIDITY = UidValidity.of(1024);
private static final Mailbox DEFAULT_MAILBOX = new Mailbox(MAILBOX_PATH, UID_VALIDITY, MAILBOX_ID);
private static final MailboxListener.Added ADDED = EventFactory.added()
.randomEventId()
diff --git a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index 945e33e..21c33c7 100644
--- a/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-jmx/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -48,7 +48,7 @@ import org.junit.jupiter.api.Test;
public class MailboxManagementTest {
public static final Username USER = Username.of("user");
- public static final UidValidity UID_VALIDITY = UidValidity.ofValid(10);
+ public static final UidValidity UID_VALIDITY = UidValidity.of(10);
public static final int LIMIT = 1;
private MailboxManagerManagement mailboxManagerManagement;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org