initial JSR-330 injection support

org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@@ -83,6 +83,8 @@ import org.springframework.util.ReflectionUtils;
  * a special case of such a general config method. Such config methods
  * do not have to be public.
  *
+ * <p>Also supports JSR-330's {@link javax.inject.Inject} annotation, if available.
+ *
  * <p>Note: A default AutowiredAnnotationBeanPostProcessor will be registered
  * by the "context:annotation-config" and "context:component-scan" XML tags.
  * Remove or turn off the default annotation configuration there if you intend
@@ -100,8 +102,8 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 
 	protected final Log logger = LogFactory.getLog(AutowiredAnnotationBeanPostProcessor.class);
 
-	@SuppressWarnings("unchecked")
-	private Class<? extends Annotation>[] autowiredAnnotationTypes = new Class[] {Autowired.class, Value.class};
+	private final Set<Class<? extends Annotation>> autowiredAnnotationTypes =
+			new LinkedHashSet<Class<? extends Annotation>>();
 	
 	private String requiredParameterName = "required";
 	
@@ -119,20 +121,24 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 
 
 	/**
-	 * Set the 'autowired' annotation types, to be used on constructors, fields,
-	 * setter methods and arbitrary config methods.
-	 * <p>The default autowired annotation type is the Spring-provided
-	 * {@link Autowired} annotation, as well as {@link Value} and raw
-	 * use of the {@link Qualifier} annotation.
-	 * <p>This setter property exists so that developers can provide their own
-	 * (non-Spring-specific) annotation types to indicate that a member is
-	 * supposed to be autowired.
+	 * Create a new AutowiredAnnotationBeanPostProcessor
+	 * for Spring's standard {@link Autowired} annotation.
+	 * <p>Also supports JSR-330's {@link javax.inject.Inject} annotation, if available.
 	 */
