Merge branch '6.0.x' (javadoc changes)

spring-core/src/main/java/org/springframework/cglib/core/CodeEmitter.java

@@ -737,7 +737,6 @@ public class CodeEmitter extends LocalVariablesSorter {
      * on the top of the stack with the unwrapped (primitive)
      * equivalent. For example, Character -> char.
      * @param type the class indicating the desired type of the top stack value
-     * @return true if the value was unboxed
      */
     public void unbox(Type type) {
         Type t = Constants.TYPE_NUMBER;

spring-core/src/main/java/org/springframework/cglib/proxy/InterfaceMaker.java

@@ -74,7 +74,7 @@ public class InterfaceMaker extends AbstractClassGenerator
      * Add all the public methods in the specified class.
      * Methods from superclasses are included, except for methods declared in the base
      * Object class (e.g. <code>getClass</code>, <code>equals</code>, <code>hashCode</code>).
-     * @param class the class containing the methods to add to the interface
+     * @param clazz the class containing the methods to add to the interface
      */
     public void add(Class clazz) {
         Method[] methods = clazz.getMethods();

spring-core/src/main/java/org/springframework/cglib/proxy/InvocationHandler.java

@@ -28,7 +28,7 @@ public interface InvocationHandler
 extends Callback
 {
     /**
-     * @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object)
+     * @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])
      */
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable;
 

spring-core/src/main/java/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.java

@@ -25,7 +25,7 @@ import org.springframework.cglib.transform.MethodFilterTransformer;
 import org.springframework.cglib.transform.TransformingClassGenerator;
 
 /**
- * A {@link GeneratorStrategy} suitable for use with {@link org.springframework.cglib.Enhancer} which
+ * A {@link GeneratorStrategy} suitable for use with {@link org.springframework.cglib.proxy.Enhancer} which
  * causes all undeclared exceptions thrown from within a proxied method to be wrapped
  * in an alternative exception of your choice.
  */

spring-core/src/main/java/org/springframework/cglib/util/ParallelSorter.java

@@ -64,7 +64,6 @@ abstract public class ParallelSorter extends SorterTemplate {
      * @param arrays An array of arrays to sort. The arrays may be a mix
      * of primitive and non-primitive types, but should all be the same
      * length.
-     * @param loader ClassLoader for generated class, uses "current" if null
      */
     public static ParallelSorter create(Object[] arrays) {
         Generator gen = new Generator();
@@ -135,8 +134,7 @@ abstract public class ParallelSorter extends SorterTemplate {
     /**
      * Sort the arrays using an in-place merge sort.
      * @param index array (column) to sort by
-     * @param lo starting array index (row), inclusive
-     * @param hi ending array index (row), exclusive
+     * @param cmp Comparator to use if the specified column is non-primitive
      */
     public void mergeSort(int index, Comparator cmp) {
         mergeSort(index, 0, len(), cmp);

spring-core/src/main/java/org/springframework/core/SpringProperties.java

@@ -38,7 +38,7 @@ import org.springframework.lang.Nullable;
  *
  * @author Juergen Hoeller
  * @since 3.2.7
- * @see org.springframework.beans.CachedIntrospectionResults#IGNORE_BEANINFO_PROPERTY_NAME
+ * @see org.springframework.beans.StandardBeanInfoFactory#IGNORE_BEANINFO_PROPERTY_NAME
  * @see org.springframework.context.index.CandidateComponentsIndexLoader#IGNORE_INDEX
  * @see org.springframework.core.env.AbstractEnvironment#IGNORE_GETENV_PROPERTY_NAME
  * @see org.springframework.expression.spel.SpelParserConfiguration#SPRING_EXPRESSION_COMPILER_MODE_PROPERTY_NAME