SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2019-12-28 05:29:48 +00:00
parent b1e3f31dd8
commit a31ca0ace3
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java
View File

@@ -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();
}

18
tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java
View File

@@ -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>(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>(
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 {