diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java index 7737240c6..ad325616a 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java @@ -42,7 +42,6 @@ import org.springframework.cloud.sleuth.Tracer; import org.springframework.cloud.sleuth.test.TestSpanHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; import org.springframework.http.ResponseEntity; import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.test.annotation.DirtiesContext; @@ -150,9 +149,10 @@ public class WebClientExceptionTests { public static class ExceptionServiceLoadBalancerClientConfiguration { @Bean - public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) { - return ServiceInstanceListSuppliers.from("exceptionservice", new DefaultServiceInstance( - "exceptionservice" + "-1", "exceptionservice", "invalid.host.to.break.tests", 1234, false)); + public ServiceInstanceListSupplier serviceInstanceListSupplier() { + return ServiceInstanceListSuppliers + .from("exceptionservice", new DefaultServiceInstance( + "exceptionservice" + "-1", "exceptionservice", "invalid.host.to.break.tests", 1234, false)); } } diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java index 07d1d8a6a..66a17fb8b 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/notsampled/WebClientNotSampledTests.java @@ -42,7 +42,6 @@ import org.springframework.cloud.sleuth.Tracer; import org.springframework.cloud.sleuth.test.TestSpanHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; @@ -182,7 +181,7 @@ public abstract class WebClientNotSampledTests { private int port = 0; @Bean - public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) { + public ServiceInstanceListSupplier serviceInstanceListSupplier() { return ServiceInstanceListSuppliers.from("fooservice", new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false)); } diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java index b0fb5c2d1..59dcb6186 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/parser/WebClientCustomParserTests.java @@ -44,7 +44,6 @@ import org.springframework.cloud.sleuth.test.TestSpanHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.core.env.Environment; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; @@ -124,7 +123,7 @@ public abstract class WebClientCustomParserTests { private int port = 0; @Bean - public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) { + public ServiceInstanceListSupplier serviceInstanceListSupplier() { return ServiceInstanceListSuppliers.from("fooservice", new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false)); } diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java index 2323c45fc..09e878673 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java @@ -63,7 +63,6 @@ import org.springframework.cloud.sleuth.exporter.FinishedSpan; import org.springframework.cloud.sleuth.test.TestSpanHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; @@ -545,7 +544,7 @@ public abstract class WebClientTests { private int port = 0; @Bean - public ServiceInstanceListSupplier serviceInstanceListSupplier(Environment env) { + public ServiceInstanceListSupplier serviceInstanceListSupplier() { return ServiceInstanceListSuppliers.from("fooservice", new DefaultServiceInstance("fooservice" + "-1", "fooservice", "localhost", port, false)); }