|
1 | 1 | /* |
2 | | - * Copyright 2013-2022 the original author or authors. |
| 2 | + * Copyright 2013-2024 the original author or authors. |
3 | 3 | * |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
|
67 | 67 | * @author Marcin Grzejszczak |
68 | 68 | * @author Olga Maciaszek-Sharma |
69 | 69 | * @author Jasbir Singh |
| 70 | + * @author Jinho Lee |
70 | 71 | */ |
71 | 72 | class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware { |
72 | 73 |
|
@@ -321,19 +322,15 @@ private void validate(Map<String, Object> attributes) { |
321 | 322 | validateFallbackFactory(annotation.getClass("fallbackFactory")); |
322 | 323 | } |
323 | 324 |
|
324 | | - /* for testing */ String getName(Map<String, Object> attributes) { |
325 | | - return getName(null, attributes); |
326 | | - } |
327 | | - |
328 | | - String getName(ConfigurableBeanFactory beanFactory, Map<String, Object> attributes) { |
| 325 | + String getName(Map<String, Object> attributes) { |
329 | 326 | String name = (String) attributes.get("serviceId"); |
330 | 327 | if (!StringUtils.hasText(name)) { |
331 | 328 | name = (String) attributes.get("name"); |
332 | 329 | } |
333 | 330 | if (!StringUtils.hasText(name)) { |
334 | 331 | name = (String) attributes.get("value"); |
335 | 332 | } |
336 | | - name = resolve(beanFactory, name); |
| 333 | + name = resolve(null, name); |
337 | 334 | return getName(name); |
338 | 335 | } |
339 | 336 |
|
|
0 commit comments