Replace eager gradle task creation with task avoidance api (#79442)

* Replace eager gradle task creation with task avoidance api

Some more eagerly created tasks sneaked into the 7.x branch lately

* Fix typo in integTest configuration

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/rewrite/RewritePlugin.java

@@ -16,6 +16,7 @@
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.ProviderFactory;
+import org.gradle.api.tasks.TaskProvider;
 
 import javax.inject.Inject;
 
@@ -47,14 +48,20 @@ public void apply(Project project) {
                 details.useVersion(extension.getRewriteVersion());
             }
         });
-        RewriteTask rewriteTask = project.getTasks().create(REWRITE_TASKNAME, RewriteTask.class, rewriteConf, extension);
-        rewriteTask.getActiveRecipes().convention(providerFactory.provider(() -> extension.getActiveRecipes()));
-        rewriteTask.getConfigFile().convention(projectLayout.file(providerFactory.provider(() -> extension.getConfigFile())));
+        TaskProvider<RewriteTask> rewriteTaskProvider = project.getTasks()
+            .register(REWRITE_TASKNAME, RewriteTask.class, rewriteConf, extension);
+        rewriteTaskProvider.configure((rewriteTask) -> {
+            rewriteTask.getActiveRecipes().convention(providerFactory.provider(() -> extension.getActiveRecipes()));
+            rewriteTask.getConfigFile().convention(projectLayout.file(providerFactory.provider(() -> extension.getConfigFile())));
+        });
+
         project.getPlugins().withType(JavaBasePlugin.class, javaBasePlugin -> {
             JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
             javaPluginExtension.getSourceSets().all(sourceSet -> {
-                rewriteTask.getSourceFiles().from(sourceSet.getAllSource());
-                rewriteTask.getDependencyFiles().from(sourceSet.getCompileClasspath());
+                rewriteTaskProvider.configure(r -> {
+                    r.getSourceFiles().from(sourceSet.getAllSource());
+                    r.getDependencyFiles().from(sourceSet.getCompileClasspath());
+                });
             });
         });
     }

client/transport/build.gradle

@@ -23,13 +23,13 @@ dependencies {
   testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
 }
 
