Polishing

(cherry picked from commit a31ebb6)

spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.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.
@@ -170,8 +170,7 @@ public interface BeanFactory {
 	 * <p>Allows for specifying explicit constructor arguments / factory method arguments,
 	 * overriding the specified default arguments (if any) in the bean definition.
 	 * @param name the name of the bean to retrieve
-	 * @param args arguments to use if creating a prototype using explicit arguments to a
-	 * static factory method. It is invalid to use a non-null args value in any other case.
+	 * @param args arguments to use if creating a prototype using explicit arguments
 	 * @return an instance of the bean
 	 * @throws NoSuchBeanDefinitionException if there is no such bean definition
 	 * @throws BeanDefinitionStoreException if arguments have been given but

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

@@ -236,7 +236,8 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 						Annotation annotation = findAutowiredAnnotation(candidate);
 						if (annotation != null) {
 							if (requiredConstructor != null) {
-								throw new BeanCreationException("Invalid autowire-marked constructor: " + candidate +
+								throw new BeanCreationException(beanName,
+										"Invalid autowire-marked constructor: " + candidate +
 										". Found another constructor with 'required' Autowired annotation: " +
 										requiredConstructor);
 							}
@@ -247,10 +248,10 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 							boolean required = determineRequiredStatus(annotation);
 							if (required) {
 								if (!candidates.isEmpty()) {
-									throw new BeanCreationException(
+									throw new BeanCreationException(beanName,
 											"Invalid autowire-marked constructors: " + candidates +
 											". Found another constructor with 'required' Autowired annotation: " +
-											requiredConstructor);
+											candidate);
 								}
 								requiredConstructor = candidate;
 							}

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.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.
@@ -1228,7 +1228,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		// Check validity of the usage of the args parameter. This can
 		// only be used for prototypes constructed via a factory method.
 		if (args != null && !mbd.isPrototype()) {
-			throw new BeanDefinitionStoreException(
+			throw new BeanDefinitionStoreException(mbd.getResourceDescription(), beanName,
 					"Can only specify arguments for the getBean method when referring to a prototype bean definition");
 		}
 	}

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

@@ -33,8 +33,9 @@ import org.springframework.cglib.proxy.NoOp;
 
 /**
  * Default object instantiation strategy for use in BeanFactories.
- * Uses CGLIB to generate subclasses dynamically if methods need to be
- * overridden by the container, to implement Method Injection.
+ *
+ * <p>Uses CGLIB to generate subclasses dynamically if methods need to be
+ * overridden by the container to implement <em>Method Injection</em>.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -50,13 +51,13 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 
 	/**
 	 * Index in the CGLIB callback array for a method that should
-	 * be overridden to provide method lookup.
+	 * be overridden to provide <em>method lookup</em>.
 	 */
 	private static final int LOOKUP_OVERRIDE = 1;
 
 	/**
 	 * Index in the CGLIB callback array for a method that should
-	 * be overridden using generic Methodreplacer functionality.
+	 * be overridden using generic <em>method replacer</em> functionality.
 	 */
 	private static final int METHOD_REPLACER = 2;
 
@@ -96,13 +97,13 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 		}
 
 		/**
-		 * Create a new instance of a dynamically generated subclasses implementing the
+		 * Create a new instance of a dynamically generated subclass implementing the
 		 * required lookups.
 		 * @param ctor constructor to use. If this is {@code null}, use the
 		 * no-arg constructor (no parameterization, or Setter Injection)
 		 * @param args arguments to use for the constructor.
-		 * Ignored if the ctor parameter is {@code null}.
-		 * @return new instance of the dynamically generated class
+		 * Ignored if the {@code ctor} parameter is {@code null}.
+		 * @return new instance of the dynamically generated subclass
 		 */
 		public Object instantiate(Constructor<?> ctor, Object[] args) {
 			Enhancer enhancer = new Enhancer();

spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.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.
@@ -37,10 +37,9 @@ public class LookupOverride extends MethodOverride {
 
 	/**
 	 * Construct a new LookupOverride.
-	 * @param methodName the name of the method to override.
-	 * This method must have no arguments.
-	 * @param beanName name of the bean in the current BeanFactory
-	 * that the overriden method should return
+	 * @param methodName the name of the method to override
+	 * @param beanName the name of the bean in the current BeanFactory
+	 * that the overridden method should return
 	 */
 	public LookupOverride(String methodName, String beanName) {
 		super(methodName);
@@ -48,6 +47,7 @@ public class LookupOverride extends MethodOverride {
 		this.beanName = beanName;
 	}
 
+
 	/**
 	 * Return the name of the bean that should be returned by this method.
 	 */
@@ -55,9 +55,8 @@ public class LookupOverride extends MethodOverride {
 		return this.beanName;
 	}
 
-
 	/**
-	 * Match method of the given name, with no parameters.
+	 * Match the method of the given name, with no parameters.
 	 */
 	@Override
 	public boolean matches(Method method) {
@@ -65,11 +64,6 @@ public class LookupOverride extends MethodOverride {
 	}
 
 
-	@Override
-	public String toString() {
-		return "LookupOverride for method '" + getMethodName() + "'; will return bean '" + this.beanName + "'";
-	}
-
 	@Override
 	public boolean equals(Object other) {
 		return (other instanceof LookupOverride && super.equals(other) &&
@@ -81,4 +75,9 @@ public class LookupOverride extends MethodOverride {
 		return (29 * super.hashCode() + ObjectUtils.nullSafeHashCode(this.beanName));
 	}
 
+	@Override
+	public String toString() {
+		return "LookupOverride for method '" + getMethodName() + "'; will return bean '" + this.beanName + "'";
+	}
+
 }

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

@@ -52,6 +52,7 @@ public abstract class MethodOverride implements BeanMetadataElement {
 		this.methodName = methodName;
 	}
 
+
 	/**
 	 * Return the name of the method to be overridden.
 	 */
@@ -98,6 +99,7 @@ public abstract class MethodOverride implements BeanMetadataElement {
 	 */
 	public abstract boolean matches(Method method);
 
+
 	@Override
 	public boolean equals(Object other) {
 		if (this == other) {

spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.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.
@@ -52,6 +52,7 @@ public class ReplaceOverride extends MethodOverride {
 		this.methodReplacerBeanName = methodReplacerBeanName;
 	}
 
+
 	/**
 	 * Return the name of the bean implementing MethodReplacer.
 	 */
@@ -68,28 +69,22 @@ public class ReplaceOverride extends MethodOverride {
 		this.typeIdentifiers.add(identifier);
 	}
 
-
 	@Override
 	public boolean matches(Method method) {
-		// TODO could cache result for efficiency
 		if (!method.getName().equals(getMethodName())) {
-			// It can't match.
 			return false;
 		}
-
 		if (!isOverloaded()) {
-			// No overloaded: don't worry about arg type matching.
+			// Not overloaded: don't worry about arg type matching...
 			return true;
 		}
-
-		// If we get to here, we need to insist on precise argument matching.
+		// If we get here, we need to insist on precise argument matching...
 		if (this.typeIdentifiers.size() != method.getParameterTypes().length) {
 			return false;
 		}
 		for (int i = 0; i < this.typeIdentifiers.size(); i++) {
 			String identifier = this.typeIdentifiers.get(i);
 			if (!method.getParameterTypes()[i].getName().contains(identifier)) {
-				// This parameter cannot match.
 				return false;
 			}
 		}
@@ -97,12 +92,6 @@ public class ReplaceOverride extends MethodOverride {
 	}
 
 
-	@Override
-	public String toString() {
-		return "Replace override for method '" + getMethodName() + "; will call bean '" +
-				this.methodReplacerBeanName + "'";
-	}
-
 	@Override
 	public boolean equals(Object other) {
 		if (!(other instanceof ReplaceOverride) || !super.equals(other)) {
@@ -121,4 +110,10 @@ public class ReplaceOverride extends MethodOverride {
 		return hashCode;
 	}
 
+	@Override
+	public String toString() {
+		return "Replace override for method '" + getMethodName() + "; will call bean '" +
+				this.methodReplacerBeanName + "'";
+	}
+
 }