diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java index d7bed915027..9a4a6827718 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java @@ -27,7 +27,6 @@ import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.StandardAnnotationMetadata; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.stereotype.Component; /** * Utilities for processing @{@link Configuration} classes. @@ -105,7 +104,6 @@ abstract class ConfigurationClassUtils { return false; // do not consider an interface or an annotation } return metadata.isAnnotated(Import.class.getName()) || - metadata.isAnnotated(Component.class.getName()) || metadata.hasAnnotatedMethods(Bean.class.getName()); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java index 956b90d157e..43e394b5603 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java @@ -16,9 +16,15 @@ package org.springframework.context.annotation.componentscan.simple; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @Component public class SimpleComponent { + @Bean + public String exampleBean() { + return "example"; + } + }