Apply review feedback

- remove unsed code
- fail early when nodes are somehow added to a testcluster after useCluster

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java

@@ -245,11 +245,11 @@ public void apply(Project project) {
         yamlRestCompatTestTask.configure(testTask -> {
             testTask.systemProperty("tests.restCompat", true);
             // Use test runner and classpath from "normal" yaml source set
-            FileCollection sourceSetOutput = yamlCompatTestSourceSet.getOutput();
+            FileCollection outputFileCollection = yamlCompatTestSourceSet.getOutput();
             testTask.setTestClassesDirs(
                 yamlTestSourceSet.getOutput().getClassesDirs().plus(yamlCompatTestSourceSet.getOutput().getClassesDirs())
             );
-            testTask.onlyIf("Compatibility tests are available", t -> sourceSetOutput.isEmpty() == false);
+            testTask.onlyIf("Compatibility tests are available", t -> outputFileCollection.isEmpty() == false);
             testTask.setClasspath(
                 yamlCompatTestSourceSet.getRuntimeClasspath()
                     // remove the "normal" api and tests

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java

@@ -415,6 +415,7 @@ public void setPreserveDataDir(boolean preserveDataDir) {
     public void freeze() {
         nodes.forEach(ElasticsearchNode::freeze);
         configurationFrozen.set(true);
+        nodes.whenObjectAdded(node -> { throw new IllegalStateException("Cannot add nodes to test cluster after is has been frozen"); });
     }
 
     private void checkFrozen() {
@@ -670,12 +671,11 @@ public String toString() {
         return "cluster{" + path + ":" + clusterName + "}";
     }
 
-    @Internal
-    public int getClaims() {
-        return claims;
+    int addClaim() {
+        return ++this.claims;
     }
 
-    public void setClaims(int claims) {
-        this.claims = claims;
+    int removeClaim() {
+        return --this.claims;
     }
 }

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersAware.java

@@ -45,6 +45,7 @@ default void useCluster(ElasticsearchCluster cluster) {
             dependsOn(cluster.getPluginAndModuleConfigurations());
         }
         getClusters().add(cluster);
+        cluster.freeze();
 
     }
 

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersRegistry.java

@@ -27,18 +27,15 @@ public abstract class TestClustersRegistry implements BuildService<BuildServiceP
     private static final Logger logger = Logging.getLogger(TestClustersRegistry.class);
     private static final String TESTCLUSTERS_INSPECT_FAILURE = "testclusters.inspect.failure";
     private final Boolean allowClusterToSurvive = Boolean.valueOf(System.getProperty(TESTCLUSTERS_INSPECT_FAILURE, "false"));
-    private final Map<ElasticsearchCluster, Integer> claimsInventory = new HashMap<>();
     private final Set<ElasticsearchCluster> runningClusters = new HashSet<>();
     private final Map<String, Process> nodeProcesses = new HashMap<>();
 
     @Inject
     public abstract ProviderFactory getProviderFactory();
 
     public void claimCluster(ElasticsearchCluster cluster) {
-        int claim = claimsInventory.getOrDefault(cluster, cluster.getClaims()) + 1;
-        claimsInventory.put(cluster, claim);
-        cluster.setClaims(claim);
-        if (claim > 1) {
+        int claims = cluster.addClaim();
+        if (claims > 1) {
             cluster.setShared(true);
         }
     }
@@ -82,9 +79,7 @@ public void stopCluster(ElasticsearchCluster cluster, boolean taskFailed) {
                 runningClusters.remove(cluster);
             }
         } else {
-            int currentClaims = claimsInventory.getOrDefault(cluster, cluster.getClaims()) - 1;
-            claimsInventory.put(cluster, currentClaims);
-            cluster.setClaims(currentClaims);
+            int currentClaims = cluster.removeClaim();
             if (currentClaims <= 0 && runningClusters.contains(cluster)) {
                 cluster.stop(false);
                 runningClusters.remove(cluster);

x-pack/plugin/esql/build.gradle

@@ -83,13 +83,11 @@ tasks.named("test").configure {
       }
     }
     File functionsFolder = file("build/testrun/test/temp/esql/functions")
-    File signatureFolder = file("build/testrun/test/temp/esql/functions/signature")
     File typesFolder = file("build/testrun/test/temp/esql/functions/types")
     def functionsDocFolder = file("${rootDir}/docs/reference/esql/functions")
     def effectiveProjectDir = projectDir
 
     doLast {
-      List signatures = signatureFolder.list().findAll {it.endsWith("svg")}
       List types = typesFolder.list().findAll {it.endsWith("asciidoc")}
       int count = types == null ? 0 : types.size()
       Closure readExample = line -> {

x-pack/plugin/sql/qa/jdbc/security/build.gradle

@@ -58,7 +58,7 @@ subprojects {
       project.gradle.sharedServices,
       TestClustersPlugin.REGISTRY_SERVICE_NAME
     )
-    def clusterInfo = project.getProviders().of(TestClusterValueSource.class) {
+    project.getProviders().of(TestClusterValueSource.class) {
       it.parameters.path.set(clusterPath)
       it.parameters.clusterName.set("javaRestTest")
       it.parameters.service = serviceProvider