Minor code cleanup: spaces, imports, etc. (#10203)

Author: AlexeyKuznetsov-DD

buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.groovy

@@ -59,7 +59,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest {
   class AroundAdvice {
     @CallSite.Around('java.lang.String java.lang.String.replaceAll(java.lang.String, java.lang.String)')
     static String around(@CallSite.This final String self, @CallSite.Argument final String regexp, @CallSite.Argument final String replacement) {
-      return self.replaceAll(regexp, replacement);
+      return self.replaceAll(regexp, replacement)
     }
   }
 
@@ -228,7 +228,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest {
                                             @CallSite.Argument final MethodType concatType,
                                             @CallSite.Argument final String recipe,
                                             @CallSite.Argument final Object... constants) {
-      return null;
+      return null
     }
   }
 
@@ -270,7 +270,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest {
     static String after(@CallSite.AllArguments final Object[] arguments,
                         @CallSite.Return final String result,
                         @CallSite.InvokeDynamicConstants final Object[] constants) {
-      return result;
+      return result
     }
   }
 

buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/AdviceSpecificationTest.groovy

@@ -548,7 +548,7 @@ class AdviceSpecificationTest extends BaseCsiPluginTest {
   class AfterWithVoidWrongAdvice {
     @CallSite.After("void java.lang.String.getChars(int, int, char[], int)")
     static String after(@CallSite.AllArguments final Object[] args, @CallSite.Return final String result) {
-      return result;
+      return result
     }
   }
 

buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/AsmSpecificationBuilderTest.groovy

@@ -7,7 +7,7 @@ import datadog.trace.plugin.csi.impl.CallSiteSpecification.AfterSpecification
 import datadog.trace.plugin.csi.impl.CallSiteSpecification.AroundSpecification
 import datadog.trace.plugin.csi.impl.CallSiteSpecification.BeforeSpecification
 import datadog.trace.plugin.csi.util.Types
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import groovy.transform.CompileDynamic
 import org.objectweb.asm.Type
 

buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/assertion/AssertBuilder.groovy

@@ -113,10 +113,9 @@ class AssertBuilder<C extends CallSiteAssert> {
     return resolved.@method as Method
   }
 
-  private static CompilationUnit parseJavaFile(final File file)
-    throws FileNotFoundException {
-    final JavaSymbolSolver solver = new JavaSymbolSolver(typeResolver());
-    final JavaParser parser = new JavaParser(new ParserConfiguration().setSymbolResolver(solver));
-    return parser.parse(file).getResult().get();
+  private static CompilationUnit parseJavaFile(final File file) throws FileNotFoundException {
+    final JavaSymbolSolver solver = new JavaSymbolSolver(typeResolver())
+    final JavaParser parser = new JavaParser(new ParserConfiguration().setSymbolResolver(solver))
+    return parser.parse(file).getResult().get()
   }
 }

buildSrc/src/main/groovy/InstrumentPlugin.groovy

@@ -53,8 +53,7 @@ class InstrumentPlugin implements Plugin<Project> {
 
           // insert intermediate 'raw' directory for unprocessed classes
           Directory classesDir = compileTask.destinationDirectory.get()
-          Directory rawClassesDir = classesDir.dir(
-            "../raw${sourceSetSuffix ? "_$sourceSetSuffix" : ''}/")
+          Directory rawClassesDir = classesDir.dir("../raw${sourceSetSuffix ? "_$sourceSetSuffix" : ''}/")
           compileTask.destinationDirectory.set(rawClassesDir.asFile)
 
           // insert task between compile and jar, and before test*

buildSrc/src/main/groovy/InstrumentingPlugin.groovy

@@ -58,7 +58,7 @@ class InstrumentingPlugin {
                   throwables.values().flatten().each {
                     ise.addSuppressed(it)
                   }
-                };
+                }
               }
             }
           )

buildSrc/src/main/kotlin/datadog/gradle/plugin/ci/CIJobsExtensions.kt

@@ -10,14 +10,14 @@ import org.gradle.kotlin.dsl.extra
 internal fun findAffectedTaskPath(baseTask: Task, affectedProjects: Map<Project, Set<String>>): String? {
   val visited = mutableSetOf<Task>()
   val queue = mutableListOf(baseTask)
-  
+
   while (queue.isNotEmpty()) {
     val t = queue.removeAt(0)
     if (visited.contains(t)) {
       continue
     }
     visited.add(t)
-    
+
     val affectedTasks = affectedProjects[t.project]
     if (affectedTasks != null) {
       if (affectedTasks.contains("all")) {
@@ -27,7 +27,7 @@ internal fun findAffectedTaskPath(baseTask: Task, affectedProjects: Map<Project,
         return "${t.project.path}:${t.name}"
       }
     }
-    
+
     t.taskDependencies.getDependencies(t).forEach { queue.add(it) }
   }
   return null
@@ -106,4 +106,3 @@ fun Project.testAggregate(
   createRootTask("${baseTaskName}LatestDepTest", "allLatestDepTests", includePrefixes, excludePrefixes, forceCoverage)
   createRootTask("${baseTaskName}Check", "check", includePrefixes, excludePrefixes, forceCoverage)
 }
-

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt

@@ -3,14 +3,14 @@ package datadog.gradle.plugin.config
 import com.github.javaparser.ParserConfiguration
 import com.github.javaparser.StaticJavaParser
 import com.github.javaparser.ast.CompilationUnit
-import com.github.javaparser.ast.expr.StringLiteralExpr
-import com.github.javaparser.ast.nodeTypes.NodeWithModifiers
 import com.github.javaparser.ast.Modifier
 import com.github.javaparser.ast.body.FieldDeclaration
 import com.github.javaparser.ast.body.VariableDeclarator
+import com.github.javaparser.ast.expr.StringLiteralExpr
+import com.github.javaparser.ast.nodeTypes.NodeWithModifiers
+import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.GradleException
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.kotlin.dsl.getByType

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ParseSupportedConfigurationsTask.kt

@@ -1,23 +1,23 @@
 package datadog.gradle.plugin.config
 
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
 import org.gradle.api.DefaultTask
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.TaskAction
-import com.fasterxml.jackson.core.type.TypeReference
-import com.fasterxml.jackson.databind.ObjectMapper
-import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
 import java.io.File
 import java.io.FileInputStream
 import java.io.PrintWriter
 import javax.inject.Inject
 
 @CacheableTask
-abstract class ParseSupportedConfigurationsTask  @Inject constructor(
+abstract class ParseSupportedConfigurationsTask @Inject constructor(
   private val objects: ObjectFactory
 ) : DefaultTask() {
   @InputFile

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ParseV2SupportedConfigurationsTask.kt

@@ -53,6 +53,7 @@ abstract class ParseV2SupportedConfigurationsTask  @Inject constructor(
     // Parse supportedConfigurations key to into a V2 format
     val supported: Map<String, List<SupportedConfigurationItem>> = supportedRaw.mapValues { (_, configList) ->
       configList.map { configMap ->
+        @Suppress("UNCHECKED_CAST")
         SupportedConfigurationItem(
           configMap["version"] as? String,
           configMap["type"] as? String,