Another batch of lazy API changes (#9737)

* chore: Lazy task access

* chore: Lazy task access

* chore: Lazy task access for classpath, removes non-needed dependsOn

Since the classpath is properly declared the task dependency is not necessary anymore.

* chore: Lazy configurations access

* chore: Lazy configurations access for instrument project

* chore: Lazy task access

* style: make spotless happy

Author: bric3

dd-java-agent/agent-otel/otel-bootstrap/build.gradle

@@ -11,12 +11,14 @@ apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'instrument'
 
 configurations {
-  embeddedClasspath {
+  def ec = register('embeddedClasspath') {
     visible = false
     canBeConsumed = false
     canBeResolved = true
   }
-  compileClasspath.extendsFrom(embeddedClasspath)
+  named('compileClasspath') {
+    compileClasspath.extendsFrom(ec.get())
+  }
   instrumentPluginClasspath {
     visible = false
     canBeConsumed = false
@@ -55,13 +57,12 @@ dependencies {
 
 // unpack embeddedClasspath to same path as compiled classes so it can get instrumented
 tasks.register('unpackJars', Copy) {
-  dependsOn configurations.embeddedClasspath
+  dependsOn configurations.named('embeddedClasspath')
   exclude 'META-INF/'
   exclude '**/module-info.class'
   exclude '**/package-info.class'
-  from {
-    configurations.embeddedClasspath.collect { zipTree(it) }
-  }
+
+  from(configurations.named('embeddedClasspath').map { it.collect { zipTree(it) } })
   into compileJava.destinationDirectory
 }
 

dd-java-agent/appsec/appsec-test-fixtures/build.gradle

@@ -6,6 +6,6 @@ dependencies {
   api project(':dd-java-agent:instrumentation-testing')
 }
 
-configurations.api {
+configurations.named('api') {
   exclude group: 'org.eclipse.jetty', module: 'jetty-server'
 }

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle

@@ -171,31 +171,25 @@ dependencies {
 }
 
 tasks.named("compileBaseTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
-  dependsOn "compileBaseTestScala"
+  classpath += files(tasks.named('compileBaseTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileBaseForkedTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory))
-  dependsOn "compileBaseTestScala"
+  classpath += files(tasks.named('compileBaseTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileVersion101TestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))
-  dependsOn "compileVersion101TestScala"
+  classpath += files(tasks.named('compileVersion101TestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileVersion101ForkedTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory))
-  dependsOn "compileVersion101TestScala"
+  classpath += files(tasks.named('compileVersion101TestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileVersion102Scala213TestScala.destinationDirectory))
-  dependsOn "compileVersion102Scala213TestScala"
+  classpath += files(tasks.named('compileVersion102Scala213TestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
-  dependsOn "compileLatestDepTestScala"
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle

@@ -47,14 +47,12 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 tasks.named("compileTestGroovy", GroovyCompile) {
   configureCompiler(it, 11)
-  dependsOn compileTestScala
-  classpath += files(compileTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   configureCompiler(it, 11)
-  dependsOn compileLatestDepTestScala
-  classpath += files(compileLatestDepTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
 
 dependencies {

dd-java-agent/instrumentation/build.gradle

@@ -39,7 +39,7 @@ subprojects { Project subProj ->
       def name = "java$version.majorVersion"
       jdkCompile = "main_${name}Implementation"
     }
-    configurations.muzzleBootstrap {
+    configurations.named('muzzleBootstrap') {
       exclude group: 'org.snakeyaml', module: 'snakeyaml-engine' // we vendor this in the agent jar
     }
     dependencies {

dd-java-agent/instrumentation/cxf-2.1/build.gradle

@@ -75,10 +75,16 @@ dependencies {
   latestDepTestCompileOnly group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.+'
   latestDepTestImplementation group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxrs', version: '+'
   latestDepTestImplementation group: 'org.apache.cxf', name:'cxf-rt-transports-http-jetty', version: '+'
+}
+
+configurations.named('latestDepTestRuntimeClasspath') {
+  resolutionStrategy {
+    force libs.slf4j
+  }
+}
 
-  configurations.findAll {it.name in ['latestDepTestRuntimeClasspath', 'cxf3LatestDepTestRuntimeClasspath'] }.each {
-    it.resolutionStrategy {
-      force libs.slf4j
-    }
+configurations.named('cxf3LatestDepTestRuntimeClasspath') {
+  resolutionStrategy {
+    force libs.slf4j
   }
 }

dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle

@@ -46,6 +46,6 @@ dependencies {
   latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.3.+'
 }
 
-configurations.latestDepTestImplementation {
+configurations.named('latestDepTestImplementation') {
   exclude group: "org.elasticsearch.client", module: "rest"
 }

dd-java-agent/instrumentation/finatra-2.9/build.gradle

@@ -36,15 +36,15 @@ dependencies {
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
   dependsOn "compileLatestDepTestScala"
 }
 
 tasks.named("compileLatestPre207TestGroovy", GroovyCompile) {
-  classpath = classpath.plus(files(compileLatestPre207TestScala.destinationDirectory))
+  classpath += files(tasks.named('compileLatestPre207TestScala').map { it.destinationDirectory })
   dependsOn "compileLatestPre207TestScala"
 }
 
 tasks.named("latestDepTest", Test) {
-  finalizedBy latestPre207Test
+  finalizedBy 'latestPre207Test'
 }

dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle

@@ -26,7 +26,7 @@ dependencies {
   latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'
 }
 
-configurations.testRuntimeOnly {
+configurations.named('testRuntimeOnly') {
   // jersey-container-grizzly2-http transitively imports its own set repackaged asm classes
   exclude group: 'org.ow2.asm'
 }

dd-java-agent/instrumentation/jdbc/scalikejdbc/build.gradle

@@ -12,12 +12,12 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 tasks.named("compileTestGroovy", GroovyCompile) {
   dependsOn "compileTestScala"
-  classpath += files(compileTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileTestScala').map { it.destinationDirectory })
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   dependsOn "compileLatestDepTestScala"
-  classpath += files(compileLatestDepTestScala.destinationDirectory)
+  classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory })
 }
 
 tasks.withType(ScalaCompile).configureEach {