From d97add075abbd3df4d4a59e2272029617af5456b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 7 Dec 2014 23:24:02 +0100 Subject: [PATCH] Consistent bridge method handling in annotation post-processors Issue: SPR-12495 (cherry picked from commit 03d4e1b) --- .../org/springframework/beans/BeanUtils.java | 25 ++++++++--- .../AutowiredAnnotationBeanPostProcessor.java | 5 +-- ...wiredAnnotationBeanPostProcessorTests.java | 10 ++--- .../CommonAnnotationBeanPostProcessor.java | 8 ++-- .../BridgeMethodAutowiringTests.java | 42 ++++++++++--------- ...ommonAnnotationBeanPostProcessorTests.java | 42 +++++++++++++------ ...ersistenceAnnotationBeanPostProcessor.java | 19 +++++---- .../support/PersistenceInjectionTests.java | 7 +++- 8 files changed, 97 insertions(+), 61 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java index 84c8abebf5f..5425d640b5c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -379,13 +379,28 @@ public abstract class BeanUtils { * Find a JavaBeans {@code PropertyDescriptor} for the given method, * with the method either being the read method or the write method for * that bean property. - * @param method the method to find a corresponding PropertyDescriptor for + * @param method the method to find a corresponding PropertyDescriptor for, + * introspecting its declaring class * @return the corresponding PropertyDescriptor, or {@code null} if none * @throws BeansException if PropertyDescriptor lookup fails */ public static PropertyDescriptor findPropertyForMethod(Method method) throws BeansException { + return findPropertyForMethod(method, method.getDeclaringClass()); + } + + /** + * Find a JavaBeans {@code PropertyDescriptor} for the given method, + * with the method either being the read method or the write method for + * that bean property. + * @param method the method to find a corresponding PropertyDescriptor for + * @param clazz the (most specific) class to introspect for descriptors + * @return the corresponding PropertyDescriptor, or {@code null} if none + * @throws BeansException if PropertyDescriptor lookup fails + * @since 4.0.9 + */ + public static PropertyDescriptor findPropertyForMethod(Method method, Class clazz) throws BeansException { Assert.notNull(method, "Method must not be null"); - PropertyDescriptor[] pds = getPropertyDescriptors(method.getDeclaringClass()); + PropertyDescriptor[] pds = getPropertyDescriptors(clazz); for (PropertyDescriptor pd : pds) { if (method.equals(pd.getReadMethod()) || method.equals(pd.getWriteMethod())) { return pd; @@ -591,11 +606,11 @@ public abstract class BeanUtils { actualEditable = editable; } PropertyDescriptor[] targetPds = getPropertyDescriptors(actualEditable); - List ignoreList = (ignoreProperties != null) ? Arrays.asList(ignoreProperties) : null; + List ignoreList = (ignoreProperties != null ? Arrays.asList(ignoreProperties) : null); for (PropertyDescriptor targetPd : targetPds) { Method writeMethod = targetPd.getWriteMethod(); - if (writeMethod != null && (ignoreProperties == null || (!ignoreList.contains(targetPd.getName())))) { + if (writeMethod != null && (ignoreList == null || (!ignoreList.contains(targetPd.getName())))) { PropertyDescriptor sourcePd = getPropertyDescriptor(source.getClass(), targetPd.getName()); if (sourcePd != null) { Method readMethod = sourcePd.getReadMethod(); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index 0035107d336..f5a9e464a0c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -363,9 +363,6 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean if (BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod)) { ann = findAutowiredAnnotation(bridgedMethod); } - else if (!method.isBridge()) { - ann = findAutowiredAnnotation(method); - } if (ann != null && method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) { if (Modifier.isStatic(method.getModifiers())) { if (logger.isWarnEnabled()) { @@ -379,7 +376,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean } } boolean required = determineRequiredStatus(ann); - PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method); + PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz); currElements.add(new AutowiredMethodElement(method, required, pd)); } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index 869c2cb02ec..3e5041de8f8 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -1773,7 +1773,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { } - public static class ExtendedResourceInjectionBean extends ResourceInjectionBean { + static class NonPublicResourceInjectionBean extends ResourceInjectionBean { @Autowired public final ITestBean testBean3 = null; @@ -1786,7 +1786,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { public boolean baseInjected = false; - public ExtendedResourceInjectionBean() { + public NonPublicResourceInjectionBean() { } @Override @@ -1829,12 +1829,11 @@ public class AutowiredAnnotationBeanPostProcessorTests { } - public static class TypedExtendedResourceInjectionBean extends ExtendedResourceInjectionBean { - + public static class TypedExtendedResourceInjectionBean extends NonPublicResourceInjectionBean { } - public static class OverriddenExtendedResourceInjectionBean extends ExtendedResourceInjectionBean { + public static class OverriddenExtendedResourceInjectionBean extends NonPublicResourceInjectionBean { public boolean subInjected = false; @@ -2229,7 +2228,6 @@ public class AutowiredAnnotationBeanPostProcessorTests { private TestBean testBean3; - @MyAutowired(optional = true) protected void setTestBean3(TestBean testBean3) { this.testBean3 = testBean3; diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java index 3e38a3f4b8e..63ce5c90fa5 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java @@ -312,9 +312,9 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean private InjectionMetadata findResourceMetadata(String beanName, final Class clazz) { - // Quick check on the concurrent map first, with minimal locking. // Fall back to class name as cache key, for backwards compatibility with custom callers. String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName()); + // Quick check on the concurrent map first, with minimal locking. InjectionMetadata metadata = this.injectionMetadataCache.get(cacheKey); if (InjectionMetadata.needsRefresh(metadata, clazz)) { synchronized (this.injectionMetadataCache) { @@ -358,7 +358,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean if (method.getParameterTypes().length != 1) { throw new IllegalStateException("@WebServiceRef annotation requires a single-arg method: " + method); } - PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method); + PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method, clazz); currElements.add(new WebServiceRefElement(method, pd)); } else if (ejbRefClass != null && method.isAnnotationPresent(ejbRefClass)) { @@ -368,7 +368,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean if (method.getParameterTypes().length != 1) { throw new IllegalStateException("@EJB annotation requires a single-arg method: " + method); } - PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method); + PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method, clazz); currElements.add(new EjbRefElement(method, pd)); } else if (method.isAnnotationPresent(Resource.class)) { @@ -380,7 +380,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean throw new IllegalStateException("@Resource annotation requires a single-arg method: " + method); } if (!ignoredResourceTypes.contains(paramTypes[0].getName())) { - PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method); + PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method, clazz); currElements.add(new ResourceElement(method, pd)); } } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java index c69ab5658b1..381c76d9706 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,47 +16,51 @@ package org.springframework.beans.factory.annotation; -import static org.junit.Assert.assertNotNull; - import javax.inject.Inject; import javax.inject.Named; import org.junit.Test; + import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.stereotype.Component; +import static org.junit.Assert.*; + public class BridgeMethodAutowiringTests { @Test - public void SPR_8434() { + public void SPR8434() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(UserServiceImpl.class, Foo.class); ctx.refresh(); assertNotNull(ctx.getBean(UserServiceImpl.class).object); } -} + static abstract class GenericServiceImpl { -abstract class GenericServiceImpl { + public abstract void setObject(D object); + } - public abstract void setObject(D object); -} + public static class UserServiceImpl extends GenericServiceImpl { + protected Foo object; -class UserServiceImpl extends GenericServiceImpl { + @Override + @Inject + @Named("userObject") + public void setObject(Foo object) { + if (this.object != null) { + throw new IllegalStateException("Already called"); + } + this.object = object; + } + } - protected Foo object; - @Override - @Inject - @Named("userObject") - public void setObject(Foo object) { - this.object = object; + @Component("userObject") + public static class Foo { } -} - -@Component("userObject") -class Foo { } +} diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java index e2c1cc3b57d..c44662b418a 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,11 +25,6 @@ import javax.ejb.EJB; import org.junit.Test; import org.springframework.beans.BeansException; -import org.springframework.tests.mock.jndi.ExpectedLookupTemplate; -import org.springframework.tests.sample.beans.INestedTestBean; -import org.springframework.tests.sample.beans.ITestBean; -import org.springframework.tests.sample.beans.NestedTestBean; -import org.springframework.tests.sample.beans.TestBean; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -42,6 +37,11 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.GenericApplicationContext; import org.springframework.jndi.support.SimpleJndiBeanFactory; +import org.springframework.tests.mock.jndi.ExpectedLookupTemplate; +import org.springframework.tests.sample.beans.INestedTestBean; +import org.springframework.tests.sample.beans.ITestBean; +import org.springframework.tests.sample.beans.NestedTestBean; +import org.springframework.tests.sample.beans.TestBean; import org.springframework.util.SerializationTestUtils; import static org.junit.Assert.*; @@ -566,20 +566,20 @@ public class CommonAnnotationBeanPostProcessorTests { } - public static class ExtendedResourceInjectionBean extends ResourceInjectionBean { + static class NonPublicResourceInjectionBean extends ResourceInjectionBean { @Resource(name="testBean4", type=TestBean.class) protected ITestBean testBean3; - private ITestBean testBean4; + private B testBean4; @Resource - private INestedTestBean testBean5; + INestedTestBean testBean5; - private INestedTestBean testBean6; + INestedTestBean testBean6; @Resource - private BeanFactory beanFactory; + BeanFactory beanFactory; @Override @Resource @@ -588,12 +588,18 @@ public class CommonAnnotationBeanPostProcessorTests { } @Resource(name="${tb}", type=ITestBean.class) - private void setTestBean4(ITestBean testBean4) { + private void setTestBean4(B testBean4) { + if (this.testBean4 != null) { + throw new IllegalStateException("Already called"); + } this.testBean4 = testBean4; } @Resource public void setTestBean6(INestedTestBean testBean6) { + if (this.testBean6 != null) { + throw new IllegalStateException("Already called"); + } this.testBean6 = testBean6; } @@ -601,7 +607,7 @@ public class CommonAnnotationBeanPostProcessorTests { return testBean3; } - public ITestBean getTestBean4() { + public B getTestBean4() { return testBean4; } @@ -630,6 +636,10 @@ public class CommonAnnotationBeanPostProcessorTests { } + public static class ExtendedResourceInjectionBean extends NonPublicResourceInjectionBean { + } + + public static class ExtendedEjbInjectionBean extends ResourceInjectionBean { @EJB(name="testBean4", beanInterface=TestBean.class) @@ -653,11 +663,17 @@ public class CommonAnnotationBeanPostProcessorTests { @EJB(beanName="testBean3", beanInterface=ITestBean.class) private void setTestBean4(ITestBean testBean4) { + if (this.testBean4 != null) { + throw new IllegalStateException("Already called"); + } this.testBean4 = testBean4; } @EJB public void setTestBean6(INestedTestBean testBean6) { + if (this.testBean6 != null) { + throw new IllegalStateException("Already called"); + } this.testBean6 = testBean6; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java index f35bc6c8a7e..88c6ef076c4 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java @@ -50,6 +50,7 @@ import org.springframework.beans.factory.config.DestructionAwareBeanPostProcesso import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor; import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor; import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.core.BridgeMethodResolver; import org.springframework.core.Ordered; import org.springframework.core.PriorityOrdered; import org.springframework.jndi.JndiLocatorDelegate; @@ -376,9 +377,9 @@ public class PersistenceAnnotationBeanPostProcessor private InjectionMetadata findPersistenceMetadata(String beanName, final Class clazz) { - // Quick check on the concurrent map first, with minimal locking. // Fall back to class name as cache key, for backwards compatibility with custom callers. String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName()); + // Quick check on the concurrent map first, with minimal locking. InjectionMetadata metadata = this.injectionMetadataCache.get(cacheKey); if (InjectionMetadata.needsRefresh(metadata, clazz)) { synchronized (this.injectionMetadataCache) { @@ -390,9 +391,8 @@ public class PersistenceAnnotationBeanPostProcessor do { LinkedList currElements = new LinkedList(); for (Field field : targetClass.getDeclaredFields()) { - PersistenceContext pc = field.getAnnotation(PersistenceContext.class); - PersistenceUnit pu = field.getAnnotation(PersistenceUnit.class); - if (pc != null || pu != null) { + if (field.isAnnotationPresent(PersistenceContext.class) || + field.isAnnotationPresent(PersistenceUnit.class)) { if (Modifier.isStatic(field.getModifiers())) { throw new IllegalStateException("Persistence annotations are not supported on static fields"); } @@ -400,17 +400,18 @@ public class PersistenceAnnotationBeanPostProcessor } } for (Method method : targetClass.getDeclaredMethods()) { - PersistenceContext pc = method.getAnnotation(PersistenceContext.class); - PersistenceUnit pu = method.getAnnotation(PersistenceUnit.class); - if ((pc != null || pu != null) && !method.isBridge() && - method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) { + method = BridgeMethodResolver.findBridgedMethod(method); + Method mostSpecificMethod = BridgeMethodResolver.findBridgedMethod(ClassUtils.getMostSpecificMethod(method, clazz)); + if ((method.isAnnotationPresent(PersistenceContext.class) || + method.isAnnotationPresent(PersistenceUnit.class)) && + method.equals(mostSpecificMethod)) { if (Modifier.isStatic(method.getModifiers())) { throw new IllegalStateException("Persistence annotations are not supported on static methods"); } if (method.getParameterTypes().length != 1) { throw new IllegalStateException("Persistence annotation requires a single-arg method: " + method); } - PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method); + PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method, clazz); currElements.add(new PersistenceElement(method, pd)); } } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java index b907a2d5dfc..faa2ab62717 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java @@ -774,7 +774,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @SuppressWarnings("serial") - public static class SpecificPublicPersistenceContextSetter extends DefaultPublicPersistenceContextSetter { + static class PublicPersistenceContextSetterOnNonPublicClass extends DefaultPublicPersistenceContextSetter { @Override @PersistenceContext(unitName="unit2", type = PersistenceContextType.EXTENDED) @@ -784,6 +784,11 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } + @SuppressWarnings("serial") + public static class SpecificPublicPersistenceContextSetter extends PublicPersistenceContextSetterOnNonPublicClass { + } + + public static class DefaultPrivatePersistenceUnitField { @PersistenceUnit