Skip to content

Fix BeanFactory.getBean(String, ParameterizedTypeReference) to respect AOP proxy #37047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quaff wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −4
Open

Fix BeanFactory.getBean(String, ParameterizedTypeReference) to respect AOP proxy #37047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ng-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
public <T> T getBean(String name, ParameterizedTypeReference<T> typeReference) throws BeansException {
Object bean = getBean(name);
Type requiredType = typeReference.getType();
if (!ResolvableType.forType(requiredType).isInstance(bean)) {
if (!isTypeMatch(name, ResolvableType.forType(requiredType), true)) {
throw new BeanNotOfRequiredTypeException(name, requiredType, bean.getClass());
}
return (T) bean;
Expand Down
7 changes: 4 additions & 3 deletions ...ext/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,21 @@
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.ParameterizedTypeReference;

/**
* @author Stephane Nicoll
* @author Yanming Zhou
*/
class ExpressionCachingIntegrationTests {

@Test // SPR-11692
@SuppressWarnings("unchecked")
void expressionIsCacheBasedOnActualMethod() {
ConfigurableApplicationContext context =
new AnnotationConfigApplicationContext(SharedConfig.class, Spr11692Config.class);

BaseDao<User> userDao = (BaseDao<User>) context.getBean("userDao");
BaseDao<Order> orderDao = (BaseDao<Order>) context.getBean("orderDao");
BaseDao<User> userDao = context.getBean("userDao", new ParameterizedTypeReference<>() {});
BaseDao<Order> orderDao = context.getBean("orderDao", new ParameterizedTypeReference<>() {});

userDao.persist(new User("1"));
orderDao.persist(new Order("2"));
Expand Down