-	public void setAutowiredAnnotationTypes(Class<? extends Annotation>[] autowiredAnnotationTypes) {
-		Assert.notEmpty(autowiredAnnotationTypes, "'autowiredAnnotationTypes' must not be empty");
-		this.autowiredAnnotationTypes = autowiredAnnotationTypes;
+	@SuppressWarnings("unchecked")
+	public AutowiredAnnotationBeanPostProcessor() {
+		this.autowiredAnnotationTypes.add(Autowired.class);
+		this.autowiredAnnotationTypes.add(Value.class);
+		ClassLoader cl = AutowiredAnnotationBeanPostProcessor.class.getClassLoader();
+		try {
+			this.autowiredAnnotationTypes.add((Class<? extends Annotation>) cl.loadClass("javax.inject.Inject"));
+		}
+		catch (ClassNotFoundException ex) {
+			// JSR-330 API not available - simply skip.
+		}
 	}
 
+
 	/**
 	 * Set the 'autowired' annotation type, to be used on constructors, fields,
 	 * setter methods and arbitrary config methods.
@@ -142,10 +148,26 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 	 * (non-Spring-specific) annotation type to indicate that a member is
 	 * supposed to be autowired.
 	 */
-	@SuppressWarnings("unchecked")
 	public void setAutowiredAnnotationType(Class<? extends Annotation> autowiredAnnotationType) {
 		Assert.notNull(autowiredAnnotationType, "'autowiredAnnotationType' must not be null");
-		this.autowiredAnnotationTypes = new Class[] {autowiredAnnotationType};
+		this.autowiredAnnotationTypes.clear();
+		this.autowiredAnnotationTypes.add(autowiredAnnotationType);
+	}
+
+	/**
+	 * Set the 'autowired' annotation types, to be used on constructors, fields,
+	 * setter methods and arbitrary config methods.
+	 * <p>The default autowired annotation type is the Spring-provided
+	 * {@link Autowired} annotation, as well as {@link Value} and raw
+	 * use of the {@link Qualifier} annotation.
+	 * <p>This setter property exists so that developers can provide their own
+	 * (non-Spring-specific) annotation types to indicate that a member is
+	 * supposed to be autowired.
+	 */
+	public void setAutowiredAnnotationTypes(Set<Class<? extends Annotation>> autowiredAnnotationTypes) {
+		Assert.notEmpty(autowiredAnnotationTypes, "'autowiredAnnotationTypes' must not be empty");
+		this.autowiredAnnotationTypes.clear();
+		this.autowiredAnnotationTypes.addAll(autowiredAnnotationTypes);
 	}
 
 	/**

org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java

@@ -18,7 +18,7 @@ package org.springframework.beans.factory.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -38,9 +38,11 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
 /**
- * {@link AutowireCandidateResolver} implementation that matches bean definition
- * qualifiers against qualifier annotations on the field or parameter to be autowired.
- * Also supports suggested expression values through a value annotation.
+ * {@link AutowireCandidateResolver} implementation that matches bean definition qualifiers
+ * against {@link Qualifier qualifier annotations} on the field or parameter to be autowired.
+ * Also supports suggested expression values through a {@link Value value} annotation.
+ *
+ * <p>Also supports JSR-330's {@link javax.inject.Qualifier} annotation, if available.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -51,7 +53,7 @@ import org.springframework.util.ObjectUtils;
  */
 public class QualifierAnnotationAutowireCandidateResolver implements AutowireCandidateResolver, BeanFactoryAware {
 
-	private final Set<Class<? extends Annotation>> qualifierTypes;
+	private final Set<Class<? extends Annotation>> qualifierTypes = new LinkedHashSet<Class<? extends Annotation>>();
 
 	private Class<? extends Annotation> valueAnnotationType = Value.class;
 
@@ -61,10 +63,18 @@ public class QualifierAnnotationAutowireCandidateResolver implements AutowireCan
 	/**
 	 * Create a new QualifierAnnotationAutowireCandidateResolver
 	 * for Spring's standard {@link Qualifier} annotation.
+	 * <p>Also supports JSR-330's {@link javax.inject.Qualifier} annotation, if available.
 	 */
+	@SuppressWarnings("unchecked")
 	public QualifierAnnotationAutowireCandidateResolver() {
-		this.qualifierTypes = new HashSet<Class<? extends Annotation>>(1);
 		this.qualifierTypes.add(Qualifier.class);
+		ClassLoader cl = QualifierAnnotationAutowireCandidateResolver.class.getClassLoader();
+		try {
+			this.qualifierTypes.add((Class<? extends Annotation>) cl.loadClass("javax.inject.Qualifier"));
+		}
+		catch (ClassNotFoundException ex) {
+			// JSR-330 API not available - simply skip.
+		}
 	}
 
 	/**
@@ -74,7 +84,6 @@ public class QualifierAnnotationAutowireCandidateResolver implements AutowireCan
 	 */
 	public QualifierAnnotationAutowireCandidateResolver(Class<? extends Annotation> qualifierType) {
 		Assert.notNull(qualifierType, "'qualifierType' must not be null");
-		this.qualifierTypes = new HashSet<Class<? extends Annotation>>(1);
 		this.qualifierTypes.add(qualifierType);
 	}
 
@@ -85,7 +94,7 @@ public class QualifierAnnotationAutowireCandidateResolver implements AutowireCan
 	 */
 	public QualifierAnnotationAutowireCandidateResolver(Set<Class<? extends Annotation>> qualifierTypes) {
 		Assert.notNull(qualifierTypes, "'qualifierTypes' must not be null");
-		this.qualifierTypes = new HashSet<Class<? extends Annotation>>(qualifierTypes);
+		this.qualifierTypes.addAll(qualifierTypes);
 	}
 
 

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -43,6 +43,7 @@ public interface AutowireCandidateResolver {
 	 * @param descriptor the descriptor for the target method parameter or field
 	 * @return the value suggested (typically an expression String),
 	 * or <code>null</code> if none found
+	 * @since 3.0
 	 */
 	Object getSuggestedValue(DependencyDescriptor descriptor);
 

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import javax.inject.Provider;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.FatalBeanException;
@@ -642,9 +643,12 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			Set<String> autowiredBeanNames, TypeConverter typeConverter) throws BeansException  {
 
 		descriptor.initParameterNameDiscovery(getParameterNameDiscoverer());
-		if (ObjectFactory.class.equals(descriptor.getDependencyType())) {
+		if (descriptor.getDependencyType().equals(ObjectFactory.class)) {
 			return new DependencyObjectFactory(descriptor, beanName);
 		}
+		else if (descriptor.getDependencyType().getName().equals("javax.inject.Provider")) {
+			return new DependencyProviderFactory().createDependencyProvider(descriptor, beanName);
+		}
 		else {
 			return doResolveDependency(descriptor, descriptor.getDependencyType(), beanName, autowiredBeanNames, typeConverter);
 		}
@@ -961,4 +965,30 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		}
 	}
 
+
+	/**
+	 * Serializable ObjectFactory for lazy resolution of a dependency.
+	 */
+	private class DependencyProvider extends DependencyObjectFactory implements Provider {
+
+		public DependencyProvider(DependencyDescriptor descriptor, String beanName) {
+			super(descriptor, beanName);
+		}
+
+		public Object get() throws BeansException {
+			return getObject();
+		}
+	}
+
+
+	/**
+	 * Separate inner class for avoiding a hard dependency on the <code>javax.inject</code> API.
+	 */
+	private class DependencyProviderFactory {
+
+		public Object createDependencyProvider(DependencyDescriptor descriptor, String beanName) {
+			return new DependencyProvider(descriptor, beanName);
+		}
+	}
+
 }

org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java

@@ -573,6 +573,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 	@Test
 	public void testObjectFactoryQualifierInjection() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
 		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
 		bpp.setBeanFactory(bf);
 		bf.addBeanPostProcessor(bpp);
@@ -580,6 +581,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		bd.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "testBean"));
 		bf.registerBeanDefinition("testBean", bd);
