From fe7271960d29807164b746559c5fef28e2dffd56 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 4 May 2016 11:32:03 +0100 Subject: [PATCH] Compiler warnings --- spring-cloud-sleuth-stream/pom.xml | 1 - .../cloud/sleuth/stream/StreamSpanListenerTests.java | 3 --- .../stream/TracerIgnoringChannelInterceptorTest.java | 8 ++++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index 796926f53..08e2da3f4 100644 --- a/spring-cloud-sleuth-stream/pom.xml +++ b/spring-cloud-sleuth-stream/pom.xml @@ -47,7 +47,6 @@ org.assertj assertj-core - 2.1.0 test diff --git a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java index 2a7ccb5c3..1ad85c568 100644 --- a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java +++ b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java @@ -22,10 +22,7 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingQueue; import javax.annotation.PostConstruct; diff --git a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java index 213334974..98c437243 100644 --- a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java +++ b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java @@ -16,6 +16,9 @@ package org.springframework.cloud.sleuth.stream; +import static org.assertj.core.api.BDDAssertions.then; +import static org.mockito.Mockito.verifyZeroInteractions; + import java.util.Arrays; import org.junit.Test; @@ -30,9 +33,6 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import static org.assertj.core.api.BDDAssertions.then; -import static org.mockito.Mockito.verifyZeroInteractions; - /** * @author Marcin Grzejszczak */ @@ -47,7 +47,7 @@ public class TracerIgnoringChannelInterceptorTest { public void should_attach_not_sampled_header_to_the_message() throws Exception { Message message = MessageBuilder.withPayload("hello").build(); - Message interceptedMessage = this.tracerIgnoringChannelInterceptor.preSend(message, this.messageChannel); + Message interceptedMessage = this.tracerIgnoringChannelInterceptor.preSend(message, this.messageChannel); then(interceptedMessage.getHeaders().get( Span.SAMPLED_NAME)).isEqualTo(Span.SPAN_NOT_SAMPLED);