Test works now

Author: nik9000

x-pack/plugin/esql/qa/server/extra-checkers/build.gradle

@@ -18,6 +18,7 @@ esplugin {
 dependencies {
   compileOnly project(':x-pack:plugin:esql')
   compileOnly project(':x-pack:plugin:esql-core')
+  clusterPlugins project(':x-pack:plugin:esql:qa:server:extra-checkers')
 }
 
 tasks.named('javaRestTest') {

x-pack/plugin/esql/qa/server/extra-checkers/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/extra/ExtraCheckersIT.java

@@ -9,16 +9,21 @@
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 
+import org.apache.http.util.EntityUtils;
 import org.elasticsearch.client.Request;
+import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.test.TestClustersThreadFilter;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.junit.ClassRule;
 
+import javax.swing.text.html.parser.Entity;
+
 import java.io.IOException;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
 @ThreadLeakFilters(filters = TestClustersThreadFilter.class)
@@ -32,15 +37,42 @@ public class ExtraCheckersIT extends ESRestTestCase {
         .plugin("extra-checkers")
         .build();
 
-    public void testIncludesCategorize() throws IOException {
-        Request request = new Request("POST", "/_query");
-        request.setJsonEntity("""
+    public void testWithCategorize() {
+        ResponseException e = expectThrows(ResponseException.class, () -> runEsql("""
+            {
+              "query": "ROW message=\\"foo bar\\" | STATS COUNT(*) BY CATEGORIZE(message) | LIMIT 1"
+            }"""));
+        assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(400));
+        assertThat(e.getMessage(), containsString("line 1:43: CATEGORIZE is unsupported"));
+    }
+
+    public void testWithoutCategorize() throws IOException {
+        String result = runEsql("""
             {
-              "query": "ROW message=\\"foo bar\\" | STATS COUNT(*) BY CATEGORIZE(message)"
+              "query": "ROW message=\\"foo bar\\" | STATS COUNT(*) | LIMIT 1"
             }""");
+        assertThat(result, containsString("""
+              "columns" : [
+                {
+                  "name" : "COUNT(*)",
+                  "type" : "long"
+                }
+              ],
+              "values" : [
+                [
+                  1
+                ]
+              ]
+            """));
+    }
+
+    private String runEsql(String json) throws IOException {
+        Request request = new Request("POST", "/_query");
+        request.setJsonEntity(json);
         request.addParameter("error_trace", "");
-        Exception e = expectThrows(ResponseException.class, () -> client().performRequest(request));
-        assertThat(e.getMessage(), equalTo("ADFSADF"));
+        request.addParameter("pretty", "");
+        Response response = client().performRequest(request);
+        return EntityUtils.toString(response.getEntity());
     }
 
     @Override

x-pack/plugin/esql/qa/server/extra-checkers/src/main/resources/services/org.elasticsearch.xpack.esql.analysis.Verifier.ExtraCheckers renamed to x-pack/plugin/esql/qa/server/extra-checkers/src/main/resources/META-INF/services/org.elasticsearch.xpack.esql.analysis.Verifier$ExtraCheckers

@@ -6,7 +6,6 @@
  */
 package org.elasticsearch.xpack.esql.plugin;
 
-import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.breaker.CircuitBreaker;
@@ -190,7 +189,7 @@ public class EsqlPlugin extends Plugin implements ActionPlugin, ExtensiblePlugin
         Setting.Property.Dynamic
     );
 
-    private SetOnce<List<Verifier.ExtraCheckers>> extraCheckers = new SetOnce<>();
+    private final List<Verifier.ExtraCheckers> extraCheckers = new ArrayList<>();
 
     @Override
     public Collection<?> createComponents(PluginServices services) {
@@ -210,7 +209,7 @@ public Collection<?> createComponents(PluginServices services) {
                 services.telemetryProvider().getMeterRegistry(),
                 getLicenseState(),
                 new EsqlQueryLog(services.clusterService().getClusterSettings(), services.slowLogFieldProvider()),
-                extraCheckers.get()
+                extraCheckers
             ),
             new ExchangeService(
                 services.clusterService().getSettings(),
@@ -343,6 +342,6 @@ public List<ExecutorBuilder<?>> getExecutorBuilders(Settings settings) {
 
     @Override
     public void loadExtensions(ExtensionLoader loader) {
-        extraCheckers.set(loader.loadExtensions(Verifier.ExtraCheckers.class));
+        extraCheckers.addAll(loader.loadExtensions(Verifier.ExtraCheckers.class));
     }
 }