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 07559627d5c61a7237d56a3589846d85d0d5fc21 Author: duc91 <[email protected]> AuthorDate: Wed Sep 23 14:05:46 2020 +0700 JAMES-3374: fixes email/query with filter minSize, maxSize --- .../james/mailbox/elasticsearch/query/CriterionConverter.java | 4 ++-- .../mailbox/store/search/AbstractMessageSearchIndexTest.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/CriterionConverter.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/CriterionConverter.java index 724f711..e654df4 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/CriterionConverter.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/CriterionConverter.java @@ -251,9 +251,9 @@ public class CriterionConverter { case EQUALS: return boolQuery().filter(rangeQuery(fieldName).gte(operator.getValue()).lte(operator.getValue())); case GREATER_THAN: - return boolQuery().filter(rangeQuery(fieldName).gte(operator.getValue())); + return boolQuery().filter(rangeQuery(fieldName).gt(operator.getValue())); case LESS_THAN: - return boolQuery().filter(rangeQuery(fieldName).lte(operator.getValue())); + return boolQuery().filter(rangeQuery(fieldName).lt(operator.getValue())); default: throw new RuntimeException("A non existing numeric operator was triggered"); } 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 4f3e1c2..74b08f7 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 @@ -787,7 +787,7 @@ public abstract class AbstractMessageSearchIndexTest { SearchQuery searchQuery = SearchQuery.of(SearchQuery.modSeqGreaterThan(7L)); assertThat(messageSearchIndex.search(session, mailbox, searchQuery)) - .containsOnly(m7.getUid(), m8.getUid(), m9.getUid()); + .containsOnly(m8.getUid(), m9.getUid()); } @Test @@ -795,7 +795,7 @@ public abstract class AbstractMessageSearchIndexTest { SearchQuery searchQuery = SearchQuery.of(SearchQuery.modSeqLessThan(3L)); assertThat(messageSearchIndex.search(session, mailbox, searchQuery)) - .containsOnly(m1.getUid(), m2.getUid(), m3.getUid()); + .containsOnly(m1.getUid(), m2.getUid()); } @Test @@ -999,7 +999,7 @@ public abstract class AbstractMessageSearchIndexTest { SearchQuery searchQuery = SearchQuery.of(SearchQuery.headerExists("Precedence"), SearchQuery.modSeqGreaterThan(6L)); assertThat(messageSearchIndex.search(session, mailbox, searchQuery)) - .containsOnly(m6.getUid(), m8.getUid(), m9.getUid()); + .containsOnly(m8.getUid(), m9.getUid()); } @Test @@ -1009,7 +1009,7 @@ public abstract class AbstractMessageSearchIndexTest { SearchQuery.modSeqGreaterThan(6L))); assertThat(messageSearchIndex.search(session, mailbox, searchQuery)) - .containsOnly(m6.getUid(), m8.getUid(), m9.getUid()); + .containsOnly(m8.getUid(), m9.getUid()); } @Test @@ -1020,7 +1020,7 @@ public abstract class AbstractMessageSearchIndexTest { SearchQuery.modSeqGreaterThan(6L))); assertThat(messageSearchIndex.search(session, mailbox, searchQuery)) - .containsOnly(m2.getUid(), m3.getUid(), m4.getUid(), m6.getUid(), m7.getUid(), m8.getUid(), m9.getUid()); + .containsOnly(m2.getUid(), m3.getUid(), m4.getUid(), m7.getUid(), m8.getUid(), m9.getUid()); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
