Skip to content

Commit 409c915

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
committed
Updated CodeNarc and fixed failed rules.
1 parent 13674fd commit 409c915

33 files changed

Lines changed: 85 additions & 118 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package datadog.trace.civisibility.config
22

33
import datadog.trace.api.civisibility.CIConstants
4-
import datadog.trace.api.civisibility.config.LibraryCapability
54
import datadog.trace.api.civisibility.config.TestFQN
65
import datadog.trace.api.civisibility.config.TestIdentifier
76
import datadog.trace.api.civisibility.config.TestMetadata
87
import datadog.trace.api.config.CiVisibilityConfig
98
import datadog.trace.civisibility.diff.LineDiff
109
import datadog.trace.test.util.DDSpecification
1110

12-
import java.util.stream.Collectors
13-
1411
import static datadog.trace.civisibility.TestUtils.lines
1512

1613
class ExecutionSettingsTest extends DDSpecification {
@@ -110,6 +107,8 @@ class ExecutionSettingsTest extends DDSpecification {
110107
]
111108
}
112109

110+
// TODO: Delete or comment or keep suppressed?
111+
@SuppressWarnings('UnusedPrivateMethod')
113112
private ExecutionSettings givenExecutionSettings(boolean settingsEnabled) {
114113
if (settingsEnabled) {
115114
injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ class SerializerTest extends Specification {
133133
deserializedMap.getClass() == clazz
134134

135135
where:
136-
m | clazz | provider | keySerializer | keyDeserializer
137-
[:] | HashMap | HashMap::new | Serializer::write | Serializer::readString
138-
["a": "1", "b": "2"] | HashMap | HashMap::new | Serializer::write | Serializer::readString
139-
[:] | LinkedHashMap | LinkedHashMap::new | Serializer::write | Serializer::readString
140-
["a": "1", "b": "2"] | LinkedHashMap | LinkedHashMap::new | Serializer::write | Serializer::readString
141-
[:] | TreeMap | TreeMap::new | Serializer::write | Serializer::readString
142-
["a": "1", "b": "2"] | TreeMap | TreeMap::new | Serializer::write | Serializer::readString
143-
[:] | EnumMap | (() -> new EnumMap<>(MyEnum.class)) | MyEnum::serialize | MyEnum::deserialize
144-
[(MyEnum.A): "1", (MyEnum.B): "2"] | EnumMap | (() -> new EnumMap<>(MyEnum.class)) | MyEnum::serialize | MyEnum::deserialize
136+
m | clazz | provider | keySerializer | keyDeserializer
137+
[:] | HashMap | HashMap::new | Serializer::write | Serializer::readString
138+
["a": "1", "b": "2"] | HashMap | HashMap | Serializer::write | Serializer::readString
139+
[:] | LinkedHashMap | LinkedHashMap::new | Serializer::write | Serializer::readString
140+
["a": "1", "b": "2"] | LinkedHashMap | LinkedHashMap::new | Serializer::write | Serializer::readString
141+
[:] | TreeMap | TreeMap::new | Serializer::write | Serializer::readString
142+
["a": "1", "b": "2"] | TreeMap | TreeMap::new | Serializer::write | Serializer::readString
143+
[:] | EnumMap | (() -> new EnumMap<>(MyEnum)) | MyEnum::serialize | MyEnum::deserialize
144+
[(MyEnum.A): "1", (MyEnum.B): "2"] | EnumMap | (() -> new EnumMap<>(MyEnum)) | MyEnum::serialize | MyEnum::deserialize
145145
}
146146

147147
def "test mixed serialization"() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class GrpcRequestMessageHandlerTest extends IastModuleImplTestBase {
121121
!result
122122
}
123123

124-
private static def buildProto2Message() {
124+
private static buildProto2Message() {
125125
final child = Test2.Proto2Child.newBuilder()
126126
.setOptional("optional")
127127
.setRequired("required")
@@ -131,7 +131,7 @@ class GrpcRequestMessageHandlerTest extends IastModuleImplTestBase {
131131
return Test2.Proto2Parent.newBuilder().setChild(child).build()
132132
}
133133

134-
private static def buildProto3Message() {
134+
private static buildProto3Message() {
135135
final child = Test3.Proto3Child.newBuilder()
136136
.setOptional("optional")
137137
.setRequired("required")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class LogsDispatcherTest extends Specification {
6868
}
6969

7070
private static final class DummyBackendApi implements BackendApi {
71-
private final listJsonAdapter = new Moshi.Builder().build().adapter(List.class)
71+
private final listJsonAdapter = new Moshi.Builder().build().adapter(List)
7272
private final Queue<Map<String, Object>> messages = new ArrayDeque<>()
7373
private int requestsReceived = 0
7474

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ import com.squareup.moshi.Types
3131
import datadog.appsec.api.blocking.BlockingContentType
3232
import datadog.communication.monitor.Monitoring
3333
import datadog.remoteconfig.ConfigurationPoller
34-
import datadog.remoteconfig.PollerRequestFactory
35-
import datadog.remoteconfig.PollingRateHinter
3634
import datadog.remoteconfig.Product
3735
import datadog.remoteconfig.state.ConfigKey
3836
import datadog.remoteconfig.state.ParsedConfigKey
@@ -104,7 +102,7 @@ class WAFModuleSpecification extends DDSpecification {
104102

105103
final configurationPoller = Stub(ConfigurationPoller) {
106104
addListener(Product.ASM_DD, _ as ProductListener) >> {
107-
Product _, ProductListener l ->
105+
Product ignored, ProductListener l ->
108106
listener = l
109107
}
110108
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import static com.datadog.appsec.ddwaf.WAFModule.MAX_ELEMENTS
1515
import static com.datadog.appsec.ddwaf.WAFModule.MAX_STRING_SIZE
1616
import static com.datadog.appsec.event.data.ObjectIntrospection.convert
1717

18+
@SuppressWarnings('UnnecessaryBooleanExpression')
1819
class ObjectIntrospectionSpecification extends DDSpecification {
1920

2021
@Shared

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ import com.datadog.appsec.event.data.DataBundle
99
import com.datadog.appsec.event.data.KnownAddresses
1010
import com.datadog.appsec.report.AppSecEvent
1111
import com.datadog.appsec.report.AppSecEventWrapper
12-
import datadog.trace.api.TagMap
1312
import datadog.trace.api.ProductTraceSource
13+
import datadog.trace.api.TagMap
1414
import datadog.trace.api.config.GeneralConfig
15-
import static datadog.trace.api.config.IastConfig.IAST_DEDUPLICATION_ENABLED
1615
import datadog.trace.api.function.TriConsumer
1716
import datadog.trace.api.function.TriFunction
1817
import datadog.trace.api.gateway.BlockResponseFunction
@@ -42,6 +41,7 @@ import static datadog.trace.api.telemetry.LoginEvent.LOGIN_FAILURE
4241
import static datadog.trace.api.telemetry.LoginEvent.LOGIN_SUCCESS
4342
import static datadog.trace.api.telemetry.LoginEvent.SIGN_UP
4443

44+
@SuppressWarnings('UnusedVariable')
4545
class GatewayBridgeSpecification extends DDSpecification {
4646

4747
@Shared
@@ -81,7 +81,7 @@ class GatewayBridgeSpecification extends DDSpecification {
8181
i
8282
}()
8383

84-
EventProducerService.DataSubscriberInfo emptyDsInfo = Stub() {
84+
EventProducerService.DataSubscriberInfo emptyDsInfo = Stub {
8585
isEmpty() >> true
8686
}
8787

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,18 @@ class AvroDatumReaderTest extends AgentTestRunner {
103103
encoder.flush()
104104
bytes = out.toByteArray()
105105

106-
GenericRecord result = null
107-
runUnderTrace("parent_deserialize") {
106+
GenericRecord result = runUnderTrace("parent_deserialize") {
108107
ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)
109108
BinaryDecoder decoder = DecoderFactory.get().binaryDecoder(inputStream, null)
110109
GenericDatumReader<GenericRecord> datumReader = new GenericDatumReader<>(schemaDef)
111110

112-
result = datumReader.read(null, decoder)
111+
datumReader.read(null, decoder)
113112
}
114113

115114
TEST_WRITER.waitForTraces(1)
116115

117116
then:
117+
result != null
118118

119119
assertTraces(1, SORT_TRACES_BY_ID) {
120120
trace(1) {
@@ -182,21 +182,21 @@ class AvroDatumReaderTest extends AgentTestRunner {
182182
datum.put("mapNestedField", nestedMap)
183183

184184
when:
185-
def bytes
186185
ByteArrayOutputStream out = new ByteArrayOutputStream()
187186
Encoder encoder = EncoderFactory.get().binaryEncoder(out, null)
188187
SpecificDatumWriter<GenericRecord> datumWriter = new SpecificDatumWriter<>(schemaDef)
189188

190189

191-
runUnderTrace("parent_serialize") {
190+
def bytes = runUnderTrace("parent_serialize") {
192191
datumWriter.write(datum, encoder)
193192
encoder.flush()
194-
bytes = out.toByteArray()
193+
out.toByteArray()
195194
}
196195

197196
TEST_WRITER.waitForTraces(1)
198197

199198
then:
199+
bytes != null
200200

201201
assertTraces(1, SORT_TRACES_BY_ID) {
202202
trace(1) {
@@ -219,4 +219,4 @@ class AvroDatumReaderTest extends AgentTestRunner {
219219
}
220220
}
221221
}
222-
}
222+
}

‎dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ abstract class SnsClientTest extends VersionedNamingTestBase {
8585
def "trace details propagated when message attributes are readonly"() {
8686
when:
8787
TEST_WRITER.clear()
88-
PublishResponse response
88+
8989
def headers = new HashMap<String, MessageAttributeValue>()
9090
headers.put("mykey", MessageAttributeValue.builder().stringValue("myvalue").dataType("String").build())
9191
def readonlyHeaders = Collections.unmodifiableMap(headers)

‎dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
201201

202202
when:
203203
TraceUtils.runUnderTrace('parent', {
204-
def my_attribute = new MessageAttributeValue()
205-
my_attribute.setStringValue("hello world")
206-
my_attribute.setDataType("String")
207-
def readonlyAttributes = ImmutableMap<String, MessageAttributeValue>.of("my_key", my_attribute)
204+
def myAttribute = new MessageAttributeValue()
205+
myAttribute.setStringValue("hello world")
206+
myAttribute.setDataType("String")
207+
def readonlyAttributes = ImmutableMap<String, MessageAttributeValue>.of("my_key", myAttribute)
208208
def req = new SendMessageRequest(queueUrl, 'sometext')
209209
req.setMessageAttributes(readonlyAttributes)
210210
client.sendMessage(req)

0 commit comments

Comments
 (0)