From a869a9aeb6288be23ee5d90662dc5b7073c4f174 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Wed, 15 May 2019 14:19:15 +0200
Subject: [PATCH] Polish

---
 .../instrument/web/TraceWebFluxTests.java     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java
index f1fe63a33..02074d28c 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java
@@ -138,11 +138,10 @@ public class TraceWebFluxTests {
 
 	private void thenSpanWasReportedWithTags(ArrayListSpanReporter accumulator,
 			ClientResponse response) {
-		Awaitility.await().untilAsserted(() -> {
-			then(response.statusCode().value()).isEqualTo(200);
-		});
+		Awaitility.await()
+				.untilAsserted(() -> then(response.statusCode().value()).isEqualTo(200));
 		List<zipkin2.Span> spans = accumulator.getSpans().stream()
-				.filter(span -> span.name().equals("get /api/c2/{id}"))
+				.filter(span -> "get /api/c2/{id}".equals(span.name()))
 				.collect(Collectors.toList());
 		then(spans).hasSize(1);
 		then(spans.get(0).name()).isEqualTo("get /api/c2/{id}");
@@ -152,11 +151,10 @@ public class TraceWebFluxTests {
 
 	private void thenSpanWasReportedForFunction(ArrayListSpanReporter accumulator,
 			ClientResponse response) {
-		Awaitility.await().untilAsserted(() -> {
-			then(response.statusCode().value()).isEqualTo(200);
-		});
+		Awaitility.await()
+				.untilAsserted(() -> then(response.statusCode().value()).isEqualTo(200));
 		List<zipkin2.Span> spans = accumulator.getSpans().stream()
-				.filter(span -> span.name().equals("get")).collect(Collectors.toList());
+				.filter(span -> "get".equals(span.name())).collect(Collectors.toList());
 		then(spans).hasSize(1);
 	}
 
@@ -382,7 +380,7 @@ class SleuthSpanCreatorAspectWebFlux {
 		Awaitility.await().untilAsserted(() -> {
 			List<zipkin2.Span> spans = getSpans();
 			zipkin2.Span spanToFind = spans.stream()
-					.filter(span -> span.name().equals("get /test/ping")).findFirst()
+					.filter(span -> "get /test/ping".equals(span.name())).findFirst()
 					.orElseThrow(() -> new AssertionError(
 							"No span with name [get /test/ping] found"));
 			then(spanToFind.kind()).isEqualTo(zipkin2.Span.Kind.SERVER);
@@ -410,7 +408,7 @@ class SleuthSpanCreatorAspectWebFlux {
 		Awaitility.await().untilAsserted(() -> {
 			List<zipkin2.Span> spans = getSpans();
 			zipkin2.Span pingFromContext = spans.stream()
-					.filter(span -> span.name().equals("get /test/pingfromcontext"))
+					.filter(span -> "get /test/pingfromcontext".equals(span.name()))
 					.findFirst().orElseThrow(() -> new AssertionError(
 							"No span with name [get /test/pingfromcontext] found"));
 			then(pingFromContext.name()).isEqualTo("get /test/pingfromcontext");
@@ -431,9 +429,10 @@ class SleuthSpanCreatorAspectWebFlux {
 
 		Awaitility.await().untilAsserted(() -> {
 			List<zipkin2.Span> spans = getSpans();
-			zipkin2.Span spanToFind = spans.stream().filter(span -> span.name().equals("get /test/continuespan"))
-					.findFirst()
-					.orElseThrow(() -> new AssertionError("No span with name [get /test/continuespan] found"));
+			zipkin2.Span spanToFind = spans.stream()
+					.filter(span -> "get /test/continuespan".equals(span.name()))
+					.findFirst().orElseThrow(() -> new AssertionError(
+							"No span with name [get /test/continuespan] found"));
 			then(spanToFind.kind()).isEqualTo(zipkin2.Span.Kind.SERVER);
 			then(spanToFind.name()).isEqualTo("get /test/continuespan");
 			then(spanToFind.id()).isEqualTo(toHexString(newSpanId));