@Bean-returned FactoryBean proxy delegates to actual target instance now

Issue: SPR-12915

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -289,7 +289,7 @@ class ConfigurationClassEnhancer {
 				}
 				else {
 					// It is a candidate FactoryBean - go ahead with enhancement
-					return enhanceFactoryBean(factoryBean.getClass(), beanFactory, beanName);
+					return enhanceFactoryBean(factoryBean, beanFactory, beanName);
 				}
 			}
 
@@ -365,11 +365,11 @@ class ConfigurationClassEnhancer {
 		 * instance directly. If a FactoryBean instance is fetched through the container via &-dereferencing,
 		 * it will not be proxied. This too is aligned with the way XML configuration works.
 		 */
-		private Object enhanceFactoryBean(Class<?> fbClass, final ConfigurableBeanFactory beanFactory,
+		private Object enhanceFactoryBean(final Object factoryBean, final ConfigurableBeanFactory beanFactory,
 				final String beanName) throws InstantiationException, IllegalAccessException {
 
 			Enhancer enhancer = new Enhancer();
-			enhancer.setSuperclass(fbClass);
+			enhancer.setSuperclass(factoryBean.getClass());
 			enhancer.setUseFactory(false);
 			enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
 			enhancer.setCallback(new MethodInterceptor() {
@@ -378,7 +378,7 @@ class ConfigurationClassEnhancer {
 					if (method.getName().equals("getObject") && args.length == 0) {
 						return beanFactory.getBean(beanName);
 					}
-					return proxy.invokeSuper(obj, args);
+					return proxy.invoke(factoryBean, args);
 				}
 			});
 			return enhancer.create();

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -19,13 +19,17 @@ package org.springframework.context.annotation;
 import org.junit.Test;
 
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 
+import static org.junit.Assert.*;
+
 /**
  * Tests cornering bug SPR-8514.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  */
 public class ConfigurationWithFactoryBeanAndAutowiringTests {
@@ -77,30 +81,52 @@ public class ConfigurationWithFactoryBeanAndAutowiringTests {
 		ctx.register(WildcardParameterizedFactoryBeanInterfaceConfig.class);
 		ctx.refresh();
 	}
-}
+
+	@Test
+	public void withFactoryBeanCallingBean() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(AppConfig.class);
+		ctx.register(FactoryBeanCallingConfig.class);
+		ctx.refresh();
+		assertEquals("true", ctx.getBean("myString"));
+	}
 
 
-class DummyBean {
+	static class DummyBean {
-}
+	}
 
 
-class MyFactoryBean implements FactoryBean<String> {
+	static class MyFactoryBean implements FactoryBean<String>, InitializingBean {
+
+		private boolean initialized = false;
+
+		@Override
+		public void afterPropertiesSet() throws Exception {
+			this.initialized = true;
+		}
+
 		@Override
 		public String getObject() throws Exception {
 			return "foo";
 		}
+
 		@Override
 		public Class<String> getObjectType() {
 			return String.class;
 		}
+
 		@Override
 		public boolean isSingleton() {
 			return true;
 		}
-}
+
+		public String getString() {
+			return Boolean.toString(this.initialized);
+		}
+	}
 
 
-class MyParameterizedFactoryBean<T> implements FactoryBean<T> {
+	static class MyParameterizedFactoryBean<T> implements FactoryBean<T> {
 
 		private final T obj;
 
@@ -123,20 +149,22 @@ class MyParameterizedFactoryBean<T> implements FactoryBean<T> {
 		public boolean isSingleton() {
 			return true;
 		}
-}
+	}
 
 
-@Configuration
+	@Configuration
-class AppConfig {
+	static class AppConfig {
+
 		@Bean
 		public DummyBean dummyBean() {
 			return new DummyBean();
 		}
-}
+	}
 
 
-@Configuration
+	@Configuration
-class ConcreteFactoryBeanImplementationConfig {
+	static class ConcreteFactoryBeanImplementationConfig {
+
 		@Autowired
 		private DummyBean dummyBean;
 
@@ -145,11 +173,12 @@ class ConcreteFactoryBeanImplementationConfig {
 			Assert.notNull(dummyBean, "DummyBean was not injected.");
 			return new MyFactoryBean();
 		}
-}
+	}
 
 
-@Configuration
+	@Configuration
-class ParameterizedFactoryBeanImplementationConfig {
+	static class ParameterizedFactoryBeanImplementationConfig {
+
 		@Autowired
 		private DummyBean dummyBean;
 
@@ -158,11 +187,12 @@ class ParameterizedFactoryBeanImplementationConfig {
 			Assert.notNull(dummyBean, "DummyBean was not injected.");
 			return new MyParameterizedFactoryBean<String>("whatev");
 		}
-}
+	}
 
 
-@Configuration
+	@Configuration
-class ParameterizedFactoryBeanInterfaceConfig {
+	static class ParameterizedFactoryBeanInterfaceConfig {
+
 		@Autowired
 		private DummyBean dummyBean;
 
@@ -171,11 +201,12 @@ class ParameterizedFactoryBeanInterfaceConfig {
 			Assert.notNull(dummyBean, "DummyBean was not injected.");
 			return new MyFactoryBean();
 		}
-}
+	}
 
 
-@Configuration
+	@Configuration
-class NonPublicParameterizedFactoryBeanInterfaceConfig {
+	static class NonPublicParameterizedFactoryBeanInterfaceConfig {
+
 		@Autowired
 		private DummyBean dummyBean;
 
@@ -184,11 +215,12 @@ class NonPublicParameterizedFactoryBeanInterfaceConfig {
 			Assert.notNull(dummyBean, "DummyBean was not injected.");
 			return new MyFactoryBean();
 		}
-}
+	}
 
 
-@Configuration
+	@Configuration
-class RawFactoryBeanInterfaceConfig {
+	static class RawFactoryBeanInterfaceConfig {
+
 		@Autowired
 		private DummyBean dummyBean;
 
@@ -198,11 +230,12 @@ class RawFactoryBeanInterfaceConfig {
 			Assert.notNull(dummyBean, "DummyBean was not injected.");
 			return new MyFactoryBean();
 		}
-}
+	}
 
 
-@Configuration
+	@Configuration
-class WildcardParameterizedFactoryBeanInterfaceConfig {
+	static class WildcardParameterizedFactoryBeanInterfaceConfig {
+
 		@Autowired
 		private DummyBean dummyBean;
 
@@ -211,4 +244,25 @@ class WildcardParameterizedFactoryBeanInterfaceConfig {
 			Assert.notNull(dummyBean, "DummyBean was not injected.");
 			return new MyFactoryBean();
 		}
+	}
+
+
+	@Configuration
+	static class FactoryBeanCallingConfig {
+
+		@Autowired
+		private DummyBean dummyBean;
+
+		@Bean
+		public MyFactoryBean factoryBean() {
+			Assert.notNull(dummyBean, "DummyBean was not injected.");
+			return new MyFactoryBean();
+		}
+
+		@Bean
+		public String myString() {
+			return factoryBean().getString();
+		}
+	}
+
 }