Skip to content

polishing FeignClientsRegistrar #1038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2024
Merged

polishing FeignClientsRegistrar #1038

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f9e253
polishing feignClientsRegistrar
birariro Jun 21, 2024
0d5fa1e
update the date in the license and add author
birariro Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ...enfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,19 +320,15 @@ private void validate(Map<String, Object> attributes) {
validateFallbackFactory(annotation.getClass("fallbackFactory"));
}

/* for testing */ String getName(Map<String, Object> attributes) {
return getName(null, attributes);
}

String getName(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) {
String getName(Map<String, Object> attributes) {
String name = (String) attributes.get("serviceId");
if (!StringUtils.hasText(name)) {
name = (String) attributes.get("name");
}
if (!StringUtils.hasText(name)) {
name = (String) attributes.get("value");
}
name = resolve(beanFactory, name);
name = resolve(null, name);
return getName(name);
}

Expand Down