Fix spotBugs warning

Author: nikita-tkachenko-datadog

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java

@@ -3,6 +3,7 @@
 import datadog.trace.api.civisibility.config.TestIdentifier;
 import datadog.trace.api.civisibility.config.TestMetadata;
 import datadog.trace.civisibility.diff.Diff;
+import datadog.trace.civisibility.diff.LineDiff;
 import datadog.trace.civisibility.ipc.serialization.Serializer;
 import java.nio.ByteBuffer;
 import java.util.BitSet;
@@ -29,7 +30,7 @@ public class ExecutionSettings {
           Collections.emptyMap(),
           Collections.emptyList(),
           null,
-          Diff.EMPTY);
+          LineDiff.EMPTY);
 
   private final boolean itrEnabled;
   private final boolean codeCoverageEnabled;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java

@@ -10,6 +10,7 @@
 import datadog.trace.civisibility.ci.PullRequestInfo;
 import datadog.trace.civisibility.diff.Diff;
 import datadog.trace.civisibility.diff.FileDiff;
+import datadog.trace.civisibility.diff.LineDiff;
 import datadog.trace.civisibility.git.tree.GitClient;
 import datadog.trace.civisibility.git.tree.GitDataUploader;
 import datadog.trace.civisibility.git.tree.GitRepoUnshallow;
@@ -307,7 +308,7 @@ private Map<String, Collection<TestIdentifier>> getKnownTestsByModule(
   private Diff getPullRequestDiff(
       boolean impactedTestsDetectionEnabled, TracerEnvironment tracerEnvironment) {
     if (!impactedTestsDetectionEnabled) {
-      return Diff.EMPTY;
+      return LineDiff.EMPTY;
     }
 
     try {
@@ -355,6 +356,6 @@ private Diff getPullRequestDiff(
       LOGGER.error("Could not get git diff for: {}", tracerEnvironment, e);
     }
 
-    return Diff.EMPTY;
+    return LineDiff.EMPTY;
   }
 }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/diff/Diff.java

@@ -5,8 +5,6 @@
 
 public interface Diff extends SerializableType {
 
-  Diff EMPTY = LineDiff.EMPTY;
-
   PolymorphicSerializer<Diff> SERIALIZER =
       new PolymorphicSerializer<>(LineDiff.class, FileDiff.class);
 

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy

@@ -1,13 +1,11 @@
 package datadog.trace.civisibility.config
 
-
 import datadog.trace.api.civisibility.config.TestIdentifier
 import datadog.trace.api.civisibility.config.TestMetadata
-import datadog.trace.civisibility.diff.Diff
 import datadog.trace.civisibility.diff.LineDiff
 import spock.lang.Specification
 
-import static datadog.trace.civisibility.TestUtils.*
+import static datadog.trace.civisibility.TestUtils.lines
 
 class ExecutionSettingsTest extends Specification {
 
@@ -33,7 +31,7 @@ class ExecutionSettingsTest extends Specification {
       [:],
       null,
       new HashSet<>([]),
-      Diff.EMPTY),
+      LineDiff.EMPTY),
 
       new ExecutionSettings(
       true,

dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy

@@ -19,15 +19,12 @@ import datadog.trace.api.config.CiVisibilityConfig
 import datadog.trace.api.config.GeneralConfig
 import datadog.trace.bootstrap.ContextStore
 import datadog.trace.civisibility.codeowners.Codeowners
-import datadog.trace.civisibility.config.EarlyFlakeDetectionSettings
-import datadog.trace.civisibility.config.ExecutionSettings
-import datadog.trace.civisibility.config.ExecutionSettingsFactory
-import datadog.trace.civisibility.config.JvmInfo
-import datadog.trace.civisibility.config.JvmInfoFactoryImpl
+import datadog.trace.civisibility.config.*
 import datadog.trace.civisibility.coverage.file.FileCoverageStore
 import datadog.trace.civisibility.coverage.percentage.NoOpCoverageCalculator
 import datadog.trace.civisibility.decorator.TestDecorator
 import datadog.trace.civisibility.decorator.TestDecoratorImpl
+import datadog.trace.civisibility.diff.LineDiff
 import datadog.trace.civisibility.domain.BuildSystemSession
 import datadog.trace.civisibility.domain.TestFrameworkModule
 import datadog.trace.civisibility.domain.TestFrameworkSession
@@ -36,7 +33,6 @@ import datadog.trace.civisibility.domain.buildsystem.ModuleSignalRouter
 import datadog.trace.civisibility.domain.headless.HeadlessTestSession
 import datadog.trace.civisibility.events.BuildEventsHandlerImpl
 import datadog.trace.civisibility.events.TestEventsHandlerImpl
-import datadog.trace.civisibility.diff.Diff
 import datadog.trace.civisibility.ipc.SignalServer
 import datadog.trace.civisibility.source.LinesResolver
 import datadog.trace.civisibility.source.SourcePathResolver
@@ -129,7 +125,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
         [:],
         flakyTests,
         earlyFlakinessDetectionEnabled || CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(Config.get().ciVisibilityTestOrder) ? knownTests : null,
-        Diff.EMPTY)
+        LineDiff.EMPTY)
       }
     }