Skip to content

Commit 2dea149

Browse files
jaydelucajaydeluca
committed
dont use lambda shorthand
1 parent ac9c10d commit 2dea149

File tree

8 files changed

+19
-29
lines changed

8 files changed

+19
-29
lines changed

‎instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
3434
import java.util.ArrayList;
3535
import java.util.List;
36-
import org.assertj.core.api.AbstractAssert;
3736

3837
class AwsSpanAssertions {
3938

@@ -107,10 +106,10 @@ static SpanDataAssert sqs(
107106
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "receive"));
108107
} else if (spanName.endsWith("process")) {
109108
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "process"));
110-
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, AbstractAssert::isNotNull));
109+
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, val -> val.isNotNull()));
111110
} else if (spanName.endsWith("publish")) {
112111
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "publish"));
113-
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, AbstractAssert::isNotNull));
112+
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, val -> val.isNotNull()));
114113
}
115114
}
116115

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import java.util.function.Consumer;
4747
import java.util.stream.Collectors;
4848
import java.util.stream.IntStream;
49-
import org.assertj.core.api.AbstractAssert;
5049
import org.junit.jupiter.api.AfterEach;
5150
import org.junit.jupiter.api.Test;
5251
import org.junitpioneer.jupiter.cartesian.CartesianTest;
@@ -247,7 +246,7 @@ public void onCompleted() {
247246
equalTo(SERVER_PORT, server.getPort()),
248247
equalTo(NETWORK_TYPE, "ipv4"),
249248
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
250-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
249+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
251250
.satisfies(
252251
spanData ->
253252
assertThat(spanData.getEvents())

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
import java.util.concurrent.atomic.AtomicBoolean;
7171
import java.util.concurrent.atomic.AtomicReference;
7272
import java.util.stream.Stream;
73-
import org.assertj.core.api.AbstractAssert;
7473
import org.junit.jupiter.api.AfterEach;
7574
import org.junit.jupiter.api.Test;
7675
import org.junit.jupiter.api.TestInstance;
@@ -176,7 +175,7 @@ public void sayHello(
176175
equalTo(SERVER_PORT, server.getPort()),
177176
equalTo(NETWORK_TYPE, "ipv4"),
178177
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
179-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
178+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
180179
.hasEventsSatisfyingExactly(
181180
event ->
182181
event
@@ -329,7 +328,7 @@ public void sayHello(
329328
equalTo(SERVER_PORT, server.getPort()),
330329
equalTo(NETWORK_TYPE, "ipv4"),
331330
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
332-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
331+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
333332
.hasEventsSatisfyingExactly(
334333
event ->
335334
event
@@ -494,7 +493,7 @@ public void onCompleted() {
494493
equalTo(SERVER_PORT, server.getPort()),
495494
equalTo(NETWORK_TYPE, "ipv4"),
496495
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
497-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
496+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
498497
.hasEventsSatisfyingExactly(
499498
event ->
500499
event
@@ -627,7 +626,7 @@ public void sayHello(
627626
equalTo(SERVER_PORT, server.getPort()),
628627
equalTo(NETWORK_TYPE, "ipv4"),
629628
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
630-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
629+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
631630
.hasEventsSatisfying(
632631
events -> {
633632
assertThat(events).isNotEmpty();
@@ -766,7 +765,7 @@ public void sayHello(
766765
equalTo(SERVER_PORT, server.getPort()),
767766
equalTo(NETWORK_TYPE, "ipv4"),
768767
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
769-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
768+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
770769
.hasEventsSatisfying(
771770
events -> {
772771
assertThat(events).hasSize(2);
@@ -1003,7 +1002,7 @@ public void onCompleted() {
10031002
equalTo(SERVER_PORT, server.getPort()),
10041003
equalTo(NETWORK_TYPE, "ipv4"),
10051004
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1006-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
1005+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
10071006
.hasEventsSatisfyingExactly(
10081007
event ->
10091008
event
@@ -1121,7 +1120,7 @@ public void onCompleted() {
11211120
equalTo(SERVER_PORT, server.getPort()),
11221121
equalTo(NETWORK_TYPE, "ipv4"),
11231122
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1124-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
1123+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
11251124
.hasEventsSatisfyingExactly(
11261125
event ->
11271126
event
@@ -1236,7 +1235,7 @@ public void onCompleted() {
12361235
equalTo(SERVER_PORT, server.getPort()),
12371236
equalTo(NETWORK_TYPE, "ipv4"),
12381237
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1239-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
1238+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
12401239
.hasEventsSatisfyingExactly(
12411240
event ->
12421241
event
@@ -1337,7 +1336,7 @@ public void sayHello(
13371336
equalTo(SERVER_PORT, server.getPort()),
13381337
equalTo(NETWORK_TYPE, "ipv4"),
13391338
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1340-
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
1339+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
13411340
.hasEventsSatisfyingExactly(
13421341
event ->
13431342
event
@@ -1596,7 +1595,7 @@ static List<AttributeAssertion> addExtraClientAttributes(AttributeAssertion... a
15961595
if (Boolean.getBoolean("testLatestDeps")) {
15971596
result.add(equalTo(NETWORK_TYPE, "ipv4"));
15981597
result.add(equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"));
1599-
result.add(satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull));
1598+
result.add(satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()));
16001599
}
16011600
return result;
16021601
}

‎instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import java.util.function.BiFunction;
5353
import java.util.function.Consumer;
5454
import java.util.function.Function;
55-
import org.assertj.core.api.AbstractAssert;
5655
import org.junit.jupiter.api.AfterAll;
5756
import org.junit.jupiter.api.BeforeAll;
5857
import org.junit.jupiter.api.Test;
@@ -177,7 +176,7 @@ void testConnectExceptionInsideTheConnectionFuture() {
177176
+ incorrectPort),
178177
satisfies(
179178
AttributeKey.stringKey("exception.stacktrace"),
180-
AbstractAssert::isNotNull)))));
179+
val -> val.isNotNull())))));
181180
}
182181

183182
@Test

‎instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.net.InetAddress;
2929
import java.net.UnknownHostException;
3030
import java.util.Map;
31-
import org.assertj.core.api.AbstractAssert;
3231
import org.junit.jupiter.api.AfterAll;
3332
import org.junit.jupiter.api.BeforeAll;
3433
import org.junit.jupiter.api.Test;
@@ -137,7 +136,7 @@ void testConnectException() {
137136
+ incorrectPort),
138137
satisfies(
139138
AttributeKey.stringKey("exception.stacktrace"),
140-
AbstractAssert::isNotNull)))));
139+
val -> val.isNotNull())))));
141140
}
142141

143142
@Test

‎instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.rmi.registry.LocateRegistry;
2525
import java.rmi.registry.Registry;
2626
import java.rmi.server.UnicastRemoteObject;
27-
import org.assertj.core.api.AbstractAssert;
2827
import org.junit.jupiter.api.AfterAll;
2928
import org.junit.jupiter.api.BeforeAll;
3029
import org.junit.jupiter.api.Test;
@@ -157,8 +156,7 @@ void serviceThrownException() throws Exception {
157156
thrown.getClass().getCanonicalName()),
158157
equalTo(EXCEPTION_MESSAGE, thrown.getMessage()),
159158
satisfies(
160-
EXCEPTION_STACKTRACE,
161-
AbstractAssert::isNotNull)))
159+
EXCEPTION_STACKTRACE, val -> val.isNotNull())))
162160
.hasAttributesSatisfyingExactly(
163161
equalTo(RPC_SYSTEM, "java_rmi"),
164162
equalTo(RPC_SERVICE, "rmi.app.Greeter"),
@@ -177,8 +175,7 @@ void serviceThrownException() throws Exception {
177175
thrown.getClass().getCanonicalName()),
178176
equalTo(EXCEPTION_MESSAGE, thrown.getMessage()),
179177
satisfies(
180-
EXCEPTION_STACKTRACE,
181-
AbstractAssert::isNotNull)))
178+
EXCEPTION_STACKTRACE, val -> val.isNotNull())))
182179
.hasAttributesSatisfyingExactly(
183180
equalTo(RPC_SYSTEM, "java_rmi"),
184181
equalTo(RPC_SERVICE, "rmi.app.Server"),

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.opentelemetry.sdk.trace.data.SpanData;
2525
import io.opentelemetry.sdk.trace.data.StatusData;
2626
import java.util.Map;
27-
import org.assertj.core.api.AbstractAssert;
2827
import org.junit.jupiter.api.extension.RegisterExtension;
2928
import org.springframework.boot.SpringApplication;
3029
import org.springframework.context.ConfigurableApplicationContext;
@@ -86,7 +85,7 @@ protected SpanDataAssert assertHandlerSpan(
8685
equalTo(
8786
EXCEPTION_TYPE,
8887
"org.springframework.web.servlet.resource.NoResourceFoundException"),
89-
satisfies(EXCEPTION_MESSAGE, AbstractAssert::isNotNull),
88+
satisfies(EXCEPTION_MESSAGE, val -> val.isNotNull()),
9089
satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
9190
return span;
9291
} else {

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/filter/ServletFilterTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.opentelemetry.sdk.trace.data.SpanData;
2525
import io.opentelemetry.sdk.trace.data.StatusData;
2626
import java.util.Map;
27-
import org.assertj.core.api.AbstractAssert;
2827
import org.junit.jupiter.api.extension.RegisterExtension;
2928
import org.springframework.boot.SpringApplication;
3029
import org.springframework.context.ConfigurableApplicationContext;
@@ -71,7 +70,7 @@ protected SpanDataAssert assertHandlerSpan(
7170
equalTo(
7271
EXCEPTION_TYPE,
7372
"org.springframework.web.servlet.resource.NoResourceFoundException"),
74-
satisfies(EXCEPTION_MESSAGE, AbstractAssert::isNotNull),
73+
satisfies(EXCEPTION_MESSAGE, val -> val.isNotNull()),
7574
satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
7675
return span;
7776
} else {

0 commit comments

Comments
 (0)