Skip to content

Commit b902d15

Browse files
committed
Update type parameters
1 parent 3a3ea59 commit b902d15

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

dd-java-agent/instrumentation/netty-promise-4/src/test/groovy/NettyProgressivePromiseTest.groovy

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import datadog.trace.agent.test.base.AbstractPromiseTest
22
import io.netty.util.concurrent.DefaultEventExecutorGroup
3-
import io.netty.util.concurrent.Future
43
import io.netty.util.concurrent.GenericProgressiveFutureListener
4+
import io.netty.util.concurrent.ProgressiveFuture
55
import io.netty.util.concurrent.ProgressivePromise
66
import spock.lang.Shared
77

@@ -61,15 +61,12 @@ class NettyProgressivePromiseTest extends AbstractPromiseTest<ProgressivePromise
6161
when:
6262
runUnderTrace("parent") {
6363
def listeners = iterations.collect { int i ->
64-
return new GenericProgressiveFutureListener<Future<?>>() {
65-
66-
@Override
67-
void operationComplete(Future<?> future) throws Exception {
64+
return new GenericProgressiveFutureListener<ProgressiveFuture<?>>() {
65+
void operationComplete(ProgressiveFuture<?> future) throws Exception {
6866
runUnderTrace("listen$i") {}
6967
}
7068

71-
@Override
72-
void operationProgressed(Future<?> future, long progress, long total) throws Exception {
69+
void operationProgressed(ProgressiveFuture<?> future, long progress, long total) throws Exception {
7370
runUnderTrace("progress$i") {}
7471
}
7572
}

telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ class MetricPeriodicActionTest extends Specification {
157157

158158
class DefaultMetricPeriodicAction extends MetricPeriodicAction {
159159

160-
private final MetricCollector<Metric> collector
160+
private final MetricCollector<MetricCollector.Metric> collector
161161

162-
DefaultMetricPeriodicAction(@NonNull final MetricCollector<Metric> collector) {
162+
DefaultMetricPeriodicAction(@NonNull final MetricCollector<MetricCollector.Metric> collector) {
163163
this.collector = collector
164164
}
165165

166166
@Override
167167
@NonNull
168-
MetricCollector<Metric> collector() {
168+
MetricCollector<MetricCollector.Metric> collector() {
169169
return collector
170170
}
171171
}

0 commit comments

Comments
 (0)