Revert "Test utility for POST _features/_reset (elastic#137133)"

This reverts commit df67e27.

Author: DaveCTurner

qa/system-indices/src/javaRestTest/java/org/elasticsearch/system/indices/FeatureUpgradeApiIT.java

@@ -29,7 +29,7 @@ public class FeatureUpgradeApiIT extends AbstractSystemIndicesIT {
 
     @After
     public void resetFeatures() throws Exception {
-        performPostFeaturesReset(client());
+        client().performRequest(new Request("POST", "/_features/_reset"));
     }
 
     public void testCreatingSystemIndex() throws Exception {

qa/system-indices/src/javaRestTest/java/org/elasticsearch/system/indices/NetNewSystemIndicesIT.java

@@ -94,6 +94,6 @@ public void testSearch() throws Exception {
 
     @After
     public void resetFeatures() throws Exception {
-        performPostFeaturesReset(client());
+        client().performRequest(new Request("POST", "/_features/_reset"));
     }
 }

qa/system-indices/src/javaRestTest/java/org/elasticsearch/system/indices/SystemAliasIT.java

@@ -26,7 +26,7 @@ public class SystemAliasIT extends AbstractSystemIndicesIT {
 
     @After
     public void resetFeatures() throws Exception {
-        performPostFeaturesReset(client());
+        client().performRequest(new Request("POST", "/_features/_reset"));
     }
 
     public void testCreatingSystemIndexWithAlias() throws Exception {

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -925,16 +925,6 @@ protected boolean preserveSearchableSnapshotsIndicesUponCompletion() {
         return false;
     }
 
-    /**
-     * Invoke {@code POST /_features/_reset?error_trace&master_timeout=-1} with the given {@link RestClient}.
-     */
-    public static void performPostFeaturesReset(RestClient restClient) throws IOException {
-        final var request = new Request(HttpPost.METHOD_NAME, "/_features/_reset");
-        request.addParameter("error_trace", "true");
-        request.addParameter("master_timeout", "-1");
-        assertOK(restClient.performRequest(request));
-    }
-
     private void wipeCluster() throws Exception {
         waitForClusterUpdates();
 
@@ -961,7 +951,8 @@ private void wipeCluster() throws Exception {
         wipeSnapshots();
 
         if (resetFeatureStates()) {
-            performPostFeaturesReset(cleanupClient());
+            final Request postRequest = new Request("POST", "/_features/_reset");
+            cleanupClient().performRequest(postRequest);
         }
 
         // wipe data streams before indices so that the backing indices for data streams are handled properly

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/integration/MlRestTestStateCleaner.java

@@ -17,7 +17,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.test.rest.ESRestTestCase.performPostFeaturesReset;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 
@@ -34,7 +33,7 @@ public MlRestTestStateCleaner(Logger logger, RestClient adminClient) {
     public void resetFeatures() throws IOException {
         deletePipelinesWithInferenceProcessors();
         // This resets all features, not just ML, but they should have been getting reset between tests anyway so it shouldn't matter
-        performPostFeaturesReset(adminClient);
+        adminClient.performRequest(new Request("POST", "/_features/_reset"));
     }
 
     @SuppressWarnings("unchecked")

x-pack/plugin/deprecation/qa/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/MlDeprecationIT.java

@@ -59,7 +59,8 @@ protected String getTestRestCluster() {
 
     @After
     public void resetFeatures() throws IOException {
-        performPostFeaturesReset(adminClient());
+        Response response = adminClient().performRequest(new Request("POST", "/_features/_reset"));
+        assertOK(response);
     }
 
     @Override

x-pack/plugin/ml/qa/disabled/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlPluginDisabledIT.java

@@ -75,7 +75,8 @@ public void testActionsFail() throws Exception {
     }
 
     public void testMlFeatureReset() throws IOException {
-        performPostFeaturesReset(client());
+        Request request = new Request("POST", "/_features/_reset");
+        assertOK(client().performRequest(request));
     }
 
     @SuppressWarnings("unchecked")

x-pack/plugin/ml/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/InferenceTestCase.java

@@ -33,7 +33,7 @@ public void cleanup() throws Exception {
         }
         createdPipelines.clear();
         waitForStats();
-        performPostFeaturesReset(adminClient());
+        adminClient().performRequest(new Request("POST", "/_features/_reset"));
     }
 
     void deletePipeline(String pipelineId) throws IOException {

x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TestFeatureResetIT.java

@@ -6,6 +6,7 @@
  */
 package org.elasticsearch.xpack.transform.integration;
 
+import org.apache.http.client.methods.HttpPost;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.Response;
@@ -94,7 +95,7 @@ public void testTransformFeatureReset() throws Exception {
 
         startTransform(continuousTransformId, RequestOptions.DEFAULT);
 
-        performPostFeaturesReset(client());
+        assertOK(client().performRequest(new Request(HttpPost.METHOD_NAME, "/_features/_reset")));
 
         Response response = adminClient().performRequest(new Request("GET", "/_cluster/state?metric=metadata"));
         Map<String, Object> metadata = (Map<String, Object>) ESRestTestCase.entityAsMap(response).get("metadata");

x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformGetAndGetStatsIT.java

@@ -66,7 +66,7 @@ public void createIndexes() throws IOException {
 
     @After
     public void clearOutTransforms() throws Exception {
-        performPostFeaturesReset(adminClient());
+        adminClient().performRequest(new Request("POST", "/_features/_reset"));
     }
 
     @SuppressWarnings("unchecked")