Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-11-22 10:30:15 +01:00

View File

@@ -16,6 +16,9 @@
package org.springframework.cloud.sleuth.instrument.web;
import static org.assertj.core.api.Assertions.fail;
import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -51,9 +54,6 @@ import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
import static org.assertj.core.api.Assertions.fail;
import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then;
/**
* @author Marcin Grzejszczak
*/