Prepare method overrides when bean class gets resolved

See gh-31826 See gh-31828 (cherry picked from commit cd64e66)
spring-projects · Dec 13, 2023 · 76bc9cf · 76bc9cf
1 parent db52c77
commit 76bc9cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/...in/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/...in/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -493,15 +493,13 @@ protected Object createBean(String beanName, RootBeanDefinition mbd, @Nullable O
  if (resolvedClass != null && !mbd.hasBeanClass() && mbd.getBeanClassName() != null) {
  mbdToUse = new RootBeanDefinition(mbd);
  mbdToUse.setBeanClass(resolvedClass);
- }
-
- // Prepare method overrides.
- try {
- mbdToUse.prepareMethodOverrides();
- }
- catch (BeanDefinitionValidationException ex) {
- throw new BeanDefinitionStoreException(mbdToUse.getResourceDescription(),
- beanName, "Validation of method overrides failed", ex);
+ try {
+ mbdToUse.prepareMethodOverrides();
+ }
+ catch (BeanDefinitionValidationException ex) {
+ throw new BeanDefinitionStoreException(mbdToUse.getResourceDescription(),
+ beanName, "Validation of method overrides failed", ex);
+ }
  }
 
  try {

diff --git a/...ng-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/...ng-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1497,14 +1497,22 @@ protected Class<?> resolveBeanClass(RootBeanDefinition mbd, String beanName, Cla
  if (mbd.hasBeanClass()) {
  return mbd.getBeanClass();
  }
- return doResolveBeanClass(mbd, typesToMatch);
+ Class<?> beanClass = doResolveBeanClass(mbd, typesToMatch);
+ if (mbd.hasBeanClass()) {
+ mbd.prepareMethodOverrides();
+ }
+ return beanClass;
  }
  catch (ClassNotFoundException ex) {
  throw new CannotLoadBeanClassException(mbd.getResourceDescription(), beanName, mbd.getBeanClassName(), ex);
  }
  catch (LinkageError err) {
  throw new CannotLoadBeanClassException(mbd.getResourceDescription(), beanName, mbd.getBeanClassName(), err);
  }
+ catch (BeanDefinitionValidationException ex) {
+ throw new BeanDefinitionStoreException(mbd.getResourceDescription(),
+ beanName, "Validation of method overrides failed", ex);
+ }
  }
 
  @Nullable