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/30 03:35:36 UTC
[james-project] 24/29: [REFACTORING] SearchQuery::uid should accept
a vararg
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 9fd0c6a4437fc08819c77e259a214e79360863a9
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Dec 25 09:14:12 2020 +0700
[REFACTORING] SearchQuery::uid should accept a vararg
---
.../org/apache/james/mailbox/model/SearchQuery.java | 2 +-
.../search/LuceneMailboxMessageSearchIndexTest.java | 6 +++---
.../store/search/AbstractMessageSearchIndexTest.java | 17 +++++++----------
.../james/mailbox/store/search/SearchUtilsTest.java | 20 ++++++++------------
4 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
index e3daeeb..52a51f6 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
@@ -523,7 +523,7 @@ public class SearchQuery implements Serializable {
* <code>NumericRange</code>'s, not null
* @return <code>Criterion</code>, not null
*/
- public static Criterion uid(UidRange[] range) {
+ public static Criterion uid(UidRange... range) {
return new UidCriterion(range);
}
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 5ef86c7..9508ffe 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
@@ -419,7 +419,7 @@ class LuceneMailboxMessageSearchIndexTest {
void uidSearchShouldMatch() throws Exception {
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
- SearchQuery query = SearchQuery.of(SearchQuery.uid(new SearchQuery.UidRange[] {new SearchQuery.UidRange(uid1)}));
+ SearchQuery query = SearchQuery.of(SearchQuery.uid(new SearchQuery.UidRange(uid1)));
Stream<MessageUid> result = index.search(session, mailbox, query).toStream();
assertThat(result).containsExactly(uid1);
}
@@ -428,7 +428,7 @@ class LuceneMailboxMessageSearchIndexTest {
void uidRangeSearchShouldMatch() throws Exception {
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
- SearchQuery query = SearchQuery.of(SearchQuery.uid(new SearchQuery.UidRange[] {new SearchQuery.UidRange(uid1), new SearchQuery.UidRange(uid3,uid4)}));
+ SearchQuery query = SearchQuery.of(SearchQuery.uid(new SearchQuery.UidRange(uid1), new SearchQuery.UidRange(uid3,uid4)));
Stream<MessageUid> result = index.search(session, mailbox, query).toStream();
assertThat(result).containsExactly(uid1, uid3, uid4);
}
@@ -583,7 +583,7 @@ class LuceneMailboxMessageSearchIndexTest {
@Test
void notOperatorShouldReverseMatching() throws Exception {
- SearchQuery query = SearchQuery.of(SearchQuery.not(SearchQuery.uid(new SearchQuery.UidRange[] { new SearchQuery.UidRange(uid1)})));
+ SearchQuery query = SearchQuery.of(SearchQuery.not(SearchQuery.uid(new SearchQuery.UidRange(uid1))));
Stream<MessageUid> result = index.search(session, mailbox, query).toStream();
assertThat(result).containsExactly(uid3, uid4);
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
index 30f1ac1..da59e1f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
@@ -1073,8 +1073,9 @@ public abstract class AbstractMessageSearchIndexTest {
@Test
void uidShouldreturnExistingUidsOnTheGivenRanges() throws Exception {
- SearchQuery.UidRange[] numericRanges = {new SearchQuery.UidRange(m2.getUid(), m4.getUid()), new SearchQuery.UidRange(m6.getUid(), m7.getUid())};
- SearchQuery searchQuery = SearchQuery.of(SearchQuery.uid(numericRanges));
+ SearchQuery searchQuery = SearchQuery.of(SearchQuery.uid(
+ new SearchQuery.UidRange(m2.getUid(), m4.getUid()),
+ new SearchQuery.UidRange(m6.getUid(), m7.getUid())));
assertThat(messageSearchIndex.search(session, mailbox, searchQuery).toStream())
.containsOnly(m2.getUid(), m3.getUid(), m4.getUid(), m6.getUid(), m7.getUid());
@@ -1189,9 +1190,8 @@ public abstract class AbstractMessageSearchIndexTest {
@Test
protected void sortOnCcShouldWork() throws Exception {
- SearchQuery.UidRange[] numericRanges = {new SearchQuery.UidRange(m2.getUid(), m5.getUid())};
SearchQuery searchQuery = SearchQuery.builder()
- .andCriteria(SearchQuery.uid(numericRanges))
+ .andCriteria(SearchQuery.uid(new SearchQuery.UidRange(m2.getUid(), m5.getUid())))
.sorts(new Sort(SortClause.MailboxCc))
.build();
@@ -1205,9 +1205,8 @@ public abstract class AbstractMessageSearchIndexTest {
@Test
protected void sortOnFromShouldWork() throws Exception {
- SearchQuery.UidRange[] numericRanges = {new SearchQuery.UidRange(m2.getUid(), m5.getUid())};
SearchQuery searchQuery = SearchQuery.builder()
- .andCriteria(SearchQuery.uid(numericRanges))
+ .andCriteria(SearchQuery.uid(new SearchQuery.UidRange(m2.getUid(), m5.getUid())))
.sorts(new Sort(SortClause.MailboxFrom))
.build();
@@ -1221,9 +1220,8 @@ public abstract class AbstractMessageSearchIndexTest {
@Test
protected void sortOnToShouldWork() throws Exception {
- SearchQuery.UidRange[] numericRanges = {new SearchQuery.UidRange(m2.getUid(), m5.getUid())};
SearchQuery searchQuery = SearchQuery.builder()
- .andCriteria(SearchQuery.uid(numericRanges))
+ .andCriteria(SearchQuery.uid(new SearchQuery.UidRange(m2.getUid(), m5.getUid())))
.sorts(new Sort(SortClause.MailboxTo))
.build();
@@ -1237,9 +1235,8 @@ public abstract class AbstractMessageSearchIndexTest {
@Test
void sortOnSubjectShouldWork() throws Exception {
- SearchQuery.UidRange[] numericRanges = {new SearchQuery.UidRange(m2.getUid(), m5.getUid())};
SearchQuery searchQuery = SearchQuery.builder()
- .andCriteria(SearchQuery.uid(numericRanges))
+ .andCriteria(SearchQuery.uid(new SearchQuery.UidRange(m2.getUid(), m5.getUid())))
.sorts(new Sort(SortClause.BaseSubject))
.build();
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsTest.java
index f622d1f..5d1bb0f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsTest.java
@@ -457,21 +457,21 @@ class SearchUtilsTest {
void testShouldMatchUidRange() throws Exception {
builder.setKey(1, MessageUid.of(1729));
MailboxMessage row = builder.build();
- assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1))), row, recent)).isFalse();
- assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1728), MessageUid.of(1728))), row,
+ assertThat(messageSearches.isMatch(SearchQuery.uid(new SearchQuery.UidRange(MessageUid.of(1), MessageUid.of(1))), row, recent)).isFalse();
+ assertThat(messageSearches.isMatch(SearchQuery.uid(new SearchQuery.UidRange(MessageUid.of(1728), MessageUid.of(1728))), row,
recent)).isFalse();
- assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1729), MessageUid.of(1729))), row,
+ assertThat(messageSearches.isMatch(SearchQuery.uid(new SearchQuery.UidRange(MessageUid.of(1729), MessageUid.of(1729))), row,
recent)).isTrue();
- assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730), MessageUid.of(1730))), row,
+ assertThat(messageSearches.isMatch(SearchQuery.uid(new SearchQuery.UidRange(MessageUid.of(1730), MessageUid.of(1730))), row,
recent)).isFalse();
- assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1728))), row,
+ assertThat(messageSearches.isMatch(SearchQuery.uid(new SearchQuery.UidRange(MessageUid.of(1), MessageUid.of(1728))), row,
recent)).isFalse();
- assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1729))), row,
+ assertThat(messageSearches.isMatch(SearchQuery.uid(new SearchQuery.UidRange(MessageUid.of(1), MessageUid.of(1729))), row,
recent)).isTrue();
- assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1729), MessageUid.of(1800))), row,
+ assertThat(messageSearches.isMatch(SearchQuery.uid(new SearchQuery.UidRange(MessageUid.of(1729), MessageUid.of(1800))), row,
recent)).isTrue();
assertThat(messageSearches.isMatch(SearchQuery
- .uid(range(MessageUid.of(1730), MessageUid.MAX_VALUE)), row, recent)).isFalse();
+ .uid(new SearchQuery.UidRange(MessageUid.of(1730), MessageUid.MAX_VALUE)), row, recent)).isFalse();
assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730),
MessageUid.MAX_VALUE, MessageUid.of(1), MessageUid.of(1728))), row, recent)).isFalse();
assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730), MessageUid.MAX_VALUE,
@@ -750,10 +750,6 @@ class SearchUtilsTest {
assertThat(messageSearches.isMatch(SearchQuery.and(SearchQuery.all(),
SearchQuery.all()), row, recent)).isTrue();
}
-
- SearchQuery.UidRange[] range(MessageUid low, MessageUid high) {
- return new SearchQuery.UidRange[]{ new SearchQuery.UidRange(low, high) };
- }
SearchQuery.UidRange[] range(MessageUid lowOne, MessageUid highOne,
MessageUid lowTwo, MessageUid highTwo) {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org