From 199ebb69d0ead820a6c7daa252306f0f29b74e4e Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 8 Jan 2020 15:13:01 +0100 Subject: [PATCH] Fix compatibility in feign-based tests. --- .../sleuth/instrument/web/client/feign/FeignRetriesTests.java | 3 ++- .../sleuth/instrument/feign/issues/issue502/Issue502Tests.java | 3 ++- .../sleuth/instrument/feign/issues/issueX/IssueXTests.java | 3 ++- .../sleuth/instrument/feign/issues/issueY/IssueYTests.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java index cb0a100ab..1c36cbd2b 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java @@ -113,7 +113,8 @@ public class FeignRetriesTests { return Response.builder().status(200).reason("OK") .headers(new HashMap<>()).body("OK", Charset.defaultCharset()) .request(Request.create(Request.HttpMethod.POST, "/foo", - new HashMap<>(), Request.Body.empty(), new RequestTemplate())) + new HashMap<>(), Request.Body.empty(), + new RequestTemplate())) .build(); } }; diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java index 3279ffb2c..2ec4e1b02 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java @@ -25,6 +25,7 @@ import brave.Tracing; import brave.sampler.Sampler; import feign.Client; import feign.Request; +import feign.RequestTemplate; import feign.Response; import org.junit.Before; import org.junit.Test; @@ -125,7 +126,7 @@ class MyClient implements Client { this.wasCalled = true; return Response.builder().body("foo", Charset.forName("UTF-8")) .request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(), - Request.Body.empty())) + Request.Body.empty(), new RequestTemplate())) .headers(new HashMap<>()).status(200).build(); } diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java index 165cbbd6f..5a2bd4723 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java @@ -25,6 +25,7 @@ import brave.Tracing; import brave.sampler.Sampler; import feign.Client; import feign.Request; +import feign.RequestTemplate; import feign.Response; import org.junit.Before; import org.junit.Test; @@ -157,7 +158,7 @@ class MyDelegateClient implements Client { this.wasCalled = true; return Response.builder().body("foo", Charset.forName("UTF-8")) .request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(), - Request.Body.empty())) + Request.Body.empty(), new RequestTemplate())) .headers(new HashMap<>()).status(200).build(); } diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java index af312cc7d..bbf89babc 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java @@ -27,6 +27,7 @@ import feign.Client; import feign.Contract; import feign.Feign; import feign.Request; +import feign.RequestTemplate; import feign.Response; import feign.Target.HardCodedTarget; import feign.codec.Decoder; @@ -183,7 +184,7 @@ class MyDelegateClient implements Client { this.wasCalled = true; return Response.builder().body("foo", Charset.forName("UTF-8")) .request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(), - Request.Body.empty())) + Request.Body.empty(), new RequestTemplate())) .headers(new HashMap<>()).status(200).build(); }