Polishing

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -146,8 +146,9 @@ protected Method doFindMatchingMethod(Object[] arguments) {
 			for (Method candidate : candidates) {
 				if (candidate.getName().equals(targetMethod)) {
 					// Check if the inspected method has the correct number of parameters.
-					Class<?>[] paramTypes = candidate.getParameterTypes();
-					if (paramTypes.length == argCount) {
+					int parameterCount = candidate.getParameterCount();
+					if (parameterCount == argCount) {
+						Class<?>[] paramTypes = candidate.getParameterTypes();
 						Object[] convertedArguments = new Object[argCount];
 						boolean match = true;
 						for (int j = 0; j < argCount && match; j++) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -169,11 +169,12 @@ else if (genericType instanceof ParameterizedType) {
 					ParameterizedType parameterizedType = (ParameterizedType) genericType;
 					Class<?>[] generics = new Class<?>[parameterizedType.getActualTypeArguments().length];
 					Type[] typeArguments = parameterizedType.getActualTypeArguments();
+					ResolvableType contextType = ResolvableType.forClass(contextClass);
 					for (int i = 0; i < typeArguments.length; i++) {
 						Type typeArgument = typeArguments[i];
 						if (typeArgument instanceof TypeVariable) {
 							ResolvableType resolvedTypeArgument = resolveVariable(
-									(TypeVariable<?>) typeArgument, ResolvableType.forClass(contextClass));
+									(TypeVariable<?>) typeArgument, contextType);
 							if (resolvedTypeArgument != ResolvableType.NONE) {
 								generics[i] = resolvedTypeArgument.resolve();
 							}

spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -149,9 +149,10 @@ public MultiValueMap<String, Object> getAllAnnotationAttributes(String annotatio
 		MultiValueMap<String, Object> allAttributes = new LinkedMultiValueMap<>();
 		List<AnnotationAttributes> attributesList = this.attributesMap.get(annotationName);
 		if (attributesList != null) {
+			String annotatedElement = "method '" + getMethodName() + '\'';
 			for (AnnotationAttributes annotationAttributes : attributesList) {
 				AnnotationAttributes convertedAttributes = AnnotationReadingVisitorUtils.convertClassValues(
-						"method '" + getMethodName() + "'", this.classLoader, annotationAttributes, classValuesAsString);
+						annotatedElement, this.classLoader, annotationAttributes, classValuesAsString);
 				convertedAttributes.forEach(allAttributes::add);
 			}
 		}

spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java

@@ -608,8 +608,8 @@ private void log(java.util.logging.Level level, Object message, Throwable except
 				else {
 					rec = new LocationResolvingLogRecord(level, String.valueOf(message));
 					rec.setLoggerName(this.name);
-					rec.setResourceBundleName(logger.getResourceBundleName());
-					rec.setResourceBundle(logger.getResourceBundle());
+					rec.setResourceBundleName(this.logger.getResourceBundleName());
+					rec.setResourceBundle(this.logger.getResourceBundle());
 					rec.setThrown(exception);
 				}
 				logger.log(rec);