Search - make term/prefix/wildcard/regex query parsing more lenient (#63926)

Remove errors when case_insensitive flag set to false

Closes #63893

docs/reference/query-dsl/prefix-query.asciidoc

@@ -43,7 +43,8 @@ information, see the <<query-dsl-multi-term-rewrite, `rewrite` parameter>>.
 
 `case_insensitive`::
 (Optional, boolean) allows ASCII case insensitive matching of the
-value with the indexed field values when set to true. Setting to false is disallowed.
+value with the indexed field values when set to true. Default is false which means
+the case sensitivity of matching depends on the underlying field's mapping.
 
 [[prefix-query-notes]]
 ==== Notes

docs/reference/query-dsl/regexp-query.asciidoc

@@ -70,7 +70,8 @@ expression syntax>>.
 
 `case_insensitive`::
 (Optional, boolean) allows case insensitive matching of the regular expression
-value with the indexed field values when set to true. Setting to false is disallowed.
+value with the indexed field values when set to true. Default is false which means
+the case sensitivity of matching depends on the underlying field's mapping.
 
 `max_determinized_states`::
 +

docs/reference/query-dsl/term-query.asciidoc

@@ -64,7 +64,8 @@ increases the relevance score.
 
 `case_insensitive`::
 (Optional, boolean) allows ASCII case insensitive matching of the
-value with the indexed field values when set to true. Setting to false is disallowed.
+value with the indexed field values when set to true. Default is false which means
+the case sensitivity of matching depends on the underlying field's mapping
 
 [[term-query-notes]]
 ==== Notes

docs/reference/query-dsl/wildcard-query.asciidoc

@@ -71,7 +71,8 @@ increases the relevance score.
 
 `case_insensitive`::
 (Optional, boolean) allows case insensitive matching of the
-pattern with the indexed field values when set to true. Setting to false is disallowed.
+pattern with the indexed field values when set to true. Default is false which means
+the case sensitivity of matching depends on the underlying field's mapping.
 
 [[wildcard-query-notes]]
 ==== Notes

server/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java

@@ -107,18 +107,15 @@ public class PrefixQueryBuilder extends AbstractQueryBuilder<PrefixQueryBuilder>
     public String value() {
         return this.value;
     }
-    
+
     public PrefixQueryBuilder caseInsensitive(boolean caseInsensitive) {
-        if (caseInsensitive == false) {
-            throw new IllegalArgumentException("The case insensitive setting cannot be set to false.");
-        }
         this.caseInsensitive = caseInsensitive;
         return this;
-    }    
+    }
 
     public boolean caseInsensitive() {
         return this.caseInsensitive;
-    }    
+    }
 
     public PrefixQueryBuilder rewrite(String rewrite) {
         this.rewrite = rewrite;
@@ -175,10 +172,6 @@ public class PrefixQueryBuilder extends AbstractQueryBuilder<PrefixQueryBuilder>
                             rewrite = parser.textOrNull();
                         } else if (CASE_INSENSITIVE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                             caseInsensitive = parser.booleanValue();
-                            if (caseInsensitive == false) {
-                                throw new ParsingException(parser.getTokenLocation(),
-                                    "[prefix] query does not support [" + currentFieldName + "] = false");
-                            }
                         } else {
                             throw new ParsingException(parser.getTokenLocation(),
                                     "[prefix] query does not support [" + currentFieldName + "]");
@@ -192,21 +185,18 @@ public class PrefixQueryBuilder extends AbstractQueryBuilder<PrefixQueryBuilder>
             }
         }
 
-        PrefixQueryBuilder result = new PrefixQueryBuilder(fieldName, value)
+        return new PrefixQueryBuilder(fieldName, value)
                 .rewrite(rewrite)
                 .boost(boost)
-                .queryName(queryName);
+                .queryName(queryName)
-        if (caseInsensitive) {
+                .caseInsensitive(caseInsensitive);
-            result.caseInsensitive(caseInsensitive);            
-        }
-        return result;
     }
 
     @Override
     public String getWriteableName() {
         return NAME;
     }
-    
+
     @Override
     protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws IOException {
         QueryShardContext context = queryRewriteContext.convertToShardContext();

server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java

@@ -154,9 +154,6 @@ public class RegexpQueryBuilder extends AbstractQueryBuilder<RegexpQueryBuilder>
     }
 
     public RegexpQueryBuilder caseInsensitive(boolean caseInsensitive) {
-        if (caseInsensitive == false) {
-            throw new IllegalArgumentException("The case insensitive setting cannot be set to false.");
-        }
         this.caseInsensitive = caseInsensitive;
         return this;
     }