-forbiddenApisTest {
+tasks.named("forbiddenApisTest").configure {
   // we don't use the core test-framework, no lucene classes present so we don't want the es-test-signatures to
   // be pulled in
   replaceSignatureFiles 'jdk-signatures', 'es-all-signatures'
 }
 
-testingConventions {
+tasks.named("testingConventions").configure {
   naming.clear()
   naming {
     Tests {

libs/core/build.gradle

@@ -31,19 +31,19 @@ if (!isEclipse) {
     java11Implementation sourceSets.main.output
   }
 
-  compileJava11Java {
+  tasks.named("compileJava11Java").configure {
     sourceCompatibility = 11
     targetCompatibility = 11
   }
 
-  forbiddenApisJava11 {
+  tasks.named("forbiddenApisJava11").configure {
     if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {
       targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()
     }
     replaceSignatureFiles 'jdk-signatures'
   }
 
-  jar {
+  tasks.named("jar").configure {
     metaInf {
       into 'versions/11'
       from sourceSets.java11.output

plugins/repository-s3/build.gradle

@@ -76,13 +76,16 @@ tasks.named("bundlePlugin").configure {
   }
 }
 
-task testRepositoryCreds(type: Test) {
+def testRepositoryCreds = tasks.register("testRepositoryCreds", Test) {
   include '**/RepositoryCredentialsTests.class'
   systemProperty 'es.allow_insecure_settings', 'true'
 }
-check.dependsOn(testRepositoryCreds)
 
-test {
+tasks.named('check').configure {
+  dependsOn(testRepositoryCreds)
+}
+
+tasks.named('test').configure {
   // this is tested explicitly in separate test tasks
   exclude '**/RepositoryCredentialsTests.class'
   exclude '**/S3RepositoryThirdPartyTests.class'

qa/smoke-test-client/build.gradle

@@ -17,22 +17,23 @@ dependencies {
   testImplementation project(':client:transport') // randomly swapped in as a transport
 }
 
-task singleNodeIntegTest(type: RestIntegTestTask) {
-  mustRunAfter(precommit)
+def singleNodeIntegTest = tasks.register("singleNodeIntegTest", RestIntegTestTask) {
+  mustRunAfter("precommit")
 }
 
-testClusters.singleNodeIntegTest {
+testClusters.matching { it.name == "singleNodeIntegTest" }.configureEach {
   setting 'discovery.type', 'single-node'
 }
 
-integTest {
+tasks.named("integTest").configure {
   dependsOn singleNodeIntegTest
 }
 
-check.dependsOn(integTest)
-
+tasks.named("check").configure {
+  dependsOn("integTest")
+}
 
-testingConventions {
+tasks.named("testingConventions").configure {
   naming.clear()
   naming {
     IT {

qa/translog-policy/build.gradle

@@ -85,7 +85,7 @@ configurations {
   testArtifacts.extendsFrom testRuntime
 }
 
-task testJar(type: Jar) {
+def testJar = tasks.register("testJar", Jar) {
   archiveAppendix.set('test')
   from sourceSets.test.output
 }

server/build.gradle

@@ -41,7 +41,7 @@ if (!isEclipse) {
     java11Implementation sourceSets.main.output
   }
 
-  compileJava11Java {
+  tasks.named("compileJava11Java").configure {
     sourceCompatibility = 11
     targetCompatibility = 11
   }
@@ -54,7 +54,7 @@ if (!isEclipse) {
     }
   }
 
-  jar {
+  tasks.named("jar").configure {
     metaInf {
       into 'versions/11'
       from sourceSets.java11.output

x-pack/plugin/build.gradle

@@ -29,7 +29,7 @@ subprojects {
       project.dependencies.add('featureAwarePlugin', project.sourceSets.main.output.getClassesDirs())
 
       File successMarker = file("$buildDir/markers/featureAware")
-      task featureAwareCheck(type: LoggedExec) {
+      def featureAwareCheck = tasks.register("featureAwareCheck", LoggedExec) {
         description = "Runs FeatureAwareCheck on main classes."
         dependsOn project.configurations.featureAwarePlugin
         outputs.file(successMarker)
@@ -40,7 +40,7 @@ subprojects {
         final List files = []
         if (project.sourceSets.findByName("main")) {
           files.add(project.sourceSets.main.output.classesDirs)
-          dependsOn project.tasks.classes
+          dependsOn project.tasks.named('classes')
         }
         // filter out non-existent classes directories from empty source sets
         final FileCollection classDirectories = project.files(files).filter { it.exists() }
@@ -55,7 +55,9 @@ subprojects {
         }
       }
 
-      project.precommit.dependsOn featureAwareCheck
+      project.tasks.named("precommit").configure {
+        dependsOn featureAwareCheck
+      }
     }
   }
 }

x-pack/qa/security-client-tests/build.gradle

@@ -7,18 +7,19 @@ dependencies {
 }
 
 String outputDir = "${buildDir}/generated-resources/${project.name}"
-task copyXPackPluginProps(type: Copy) {
+def copyXPackPluginProps = tasks.register("copyXPackPluginProps", Copy) {
   from project(xpackModule('core')).file('src/main/plugin-metadata')
+  // TODO revisit resolving other modules plugin properties
   from project(xpackModule('core')).tasks.pluginProperties
   into outputDir
 }
 project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
 
-integTest {
+tasks.named("integTest").configure {
   systemProperty 'tests.security.manager', 'false'
 }
 
-testClusters.integTest {
+testClusters.matching { it.name == "integTest" }.configureEach {
   testDistribution = "default"
   setting 'xpack.security.enabled', 'true'
   setting 'xpack.ml.enabled', 'false'

x-pack/qa/security-migrate-tests/build.gradle

@@ -27,7 +27,7 @@ tasks.matching { it.name.equals('integTest')}.configureEach {integTestTask ->
   nonInputProperties.systemProperty 'tests.config.dir', "${-> testClusters.integTest.singleNode().getConfigDir()}"
 }
 
-testingConventions {
+tasks.named("testingConventions").configure {
   naming.clear()
   naming {
     IT {