root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

improved context shown for non-qualifying dependency (SPR-5912)

This commit is contained in:
Juergen Hoeller 2009-11-11 21:44:36 +00:00
parent d6bab3b674
commit 7a10b7530e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,6 +17,7 @@
package org.springframework.beans.factory; package org.springframework.beans.factory;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.util.StringUtils;
/** /**
* Exception thrown when a BeanFactory is asked for a bean * Exception thrown when a BeanFactory is asked for a bean
@ -79,8 +80,9 @@ public class NoSuchBeanDefinitionException extends BeansException {
* @param message detailed message describing the problem * @param message detailed message describing the problem
*/ */
public NoSuchBeanDefinitionException(Class type, String dependencyDescription, String message) { public NoSuchBeanDefinitionException(Class type, String dependencyDescription, String message) {
super("No matching bean of type [" + type.getName() + "] found for dependency [" + super("No matching bean of type [" + type.getName() + "] found for dependency" +
dependencyDescription + "]: " + message); (StringUtils.hasLength(dependencyDescription) ? " [" + dependencyDescription + "]" : "") +
": " + message);
this.beanType = type; this.beanType = type;
} }

7
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View File

@ -763,16 +763,15 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
Map<String, Object> matchingBeans = findAutowireCandidates(beanName, type, descriptor); Map<String, Object> matchingBeans = findAutowireCandidates(beanName, type, descriptor);
if (matchingBeans.isEmpty()) { if (matchingBeans.isEmpty()) {
if (descriptor.isRequired()) { if (descriptor.isRequired()) {
throw new NoSuchBeanDefinitionException(type, raiseNoSuchBeanDefinitionException(type, "", descriptor);
"Unsatisfied dependency of type [" + type + "]: expected at least 1 matching bean");
} }
return null; return null;
} }
if (matchingBeans.size() > 1) { if (matchingBeans.size() > 1) {
String primaryBeanName = determinePrimaryCandidate(matchingBeans, descriptor); String primaryBeanName = determinePrimaryCandidate(matchingBeans, descriptor);
if (primaryBeanName == null) { if (primaryBeanName == null) {
throw new NoSuchBeanDefinitionException(type, throw new NoSuchBeanDefinitionException(type, "expected single matching bean but found " +
"expected single matching bean but found " + matchingBeans.size() + ": " + matchingBeans.keySet()); matchingBeans.size() + ": " + matchingBeans.keySet());
} }
if (autowiredBeanNames != null) { if (autowiredBeanNames != null) {
autowiredBeanNames.add(primaryBeanName); autowiredBeanNames.add(primaryBeanName);