From 0abf97ff90f40973e29cbda7e5873e43dfa75e14 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 28 Mar 2026 20:38:03 +0100 Subject: [PATCH] Polishing --- .../factory/support/BeanRegistryAdapter.java | 21 ++++++++++--------- .../ConfigurationClassPostProcessor.java | 2 +- .../context/annotation/Import.java | 4 ++-- .../support/AbstractApplicationContext.java | 2 +- .../beans/factory/BarRegistrar.java | 1 + .../beans/factory/FooRegistrar.java | 1 + .../beans/factory/GenericBeanRegistrar.java | 1 + .../factory/ImportAwareBeanRegistrar.java | 1 + .../beans/factory/SampleBeanRegistrar.java | 3 +++ 9 files changed, 22 insertions(+), 14 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanRegistryAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanRegistryAdapter.java index 47b835c5353..9e00964a06e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanRegistryAdapter.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanRegistryAdapter.java @@ -25,6 +25,7 @@ import org.jspecify.annotations.Nullable; import org.springframework.beans.BeanUtils; import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanRegistrar; import org.springframework.beans.factory.BeanRegistry; import org.springframework.beans.factory.ListableBeanFactory; @@ -81,6 +82,12 @@ public class BeanRegistryAdapter implements BeanRegistry { } + @Override + public void register(BeanRegistrar registrar) { + Assert.notNull(registrar, "BeanRegistrar must not be null"); + registrar.register(this, this.environment); + } + @Override public void registerAlias(String name, String alias) { this.beanRegistry.registerAlias(name, alias); @@ -169,12 +176,6 @@ public class BeanRegistryAdapter implements BeanRegistry { this.beanRegistry.registerBeanDefinition(name, beanDefinition); } - @Override - public void register(BeanRegistrar registrar) { - Assert.notNull(registrar, "'registrar' must not be null"); - registrar.register(this, this.environment); - } - /** * {@link RootBeanDefinition} subclass for {@code #registerBean} based @@ -218,9 +219,9 @@ public class BeanRegistryAdapter implements BeanRegistry { private final RootBeanDefinition beanDefinition; - private final ListableBeanFactory beanFactory; + private final BeanFactory beanFactory; - public BeanSpecAdapter(RootBeanDefinition beanDefinition, ListableBeanFactory beanFactory) { + public BeanSpecAdapter(RootBeanDefinition beanDefinition, BeanFactory beanFactory) { this.beanDefinition = beanDefinition; this.beanFactory = beanFactory; } @@ -296,9 +297,9 @@ public class BeanRegistryAdapter implements BeanRegistry { private static class SupplierContextAdapter implements SupplierContext { - private final ListableBeanFactory beanFactory; + private final BeanFactory beanFactory; - public SupplierContextAdapter(ListableBeanFactory beanFactory) { + public SupplierContextAdapter(BeanFactory beanFactory) { this.beanFactory = beanFactory; } 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 91e383489ed..fb9bd07d4a9 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 @@ -222,7 +222,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo /** * Set the {@link ProblemReporter} to use. *

Used to register any problems detected with {@link Configuration} or {@link Bean} - * declarations. For instance, an @Bean method marked as {@code final} is illegal + * declarations. For instance, a @Bean method marked as {@code final} is illegal * and would be reported as a problem. Defaults to {@link FailFastProblemReporter}. */ public void setProblemReporter(@Nullable ProblemReporter problemReporter) { diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Import.java b/spring-context/src/main/java/org/springframework/context/annotation/Import.java index 04fc8db01bf..c89fa15050e 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Import.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Import.java @@ -71,8 +71,8 @@ public @interface Import { /** * {@link Configuration @Configuration}, {@link ImportSelector}, - * {@link ImportBeanDefinitionRegistrar}, {@link BeanRegistrar}, or regular - * component classes to import. + * {@link ImportBeanDefinitionRegistrar}, {@link BeanRegistrar}, + * or regular component classes to import. */ Class[] value(); diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index dc3da9309eb..eb1fbc19434 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -795,7 +795,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(beanFactory, getBeanFactoryPostProcessors()); // Detect a LoadTimeWeaver and prepare for weaving, if found in the meantime - // (for example, through an @Bean method registered by ConfigurationClassPostProcessor) + // (for example, through a @Bean method registered by ConfigurationClassPostProcessor) if (!NativeDetector.inNativeImage() && beanFactory.getTempClassLoader() == null && beanFactory.containsBean(LOAD_TIME_WEAVER_BEAN_NAME)) { beanFactory.addBeanPostProcessor(new LoadTimeWeaverAwareProcessor(beanFactory)); diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/BarRegistrar.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/BarRegistrar.java index caa03890352..3666c1e5f2b 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/BarRegistrar.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/BarRegistrar.java @@ -28,4 +28,5 @@ public class BarRegistrar implements BeanRegistrar { } public record Bar() {} + } diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/FooRegistrar.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/FooRegistrar.java index 9a546ea25f2..f48f479be18 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/FooRegistrar.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/FooRegistrar.java @@ -28,4 +28,5 @@ public class FooRegistrar implements BeanRegistrar { } public record Foo() {} + } diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/GenericBeanRegistrar.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/GenericBeanRegistrar.java index b732d9a2179..f9937234aa0 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/GenericBeanRegistrar.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/GenericBeanRegistrar.java @@ -32,4 +32,5 @@ public class GenericBeanRegistrar implements BeanRegistrar { } public record Foo() {} + } diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/ImportAwareBeanRegistrar.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/ImportAwareBeanRegistrar.java index e4fcd47d551..6e34eb8988e 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/ImportAwareBeanRegistrar.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/ImportAwareBeanRegistrar.java @@ -45,4 +45,5 @@ public class ImportAwareBeanRegistrar implements BeanRegistrar, ImportAware { } public record ClassNameHolder(@Nullable String className) {} + } diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/SampleBeanRegistrar.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/SampleBeanRegistrar.java index 65944778e07..1c507501782 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/SampleBeanRegistrar.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/SampleBeanRegistrar.java @@ -41,7 +41,9 @@ public class SampleBeanRegistrar implements BeanRegistrar { } public record Foo() {} + public record Bar(Foo foo) {} + public record Baz(String message) {} public static class Init { @@ -53,4 +55,5 @@ public class SampleBeanRegistrar implements BeanRegistrar { initialized = true; } } + }