From 373e56f94bdb94acb4452a25804604fc58c3ee26 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 3 Jul 2017 08:11:42 +0200 Subject: [PATCH] Merge --- .../feign/servererrors/FeignClientServerErrorTests.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java index d9cafce01..24606c474 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java @@ -22,11 +22,6 @@ import com.netflix.loadbalancer.ILoadBalancer; import com.netflix.loadbalancer.Server; import feign.codec.Decoder; import feign.codec.ErrorDecoder; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Rule; @@ -62,6 +57,10 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; /**