|
@@ -27,17 +27,17 @@ public class AppBeanNameGenerator implements BeanNameGenerator {
|
|
|
|
|
|
/**
|
|
|
* 自定义 组件命名规则 返回全限定名称
|
|
|
- * @param beanDefinition BeanDefinition
|
|
|
- * @param beanDefinitionRegistry BeanDefinitionRegistry
|
|
|
+ * @param definition BeanDefinition
|
|
|
+ * @param registry BeanDefinitionRegistry
|
|
|
* @return String
|
|
|
*/
|
|
|
@Override
|
|
|
- public String generateBeanName(BeanDefinition beanDefinition, BeanDefinitionRegistry beanDefinitionRegistry) {
|
|
|
+ public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
|
|
|
|
|
|
//获取全限定名称
|
|
|
- String beanClassName = buildDefaultBeanName(beanDefinition, beanDefinitionRegistry);
|
|
|
+ String beanClassName = buildDefaultBeanName(definition, registry);
|
|
|
// 默认使用注解自定义名称
|
|
|
- return Optional.ofNullable(determineBeanNameFromAnnotation((AnnotatedBeanDefinition) beanDefinition)).orElse(beanClassName);
|
|
|
+ return Optional.ofNullable(determineBeanNameFromAnnotation((AnnotatedBeanDefinition) definition)).orElse(beanClassName);
|
|
|
}
|
|
|
|
|
|
protected String determineBeanNameFromAnnotation(AnnotatedBeanDefinition annotatedDef) {
|