Reuse Mode enum

Author: ivancea

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

@@ -27,12 +27,12 @@
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.test.rest.TestFeatureService;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.xpack.esql.AssertWarnings;
 import org.elasticsearch.xpack.esql.CsvSpecReader.CsvTestCase;
 import org.elasticsearch.xpack.esql.CsvTestUtils;
 import org.elasticsearch.xpack.esql.EsqlTestUtils;
 import org.elasticsearch.xpack.esql.SpecReader;
 import org.elasticsearch.xpack.esql.plugin.EsqlFeatures;
+import org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.Mode;
 import org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.RequestObjectBuilder;
 import org.elasticsearch.xpack.esql.telemetry.TookMetrics;
 import org.junit.After;
@@ -97,11 +97,6 @@ public abstract class EsqlSpecTestCase extends ESRestTestCase {
     protected final Mode mode;
     protected static Boolean supportsTook;
 
-    public enum Mode {
-        SYNC,
-        ASYNC
-    }
-
     @ParametersFactory(argumentFormatting = "%2$s.%3$s %7$s")
     public static List<Object[]> readScriptSpec() throws Exception {
         List<URL> urls = classpathResources("/*.csv-spec");
@@ -277,7 +272,12 @@ protected final void doTest(String query) throws Throwable {
         }
 
         Map<?, ?> prevTooks = supportsTook() ? tooks() : null;
-        Map<String, Object> answer = runEsql(builder.query(query), testCase.assertWarnings(deduplicateExactWarnings()));
+        Map<String, Object> answer = RestEsqlTestCase.runEsql(
+            builder.query(query),
+            testCase.assertWarnings(deduplicateExactWarnings()),
+            profileLogger,
+            mode
+        );
 
         assertNotPartial(answer);
 
@@ -330,14 +330,6 @@ protected boolean deduplicateExactWarnings() {
         return false;
     }
 
-    private Map<String, Object> runEsql(RequestObjectBuilder requestObject, AssertWarnings assertWarnings) throws IOException {
-        if (mode == Mode.ASYNC) {
-            return RestEsqlTestCase.runEsqlAsync(requestObject, assertWarnings, profileLogger);
-        } else {
-            return RestEsqlTestCase.runEsqlSync(requestObject, assertWarnings, profileLogger);
-        }
-    }
-
     protected void assertResults(
         ExpectedResults expected,
         List<Map<String, String>> actualColumns,

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

@@ -16,6 +16,7 @@
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.esql.AssertWarnings;
+import org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.Mode;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -35,11 +36,6 @@ public abstract class RestEnrichTestCase extends ESRestTestCase {
     private static final String sourceIndexName = "countries";
     private static final String policyName = "countries";
 
-    public enum Mode {
-        SYNC,
-        ASYNC
-    }
-
     protected final Mode mode;
 
     @ParametersFactory
@@ -334,11 +330,7 @@ private Map<String, Object> runEsql(String query, CheckedConsumer<XContentBuilde
             requestObject.filter(filter);
         }
         requestObject.query(query);
-        if (mode == Mode.ASYNC) {
-            return RestEsqlTestCase.runEsqlAsync(requestObject, new AssertWarnings.NoWarnings(), profileLogger);
-        } else {
-            return RestEsqlTestCase.runEsqlSync(requestObject, new AssertWarnings.NoWarnings(), profileLogger);
-        }
+        return RestEsqlTestCase.runEsql(requestObject, new AssertWarnings.NoWarnings(), profileLogger, mode);
     }
 
     @Override