Skip to content

Commit e9701a9

Browse files
committed
Remove support for Aware interfaces in BeanRegistrar
Closes gh-34562
1 parent 15b251d commit e9701a9

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.apache.commons.logging.LogFactory;
4040
import org.jspecify.annotations.Nullable;
4141

42+
import org.springframework.beans.BeanUtils;
4243
import org.springframework.beans.factory.BeanDefinitionStoreException;
4344
import org.springframework.beans.factory.BeanRegistrar;
4445
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
@@ -600,9 +601,7 @@ private void processImports(ConfigurationClass configClass, SourceClass currentS
600601
}
601602
else if (candidate.isAssignable(BeanRegistrar.class)) {
602603
Class<?> candidateClass = candidate.loadClass();
603-
BeanRegistrar registrar =
604-
ParserStrategyUtils.instantiateClass(candidateClass, BeanRegistrar.class,
605-
this.environment, this.resourceLoader, this.registry);
604+
BeanRegistrar registrar = (BeanRegistrar) BeanUtils.instantiateClass(candidateClass);
606605
configClass.addBeanRegistrar(registrar);
607606
}
608607
else if (candidate.isAssignable(ImportBeanDefinitionRegistrar.class)) {

0 commit comments

Comments
 (0)