From 2165fdbe1eb4e658cd70c83b70a26b92930c77df Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 29 Sep 2009 14:42:35 +0000
Subject: [PATCH] removed reflection usage for handling Annotation array return
 value across 2.5 and 3.0 now that we require Spring 3.0

---
 .../message/MethodParameterMessageMapper.java     | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
index 4229e0bcd6..1696dbc3df 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
@@ -16,11 +16,11 @@
 
 package org.springframework.integration.message;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -34,9 +34,7 @@ import org.springframework.integration.annotation.Headers;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageHeaders;
 import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -277,16 +275,7 @@ public class MethodParameterMessageMapper implements InboundMessageMapper<Object
 
 		private MethodParameterMetadata(Method method, int index) {
 			this.parameter = new MethodParameter(method, index);
-			Object annotationArray = null;
-			try {
-				// using reflection since Spring 3.0 returns Annotation[] yet Spring 2.5 returns Object[]
-				annotationArray = ReflectionUtils.invokeMethod(
-						this.parameter.getClass().getMethod("getParameterAnnotations", new Class[0]), this.parameter);
-			}
-			catch (Exception e) {
-				throw new IllegalStateException("failed to introspect method parameter annotations", e);
-			}
-			List<?> annotations = CollectionUtils.arrayToList(annotationArray);
+			Annotation[] annotations = this.parameter.getParameterAnnotations();
 			for (Object o : annotations) {
 				if (o instanceof Header) {
 					this._headerAnnotation = (Header) o;