JAMES-4057 Use Query string only when control character are used (#2730)

Author: chibenwa

mailbox/opensearch/src/main/java/org/apache/james/mailbox/opensearch/query/CriterionConverter.java

@@ -55,10 +55,12 @@
 import org.opensearch.client.opensearch._types.query_dsl.TermQuery;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.CharMatcher;
 import com.google.common.collect.ImmutableList;
 
 public class CriterionConverter {
 
+    public static final CharMatcher QUERY_STRING_CONTROL_CHAR = CharMatcher.anyOf("()\"~-|*");
     private final Map<Class<?>, Function<Criterion, Query>> criterionConverterMap;
     private final Map<Class<?>, BiFunction<String, HeaderOperator, Query>> headerOperatorConverterMap;
     private final String textFuzzinessSearchValue;
@@ -224,7 +226,7 @@ private Query convertCustomFlagCriterion(SearchQuery.CustomFlagCriterion criteri
     private Query convertTextCriterion(SearchQuery.TextCriterion textCriterion) {
         switch (textCriterion.getType()) {
         case BODY:
-            if (useQueryStringQuery) {
+            if (useQueryStringQuery && QUERY_STRING_CONTROL_CHAR.matchesAnyOf(textCriterion.getOperator().getValue())) {
                 return new SimpleQueryStringQuery.Builder()
                     .fields(ImmutableList.of(JsonMessageConstants.TEXT_BODY, JsonMessageConstants.HTML_BODY))
                     .query(textCriterion.getOperator().getValue())
@@ -249,7 +251,7 @@ private Query convertTextCriterion(SearchQuery.TextCriterion textCriterion) {
                     .toQuery();
             }
         case FULL:
-            if (useQueryStringQuery) {
+            if (useQueryStringQuery && QUERY_STRING_CONTROL_CHAR.matchesAnyOf(textCriterion.getOperator().getValue())) {
                 return new SimpleQueryStringQuery.Builder()
                     .fields(ImmutableList.of(JsonMessageConstants.TEXT_BODY, JsonMessageConstants.HTML_BODY, JsonMessageConstants.ATTACHMENTS + "." + JsonMessageConstants.Attachment.TEXT_CONTENT))
                     .query(textCriterion.getOperator().getValue())
@@ -493,7 +495,7 @@ private Query convertHeader(SearchQuery.HeaderCriterion headerCriterion) {
     }
 
     private Query convertSubject(SearchQuery.SubjectCriterion headerCriterion) {
-        if (useQueryStringQuery) {
+        if (useQueryStringQuery && QUERY_STRING_CONTROL_CHAR.matchesAnyOf(headerCriterion.getSubject())) {
             return new QueryStringQuery.Builder()
                 .fields(ImmutableList.of(JsonMessageConstants.SUBJECT))
                 .query(headerCriterion.getSubject())