SPR-16628 - Improve NoSuchBeanDefinitionException to include a reference to the dependent bean

spring-beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java

@@ -41,6 +41,9 @@ public class NoSuchBeanDefinitionException extends BeansException {
 	@Nullable
 	private ResolvableType resolvableType;
 
+	@Nullable
+	private ResolvableType dependentBeanType;
+
 
 	/**
 	 * Create a new {@code NoSuchBeanDefinitionException}.
@@ -61,6 +64,12 @@ public NoSuchBeanDefinitionException(String name, String message) {
 		this.beanName = name;
 	}
 
+	public NoSuchBeanDefinitionException(String name, ResolvableType dependentBeanType) {
+		super("'" + dependentBeanType + "' depends on a bean named '" + name + "' but it wasn't available");
+		this.beanName = name;
+		this.dependentBeanType = dependentBeanType;
+	}
+
 	/**
 	 * Create a new {@code NoSuchBeanDefinitionException}.
 	 * @param type required type of the missing bean
@@ -99,7 +108,6 @@ public NoSuchBeanDefinitionException(ResolvableType type, String message) {
 		this.resolvableType = type;
 	}
 
-
 	/**
 	 * Return the name of the missing bean, if it was a lookup <em>by name</em> that failed.
 	 */
@@ -136,4 +144,9 @@ public int getNumberOfBeansFound() {
 		return 0;
 	}
 
+	@Nullable
+	public ResolvableType getDependentBeanType() {
+		return this.dependentBeanType;
+	}
+
 }

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@@ -300,7 +300,18 @@ else if (args != null) {
 									"Circular depends-on relationship between '" + beanName + "' and '" + dep + "'");
 						}
 						registerDependentBean(dep, beanName);
-						getBean(dep);
+						try {
+							getBean(dep);
+						}catch(NoSuchBeanDefinitionException ex) {
+							Class dependentClass = null;
+							try {
+								dependentClass = Class.forName(mbd.getBeanClassName());
+							}
+							catch (ClassNotFoundException e) {} //swallow
+							finally {
+								throw new NoSuchBeanDefinitionException(dep, ResolvableType.forClass(dependentClass));
+							}
+						}
 					}
 				}