Pick up code removal in QL module on the main branch (#389)

Author: costin

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportEsqlQueryAction.java

@@ -28,7 +28,6 @@
 
 import java.time.ZoneOffset;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import static org.elasticsearch.action.ActionListener.wrap;
@@ -62,7 +61,6 @@ protected void doExecute(Task task, EsqlQueryRequest request, ActionListener<Esq
             // TODO: plug-in security
             null,
             clusterService.getClusterName().value(),
-            x -> Collections.emptySet(),
             request.pragmas()
         );
         planExecutor.newSession(configuration).execute(request, wrap(r -> {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlConfiguration.java

@@ -11,20 +11,12 @@
 import org.elasticsearch.xpack.ql.session.Configuration;
 
 import java.time.ZoneId;
-import java.util.Collection;
-import java.util.function.Function;
 
 public class EsqlConfiguration extends Configuration {
     private final Settings pragmas;
 
-    public EsqlConfiguration(
-        ZoneId zi,
-        String username,
-        String clusterName,
-        Function<String, Collection<String>> versionIncompatibleClusters,
-        Settings pragmas
-    ) {
-        super(zi, username, clusterName, versionIncompatibleClusters);
+    public EsqlConfiguration(ZoneId zi, String username, String clusterName, Settings pragmas) {
+        super(zi, username, clusterName);
         this.pragmas = pragmas;
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java

@@ -29,7 +29,7 @@
 
 public final class EsqlTestUtils {
 
-    public static final EsqlConfiguration TEST_CFG = new EsqlConfiguration(DateUtils.UTC, null, null, s -> emptyList(), Settings.EMPTY);
+    public static final EsqlConfiguration TEST_CFG = new EsqlConfiguration(DateUtils.UTC, null, null, Settings.EMPTY);
 
     private EsqlTestUtils() {}
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java

@@ -33,7 +33,6 @@
 import org.elasticsearch.xpack.ql.type.TypesTests;
 
 import java.time.ZoneOffset;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -305,7 +304,7 @@ private void assertProjection(String query, String... names) {
     }
 
     private Analyzer newAnalyzer(IndexResolution indexResolution) {
-        Configuration configuration = new Configuration(ZoneOffset.UTC, null, null, x -> Collections.emptySet());
+        Configuration configuration = new Configuration(ZoneOffset.UTC, null, null);
         return new Analyzer(indexResolution, new EsqlFunctionRegistry(), new Verifier(), configuration);
     }