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

INT-1180 Added a 'requiresReply' header. The default value is FALSE, but Gateway request Messages now have this value set to true whenever the invoked method has a non-void return. This will trigger a MessageHandlingException instead of a timeout downstream if no reply is produced by an instance of AbstractReplyProducingMessageHandler.

Browse Source
This commit is contained in:
Mark Fisher
2010-08-27 21:20:10 +00:00
parent b2d66aeab5
commit 9c55cdf5df
6 changed files with 95 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java
View File

@@ -58,6 +58,8 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
public static final String CORRELATION_ID = PREFIX + "correlationId";
public static final String REQUIRES_REPLY = PREFIX + "requiresReply";
public static final String REPLY_CHANNEL = PREFIX + "replyChannel";
public static final String ERROR_CHANNEL = PREFIX + "errorChannel";
@@ -98,6 +100,11 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
return this.get(REPLY_CHANNEL);
}
public boolean getRequiresReply() {
Boolean headerValue = this.get(REQUIRES_REPLY, Boolean.class);
return (headerValue != null && headerValue);
}
public Object getErrorChannel() {
return this.get(ERROR_CHANNEL);
}

4
spring-integration-core/src/main/java/org/springframework/integration/core/MessageBuilder.java
View File

@@ -167,6 +167,10 @@ public final class MessageBuilder<T> {
return this.setHeader(MessageHeaders.CORRELATION_ID, correlationId);
}
public MessageBuilder<T> setRequiresReply(Boolean requiresReply) {
return this.setHeader(MessageHeaders.REQUIRES_REPLY, requiresReply);
}
public MessageBuilder<T> setReplyChannel(MessageChannel replyChannel) {
return this.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel);
}

4
spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
View File

@@ -109,6 +109,10 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa
throw new MessageHandlingException(message, "handler '" + this
+ "' requires a reply, but no reply was received");
}
if (message != null && message.getHeaders().getRequiresReply()) {
throw new MessageHandlingException(message,
"A reply Message is required by this request Message, but none was received.");
}
if (logger.isDebugEnabled()) {
logger.debug("handler '" + this + "' produced no reply for request Message: " + message);
}

3
spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java
View File

@@ -236,6 +236,9 @@ public class ArgumentArrayMessageMapper implements InboundMessageMapper<Object[]
}
builder.copyHeaders(evaluatedHeaders);
}
if (!void.class.equals(this.method.getReturnType())) {
builder.setRequiresReply(true);
}
return builder.build();
}