Code cleanup.

Author: AlexeyKuznetsov-DD

buildSrc/build.gradle.kts

@@ -80,8 +80,8 @@ testing {
   suites {
     val test by getting(JvmTestSuite::class) {
       dependencies {
-        implementation(libs.spock.core)
         implementation(libs.groovy)
+        implementation(libs.spock.core)
       }
       targets.configureEach {
         testTask.configure {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -35,9 +35,8 @@ dependencies {
   implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
   testImplementation(libs.bytebuddy)
-  testImplementation(libs.spock.core)
-  testImplementation("org.objenesis", "objenesis", "3.0.1")
   testImplementation(libs.groovy)
+  testImplementation(libs.bundles.spock)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
 }

communication/src/test/groovy/datadog/communication/http/RejectingExecutorServiceTest.groovy

@@ -1,19 +1,19 @@
 package datadog.communication.http
 
+import static org.junit.jupiter.api.Assertions.assertThrows
+
 import org.junit.jupiter.api.Test
 
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.TimeUnit
 
-import static groovy.test.GroovyAssert.shouldFail
-
 class RejectingExecutorServiceTest {
   ExecutorService executorService = new RejectingExecutorService()
 
   @Test
   void 'execute throws exception'() {
-    shouldFail(RejectedExecutionException) {
+    assertThrows(RejectedExecutionException) {
       executorService.execute({})
     }
   }

dd-java-agent/agent-iast/iast-test-fixtures/src/main/groovy/com/datadog/iast/test/NoopOverheadController.groovy

@@ -3,9 +3,9 @@ package com.datadog.iast.test
 import com.datadog.iast.model.VulnerabilityType
 import com.datadog.iast.overhead.Operation
 import com.datadog.iast.overhead.OverheadController
-import com.github.javaparser.quality.Nullable
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import groovy.transform.CompileStatic
+import javax.annotation.Nullable
 
 @CompileStatic
 class NoopOverheadController implements OverheadController {

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy

@@ -515,7 +515,7 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
       def sw = new StringWriter()
       PrintWriter pw = new PrintWriter(sw)
       entry.value.eachWithIndex { Exception e, int i ->
-        pw.write('\n' as char)
+        pw.write((char)'\n')
         pw.write "Location $i:\n"
         def st = e.stackTrace
         int loc = st.findIndexOf {

dd-java-agent/instrumentation-testing/src/test/groovy/server/HttpServerTest.groovy

@@ -435,7 +435,7 @@ class HttpServerTest extends InstrumentationSpecification {
 
     then:
     clientResponse.code() == 500
-    IOUtils.readFully (clientResponse.body().byteStream()).contains("assert body != null")
+    IOUtils.readFully(clientResponse.body().byteStream()).contains("assert body != null")
 
     cleanup:
     server.stop()

dd-java-agent/instrumentation/jax-rs-annotations-1/build.gradle

@@ -16,7 +16,7 @@ apply from: "$rootDir/gradle/java.gradle"
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'
 
-  testImplementation libs.spock.junit4 // This legacy module still needs JUnit4.
+  testImplementation libs.junit4 // This legacy still needs JUnit4.
   testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.7.1'
   testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
 }

dd-java-agent/instrumentation/junit/junit-5.3/build.gradle

@@ -36,6 +36,8 @@ dependencies {
 
   testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures')
 
+  testImplementation libs.junit4 // This module still needs JUnit4.
+
   // versions used below are not the minimum ones that we support,
   // but the tests need to use them in order to be compliant with Spock 2.x
   testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: libs.versions.junit.platform.get()

dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java

@@ -7,6 +7,7 @@ public class TestAssumptionLegacy {
 
   @Test
   public void test_fail_assumption_legacy() {
+    // Throw exception from legacy JUnit4 library.
     throw new AssumptionViolatedException("assumption is not fulfilled");
   }
 }

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle

@@ -26,7 +26,7 @@ dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
 
-  testImplementation libs.spock.junit4 // This legacy module still needs JUnit4.
+  testImplementation libs.junit4 // This module still needs JUnit4.
   testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'