| #218 uses in-build parameter name in JDK8

Haven't really seen this work yet, but no worse than before.

Also updates guava and codemodel dependencies.

Author: UnquietCode

src/main/java/unquietcode/tools/flapi/IntrospectorSupport.java

@@ -22,6 +22,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 
 import static com.google.common.base.Preconditions.checkState;
 
@@ -31,8 +32,8 @@
  */
 public class IntrospectorSupport {
 
-	protected static <T extends Annotation> T getParameterAnnotation(Method method, int parameterIndex, Class<T> annotationClass) {
-		for (Annotation annotation : method.getParameterAnnotations()[parameterIndex]) {
+	protected static <T extends Annotation> T getParameterAnnotation(Parameter parameter, Class<T> annotationClass) {
+		for (Annotation annotation : parameter.getAnnotations()) {
 			if (annotation.annotationType() == annotationClass) {
 				@SuppressWarnings("unchecked") T annotation1 = (T) annotation;
 				return annotation1;
@@ -42,8 +43,8 @@ protected static <T extends Annotation> T getParameterAnnotation(Method method,
 		return null;
 	}
 
-	protected static <T extends Annotation> boolean hasParameterAnnotation(Method method, int parameterIndex, Class<T> annotationClass) {
-		return getParameterAnnotation(method, parameterIndex, annotationClass) != null;
+	protected static <T extends Annotation> boolean hasParameterAnnotation(Parameter parameter, Class<T> annotationClass) {
+		return getParameterAnnotation(parameter, annotationClass) != null;
 	}
 
 	protected static String getMethodSignature(Method method) {
@@ -57,13 +58,14 @@ protected static String getMethodSignature(final Method method, final String nor
 		signature.append(name).append("(");
 
 		boolean first = true;
-		Class<?>[] parameterTypes = method.getParameterTypes();
+		final Parameter[] parameters = method.getParameters();
 
-		for (int i=0; i < parameterTypes.length; i++) {
-			Class<?> parameterType = parameterTypes[i];
+		for (int i=0; i < parameters.length; ++i) {
+			final Parameter parameter = parameters[i];
+			final Class<?> parameterType = parameter.getType();
 
 			// skip BlockChain parameters
-			if (hasParameterAnnotation(method, i, BlockChain.class)) {
+			if (hasParameterAnnotation(parameter, BlockChain.class)) {
 				continue;
 			}
 
@@ -76,7 +78,7 @@ protected static String getMethodSignature(final Method method, final String nor
 			final String typeName;
 
 			// varargs
-			if (i == parameterTypes.length-1 && method.isVarArgs()) {
+			if (parameter.isVarArgs()) {
 				checkState(parameterType.isArray());
 				typeName = parameterType.getComponentType().getName()+"...";
 			}
@@ -95,9 +97,8 @@ else if (parameterType.isArray()) {
 			Class<?>[] generics = ResolvableType.forMethodParameter(MethodParameter.forMethodOrConstructor(method, i)).resolveGenerics();
 			signature.append(makeTypeWithGenerics(typeName, generics));
 
-			// parameter name
-			// TODO improve in JDK8 (#218)
-			signature.append(" p").append(i);
+			// parameter name (or argX by default)
+			signature.append(" ").append(parameter.getName());
 		}
 
 		signature.append(")");

src/main/java/unquietcode/tools/flapi/annotations/AnnotationIntrospector.java

@@ -40,6 +40,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -300,14 +301,16 @@ else if (selector == null) {
 		}
 
 		// block chaining
-		for (int i=0; i < method.getParameterTypes().length; ++i) {
-			Class<?> parameterType = method.getParameterTypes()[i];
-			BlockChain blockChain = getParameterAnnotation(method, i, BlockChain.class);
+		final Parameter[] parameters = method.getParameters();
+
+		for (int i=0; i < parameters.length; ++i) {
+			final Parameter parameter = parameters[i];
+			final BlockChain blockChain = getParameterAnnotation(parameter, BlockChain.class);
 
 			if (blockChain != null) {
 
 				// check type
-				if (parameterType != AtomicReference.class) {
+				if (parameter.getType() != AtomicReference.class) {
 					throw new DescriptorBuilderException("@BlockChain parameters must be of type AtomicReference");
 				}