From 344e1cecd77b2b97bd9efcc2963b01a5ab19efcf Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 15 Oct 2008 15:55:37 +0000 Subject: [PATCH] Renamed 'returnAddress' in MessageHeaders to 'replyChannel'. --- .../HttpInvokerInboundGatewayTests.java | 2 +- .../AbstractMessageBarrierConsumer.java | 10 +++++----- .../integration/core/MessageHeaders.java | 6 +++--- .../AbstractReplyProducingMessageConsumer.java | 16 ++++++++-------- .../integration/message/MessageBuilder.java | 8 ++++---- .../gateway/GatewayProxyFactoryBeanTests.java | 12 ++++++------ .../gateway/SimpleMessagingGatewayTests.java | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java index 984fb057b1..339eaeec65 100644 --- a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java +++ b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java @@ -66,7 +66,7 @@ public class HttpInvokerInboundGatewayTests { Executors.newSingleThreadExecutor().execute(new Runnable() { public void run() { Message message = channel.receive(); - MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReturnAddress(); + MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReplyChannel(); replyChannel.send(new StringMessage(message.getPayload().toString().toUpperCase())); } }); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java index 86a17c0aa0..caac2a03da 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java @@ -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; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java index 44243f1101..8b66e1fcc2 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java @@ -40,7 +40,7 @@ public final class MessageHeaders implements Map, 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, 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() { diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java index 2ff0e3b241..a1a9b477fa 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java @@ -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() + "]"); } } } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java index 4d0a5a587d..711fd9e339 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java @@ -166,12 +166,12 @@ public final class MessageBuilder { return this.setHeader(MessageHeaders.CORRELATION_ID, correlationId); } - public MessageBuilder setReturnAddress(MessageChannel returnAddress) { - return this.setHeader(MessageHeaders.RETURN_ADDRESS, returnAddress); + public MessageBuilder setReturnAddress(MessageChannel replyChannel) { + return this.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel); } - public MessageBuilder setReturnAddress(String returnAddress) { - return this.setHeader(MessageHeaders.RETURN_ADDRESS, returnAddress); + public MessageBuilder setReturnAddress(String replyChannelName) { + return this.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannelName); } public MessageBuilder setSequenceNumber(Integer sequenceNumber) { diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java index 32777b69d1..e60d883dae 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java @@ -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(); } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java index 82afb75e03..a232acbcfa 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java @@ -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);