Updated CodeNarc to 3.6.0 and fixed failed rules. (#9421)

Author: AlexeyKuznetsov-DD

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

@@ -1,16 +1,11 @@
 package datadog.trace.civisibility.config
 
-import datadog.trace.api.civisibility.CIConstants
-import datadog.trace.api.civisibility.config.LibraryCapability
 import datadog.trace.api.civisibility.config.TestFQN
 import datadog.trace.api.civisibility.config.TestIdentifier
 import datadog.trace.api.civisibility.config.TestMetadata
-import datadog.trace.api.config.CiVisibilityConfig
 import datadog.trace.civisibility.diff.LineDiff
 import datadog.trace.test.util.DDSpecification
 
-import java.util.stream.Collectors
-
 import static datadog.trace.civisibility.TestUtils.lines
 
 class ExecutionSettingsTest extends DDSpecification {
@@ -109,35 +104,4 @@ class ExecutionSettingsTest extends DDSpecification {
       ),
     ]
   }
-
-  private ExecutionSettings givenExecutionSettings(boolean settingsEnabled) {
-    if (settingsEnabled) {
-      injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER)
-    }
-
-    def testManagementSettings = Stub(TestManagementSettings)
-    testManagementSettings.isEnabled() >> settingsEnabled
-
-    def earlyFlakeDetectionSettings = Stub(EarlyFlakeDetectionSettings)
-    earlyFlakeDetectionSettings.isEnabled() >> settingsEnabled
-
-    return new ExecutionSettings(
-    settingsEnabled,
-    settingsEnabled,
-    settingsEnabled,
-    settingsEnabled,
-    settingsEnabled,
-    earlyFlakeDetectionSettings,
-    testManagementSettings,
-    null,
-    [:],
-    [:],
-    [],
-    [],
-    [],
-    [],
-    [],
-    LineDiff.EMPTY
-    )
-  }
 }

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/serialization/SerializerTest.groovy

@@ -119,6 +119,7 @@ class SerializerTest extends Specification {
     m << [null, [:], ["a": "b"], ["a": "b", "1": "2"], [null: "b", "1": null]]
   }
 
+  @SuppressWarnings('UnnecessaryDotClass')
   def "test map deserialization with provider: #m #clazz #provider"() {
     given:
     def serializer = new Serializer()

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

@@ -98,6 +98,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
     injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER)
   }
 
+  @SuppressWarnings('UnusedPrivateField')
   private static final class Settings {
     private volatile List<TestIdentifier> skippableTests = []
     private volatile List<TestFQN> flakyTests
@@ -363,9 +364,9 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
 
     if (System.getenv().get("GENERATE_TEST_FIXTURES") != null) {
       return generateTestFixtures(testcaseName, events, coverages, additionalReplacements, additionalIgnoredTags)
-    } else {
-      return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements, additionalIgnoredTags)
     }
+
+    return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements, additionalIgnoredTags)
   }
 
   def generateTestFixtures(String testcaseName, List<Map> events, List<Map> coverages, Map<String, String> additionalReplacements, List<String> additionalIgnoredTags) {

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

@@ -16,6 +16,7 @@ import freemarker.core.InvalidReferenceException
 import freemarker.template.Template
 import freemarker.template.TemplateException
 import freemarker.template.TemplateExceptionHandler
+import org.opentest4j.AssertionFailedError
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
 
@@ -118,7 +119,7 @@ abstract class CiVisibilityTestUtils {
         println "Expected events: $expectedEvents"
         println "Actual events: $actualEvents"
       }
-      throw new org.opentest4j.AssertionFailedError("Events mismatch", expectedEvents, actualEvents, e)
+      throw new AssertionFailedError("Events mismatch", expectedEvents, actualEvents, e)
     }
 
     def expectedCoverages = getFreemarkerTemplate(baseTemplatesPath + "/coverages.ftl", replacementMap, coverages)
@@ -132,7 +133,7 @@ abstract class CiVisibilityTestUtils {
         println "Expected coverages: $expectedCoverages"
         println "Actual coverages: $actualCoverages"
       }
-      throw new org.opentest4j.AssertionFailedError("Coverages mismatch", expectedCoverages, actualCoverages, e)
+      throw new AssertionFailedError("Coverages mismatch", expectedCoverages, actualCoverages, e)
     }
 
     return replacementMap
@@ -258,9 +259,9 @@ abstract class CiVisibilityTestUtils {
           ctx.map(dynamicPath.path, (currentValue, config) -> {
             if (dynamicPath.unique) {
               return uniqueValues.computeIfAbsent(currentValue, (k) -> label.forTemplateKey(dynamicPath.rawPath))
-            } else {
-              return label.forTemplateKey(dynamicPath.rawPath)
             }
+
+            return label.forTemplateKey(dynamicPath.rawPath)
           })
         }
 

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/GrpcRequestMessageHandlerTest.groovy

@@ -121,7 +121,7 @@ class GrpcRequestMessageHandlerTest extends IastModuleImplTestBase {
     !result
   }
 
