root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add FullyQualifiedAnnotationBeanNameGenerator.INSTANCE 

Adds a static INSTANCE to FullyQualifiedAnnotationBeanNameGenerator,
just like its parent class, AnnotationBeanNameGenerator, does.

The class doesn't have any state and overriding/hiding the INSTANCE of
the superclass, this prevents unintended use of a regular
AnnotationBeanNameGenerator through
FullyQualifiedAnnotationBeanNameGenerator.INSTANCE.
This commit is contained in:
Erik van Paassen 2020-11-03 17:59:35 +01:00 committed by Juergen Hoeller
parent 8c3cab7ead
commit fbf8e37f94
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
View File

@ -99,7 +99,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
* @see #setBeanNameGenerator * @see #setBeanNameGenerator
*/ */
public static final AnnotationBeanNameGenerator IMPORT_BEAN_NAME_GENERATOR = public static final AnnotationBeanNameGenerator IMPORT_BEAN_NAME_GENERATOR =
new FullyQualifiedAnnotationBeanNameGenerator(); FullyQualifiedAnnotationBeanNameGenerator.INSTANCE;
private static final String IMPORT_REGISTRY_BEAN_NAME = private static final String IMPORT_REGISTRY_BEAN_NAME =
ConfigurationClassPostProcessor.class.getName() + ".importRegistry"; ConfigurationClassPostProcessor.class.getName() + ".importRegistry";

8
spring-context/src/main/java/org/springframework/context/annotation/FullyQualifiedAnnotationBeanNameGenerator.java
View File

@ -43,6 +43,14 @@ import org.springframework.util.Assert;
*/ */
public class FullyQualifiedAnnotationBeanNameGenerator extends AnnotationBeanNameGenerator { public class FullyQualifiedAnnotationBeanNameGenerator extends AnnotationBeanNameGenerator {
/**
* A convenient constant for a default {@code FullyQualifiedAnnotationBeanNameGenerator} instance,
* as used for configuration-level import purposes.
*/
public static final FullyQualifiedAnnotationBeanNameGenerator INSTANCE =
new FullyQualifiedAnnotationBeanNameGenerator();
@Override @Override
protected String buildDefaultBeanName(BeanDefinition definition) { protected String buildDefaultBeanName(BeanDefinition definition) {
String beanClassName = definition.getBeanClassName(); String beanClassName = definition.getBeanClassName();