From 4c41c7a9f45b72edee495a204ccc38c5f9f8aee1 Mon Sep 17 00:00:00 2001
From: Will James <jameswt@gmail.com>
Date: Thu, 10 Mar 2022 11:14:15 -0600
Subject: [PATCH] Do not send default ignore_throttled parameter since it is
 deprecated (#84827)

---
 .../client/RequestConverters.java             |  4 +++-
 .../client/RequestConvertersTests.java        | 24 +++++++++++++++----
 docs/changelog/84827.yaml                     |  5 ++++
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 docs/changelog/84827.yaml

diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java
index 92fe494417b7..1e1ec875c286 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java
@@ -1086,7 +1086,9 @@ final class RequestConverters {
                     expandWildcards = joiner.toString();
                 }
                 putParam("expand_wildcards", expandWildcards);
-                putParam("ignore_throttled", Boolean.toString(indicesOptions.ignoreThrottled()));
+                if (indicesOptions.ignoreThrottled() == false) {
+                    putParam("ignore_throttled", Boolean.toString(indicesOptions.ignoreThrottled()));
+                }
             }
             return this;
         }
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java
index 4936b9e6a547..1c242ad3a056 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java
@@ -1773,7 +1773,10 @@ public class RequestConvertersTests extends ESTestCase {
         endpoint.add("_field_caps");
 
         assertEquals(endpoint.toString(), request.getEndpoint());
-        int expectedSize = FieldCapabilitiesRequest.DEFAULT_INDICES_OPTIONS.equals(fieldCapabilitiesRequest.indicesOptions()) ? 1 : 5;
+        int expectedSize = expectedParameterCount(
+            FieldCapabilitiesRequest.DEFAULT_INDICES_OPTIONS,
+            fieldCapabilitiesRequest.indicesOptions()
+        );
         assertEquals(expectedSize, request.getParameters().size());
 
         // Note that we don't check the field param value explicitly, as field names are
@@ -1814,7 +1817,10 @@ public class RequestConvertersTests extends ESTestCase {
         endpoint.add("_field_caps");
 
         assertEquals(endpoint.toString(), request.getEndpoint());
-        int expectedSize = FieldCapabilitiesRequest.DEFAULT_INDICES_OPTIONS.equals(fieldCapabilitiesRequest.indicesOptions()) ? 1 : 5;
+        int expectedSize = expectedParameterCount(
+            FieldCapabilitiesRequest.DEFAULT_INDICES_OPTIONS,
+            fieldCapabilitiesRequest.indicesOptions()
+        );
         assertEquals(expectedSize, request.getParameters().size());
 
         // Note that we don't check the field param value explicitly, as field names are
@@ -1855,7 +1861,7 @@ public class RequestConvertersTests extends ESTestCase {
         }
         endpoint.add(RestRankEvalAction.ENDPOINT);
         assertEquals(endpoint.toString(), request.getEndpoint());
-        int expectedSize = SearchRequest.DEFAULT_INDICES_OPTIONS.equals(rankEvalRequest.indicesOptions()) ? 1 : 5;
+        int expectedSize = expectedParameterCount(SearchRequest.DEFAULT_INDICES_OPTIONS, rankEvalRequest.indicesOptions());
         assertEquals(expectedSize, request.getParameters().size());
         assertEquals(expectedParams, request.getParameters());
         assertToXContentBody(spec, request.getEntity());
@@ -2241,7 +2247,9 @@ public class RequestConvertersTests extends ESTestCase {
         } else {
             expectedParams.put("expand_wildcards", "none");
         }
-        expectedParams.put("ignore_throttled", Boolean.toString(getter.get().ignoreThrottled()));
+        if (getter.get().ignoreThrottled() == false) {
+            expectedParams.put("ignore_throttled", Boolean.toString(getter.get().ignoreThrottled()));
+        }
     }
 
     static IndicesOptions setRandomIndicesOptions(IndicesOptions indicesOptions, Map<String, String> expectedParams) {
@@ -2268,10 +2276,16 @@ public class RequestConvertersTests extends ESTestCase {
         } else {
             expectedParams.put("expand_wildcards", "none");
         }
-        expectedParams.put("ignore_throttled", Boolean.toString(indicesOptions.ignoreThrottled()));
+        if (indicesOptions.ignoreThrottled() == false) {
+            expectedParams.put("ignore_throttled", Boolean.toString(indicesOptions.ignoreThrottled()));
+        }
         return indicesOptions;
     }
 
+    static int expectedParameterCount(IndicesOptions defaultOptions, IndicesOptions indicesOptions) {
+        return defaultOptions.equals(indicesOptions) ? 1 : indicesOptions.ignoreThrottled() ? 4 : 5;
+    }
+
     static void setRandomIncludeDefaults(Consumer<Boolean> setter, Map<String, String> expectedParams) {
         if (randomBoolean()) {
             boolean includeDefaults = randomBoolean();
diff --git a/docs/changelog/84827.yaml b/docs/changelog/84827.yaml
new file mode 100644
index 000000000000..045a1026f002
--- /dev/null
+++ b/docs/changelog/84827.yaml
@@ -0,0 +1,5 @@
+pr: 84827
+summary: Do not send default ignore_throttled parameter since it is deprecated
+area: Java High Level REST Client
+type: bug
+issues: []