spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-03 21:49:03 +00:00
Code Issues Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2026-03-28 20:38:03 +01:00
parent f0f447a73d
commit 0abf97ff90
9 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-beans/src/main/java/org/springframework/beans/factory/support/BeanRegistryAdapter.java
+11 -10
View File
@@ -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;
}