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

INT-894 now enforcing that only one parameter per-method has the @Payload annotation or NO annotation (indicating either a Message or payload as the default). Also now throwing an Exception if any expression value is provided inside the @Payload annotation.

Browse Source
This commit is contained in:
Mark Fisher
2009-12-01 17:18:17 +00:00
parent 3d5ff0f999
commit 691ab73c46
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
org.springframework.integration/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java
View File

@@ -230,15 +230,22 @@ public class ArgumentArrayMessageMapper implements InboundMessageMapper<Object[]
Map<String, Object> messageArgumentsMap = new LinkedHashMap<String, Object>();
for (int i = 0; i < this.parameterList.size(); i++) {
Object argumentValue = arguments[i];
MethodParameter methodParam = (MethodParameter) this.parameterList.get(i);
Annotation annotation = this.findMappingAnnotation(methodParam.getParameterAnnotations());
MethodParameter methodParameter = (MethodParameter) this.parameterList.get(i);
Annotation annotation = this.findMappingAnnotation(methodParameter.getParameterAnnotations());
if (annotation != null) {
if (annotation.annotationType().equals(Payload.class)) {
if (((Payload) annotation).value().length() != 0) {
throw new IllegalStateException(
"The Payload annotation does not support an expression when mapping to a Message.");
}
messageArgumentsMap.put("payload", argumentValue);
if (mappedMessageOrPayload) {
this.throwExceptionForMultipleMessageOrPayloadParameters(methodParameter);
}
mappedMessageOrPayload = true;
}
else if (annotation.annotationType().equals(Header.class)) {
Object[] header = this.mapHeaderThruAnnotation(annotation, message, methodParam, argumentValue);
Object[] header = this.mapHeaderThruAnnotation(annotation, message, methodParameter, argumentValue);
messageArgumentsMap.put((String) header[0], header[1]);
}
else if (annotation.annotationType().equals(Headers.class)) {
@@ -262,11 +269,20 @@ public class ArgumentArrayMessageMapper implements InboundMessageMapper<Object[]
}
mappedMessageOrPayload = true;
}
else {
this.throwExceptionForMultipleMessageOrPayloadParameters(methodParameter);
}
}
Assert.isTrue(mappedMessageOrPayload, "Payload can not be determined from method: " + method);
Assert.isTrue(mappedMessageOrPayload, "unable to determine a Message or payload parameter on method [" + method + "]");
return messageArgumentsMap;
}
private void throwExceptionForMultipleMessageOrPayloadParameters(MethodParameter methodParameter) {
throw new IllegalStateException(
"At most one parameter may be mapped to the payload or Message, " +
"found more than one on method [" + methodParameter.getMethod() + "]");
}
private Message<?> buildMessageFromArgumentMap(Map<String, Object> messageArgumentsMap) {
MessageBuilder<?> builder = null;
Map<String, Object> headers = null;