@@ -240,10 +237,6 @@ public class RegexpQueryBuilder extends AbstractQueryBuilder<RegexpQueryBuilder>
                             flagsValue = parser.intValue();
                         } else if (CASE_INSENSITIVE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                             caseInsensitive = parser.booleanValue();
-                            if (caseInsensitive == false) {
-                                throw new ParsingException(parser.getTokenLocation(),
-                                    "[regexp] query does not support [" + currentFieldName + "] = false");
-                            }
                         } else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                             queryName = parser.text();
                         } else {
@@ -265,9 +258,7 @@ public class RegexpQueryBuilder extends AbstractQueryBuilder<RegexpQueryBuilder>
                 .rewrite(rewrite)
                 .boost(boost)
                 .queryName(queryName);
-        if (caseInsensitive) {
+        result.caseInsensitive(caseInsensitive);
-            result.caseInsensitive(caseInsensitive);
-        }
         return result;
     }
 

server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java

@@ -87,9 +87,6 @@ public class TermQueryBuilder extends BaseTermQueryBuilder<TermQueryBuilder> {
     }
     
     public TermQueryBuilder caseInsensitive(boolean caseInsensitive) {
-        if (caseInsensitive == false) {
-            throw new IllegalArgumentException("The case insensitive setting cannot be set to false.");
-        }
         this.caseInsensitive = caseInsensitive;
         return this;
     }    
@@ -144,10 +141,6 @@ public class TermQueryBuilder extends BaseTermQueryBuilder<TermQueryBuilder> {
                             boost = parser.floatValue();
                         } else if (CASE_INSENSITIVE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                             caseInsensitive = parser.booleanValue();
-                            if (caseInsensitive == false) {
-                                throw new ParsingException(parser.getTokenLocation(),
-                                    "[term] query does not support [" + currentFieldName + "] = false");
-                            }
                         } else {
                             throw new ParsingException(parser.getTokenLocation(),
                                     "[term] query does not support [" + currentFieldName + "]");
@@ -168,9 +161,7 @@ public class TermQueryBuilder extends BaseTermQueryBuilder<TermQueryBuilder> {
         if (queryName != null) {
             termQuery.queryName(queryName);
         }
-        if (caseInsensitive) {
+        termQuery.caseInsensitive(caseInsensitive);
-            termQuery.caseInsensitive(caseInsensitive);
-        }
         return termQuery;
     }
     

server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java

@@ -126,18 +126,15 @@ public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuil
     public String rewrite() {
         return this.rewrite;
     }
-    
+
     public WildcardQueryBuilder caseInsensitive(boolean caseInsensitive) {
-        if (caseInsensitive == false) {
-            throw new IllegalArgumentException("The case insensitive setting cannot be set to false.");
-        }
         this.caseInsensitive = caseInsensitive;
         return this;
-    }    
+    }
 
     public boolean caseInsensitive() {
         return this.caseInsensitive;
-    }        
+    }
 
     @Override
     public String getWriteableName() {
@@ -189,10 +186,6 @@ public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuil
                             rewrite = parser.textOrNull();
                         } else if (CASE_INSENSITIVE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                             caseInsensitive = parser.booleanValue();
-                            if (caseInsensitive == false) {
-                                throw new ParsingException(parser.getTokenLocation(),
-                                    "[prefix] query does not support [" + currentFieldName + "] = false");
-                            }
                         } else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                             queryName = parser.text();
                         } else {
@@ -208,16 +201,13 @@ public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuil
             }
         }
 
-        WildcardQueryBuilder result = new WildcardQueryBuilder(fieldName, value)
+        return new WildcardQueryBuilder(fieldName, value)
                 .rewrite(rewrite)
                 .boost(boost)
-                .queryName(queryName);
+                .queryName(queryName)
-        if (caseInsensitive) {
+                .caseInsensitive(caseInsensitive);
-            result.caseInsensitive(caseInsensitive);            
+    }
-        }
+
-        return result;
-    }    
-    
     @Override
     protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws IOException {
         QueryShardContext context = queryRewriteContext.convertToShardContext();

server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java

@@ -151,18 +151,4 @@ public class RegexpQueryBuilderTests extends AbstractQueryTestCase<RegexpQueryBu
         e = expectThrows(ParsingException.class, () -> parseQuery(shortJson));
         assertEquals("[regexp] query doesn't support multiple fields, found [user1] and [user2]", e.getMessage());
     }
-
-    public void testParseFailsWithCaseSensitive() throws IOException {
-        String json =
-                "{\n" +
-                "    \"regexp\": {\n" +
-                "      \"user1\": {\n" +
-                "        \"value\": \"k.*y\",\n" +
-                "        \"case_insensitive\": false\n" +
-                "      },\n" +
-                "    }\n" +
-                "}";
-        ParsingException e = expectThrows(ParsingException.class, () -> parseQuery(json));
-        assertEquals("[regexp] query does not support [case_insensitive] = false", e.getMessage());
-   }
 }