Avoid unnecessary eager creation of Gradle tasks (#45098) (#45310)

Author: mark-vieira

build.gradle

@@ -24,10 +24,13 @@ import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.BwcVersions
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.plugin.PluginBuildPlugin
+import org.elasticsearch.gradle.tool.Boilerplate
 import org.gradle.util.GradleVersion
 import org.gradle.util.DistributionLocator
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
 
+import static org.elasticsearch.gradle.tool.Boilerplate.maybeConfigure
+
 plugins {
     id 'com.gradle.build-scan' version '2.3'
     id 'base'
@@ -212,7 +215,7 @@ task branchConsistency {
 
 allprojects {
   // ignore missing javadocs
-  tasks.withType(Javadoc) { Javadoc javadoc ->
+  tasks.withType(Javadoc).configureEach { Javadoc javadoc ->
     // the -quiet here is because of a bug in gradle, in that adding a string option
     // by itself is not added to the options. By adding quiet, both this option and
     // the "value" -quiet is added, separated by a space. This is ok since the javadoc
@@ -329,13 +332,9 @@ allprojects {
     }
   }
 
-  task cleanIdeaBuildDir(type: Delete) {
-    delete 'build-idea'
+  tasks.named('cleanIdea') {
+      delete 'build-idea'
   }
-  cleanIdeaBuildDir.setGroup("ide")
-  cleanIdeaBuildDir.setDescription("Deletes the IDEA build directory.")
-
-  tasks.cleanIdea.dependsOn(cleanIdeaBuildDir)
 }
 
 idea {
@@ -390,29 +389,20 @@ allprojects {
 
   String lineSeparator = Os.isFamily(Os.FAMILY_WINDOWS) ? '\\\\r\\\\n' : '\\\\n'
   String licenseHeader = licenseHeaderFile.getText('UTF-8').replace(System.lineSeparator(), lineSeparator)
-  task copyEclipseSettings(type: Copy) {
+  tasks.register('copyEclipseSettings', Copy) {
+    mustRunAfter 'wipeEclipseSettings'
     // TODO: "package this up" for external builds
     from new File(project.rootDir, 'buildSrc/src/main/resources/eclipse.settings')
     into '.settings'
     filter{ it.replaceAll('@@LICENSE_HEADER_TEXT@@', licenseHeader)}
   }
   // otherwise .settings is not nuked entirely
-  task wipeEclipseSettings(type: Delete) {
+  tasks.register('wipeEclipseSettings', Delete) {
     delete '.settings'
   }
-  tasks.cleanEclipse.dependsOn(wipeEclipseSettings)
+  tasks.named('cleanEclipse') { dependsOn 'wipeEclipseSettings' }
   // otherwise the eclipse merging is *super confusing*
-  tasks.eclipse.dependsOn(cleanEclipse, copyEclipseSettings)
-
-  // work arround https://github.com/gradle/gradle/issues/6582 
-  tasks.eclipseProject.mustRunAfter tasks.cleanEclipseProject
-  tasks.matching { it.name == 'eclipseClasspath' }.all {
-    it.mustRunAfter { tasks.cleanEclipseClasspath }
-  }
-  tasks.matching { it.name == 'eclipseJdt' }.all {
-    it.mustRunAfter { tasks.cleanEclipseJdt }
-  }
-  tasks.copyEclipseSettings.mustRunAfter tasks.wipeEclipseSettings
+  tasks.named('eclipse') { dependsOn 'cleanEclipse', 'copyEclipseSettings' }
 }
 
 allprojects {
@@ -477,13 +467,11 @@ gradle.projectsEvaluated {
      * need to publish artifacts for them.
      */
     if (project.name.equals('qa') || project.path.contains(':qa:')) {
-      Task assemble = project.tasks.findByName('assemble')
-      if (assemble) {
-        assemble.enabled = false
+      maybeConfigure(project.tasks, 'assemble') {
+        it.enabled = false
       }
-      Task dependenciesInfo = project.tasks.findByName('dependenciesInfo')
-      if (dependenciesInfo) {
-        dependenciesInfo.enabled = false
+      maybeConfigure(project.tasks, 'dependenciesInfo') {
+        it.enabled = false
       }
     }
   }
@@ -505,7 +493,7 @@ gradle.projectsEvaluated {
 }
 
 allprojects {
-  task resolveAllDependencies {
+  tasks.register('resolveAllDependencies') {
       dependsOn tasks.matching { it.name == "pullFixture"}
       doLast {
         configurations.findAll { it.isCanBeResolved() }.each { it.resolve() }
@@ -535,13 +523,13 @@ allprojects {
     }
   }
 
-  task checkPart1
-  task checkPart2 
-  tasks.matching { it.name == "check" }.all { check ->
-    if (check.path.startsWith(":x-pack:")) {
-      checkPart2.dependsOn check
-    } else {
-      checkPart1.dependsOn check
-    }
-  } 
+  def checkPart1 = tasks.register('checkPart1')
+  def checkPart2 = tasks.register('checkPart2')
+  plugins.withId('lifecycle-base') {
+      if (project.path.startsWith(":x-pack:")) {
+          checkPart1.configure { dependsOn 'check' }
+      } else {
+          checkPart2.configure { dependsOn 'check' }
+      }
+  }
 }

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

@@ -25,6 +25,7 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.DependencyResolutionListener
 import org.gradle.api.artifacts.DependencySet
+import org.gradle.api.internal.ConventionTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.OutputFile
@@ -45,7 +46,7 @@ import java.util.regex.Pattern
  * </ul>
  *
  */
-public class DependenciesInfoTask extends DefaultTask {
+public class DependenciesInfoTask extends ConventionTask {
 
     /** Dependencies to gather information from. */
     @Input
@@ -55,8 +56,7 @@ public class DependenciesInfoTask extends DefaultTask {
     @Input
     public Configuration compileOnlyConfiguration
 
-    @Input
-    public LinkedHashMap<String, String> mappings
+    private LinkedHashMap<String, String> mappings
 
     /** Directory to read license files */
     @InputDirectory
@@ -93,7 +93,7 @@ public class DependenciesInfoTask extends DefaultTask {
             }
 
             final String url = createURL(dependency.group, dependency.name, dependency.version)
-            final String dependencyName = DependencyLicensesTask.getDependencyName(mappings, dependency.name)
+            final String dependencyName = DependencyLicensesTask.getDependencyName(getMappings(), dependency.name)
             logger.info("mapped dependency ${dependency.group}:${dependency.name} to ${dependencyName} for license info")
 
             final String licenseType = getLicenseType(dependency.group, dependencyName)
@@ -103,7 +103,15 @@ public class DependenciesInfoTask extends DefaultTask {
         outputFile.setText(output.toString(), 'UTF-8')
     }
 
-    /**
+    @Input
+    LinkedHashMap<String, String> getMappings() {
+        return mappings
+    }
+
+    void setMappings(LinkedHashMap<String, String> mappings) {
+        this.mappings = mappings
+    }
+/**
      * Create an URL on <a href="https://repo1.maven.org/maven2/">Maven Central</a>
      * based on dependency coordinates.
      */

buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy

@@ -32,6 +32,7 @@ import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.gradle.api.plugins.BasePlugin
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 import org.gradle.api.publish.maven.tasks.GenerateMavenPom
@@ -112,7 +113,7 @@ class PluginBuildPlugin implements Plugin<Project> {
                 addNoticeGeneration(project, extension)
             }
         }
-        project.testingConventions {
+        project.tasks.named('testingConventions').configure {
             naming.clear()
             naming {
                 Tests {
@@ -175,7 +176,7 @@ class PluginBuildPlugin implements Plugin<Project> {
     /** Adds an integTest task which runs rest tests */
     private static void createIntegTestTask(Project project) {
         RestIntegTestTask integTest = project.tasks.create('integTest', RestIntegTestTask.class)
-        integTest.mustRunAfter(project.precommit, project.test)
+        integTest.mustRunAfter('precommit', 'test')
         if (project.plugins.hasPlugin(TestClustersPlugin.class) == false) {
             // only if not using test clusters
             project.integTestCluster.distribution = System.getProperty('tests.distribution', 'integ-test-zip')
@@ -259,7 +260,9 @@ class PluginBuildPlugin implements Plugin<Project> {
                 include 'bin/**'
             }
         }
-        project.assemble.dependsOn(bundle)
+        project.tasks.named(BasePlugin.ASSEMBLE_TASK_NAME).configure {
+          dependsOn(bundle)
+        }
 
         // also make the zip available as a configuration (used when depending on this project)
         project.configurations.create('zip')