Polishing

(cherry picked from commit c97c246)

spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.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.
@@ -103,8 +103,8 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 			// We couldn't load the class file, which is not fatal as it
 			// simply means this method of discovering parameter names won't work.
 			if (logger.isDebugEnabled()) {
-				logger.debug("Cannot find '.class' file for class [" + clazz
-						+ "] - unable to determine constructors/methods parameter names");
+				logger.debug("Cannot find '.class' file for class [" + clazz +
+						"] - unable to determine constructor/method parameter names");
 			}
 			return NO_DEBUG_INFO_MAP;
 		}
@@ -117,14 +117,14 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 		catch (IOException ex) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Exception thrown while reading '.class' file for class [" + clazz +
-						"] - unable to determine constructors/methods parameter names", ex);
+						"] - unable to determine constructor/method parameter names", ex);
 			}
 		}
 		catch (IllegalArgumentException ex) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("ASM ClassReader failed to parse class file [" + clazz +
 						"], probably due to a new Java class file version that isn't supported yet " +
-						"- unable to determine constructors/methods parameter names", ex);
+						"- unable to determine constructor/method parameter names", ex);
 			}
 		}
 		finally {
@@ -148,6 +148,7 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 		private static final String STATIC_CLASS_INIT = "<clinit>";
 
 		private final Class<?> clazz;
+
 		private final Map<Member, String[]> memberMap;
 
 		public ParameterNameDiscoveringVisitor(Class<?> clazz, Map<Member, String[]> memberMap) {
@@ -180,12 +181,17 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 		private static final String CONSTRUCTOR = "<init>";
 
 		private final Class<?> clazz;
+
 		private final Map<Member, String[]> memberMap;
+
 		private final String name;
+
 		private final Type[] args;
+
+		private final String[] parameterNames;
+
 		private final boolean isStatic;
 
-		private String[] parameterNames;
 		private boolean hasLvtInfo = false;
 
 		/*
@@ -194,25 +200,22 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 		 */
 		private final int[] lvtSlotIndex;
 
-		public LocalVariableTableVisitor(Class<?> clazz, Map<Member, String[]> map, String name, String desc,
-				boolean isStatic) {
+		public LocalVariableTableVisitor(Class<?> clazz, Map<Member, String[]> map, String name, String desc, boolean isStatic) {
 			super(SpringAsmInfo.ASM_VERSION);
 			this.clazz = clazz;
 			this.memberMap = map;
 			this.name = name;
-			// determine args
-			args = Type.getArgumentTypes(desc);
-			this.parameterNames = new String[args.length];
+			this.args = Type.getArgumentTypes(desc);
+			this.parameterNames = new String[this.args.length];
 			this.isStatic = isStatic;
-			this.lvtSlotIndex = computeLvtSlotIndices(isStatic, args);
+			this.lvtSlotIndex = computeLvtSlotIndices(isStatic, this.args);
 		}
 
 		@Override
-		public void visitLocalVariable(String name, String description, String signature, Label start, Label end,
-				int index) {
+		public void visitLocalVariable(String name, String description, String signature, Label start, Label end, int index) {
 			this.hasLvtInfo = true;
-			for (int i = 0; i < lvtSlotIndex.length; i++) {
-				if (lvtSlotIndex[i] == index) {
+			for (int i = 0; i < this.lvtSlotIndex.length; i++) {
+				if (this.lvtSlotIndex[i] == index) {
 					this.parameterNames[i] = name;
 				}
 			}
@@ -225,27 +228,25 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 				// which doesn't use any local variables.
 				// This means that hasLvtInfo could be false for that kind of methods
 				// even if the class has local variable info.
-				memberMap.put(resolveMember(), parameterNames);
+				this.memberMap.put(resolveMember(), this.parameterNames);
 			}
 		}
 
 		private Member resolveMember() {
-			ClassLoader loader = clazz.getClassLoader();
-			Class<?>[] classes = new Class<?>[args.length];
-
-			// resolve args
-			for (int i = 0; i < args.length; i++) {
-				classes[i] = ClassUtils.resolveClassName(args[i].getClassName(), loader);
+			ClassLoader loader = this.clazz.getClassLoader();
+			Class<?>[] argTypes = new Class<?>[this.args.length];
+			for (int i = 0; i < this.args.length; i++) {
+				argTypes[i] = ClassUtils.resolveClassName(this.args[i].getClassName(), loader);
 			}
 			try {
-				if (CONSTRUCTOR.equals(name)) {
-					return clazz.getDeclaredConstructor(classes);
+				if (CONSTRUCTOR.equals(this.name)) {
+					return this.clazz.getDeclaredConstructor(argTypes);
 				}
-
-				return clazz.getDeclaredMethod(name, classes);
-			} catch (NoSuchMethodException ex) {
-				throw new IllegalStateException("Method [" + name
-						+ "] was discovered in the .class file but cannot be resolved in the class object", ex);
+				return this.clazz.getDeclaredMethod(this.name, argTypes);
+			}
+			catch (NoSuchMethodException ex) {
+				throw new IllegalStateException("Method [" + this.name +
+						"] was discovered in the .class file but cannot be resolved in the class object", ex);
 			}
 		}
 
@@ -256,7 +257,8 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 				lvtIndex[i] = nextIndex;
 				if (isWideType(paramTypes[i])) {
 					nextIndex += 2;
-				} else {
+				}
+				else {
 					nextIndex++;
 				}
 			}