refactor: small rename job

Author: bric3

buildSrc/src/main/kotlin/datadog.test-jvm-contraints.gradle.kts

@@ -35,11 +35,10 @@ tasks.withType<Test>().configureEach {
   configureTestJvm(taskExtension)
 }
 
-// TODO make this part of the testJvm test task extension
 /**
  * Provide arguments if condition is met.
  */
-fun Test.configureJvmArgs(
+fun Test.conditionalJvmArgs(
   applyFromVersion: JavaVersion,
   jvmArgsToApply: List<String>,
   additionalCondition: Provider<Boolean> = project.providers.provider { true }
@@ -58,7 +57,7 @@ fun Test.configureJvmArgs(
  * Configure the jvm launcher of the test task and ensure the test task
  * can be run with the test task launcher.
  */
-fun Test.configureTestJvm(extension: TestJvmConstraintsExtension) {
+private fun Test.configureTestJvm(extension: TestJvmConstraintsExtension) {
   if (testJvmSpec.javaTestLauncher.isPresent) {
     javaLauncher = testJvmSpec.javaTestLauncher
     onlyIf("Allowed or forced JDK") {
@@ -71,7 +70,7 @@ fun Test.configureTestJvm(extension: TestJvmConstraintsExtension) {
   }
 
   // temporary workaround when using Java16+: some tests require reflective access to java.lang/java.util
-  configureJvmArgs(
+  conditionalJvmArgs(
     JavaVersion.VERSION_16,
     listOf(
       "--add-opens=java.base/java.lang=ALL-UNNAMED",

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

@@ -70,7 +70,7 @@ jmh {
 }
 
 tasks.withType(Test).configureEach {
-  configureJvmArgs(
+  conditionalJvmArgs(
     it,
     JavaVersion.VERSION_16,
     ['--add-opens', 'java.base/java.net=ALL-UNNAMED'] // for HostNameResolverForkedTest

dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle

@@ -56,7 +56,7 @@ idea {
 }
 
 tasks.withType(Test).configureEach {
-  configureJvmArgs(
+  conditionalJvmArgs(
     it,
     JavaVersion.VERSION_1_9,
     [

dd-java-agent/instrumentation/redisson/redisson-2.3.0/build.gradle

@@ -28,7 +28,7 @@ dependencies {
 
 project.afterEvaluate {
   tasks.withType(Test).configureEach {
-    configureJvmArgs(
+    conditionalJvmArgs(
       it,
       JavaVersion.VERSION_16,
       [

dd-java-agent/instrumentation/redisson/redisson-3.10.3/build.gradle

@@ -32,7 +32,7 @@ dependencies {
 }
 
 tasks.withType(Test).configureEach {
-  configureJvmArgs(
+  conditionalJvmArgs(
     it,
     JavaVersion.VERSION_16,
     [

dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle

@@ -140,7 +140,7 @@ dependencies {
 
 tasks.withType(Test).configureEach {
   // to avoid java.lang.IllegalAccessException: class org.apache.tomcat.util.compat.JreCompat cannot access a member of class java.io.FileSystem (in module java.base) with modifiers "static final"
-  configureJvmArgs(
+  conditionalJvmArgs(
     it,
     JavaVersion.VERSION_16,
     ['--add-opens', 'java.base/java.io=ALL-UNNAMED']

gradle/java_no_deps.gradle

@@ -138,8 +138,6 @@ def applyCodeCoverage = !(
   project.path.startsWith(":dd-java-agent:instrumentation") ||
   project.path.startsWith(":dd-java-agent:appsec:weblog:"))
 
-ext.applyCodeCoverage = applyCodeCoverage
-
 // https://stackoverflow.com/questions/42501869/gradle-skip-jacoco-during-test
 // https://poetengineer.postach.io/post/how-to-conditionally-enable-disable-jacoco-in-gradle-build
 if (applyCodeCoverage) {
@@ -212,7 +210,7 @@ tasks.named("javadoc", Javadoc) {
   }
 }
 
-ext.configureJvmArgs = (Test testTask, JavaVersion applyFromVersion, List<String> jvmArgsToApply, Provider<Boolean> additionalCondition = null) -> {
+ext.conditionalJvmArgs = (Test testTask, JavaVersion applyFromVersion, List<String> jvmArgsToApply, Provider<Boolean> additionalCondition = null) -> {
   testTask.jvmArgumentProviders.add(new ProvideJvmArgsOnJvmLauncherVersion(
   testTask,
   applyFromVersion,