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

add tests when the FeignClient.path is set

Browse Source 
to demonstrate the issue https://github.com/spring-cloud/spring-cloud-openfeign/issues/923
This commit is contained in:
Alexey Elin
2023-11-05 00:45:59 +03:00
committed by Olga MaciaszekSharma
parent 77632d5088
commit 502613bb74
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/NonRefreshableFeignClientUrlTests.java
View File

@@ -76,11 +76,36 @@ class NonRefreshableFeignClientUrlTests {
assertThat(response.getTargetType()).isEqualTo(Target.HardCodedTarget.class);
}
@Test
void shouldInstantiateFeignClientWhenUrlAndPathAreInTheFeignClientAnnotation(
@Autowired Application.WithPathAndFixUrlClient withPathAndFixUrlClient
) {
UrlTestClient.UrlResponseForTests response = withPathAndFixUrlClient.test();
assertThat(response.getUrl()).isEqualTo("http://localhost:7777/common/test");
assertThat(response.getTargetType()).isEqualTo(Target.HardCodedTarget.class);
}
@Test
void shouldInstantiateFeignClientWhenUrlFromPropertiesAndPathInTheFeignClientAnnotation(
@Autowired Application.WithPathAndUrlFromConfigClient withPathAndUrlFromConfigClient
) {
UrlTestClient.UrlResponseForTests response = withPathAndUrlFromConfigClient.test();
assertThat(response.getUrl()).isEqualTo("http://localhost:7777/common/test");
assertThat(response.getTargetType()).isEqualTo(Target.HardCodedTarget.class);
}
@Configuration
@EnableAutoConfiguration
@EnableConfigurationProperties(FeignClientProperties.class)
@EnableFeignClients(clients = { Application.FeignClientWithFixUrl.class, Application.ConfigBasedClient.class,
Application.NameBasedUrlClient.class })
@EnableFeignClients(
clients = {
Application.FeignClientWithFixUrl.class,
Application.ConfigBasedClient.class,
Application.NameBasedUrlClient.class,
Application.WithPathAndUrlFromConfigClient.class,
Application.WithPathAndFixUrlClient.class
}
)
protected static class Application {
@Bean
@@ -112,6 +137,22 @@ class NonRefreshableFeignClientUrlTests {
}
@FeignClient(name = "withPathAndFixUrlClient", path = "/common", url = "http://localhost:7777")
protected interface WithPathAndFixUrlClient {
@GetMapping("/test")
UrlTestClient.UrlResponseForTests test();
}
@FeignClient(name = "withPathAndUrlFromConfigClient", path = "/common")
protected interface WithPathAndUrlFromConfigClient {
@GetMapping("/test")
UrlTestClient.UrlResponseForTests test();
}
}
}

1
spring-cloud-openfeign-core/src/test/resources/feign-properties.properties
View File

@@ -28,3 +28,4 @@ spring.cloud.openfeign.client.config.connectTimeout.connectTimeout=1000
spring.cloud.openfeign.client.config.default.followRedirects=false
spring.cloud.openfeign.client.config.feignClientWithFixUrl.url=http://localhost:8888
spring.cloud.openfeign.client.config.configBasedClient.url=http://localhost:9999
spring.cloud.openfeign.client.config.withPathAndUrlFromConfigClient.url=http://localhost:7777