Skip to content

Commit 989ddc8

Browse files
committed
prefer lambda
1 parent 2d5fc13 commit 989ddc8

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636
import java.util.Arrays;
3737
import java.util.Collections;
3838
import java.util.List;
39-
import org.assertj.core.api.AbstractCharSequenceAssert;
4039
import org.assertj.core.api.AbstractIterableAssert;
41-
import org.assertj.core.api.AbstractLongAssert;
4240
import org.assertj.core.api.MapAssert;
4341
import org.junit.jupiter.api.MethodOrderer;
4442
import org.junit.jupiter.api.Test;
@@ -182,7 +180,7 @@ void shouldSendTelemetry() {
182180
UrlAttributes.URL_FULL,
183181
stringAssert -> stringAssert.endsWith("/ping")),
184182
equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"),
185-
satisfies(ServerAttributes.SERVER_PORT, AbstractLongAssert::isNotZero)),
183+
satisfies(ServerAttributes.SERVER_PORT, val -> val.isNotZero())),
186184
serverSpan ->
187185
HttpSpanDataAssert.create(serverSpan)
188186
.assertServerGetRequest("/ping")
@@ -195,7 +193,7 @@ void shouldSendTelemetry() {
195193
.hasAttribute(
196194
satisfies(
197195
ServiceIncubatingAttributes.SERVICE_INSTANCE_ID,
198-
AbstractCharSequenceAssert::isNotBlank)))
196+
val -> val.isNotBlank())))
199197
.hasAttributesSatisfying(
200198
equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"),
201199
equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L),
@@ -207,14 +205,11 @@ void shouldSendTelemetry() {
207205
equalTo(
208206
AttributeKey.stringArrayKey("http.request.header.key"),
209207
Collections.singletonList("value")),
210-
satisfies(ServerAttributes.SERVER_PORT, AbstractLongAssert::isNotZero),
208+
satisfies(ServerAttributes.SERVER_PORT, val -> val.isNotZero()),
209+
satisfies(ThreadIncubatingAttributes.THREAD_ID, val -> val.isNotZero()),
211210
satisfies(
212-
ThreadIncubatingAttributes.THREAD_ID,
213-
AbstractLongAssert::isNotZero),
214-
satisfies(
215-
ThreadIncubatingAttributes.THREAD_NAME,
216-
AbstractCharSequenceAssert::isNotBlank)),
217-
AbstractSpringStarterSmokeTest::withSpanAssert));
211+
ThreadIncubatingAttributes.THREAD_NAME, val -> val.isNotBlank())),
212+
val -> AbstractSpringStarterSmokeTest.withSpanAssert(val)));
218213

219214
// Metric
220215
testing.waitAndAssertMetrics(

0 commit comments

Comments
 (0)