-  private static def buildProto2Message() {
+  private static buildProto2Message() {
     final child = Test2.Proto2Child.newBuilder()
     .setOptional("optional")
     .setRequired("required")
@@ -131,7 +131,7 @@ class GrpcRequestMessageHandlerTest extends IastModuleImplTestBase {
     return Test2.Proto2Parent.newBuilder().setChild(child).build()
   }
 
-  private static def buildProto3Message() {
+  private static buildProto3Message() {
     final child = Test3.Proto3Child.newBuilder()
     .setOptional("optional")
     .setRequired("required")

dd-java-agent/agent-logs-intake/src/test/groovy/datadog/trace/logging/intake/LogsDispatcherTest.groovy

@@ -68,7 +68,7 @@ class LogsDispatcherTest extends Specification {
   }
 
   private static final class DummyBackendApi implements BackendApi {
-    private final listJsonAdapter = new Moshi.Builder().build().adapter(List.class)
+    private final listJsonAdapter = new Moshi.Builder().build().adapter(List)
     private final Queue<Map<String, Object>> messages = new ArrayDeque<>()
     private int requestsReceived = 0
 

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/ddwaf/WAFModuleSpecification.groovy

@@ -31,8 +31,6 @@ import com.squareup.moshi.Types
 import datadog.appsec.api.blocking.BlockingContentType
 import datadog.communication.monitor.Monitoring
 import datadog.remoteconfig.ConfigurationPoller
-import datadog.remoteconfig.PollerRequestFactory
-import datadog.remoteconfig.PollingRateHinter
 import datadog.remoteconfig.Product
 import datadog.remoteconfig.state.ConfigKey
 import datadog.remoteconfig.state.ParsedConfigKey
@@ -630,7 +628,7 @@ class WAFModuleSpecification extends DDSpecification {
     1 * segment.setTagTop('_dd.appsec.waf.version', _ as String)
     1 * segment.setTagTop('_dd.appsec.event_rules.loaded', 117)
     1 * segment.setTagTop('_dd.appsec.event_rules.error_count', 1)
-    1 * segment.setTagTop('_dd.appsec.event_rules.errors', { it =~ /\{"[^"]+":\["bad rule"\]\}/})
+    1 * segment.setTagTop('_dd.appsec.event_rules.errors', { it =~ /\{"[^"]+":\["bad rule"]}/})
     1 * segment.setTagTop('asm.keep', true)
     0 * segment._(*_)
 

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/event/data/ObjectIntrospectionSpecification.groovy

@@ -15,6 +15,7 @@ import static com.datadog.appsec.ddwaf.WAFModule.MAX_ELEMENTS
 import static com.datadog.appsec.ddwaf.WAFModule.MAX_STRING_SIZE
 import static com.datadog.appsec.event.data.ObjectIntrospection.convert
 
+@SuppressWarnings('UnnecessaryBooleanExpression')
 class ObjectIntrospectionSpecification extends DDSpecification {
 
   @Shared

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy

@@ -9,10 +9,9 @@ import com.datadog.appsec.event.data.DataBundle
 import com.datadog.appsec.event.data.KnownAddresses
 import com.datadog.appsec.report.AppSecEvent
 import com.datadog.appsec.report.AppSecEventWrapper
-import datadog.trace.api.TagMap
 import datadog.trace.api.ProductTraceSource
+import datadog.trace.api.TagMap
 import datadog.trace.api.config.GeneralConfig
-import static datadog.trace.api.config.IastConfig.IAST_DEDUPLICATION_ENABLED
 import datadog.trace.api.function.TriConsumer
 import datadog.trace.api.function.TriFunction
 import datadog.trace.api.gateway.BlockResponseFunction
@@ -42,6 +41,7 @@ import static datadog.trace.api.telemetry.LoginEvent.LOGIN_FAILURE
 import static datadog.trace.api.telemetry.LoginEvent.LOGIN_SUCCESS
 import static datadog.trace.api.telemetry.LoginEvent.SIGN_UP
 
+@SuppressWarnings('UnusedVariable')
 class GatewayBridgeSpecification extends DDSpecification {
 
   @Shared
@@ -81,7 +81,7 @@ class GatewayBridgeSpecification extends DDSpecification {
     i
   }()
 
-  EventProducerService.DataSubscriberInfo emptyDsInfo = Stub() {
+  EventProducerService.DataSubscriberInfo emptyDsInfo = Stub {
     isEmpty() >> true
   }
 

dd-java-agent/instrumentation/avro/src/test/groovy/AvroDatumReaderTest.groovy

@@ -103,18 +103,18 @@ class AvroDatumReaderTest extends AgentTestRunner {
     encoder.flush()
     bytes = out.toByteArray()
 
-    GenericRecord result = null
-    runUnderTrace("parent_deserialize") {
+    GenericRecord result = runUnderTrace("parent_deserialize") {
       ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)
       BinaryDecoder decoder = DecoderFactory.get().binaryDecoder(inputStream, null)
       GenericDatumReader<GenericRecord> datumReader = new GenericDatumReader<>(schemaDef)
 
-      result = datumReader.read(null, decoder)
+      datumReader.read(null, decoder)
     }
 
     TEST_WRITER.waitForTraces(1)
 
     then:
+    result != null
 
     assertTraces(1, SORT_TRACES_BY_ID) {
       trace(1) {
@@ -182,21 +182,21 @@ class AvroDatumReaderTest extends AgentTestRunner {
     datum.put("mapNestedField", nestedMap)
 
     when:
-    def bytes
     ByteArrayOutputStream out = new ByteArrayOutputStream()
     Encoder encoder = EncoderFactory.get().binaryEncoder(out, null)
     SpecificDatumWriter<GenericRecord> datumWriter = new SpecificDatumWriter<>(schemaDef)
 
 
-    runUnderTrace("parent_serialize") {
+    def bytes = runUnderTrace("parent_serialize") {
       datumWriter.write(datum, encoder)
       encoder.flush()
-      bytes = out.toByteArray()
+      out.toByteArray()
     }
 
     TEST_WRITER.waitForTraces(1)
 
     then:
+    bytes != null
 
     assertTraces(1, SORT_TRACES_BY_ID) {
       trace(1) {
@@ -219,4 +219,4 @@ class AvroDatumReaderTest extends AgentTestRunner {
       }
     }
   }
-}
+}