+		bf.registerBeanDefinition("testBean2", new RootBeanDefinition(TestBean.class));
 
 		ObjectFactoryQualifierInjectionBean bean = (ObjectFactoryQualifierInjectionBean) bf.getBean("annotatedBean");
 		assertSame(bf.getBean("testBean"), bean.getTestBean());
@@ -1282,7 +1284,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 	public static class ObjectFactoryQualifierInjectionBean {
 
 		@Autowired
-		//@Qualifier("testBean")
+		@Qualifier("testBean")
 		private ObjectFactory<?> testBeanFactory;
 
 		public TestBean getTestBean() {

org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java

@@ -0,0 +1,867 @@
+/*
+ * Copyright 2002-2009 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.beans.factory.annotation;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import test.beans.ITestBean;
+import test.beans.IndexedTestBean;
+import test.beans.NestedTestBean;
+import test.beans.TestBean;
+
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.AutowireCandidateQualifier;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.util.SerializationTestUtils;
+
+/**
+ * Unit tests for {@link org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor}
+ * processing the JSR-303 {@link javax.inject.Inject} annotation.
+ *
+ * @author Juergen Hoeller
+ * @since 3.0
+ */
+public class InjectAnnotationBeanPostProcessorTests {
+
+	@Test
+	public void testIncompleteBeanDefinition() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("testBean", new GenericBeanDefinition());
+		try {
+			bf.getBean("testBean");
+		}
+		catch (BeanCreationException ex) {
+			assertTrue(ex.getRootCause() instanceof IllegalStateException);
+		}
+	}
+
+	@Test
+	public void testResourceInjection() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		RootBeanDefinition bd = new RootBeanDefinition(ResourceInjectionBean.class);
+		bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", bd);
+		TestBean tb = new TestBean();
+		bf.registerSingleton("testBean", tb);
+
+		ResourceInjectionBean bean = (ResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean());
+		assertSame(tb, bean.getTestBean2());
+
+		bean = (ResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean());
+		assertSame(tb, bean.getTestBean2());
+	}
+
+	@Test
+	public void testExtendedResourceInjection() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerResolvableDependency(BeanFactory.class, bf);
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		RootBeanDefinition bd = new RootBeanDefinition(TypedExtendedResourceInjectionBean.class);
+		bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", bd);
+		TestBean tb = new TestBean();
+		bf.registerSingleton("testBean", tb);
+		NestedTestBean ntb = new NestedTestBean();
+		bf.registerSingleton("nestedTestBean", ntb);
+
+		TypedExtendedResourceInjectionBean bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean());
+		assertSame(tb, bean.getTestBean2());
+		assertSame(tb, bean.getTestBean3());
+		assertSame(tb, bean.getTestBean4());
+		assertSame(ntb, bean.getNestedTestBean());
+		assertSame(bf, bean.getBeanFactory());
+
+		bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean());
+		assertSame(tb, bean.getTestBean2());
+		assertSame(tb, bean.getTestBean3());
+		assertSame(tb, bean.getTestBean4());
+		assertSame(ntb, bean.getNestedTestBean());
+		assertSame(bf, bean.getBeanFactory());
+	}
+
+	@Test
+	public void testExtendedResourceInjectionWithOverriding() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerResolvableDependency(BeanFactory.class, bf);
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		RootBeanDefinition annotatedBd = new RootBeanDefinition(TypedExtendedResourceInjectionBean.class);
+		TestBean tb2 = new TestBean();
+		annotatedBd.getPropertyValues().addPropertyValue("testBean2", tb2);
+		bf.registerBeanDefinition("annotatedBean", annotatedBd);
+		TestBean tb = new TestBean();
+		bf.registerSingleton("testBean", tb);
+		NestedTestBean ntb = new NestedTestBean();
+		bf.registerSingleton("nestedTestBean", ntb);
+
+		TypedExtendedResourceInjectionBean bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean());
+		assertSame(tb2, bean.getTestBean2());
+		assertSame(tb, bean.getTestBean3());
+		assertSame(tb, bean.getTestBean4());
+		assertSame(ntb, bean.getNestedTestBean());
+		assertSame(bf, bean.getBeanFactory());
+		bf.destroySingletons();
+	}
+
+	@Test
+	public void testExtendedResourceInjectionWithAtRequired() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerResolvableDependency(BeanFactory.class, bf);
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
+		RootBeanDefinition bd = new RootBeanDefinition(TypedExtendedResourceInjectionBean.class);
+		bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", bd);
+		TestBean tb = new TestBean();
+		bf.registerSingleton("testBean", tb);
+		NestedTestBean ntb = new NestedTestBean();
+		bf.registerSingleton("nestedTestBean", ntb);
+
+		TypedExtendedResourceInjectionBean bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean());
+		assertSame(tb, bean.getTestBean2());
+		assertSame(tb, bean.getTestBean3());
+		assertSame(tb, bean.getTestBean4());
+		assertSame(ntb, bean.getNestedTestBean());
+		assertSame(bf, bean.getBeanFactory());
+	}
+
+	@Test
+	public void testConstructorResourceInjection() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerResolvableDependency(BeanFactory.class, bf);
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		RootBeanDefinition bd = new RootBeanDefinition(ConstructorResourceInjectionBean.class);
+		bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", bd);
+		TestBean tb = new TestBean();
+		bf.registerSingleton("testBean", tb);
+		NestedTestBean ntb = new NestedTestBean();
+		bf.registerSingleton("nestedTestBean", ntb);
+
+		ConstructorResourceInjectionBean bean = (ConstructorResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean());
+		assertSame(tb, bean.getTestBean2());
+		assertSame(tb, bean.getTestBean3());
+		assertSame(tb, bean.getTestBean4());
+		assertSame(ntb, bean.getNestedTestBean());
+		assertSame(bf, bean.getBeanFactory());
+
+		bean = (ConstructorResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean());
+		assertSame(tb, bean.getTestBean2());
+		assertSame(tb, bean.getTestBean3());
+		assertSame(tb, bean.getTestBean4());
+		assertSame(ntb, bean.getNestedTestBean());
+		assertSame(bf, bean.getBeanFactory());
+	}
+
+	@Test
+	public void testConstructorResourceInjectionWithMultipleCandidatesAsCollection() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(
+				ConstructorsCollectionResourceInjectionBean.class));
+		TestBean tb = new TestBean();
+		bf.registerSingleton("testBean", tb);
+		NestedTestBean ntb1 = new NestedTestBean();
+		bf.registerSingleton("nestedTestBean1", ntb1);
+		NestedTestBean ntb2 = new NestedTestBean();
+		bf.registerSingleton("nestedTestBean2", ntb2);
+
+		ConstructorsCollectionResourceInjectionBean bean = (ConstructorsCollectionResourceInjectionBean) bf.getBean("annotatedBean");
+		assertNull(bean.getTestBean3());
+		assertSame(tb, bean.getTestBean4());
+		assertEquals(2, bean.getNestedTestBeans().size());
+		assertSame(ntb1, bean.getNestedTestBeans().get(0));
+		assertSame(ntb2, bean.getNestedTestBeans().get(1));
+		bf.destroySingletons();
+	}
+
+	@Test
+	public void testConstructorResourceInjectionWithMultipleCandidatesAndFallback() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ConstructorsResourceInjectionBean.class));
+		TestBean tb = new TestBean();
+		bf.registerSingleton("testBean", tb);
+
+		ConstructorsResourceInjectionBean bean = (ConstructorsResourceInjectionBean) bf.getBean("annotatedBean");
+		assertSame(tb, bean.getTestBean3());
+		assertNull(bean.getTestBean4());
+		bf.destroySingletons();
+	}
+
+	@Test
+	public void testConstructorInjectionWithMap() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		RootBeanDefinition bd = new RootBeanDefinition(MapConstructorInjectionBean.class);
+		bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", bd);
+		TestBean tb1 = new TestBean();
+		TestBean tb2 = new TestBean();
+		bf.registerSingleton("testBean1", tb1);
+		bf.registerSingleton("testBean2", tb1);
+
+		MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean");
+		assertEquals(2, bean.getTestBeanMap().size());
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean2"));
+		assertTrue(bean.getTestBeanMap().values().contains(tb1));
+		assertTrue(bean.getTestBeanMap().values().contains(tb2));
+
+		bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean");
+		assertEquals(2, bean.getTestBeanMap().size());
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean2"));
+		assertTrue(bean.getTestBeanMap().values().contains(tb1));
+		assertTrue(bean.getTestBeanMap().values().contains(tb2));
+	}
+
+	@Test
+	public void testFieldInjectionWithMap() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		RootBeanDefinition bd = new RootBeanDefinition(MapFieldInjectionBean.class);
+		bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", bd);
+		TestBean tb1 = new TestBean();
+		TestBean tb2 = new TestBean();
+		bf.registerSingleton("testBean1", tb1);
+		bf.registerSingleton("testBean2", tb1);
+
+		MapFieldInjectionBean bean = (MapFieldInjectionBean) bf.getBean("annotatedBean");
+		assertEquals(2, bean.getTestBeanMap().size());
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean2"));
+		assertTrue(bean.getTestBeanMap().values().contains(tb1));
+		assertTrue(bean.getTestBeanMap().values().contains(tb2));
+
+		bean = (MapFieldInjectionBean) bf.getBean("annotatedBean");
+		assertEquals(2, bean.getTestBeanMap().size());
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean2"));
+		assertTrue(bean.getTestBeanMap().values().contains(tb1));
+		assertTrue(bean.getTestBeanMap().values().contains(tb2));
+	}
+
+	@Test
+	public void testMethodInjectionWithMap() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		RootBeanDefinition bd = new RootBeanDefinition(MapMethodInjectionBean.class);
+		bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", bd);
+		TestBean tb = new TestBean();
+		bf.registerSingleton("testBean", tb);
+
+		MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
+		assertEquals(1, bean.getTestBeanMap().size());
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean"));
+		assertTrue(bean.getTestBeanMap().values().contains(tb));
+		assertSame(tb, bean.getTestBean());
+
+		bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
+		assertEquals(1, bean.getTestBeanMap().size());
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean"));
+		assertTrue(bean.getTestBeanMap().values().contains(tb));
+		assertSame(tb, bean.getTestBean());
+	}
+
+	@Test
+	public void testMethodInjectionWithMapAndMultipleMatches() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(MapMethodInjectionBean.class));
+		bf.registerBeanDefinition("testBean1", new RootBeanDefinition(TestBean.class));
+		bf.registerBeanDefinition("testBean2", new RootBeanDefinition(TestBean.class));
+
+		try {
+			bf.getBean("annotatedBean");
+			fail("should have failed, more than one bean of type");
+		}
+		catch (BeanCreationException e) {
+			// expected
+		}
+		bf.destroySingletons();
+	}
+
+	@Test
+	public void testMethodInjectionWithMapAndMultipleMatchesButOnlyOneAutowireCandidate() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(MapMethodInjectionBean.class));
+		bf.registerBeanDefinition("testBean1", new RootBeanDefinition(TestBean.class));
+		RootBeanDefinition rbd2 = new RootBeanDefinition(TestBean.class);
+		rbd2.setAutowireCandidate(false);
+		bf.registerBeanDefinition("testBean2", rbd2);
+
+		MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
+		TestBean tb = (TestBean) bf.getBean("testBean1");
+		assertEquals(1, bean.getTestBeanMap().size());
+		assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
+		assertTrue(bean.getTestBeanMap().values().contains(tb));
+		assertSame(tb, bean.getTestBean());
+		bf.destroySingletons();
+	}
+
+	@Test
+	public void testObjectFactoryInjection() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryQualifierInjectionBean.class));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "testBean"));
+		bf.registerBeanDefinition("testBean", bd);
+		bf.registerBeanDefinition("testBean2", new RootBeanDefinition(TestBean.class));
+
+		ObjectFactoryQualifierInjectionBean bean = (ObjectFactoryQualifierInjectionBean) bf.getBean("annotatedBean");
+		assertSame(bf.getBean("testBean"), bean.getTestBean());
+		bf.destroySingletons();
+	}
+
+	@Test
+	public void testObjectFactoryQualifierInjection() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryQualifierInjectionBean.class));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "testBean"));
+		bf.registerBeanDefinition("testBean", bd);
+
+		ObjectFactoryQualifierInjectionBean bean = (ObjectFactoryQualifierInjectionBean) bf.getBean("annotatedBean");
+		assertSame(bf.getBean("testBean"), bean.getTestBean());
+		bf.destroySingletons();
+	}
+
+	@Test
+	public void testObjectFactorySerialization() throws Exception {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryInjectionBean.class));
+		bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
+		bf.setSerializationId("test");
+
+		ObjectFactoryInjectionBean bean = (ObjectFactoryInjectionBean) bf.getBean("annotatedBean");
+		assertSame(bf.getBean("testBean"), bean.getTestBean());
+		bean = (ObjectFactoryInjectionBean) SerializationTestUtils.serializeAndDeserialize(bean);
+		assertSame(bf.getBean("testBean"), bean.getTestBean());
+		bf.destroySingletons();
+	}
+
+	/**
+	 * Verifies that a dependency on a {@link org.springframework.beans.factory.FactoryBean} can be autowired via
+	 * {@link org.springframework.beans.factory.annotation.Autowired @Inject}, specifically addressing the JIRA issue
+	 * raised in <a
+	 * href="http://opensource.atlassian.com/projects/spring/browse/SPR-4040"
+	 * target="_blank">SPR-4040</a>.
+	 */
+	@Test
+	public void testBeanAutowiredWithFactoryBean() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("factoryBeanDependentBean", new RootBeanDefinition(FactoryBeanDependentBean.class));
+		bf.registerSingleton("stringFactoryBean", new StringFactoryBean());
+
+		final StringFactoryBean factoryBean = (StringFactoryBean) bf.getBean("&stringFactoryBean");
+		final FactoryBeanDependentBean bean = (FactoryBeanDependentBean) bf.getBean("factoryBeanDependentBean");
+
+		assertNotNull("The singleton StringFactoryBean should have been registered.", factoryBean);
+		assertNotNull("The factoryBeanDependentBean should have been registered.", bean);
+		assertEquals("The FactoryBeanDependentBean should have been autowired 'by type' with the StringFactoryBean.",
+				factoryBean, bean.getFactoryBean());
+
+		bf.destroySingletons();
+	}
+
+
+	public static class ResourceInjectionBean {
+
+		@Inject
+		private TestBean testBean;
+
+		private TestBean testBean2;
+
+
+		@Inject
+		public void setTestBean2(TestBean testBean2) {
+			if (this.testBean2 != null) {
+				throw new IllegalStateException("Already called");
+			}
+			this.testBean2 = testBean2;
+		}
+
+		public TestBean getTestBean() {
+			return this.testBean;
+		}
+
+		public TestBean getTestBean2() {
+			return this.testBean2;
+		}
+	}
+
+
+	public static class ExtendedResourceInjectionBean<T> extends ResourceInjectionBean {
+
+		@Inject
+		protected ITestBean testBean3;
+
+		private T nestedTestBean;
+
+		private ITestBean testBean4;
+
+		private BeanFactory beanFactory;
+
+		public ExtendedResourceInjectionBean() {
+		}
+
+		@Inject @Required
+		public void setTestBean2(TestBean testBean2) {
+			super.setTestBean2(testBean2);
+		}
+
+		@Inject
+		private void inject(ITestBean testBean4, T nestedTestBean) {
+			this.testBean4 = testBean4;
+			this.nestedTestBean = nestedTestBean;
+		}
+
+		@Inject
+		protected void initBeanFactory(BeanFactory beanFactory) {
+			this.beanFactory = beanFactory;
+		}
+
+		public ITestBean getTestBean3() {
+			return this.testBean3;
+		}
+
+		public ITestBean getTestBean4() {
+			return this.testBean4;
+		}
+
+		public T getNestedTestBean() {
+			return this.nestedTestBean;
+		}
+
+		public BeanFactory getBeanFactory() {
+			return this.beanFactory;
+		}
+	}
+
+
+	public static class TypedExtendedResourceInjectionBean extends ExtendedResourceInjectionBean<NestedTestBean> {
+
+	}
+
+
+	public static class OptionalResourceInjectionBean extends ResourceInjectionBean {
+
+		@Inject
+		protected ITestBean testBean3;
+
+		private IndexedTestBean indexedTestBean;
+
+		private NestedTestBean[] nestedTestBeans;
+
+		@Inject
+		public NestedTestBean[] nestedTestBeansField;
+
+		private ITestBean testBean4;
+
+		@Inject
+		public void setTestBean2(TestBean testBean2) {
+			super.setTestBean2(testBean2);
+		}
+
+		@Inject
+		private void inject(ITestBean testBean4, NestedTestBean[] nestedTestBeans, IndexedTestBean indexedTestBean) {
+			this.testBean4 = testBean4;
+			this.indexedTestBean = indexedTestBean;
+			this.nestedTestBeans = nestedTestBeans;
+		}
+
+		public ITestBean getTestBean3() {
+			return this.testBean3;
+		}
+
+		public ITestBean getTestBean4() {
+			return this.testBean4;
+		}
+
+		public IndexedTestBean getIndexedTestBean() {
+			return this.indexedTestBean;
+		}
+
+		public NestedTestBean[] getNestedTestBeans() {
+			return this.nestedTestBeans;
+		}
+	}
+
+
+	public static class OptionalCollectionResourceInjectionBean extends ResourceInjectionBean {
+
+		@Inject
+		protected ITestBean testBean3;
+
+		private IndexedTestBean indexedTestBean;
+
+		private List<NestedTestBean> nestedTestBeans;
+
+		public List<NestedTestBean> nestedTestBeansSetter;
+
+		@Inject
+		public List<NestedTestBean> nestedTestBeansField;
+
+		private ITestBean testBean4;
+
+		@Inject
+		public void setTestBean2(TestBean testBean2) {
+			super.setTestBean2(testBean2);
+		}
+
+		@Inject
+		private void inject(ITestBean testBean4, List<NestedTestBean> nestedTestBeans, IndexedTestBean indexedTestBean) {
+			this.testBean4 = testBean4;
+			this.indexedTestBean = indexedTestBean;
+			this.nestedTestBeans = nestedTestBeans;
+		}
+
+		@Inject
+		public void setNestedTestBeans(List<NestedTestBean> nestedTestBeans) {
+			this.nestedTestBeansSetter = nestedTestBeans;
+		}
+
+		public ITestBean getTestBean3() {
+			return this.testBean3;
+		}
+
+		public ITestBean getTestBean4() {
+			return this.testBean4;
+		}
+
+		public IndexedTestBean getIndexedTestBean() {
+			return this.indexedTestBean;
+		}
+
+		public List<NestedTestBean> getNestedTestBeans() {
+			return this.nestedTestBeans;
+		}
+	}
+
+
+	public static class ConstructorResourceInjectionBean extends ResourceInjectionBean {
+
+		@Inject
+		protected ITestBean testBean3;
+
+		private ITestBean testBean4;
+
+		private NestedTestBean nestedTestBean;
+
+		private ConfigurableListableBeanFactory beanFactory;
+
+
+		public ConstructorResourceInjectionBean() {
+			throw new UnsupportedOperationException();
+		}
+
+		public ConstructorResourceInjectionBean(ITestBean testBean3) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Inject
+		public ConstructorResourceInjectionBean(ITestBean testBean4, NestedTestBean nestedTestBean,
+				ConfigurableListableBeanFactory beanFactory) {
+			this.testBean4 = testBean4;
+			this.nestedTestBean = nestedTestBean;
+			this.beanFactory = beanFactory;
+		}
+
+		public ConstructorResourceInjectionBean(NestedTestBean nestedTestBean) {
+			throw new UnsupportedOperationException();
+		}
+
+		public ConstructorResourceInjectionBean(ITestBean testBean3, ITestBean testBean4, NestedTestBean nestedTestBean) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Inject
+		public void setTestBean2(TestBean testBean2) {
+			super.setTestBean2(testBean2);
+		}
+
+		public ITestBean getTestBean3() {
+			return this.testBean3;
+		}
+
+		public ITestBean getTestBean4() {
+			return this.testBean4;
+		}
+
+		public NestedTestBean getNestedTestBean() {
+			return this.nestedTestBean;
+		}
+
+		public ConfigurableListableBeanFactory getBeanFactory() {
+			return this.beanFactory;
+		}
+	}
+
+
+	public static class ConstructorsResourceInjectionBean {
+
+		protected ITestBean testBean3;
+
+		private ITestBean testBean4;
+
+		private NestedTestBean[] nestedTestBeans;
+
+		public ConstructorsResourceInjectionBean() {
+		}
+
+		@Inject
+		public ConstructorsResourceInjectionBean(ITestBean testBean3) {
+			this.testBean3 = testBean3;
+		}
+
+		public ConstructorsResourceInjectionBean(ITestBean testBean4, NestedTestBean[] nestedTestBeans) {
+			this.testBean4 = testBean4;
+			this.nestedTestBeans = nestedTestBeans;
+		}
+
+		public ConstructorsResourceInjectionBean(NestedTestBean nestedTestBean) {
+			throw new UnsupportedOperationException();
+		}
+
+		public ConstructorsResourceInjectionBean(ITestBean testBean3, ITestBean testBean4, NestedTestBean nestedTestBean) {
+			throw new UnsupportedOperationException();
+		}
+
+		public ITestBean getTestBean3() {
+			return this.testBean3;
+		}
+
+		public ITestBean getTestBean4() {
+			return this.testBean4;
+		}
+
+		public NestedTestBean[] getNestedTestBeans() {
+			return this.nestedTestBeans;
+		}
+	}
+
+
+	public static class ConstructorsCollectionResourceInjectionBean {
+
+		protected ITestBean testBean3;
+
+		private ITestBean testBean4;
+
+		private List<NestedTestBean> nestedTestBeans;
+
+		public ConstructorsCollectionResourceInjectionBean() {
+		}
+
+		public ConstructorsCollectionResourceInjectionBean(ITestBean testBean3) {
+			this.testBean3 = testBean3;
+		}
+
+		@Inject
+		public ConstructorsCollectionResourceInjectionBean(ITestBean testBean4, List<NestedTestBean> nestedTestBeans) {
+			this.testBean4 = testBean4;
+			this.nestedTestBeans = nestedTestBeans;
+		}
+
+		public ConstructorsCollectionResourceInjectionBean(NestedTestBean nestedTestBean) {
+			throw new UnsupportedOperationException();
+		}
+
+		public ConstructorsCollectionResourceInjectionBean(ITestBean testBean3, ITestBean testBean4,
+				NestedTestBean nestedTestBean) {
+			throw new UnsupportedOperationException();
+		}
+
+		public ITestBean getTestBean3() {
+			return this.testBean3;
+		}
+
+		public ITestBean getTestBean4() {
+			return this.testBean4;
+		}
+
+		public List<NestedTestBean> getNestedTestBeans() {
+			return this.nestedTestBeans;
+		}
+	}
+
+
+	public static class MapConstructorInjectionBean {
+
+		private Map<String, TestBean> testBeanMap;
+
+		@Inject
+		public MapConstructorInjectionBean(Map<String, TestBean> testBeanMap) {
+			this.testBeanMap = testBeanMap;
+		}
+
+		public Map<String, TestBean> getTestBeanMap() {
+			return this.testBeanMap;
+		}
+	}
+
+
+	public static class MapFieldInjectionBean {
+
+		@Inject
+		private Map<String, TestBean> testBeanMap;
+
+
+		public Map<String, TestBean> getTestBeanMap() {
+			return this.testBeanMap;
+		}
+	}
+
+
+	public static class MapMethodInjectionBean {
+
+		private TestBean testBean;
+
+		private Map<String, TestBean> testBeanMap;
+
+		@Inject
+		public void setTestBeanMap(TestBean testBean, Map<String, TestBean> testBeanMap) {
+			this.testBean = testBean;
+			this.testBeanMap = testBeanMap;
+		}
+
+		public TestBean getTestBean() {
+			return this.testBean;
+		}
+
+		public Map<String, TestBean> getTestBeanMap() {
+			return this.testBeanMap;
+		}
+	}
+
+
+	public static class ObjectFactoryInjectionBean implements Serializable {
+
+		@Inject
+		private Provider<TestBean> testBeanFactory;
+
+		public TestBean getTestBean() {
+			return this.testBeanFactory.get();
+		}
+	}
+
+
+	public static class ObjectFactoryQualifierInjectionBean {
+
+		@Inject
+		@Named("testBean")
+		private Provider<?> testBeanFactory;
+
+		public TestBean getTestBean() {
+			return (TestBean) this.testBeanFactory.get();
+		}
+	}
+
+
+	/**
+	 * Bean with a dependency on a {@link org.springframework.beans.factory.FactoryBean}.
+	 */
+	private static class FactoryBeanDependentBean {
+
+		@Inject
+		private FactoryBean<?> factoryBean;
+
+		public final FactoryBean<?> getFactoryBean() {
+			return this.factoryBean;
+		}
+	}
+
+
+	public static class StringFactoryBean implements FactoryBean<String> {
+
+		public String getObject() throws Exception {
+			return "";
+		}
+
+		public Class<String> getObjectType() {
+			return String.class;
+		}
+
+		public boolean isSingleton() {
+			return true;
+		}
+	}
+
+}