JAMES-2142 Add attachments in Text search filter
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/33846e69 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/33846e69 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/33846e69 Branch: refs/heads/master Commit: 33846e69f0d5ab3797ea8c0311ec2a93c3abc572 Parents: acaf6c2 Author: Antoine Duprat <adup...@linagora.com> Authored: Fri Sep 8 10:43:54 2017 +0200 Committer: Antoine Duprat <adup...@linagora.com> Committed: Wed Sep 13 10:20:56 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/james/jmap/utils/FilterToSearchQuery.java | 2 ++ .../java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/33846e69/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/FilterToSearchQuery.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/FilterToSearchQuery.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/FilterToSearchQuery.java index f619357..f357628 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/FilterToSearchQuery.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/FilterToSearchQuery.java @@ -21,6 +21,7 @@ package org.apache.james.jmap.utils; import java.util.Date; import java.util.Optional; + import javax.mail.Flags.Flag; import org.apache.james.jmap.model.Filter; @@ -58,6 +59,7 @@ public class FilterToSearchQuery { SearchQuery.address(AddressType.Cc, text), SearchQuery.address(AddressType.Bcc, text), SearchQuery.headerContains("Subject", text), + SearchQuery.attachmentContains(text), SearchQuery.bodyContains(text))) )); filter.getFrom().ifPresent(from -> searchQuery.andCriteria(SearchQuery.address(AddressType.From, from))); http://git-wip-us.apache.org/repos/asf/james-project/blob/33846e69/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java index 10f7ce0..0662003 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/FilterToSearchQueryTest.java @@ -170,7 +170,8 @@ public class FilterToSearchQueryTest { SearchQuery.address(AddressType.Cc, text), SearchQuery.address(AddressType.Bcc, text), SearchQuery.headerContains("Subject", text), - SearchQuery.bodyContains(text)))); + SearchQuery.bodyContains(text), + SearchQuery.attachmentContains(text)))); SearchQuery searchQuery = new FilterToSearchQuery().convert(FilterCondition.builder() .text(text) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org