diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java index fe6cac14d2..c1ca0616e4 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java @@ -99,7 +99,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo * @see #setBeanNameGenerator */ public static final AnnotationBeanNameGenerator IMPORT_BEAN_NAME_GENERATOR = - new FullyQualifiedAnnotationBeanNameGenerator(); + FullyQualifiedAnnotationBeanNameGenerator.INSTANCE; private static final String IMPORT_REGISTRY_BEAN_NAME = ConfigurationClassPostProcessor.class.getName() + ".importRegistry"; diff --git a/spring-context/src/main/java/org/springframework/context/annotation/FullyQualifiedAnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/FullyQualifiedAnnotationBeanNameGenerator.java index 5495535d6a..b3c418943a 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/FullyQualifiedAnnotationBeanNameGenerator.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/FullyQualifiedAnnotationBeanNameGenerator.java @@ -43,6 +43,14 @@ import org.springframework.util.Assert; */ 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 protected String buildDefaultBeanName(BeanDefinition definition) { String beanClassName = definition.getBeanClassName();