Remove errors when case_insensitive flag set to false

Closes elastic#63893
markharwood · Oct 21, 2020 · 17d3027 · 17d3027
1 parent 265a214
commit 17d3027
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 58 deletions.
diff --git a/docs/reference/query-dsl/prefix-query.asciidoc b/docs/reference/query-dsl/prefix-query.asciidoc
@@ -43,7 +43,7 @@ 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.
 
 [[prefix-query-notes]]
 ==== Notes

diff --git a/docs/reference/query-dsl/regexp-query.asciidoc b/docs/reference/query-dsl/regexp-query.asciidoc
@@ -70,7 +70,7 @@ 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.
 
 `max_determinized_states`::
 +

diff --git a/docs/reference/query-dsl/term-query.asciidoc b/docs/reference/query-dsl/term-query.asciidoc
@@ -64,7 +64,7 @@ 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.
 
 [[term-query-notes]]
 ==== Notes

diff --git a/docs/reference/query-dsl/wildcard-query.asciidoc b/docs/reference/query-dsl/wildcard-query.asciidoc
@@ -71,7 +71,7 @@ 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.
 
 [[wildcard-query-notes]]
 ==== Notes

diff --git a/server/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java
@@ -109,9 +109,6 @@ public String 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;
     }
@@ -175,10 +172,6 @@ public static PrefixQueryBuilder fromXContent(XContentParser parser) throws IOEx
                             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 + "]");
@@ -196,9 +189,7 @@ public static PrefixQueryBuilder fromXContent(XContentParser parser) throws IOEx
                 .rewrite(rewrite)
                 .boost(boost)
                 .queryName(queryName);
-        if (caseInsensitive) {
-            result.caseInsensitive(caseInsensitive);
-        }
+        result.caseInsensitive(caseInsensitive);
         return result;
     }
 

diff --git a/server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java
@@ -154,9 +154,6 @@ public int flags() {
     }
 
     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 static RegexpQueryBuilder fromXContent(XContentParser parser) throws IOEx
                             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 static RegexpQueryBuilder fromXContent(XContentParser parser) throws IOEx
                 .rewrite(rewrite)
                 .boost(boost)
                 .queryName(queryName);
-        if (caseInsensitive) {
-            result.caseInsensitive(caseInsensitive);
-        }
+        result.caseInsensitive(caseInsensitive);
         return result;
     }
 

diff --git a/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java
@@ -86,9 +86,6 @@ public TermQueryBuilder(String fieldName, Object value) {
     }
 
     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;
     }
@@ -143,10 +140,6 @@ public static TermQueryBuilder fromXContent(XContentParser parser) throws IOExce
                             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 + "]");
@@ -167,9 +160,7 @@ public static TermQueryBuilder fromXContent(XContentParser parser) throws IOExce
         if (queryName != null) {
             termQuery.queryName(queryName);
         }
-        if (caseInsensitive) {
-            termQuery.caseInsensitive(caseInsensitive);
-        }
+        termQuery.caseInsensitive(caseInsensitive);
         return termQuery;
     }
 

diff --git a/server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java
@@ -128,9 +128,6 @@ public String 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;
     }
@@ -189,10 +186,6 @@ public static WildcardQueryBuilder fromXContent(XContentParser parser) throws IO
                             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 {
@@ -212,9 +205,7 @@ public static WildcardQueryBuilder fromXContent(XContentParser parser) throws IO
                 .rewrite(rewrite)
                 .boost(boost)
                 .queryName(queryName);
-        if (caseInsensitive) {
-            result.caseInsensitive(caseInsensitive);
-        }
+        result.caseInsensitive(caseInsensitive);
         return result;
     }
 

diff --git a/server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java
@@ -151,18 +151,4 @@ public void testParseFailsWithMultipleFields() throws IOException {
         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());
-   }
 }