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

Fix issue 923 config url and feign annotation path

Browse Source
This commit is contained in:
Can Bezmen
2023-11-27 16:29:05 +01:00
committed by Olga MaciaszekSharma
parent bd5701d564
commit 4465795642
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java
View File

@@ -448,7 +448,6 @@ public class FeignClientFactoryBean
if (StringUtils.hasText(url) && !url.startsWith("http")) {
url = "http://" + url;
}
String url = this.url + cleanPath();
Client client = getOptional(feignClientFactory, Client.class);
if (client != null) {
if (client instanceof FeignBlockingLoadBalancerClient) {
@@ -489,7 +488,7 @@ public class FeignClientFactoryBean
@SuppressWarnings({ "unchecked", "rawtypes" })
private <T> HardCodedTarget<T> resolveTarget(FeignClientFactory context, String contextId, String url) {
if (StringUtils.hasText(url)) {
return new HardCodedTarget(type, name, url);
return new HardCodedTarget(type, name, url + cleanPath());
}
if (refreshableClient) {
@@ -505,7 +504,7 @@ public class FeignClientFactoryBean
"Provide Feign client URL either in @FeignClient() or in config properties.");
}
return new PropertyBasedTarget(type, name, config);
return new PropertyBasedTarget(type, name, config, cleanPath());
}
private boolean isUrlAvailableInConfig(String contextId) {

8
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/PropertyBasedTarget.java
View File

@@ -33,15 +33,19 @@ public class PropertyBasedTarget<T> extends Target.HardCodedTarget<T> {
private final FeignClientProperties.FeignClientConfiguration config;
public PropertyBasedTarget(Class<T> type, String name, FeignClientProperties.FeignClientConfiguration config) {
private final String path;
public PropertyBasedTarget(Class<T> type, String name, FeignClientProperties.FeignClientConfiguration config,
String path) {
super(type, name, config.getUrl());
this.config = config;
this.path = path;
}
@Override
public String url() {
if (url == null) {
url = config.getUrl();
url = config.getUrl() + path;
}
return url;
}