root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2023-12-09 23:51:18 +01:00
parent 8704ad98a7
commit 361dfd1ae4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
View File

@ -72,7 +72,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy {
synchronized (bd.constructorArgumentLock) { synchronized (bd.constructorArgumentLock) {
constructorToUse = (Constructor<?>) bd.resolvedConstructorOrFactoryMethod; constructorToUse = (Constructor<?>) bd.resolvedConstructorOrFactoryMethod;
if (constructorToUse == null) { if (constructorToUse == null) {
final Class<?> clazz = bd.getBeanClass(); Class<?> clazz = bd.getBeanClass();
if (clazz.isInterface()) { if (clazz.isInterface()) {
throw new BeanInstantiationException(clazz, "Specified class is an interface"); throw new BeanInstantiationException(clazz, "Specified class is an interface");
} }
@ -105,7 +105,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy {
@Override @Override
public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, BeanFactory owner, public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, BeanFactory owner,
final Constructor<?> ctor, Object... args) { Constructor<?> ctor, Object... args) {
if (!bd.hasMethodOverrides()) { if (!bd.hasMethodOverrides()) {
return BeanUtils.instantiateClass(ctor, args); return BeanUtils.instantiateClass(ctor, args);
@ -129,7 +129,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy {
@Override @Override
public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, BeanFactory owner, public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, BeanFactory owner,
@Nullable Object factoryBean, final Method factoryMethod, Object... args) { @Nullable Object factoryBean, Method factoryMethod, Object... args) {
try { try {
ReflectionUtils.makeAccessible(factoryMethod); ReflectionUtils.makeAccessible(factoryMethod);

10
spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
View File

@ -353,6 +353,11 @@ public class PersistenceAnnotationBeanPostProcessor implements InstantiationAwar
findInjectionMetadata(beanDefinition, beanType, beanName); findInjectionMetadata(beanDefinition, beanType, beanName);
} }
@Override
public void resetBeanDefinition(String beanName) {
this.injectionMetadataCache.remove(beanName);
}
@Override @Override
public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) { public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
Class<?> beanClass = registeredBean.getBeanClass(); Class<?> beanClass = registeredBean.getBeanClass();
@ -373,11 +378,6 @@ public class PersistenceAnnotationBeanPostProcessor implements InstantiationAwar
return metadata; return metadata;
} }
@Override
public void resetBeanDefinition(String beanName) {
this.injectionMetadataCache.remove(beanName);
}
@Override @Override
public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, String beanName) { public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, String beanName) {
InjectionMetadata metadata = findPersistenceMetadata(beanName, bean.getClass(), pvs); InjectionMetadata metadata = findPersistenceMetadata(beanName, bean.getClass(), pvs);