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

Renamed 'returnAddress' in MessageHeaders to 'replyChannel'.

Browse Source
This commit is contained in:
Mark Fisher
2008-10-15 15:55:37 +00:00
parent dd8574ccd1
commit 344e1cecd7
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java
View File

@@ -255,13 +255,13 @@ public abstract class AbstractMessageBarrierConsumer extends AbstractMessageCons
}
protected MessageChannel resolveReplyChannelFromMessage(Message<?> message) {
Object returnAddress = message.getHeaders().getReturnAddress();
if (returnAddress != null) {
if (returnAddress instanceof MessageChannel) {
return (MessageChannel) returnAddress;
Object replyChannel = message.getHeaders().getReplyChannel();
if (replyChannel != null) {
if (replyChannel instanceof MessageChannel) {
return (MessageChannel) replyChannel;
}
if (logger.isWarnEnabled()) {
logger.warn("Aggregator can only reply to a 'returnAddress' of type MessageChannel.");
logger.warn("Aggregator can only reply to a 'replyChannel' of type MessageChannel.");
}
}
return null;

6
org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java
View File

@@ -40,7 +40,7 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
public static final String CORRELATION_ID = PREFIX + "correlationId";
public static final String RETURN_ADDRESS = PREFIX + "returnAddress";
public static final String REPLY_CHANNEL = PREFIX + "replyChannel";
public static final String EXPIRATION_DATE = PREFIX + "expirationDate";
@@ -78,8 +78,8 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
return this.get(CORRELATION_ID);
}
public Object getReturnAddress() {
return this.get(RETURN_ADDRESS);
public Object getReplyChannel() {
return this.get(REPLY_CHANNEL);
}
public Integer getSequenceNumber() {

16
org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java
View File

@@ -142,19 +142,19 @@ public abstract class AbstractReplyProducingMessageConsumer extends AbstractMess
private MessageChannel resolveReplyChannel(Message<?> requestMessage) {
MessageChannel replyChannel = this.getOutputChannel();
if (replyChannel == null) {
Object returnAddress = requestMessage.getHeaders().getReturnAddress();
if (returnAddress != null) {
if (returnAddress instanceof MessageChannel) {
replyChannel = (MessageChannel) returnAddress;
Object replyChannelHeader= requestMessage.getHeaders().getReplyChannel();
if (replyChannelHeader != null) {
if (replyChannelHeader instanceof MessageChannel) {
replyChannel = (MessageChannel) replyChannelHeader;
}
else if (returnAddress instanceof String) {
else if (replyChannelHeader instanceof String) {
Assert.state(this.channelResolver != null,
"ChannelResolver is required for resolving a reply channel by name");
replyChannel = this.channelResolver.resolveChannelName((String) returnAddress);
replyChannel = this.channelResolver.resolveChannelName((String) replyChannelHeader);
}
else {
throw new MessagingException("expected a MessageChannel or String for 'returnAddress', but type is ["
+ returnAddress.getClass() + "]");
throw new MessagingException("expected a MessageChannel or String for 'replyChannel', but type is ["
+ replyChannelHeader.getClass() + "]");
}
}
}

8
org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java
View File

@@ -166,12 +166,12 @@ public final class MessageBuilder<T> {
return this.setHeader(MessageHeaders.CORRELATION_ID, correlationId);
}
public MessageBuilder<T> setReturnAddress(MessageChannel returnAddress) {
return this.setHeader(MessageHeaders.RETURN_ADDRESS, returnAddress);
public MessageBuilder<T> setReturnAddress(MessageChannel replyChannel) {
return this.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel);
}
public MessageBuilder<T> setReturnAddress(String returnAddress) {
return this.setHeader(MessageHeaders.RETURN_ADDRESS, returnAddress);
public MessageBuilder<T> setReturnAddress(String replyChannelName) {
return this.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannelName);
}
public MessageBuilder<T> setSequenceNumber(Integer sequenceNumber) {

12
org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java
View File

@@ -88,8 +88,8 @@ public class GatewayProxyFactoryBeanTests {
new Thread(new Runnable() {
public void run() {
Message<?> input = requestChannel.receive();
StringMessage response = new StringMessage(input.getPayload() + "456");
((MessageChannel) input.getHeaders().getReturnAddress()).send(response);
StringMessage reply = new StringMessage(input.getPayload() + "456");
((MessageChannel) input.getHeaders().getReplyChannel()).send(reply);
}
}).start();
GatewayProxyFactoryBean proxyFactory = new GatewayProxyFactoryBean();
@@ -175,8 +175,8 @@ public class GatewayProxyFactoryBeanTests {
new Thread(new Runnable() {
public void run() {
Message<?> input = requestChannel.receive();
StringMessage response = new StringMessage(input.getPayload() + "bar");
((MessageChannel) input.getHeaders().getReturnAddress()).send(response);
StringMessage reply = new StringMessage(input.getPayload() + "bar");
((MessageChannel) input.getHeaders().getReplyChannel()).send(reply);
}
}).start();
GatewayProxyFactoryBean proxyFactory = new GatewayProxyFactoryBean();
@@ -220,8 +220,8 @@ public class GatewayProxyFactoryBeanTests {
new Thread(new Runnable() {
public void run() {
Message<?> input = requestChannel.receive();
StringMessage response = new StringMessage(input.getPayload() + "bar");
((MessageChannel) input.getHeaders().getReturnAddress()).send(response);
StringMessage reply = new StringMessage(input.getPayload() + "bar");
((MessageChannel) input.getHeaders().getReplyChannel()).send(reply);
}
}).start();
}

2
org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java
View File

@@ -203,7 +203,7 @@ public class SimpleMessagingGatewayTests {
//set expectations
expect(replyChannel.getName()).andReturn("replyChannel").anyTimes();
expect(messageMock.getHeaders()).andReturn(messageHeadersMock);
expect(messageHeadersMock.getReturnAddress()).andReturn(replyChannel);
expect(messageHeadersMock.getReplyChannel()).andReturn(replyChannel);
expect(requestChannel.send(messageMock)).andReturn(true);
expect(messageHeadersMock.getId()).andReturn(1);