Separate client and csv loading into 2 class rules

Author: alex-spies

x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java

@@ -20,10 +20,11 @@
 
 public class MixedClusterEsqlSpecIT extends EsqlSpecTestCase {
     public static ElasticsearchCluster cluster = Clusters.mixedVersionCluster();
-    public static CsvLoader loader = new CsvLoader(cluster);
+    public static TestRuleRestClient client = new TestRuleRestClient(cluster);
+    public static CsvLoader loader = new CsvLoader(client);
 
     @ClassRule
-    public static TestRule clusterRule = RuleChain.outerRule(cluster).around(loader);
+    public static TestRule clusterRule = RuleChain.outerRule(cluster).around(client).around(loader);
 
     @Override
     protected String getTestRestCluster() {

x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/EsqlSpecIT.java

@@ -16,10 +16,11 @@
 
 public class EsqlSpecIT extends EsqlSpecTestCase {
     public static ElasticsearchCluster cluster = Clusters.testCluster();
-    public static CsvLoader loader = new CsvLoader(cluster);
+    public static TestRuleRestClient client = new TestRuleRestClient(cluster);
+    public static CsvLoader loader = new CsvLoader(client);
 
     @ClassRule
-    public static TestRule clusterRule = RuleChain.outerRule(cluster).around(loader);
+    public static TestRule clusterRule = RuleChain.outerRule(cluster).around(client).around(loader);
 
     @Override
     protected String getTestRestCluster() {

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java

@@ -20,10 +20,11 @@
 @ThreadLeakFilters(filters = TestClustersThreadFilter.class)
 public class EsqlSpecIT extends EsqlSpecTestCase {
     public static ElasticsearchCluster cluster = Clusters.testCluster();
-    public static CsvLoader loader = new CsvLoader(cluster);
+    public static TestRuleRestClient client = new TestRuleRestClient(cluster);
+    public static CsvLoader loader = new CsvLoader(client);
 
     @ClassRule
-    public static TestRule clusterRule = RuleChain.outerRule(cluster).around(loader);
+    public static TestRule clusterRule = RuleChain.outerRule(cluster).around(client).around(loader);
 
     @Override
     protected String getTestRestCluster() {

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java

@@ -109,7 +109,7 @@ protected boolean supportsAsync() {
     }
 
     @AfterClass
-    // TODO: This should become of a classrule for consistency.
+    // TODO: This should become part of a classrule for consistency.
     public static void wipeTestData() throws IOException {
         try {
             adminClient().performRequest(new Request("DELETE", "/*"));
@@ -244,29 +244,50 @@ public static void assertRequestBreakerEmpty() throws Exception {
     }
 
     public static class CsvLoader implements TestRule {
-        private static final long CLIENT_TIMEOUT = 40L;
+        TestRuleRestClient client;
+
+        public CsvLoader(TestRuleRestClient client) {
+            this.client = client;
+        }
+
+        @Override
+        public Statement apply(Statement base, Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    loadDataSetIntoEs(client.client());
+                    base.evaluate();
+                }
+            };
+        }
+    }
 
-        ElasticsearchCluster cluster;
-        Settings clientAuthSettings;
-        RestClient client;
+    public static class TestRuleRestClient implements TestRule {
+        private static final long CLIENT_TIMEOUT = 40L;
+        private ElasticsearchCluster cluster;
+        private Settings clientAuthSettings;
+        private RestClient client;
 
-        public CsvLoader(ElasticsearchCluster cluster, Settings clientAuthSettings) {
+        public TestRuleRestClient(ElasticsearchCluster cluster, Settings clientAuthSettings) {
             this.cluster = cluster;
             this.clientAuthSettings = clientAuthSettings;
         }
 
-        public CsvLoader(ElasticsearchCluster cluster) {
+        public TestRuleRestClient(ElasticsearchCluster cluster) {
             this(cluster, Settings.builder().build());
         }
 
+        public RestClient client() {
+            return client;
+        }
+
         @Override
         public Statement apply(Statement base, Description description) {
             return new Statement() {
                 @Override
                 public void evaluate() throws Throwable {
                     try {
                         client = doStartClient();
-                        loadDataSetIntoEs(client);
                         base.evaluate();
                     } finally {
                         IOUtils.close(client);