Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-656 Removed the restriction in HandlerMethodUtils for having no more than one param lacking the header or headers annotations. It now allows parameters that are assignable to Map as well. Added several tests for Properties and Map objects expecting to receive Message header values.

Browse Source
This commit is contained in:
Mark Fisher
2009-07-01 23:43:20 +00:00
parent ca5d0a9aa9
commit f2529d1dc2
3 changed files with 430 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.integration/src/main/java/org/springframework/integration/handler/HandlerMethodUtils.java
View File

@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.springframework.aop.support.AopUtils;
import org.springframework.integration.annotation.Header;
@@ -49,11 +50,14 @@ abstract class HandlerMethodUtils {
}
Class<?>[] parameterTypes = method.getParameterTypes();
if (parameterTypes.length > 1) {
// at most one parameter can be lacking @Header or @Headers
// at most one parameter can be expecting a Message or payload.
boolean foundPayloadParam = false;
Annotation[][] allParamAnnotations = method.getParameterAnnotations();
for (Annotation[] paramAnnotations : allParamAnnotations) {
if (!containsHeaderAnnotation(paramAnnotations)) {
for (int i = 0; i < parameterTypes.length; i++) {
Class<?> currentType = parameterTypes[i];
Annotation[] paramAnnotations = allParamAnnotations[i];
// it's possible that a Map is the payload type at runtime, but we can't know that here
if (!containsHeaderAnnotation(paramAnnotations) && !Map.class.isAssignableFrom(currentType)) {
if (foundPayloadParam) {
return false;
}