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
The following commit(s) were added to refs/heads/master by this push:
new a75cf9c7d6 JAMES-4057 Use And operator to back simple query string
(#2793)
a75cf9c7d6 is described below
commit a75cf9c7d6b04371bcb39efff1ebc8ba7e9fcc1c
Author: Benoit TELLIER <[email protected]>
AuthorDate: Mon Sep 1 05:52:46 2025 +0700
JAMES-4057 Use And operator to back simple query string (#2793)
---
.../james/mailbox/opensearch/query/DefaultCriterionConverter.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/query/DefaultCriterionConverter.java
b/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/query/DefaultCriterionConverter.java
index 5814c603cb..762506374e 100644
---
a/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/query/DefaultCriterionConverter.java
+++
b/mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/query/DefaultCriterionConverter.java
@@ -228,6 +228,7 @@ public class DefaultCriterionConverter implements
CriterionConverter {
return new SimpleQueryStringQuery.Builder()
.fields(ImmutableList.of(JsonMessageConstants.TEXT_BODY,
JsonMessageConstants.HTML_BODY))
.query(textCriterion.getOperator().getValue())
+ .defaultOperator(Operator.And)
.build().toQuery();
} else {
return new BoolQuery.Builder()
@@ -254,6 +255,7 @@ public class DefaultCriterionConverter implements
CriterionConverter {
.should(new SimpleQueryStringQuery.Builder()
.fields(ImmutableList.of(JsonMessageConstants.TEXT_BODY,
JsonMessageConstants.HTML_BODY, JsonMessageConstants.ATTACHMENTS + "." +
JsonMessageConstants.Attachment.TEXT_CONTENT))
.query(textCriterion.getOperator().getValue())
+ .defaultOperator(Operator.And)
.build().toQuery())
.should(new TermQuery.Builder()
.field(JsonMessageConstants.ATTACHMENTS + "." +
JsonMessageConstants.Attachment.FILE_EXTENSION)
@@ -299,6 +301,7 @@ public class DefaultCriterionConverter implements
CriterionConverter {
.should(new SimpleQueryStringQuery.Builder()
.fields(ImmutableList.of(JsonMessageConstants.ATTACHMENTS + "." +
JsonMessageConstants.Attachment.TEXT_CONTENT))
.query(textCriterion.getOperator().getValue())
+ .defaultOperator(Operator.And)
.build().toQuery())
.should(new TermQuery.Builder()
.field(JsonMessageConstants.ATTACHMENTS + "." +
JsonMessageConstants.Attachment.FILE_EXTENSION)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
