From a31ca0ace3d141510248ddac7e48b664db4b17ba Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 28 Dec 2019 05:29:48 +0000 Subject: [PATCH] Bumping versions --- .../feign/issues/issueX/IssueXTests.java | 9 ++++++--- .../feign/issues/issueY/IssueYTests.java | 18 +++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) 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 1525a824b..165cbbd6f 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 @@ -52,7 +52,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.NONE, +@SpringBootTest(classes = Application.class, + webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "feign.hystrix.enabled=false" }) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) public class IssueXTests { @@ -109,7 +110,8 @@ public class IssueXTests { class Application { @Bean - public Client client(CachingSpringLoadBalancerFactory cachingFactory, SpringClientFactory clientFactory) { + public Client client(CachingSpringLoadBalancerFactory cachingFactory, + SpringClientFactory clientFactory) { return new MyClient(new MyDelegateClient(), cachingFactory, clientFactory); } @@ -154,7 +156,8 @@ class MyDelegateClient implements Client { public Response execute(Request request, Request.Options options) throws IOException { 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(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(), + Request.Body.empty())) .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 532de1af2..af312cc7d 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 @@ -58,7 +58,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.NONE, +@SpringBootTest(classes = Application.class, + webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "feign.hystrix.enabled=false" }) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) public class IssueYTests { @@ -126,15 +127,18 @@ class Application { } @Bean - public Client client(MyDelegateClient myDelegateClient, CachingSpringLoadBalancerFactory cachingFactory, + public Client client(MyDelegateClient myDelegateClient, + CachingSpringLoadBalancerFactory cachingFactory, SpringClientFactory clientFactory) { return new MyClient(myDelegateClient, cachingFactory, clientFactory); } @Bean - public MyNameRemote myNameRemote(Client client, Decoder decoder, Encoder encoder, Contract contract) { - return Feign.builder().client(client).encoder(encoder).decoder(decoder).contract(contract) - .target(new HardCodedTarget(MyNameRemote.class, "foo", "https://non.existing.url")); + public MyNameRemote myNameRemote(Client client, Decoder decoder, Encoder encoder, + Contract contract) { + return Feign.builder().client(client).encoder(encoder).decoder(decoder) + .contract(contract).target(new HardCodedTarget( + MyNameRemote.class, "foo", "https://non.existing.url")); } @Bean @@ -178,7 +182,8 @@ class MyDelegateClient implements Client { public Response execute(Request request, Request.Options options) throws IOException { 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(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(), + Request.Body.empty())) .headers(new HashMap<>()).status(200).build(); } @@ -188,7 +193,6 @@ class MyDelegateClient implements Client { } - @FeignClient(name = "foo", url = "https://non.existing.url") interface MyNameRemote {