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

Renamed 'setReturnAddress(MessageChannel)' in MessageBuilder to 'setReplyChannel(MessageChannel)'. Also, the version that takes a String instead of a MessageChannel is now named 'setReplyChannelName(String)' for clarity.

Browse Source
This commit is contained in:
Mark Fisher
2008-10-15 16:08:55 +00:00
parent 344e1cecd7
commit 8e24ef2dd0
12 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java
View File

@@ -249,7 +249,7 @@ public class AggregatorEndpointTests {
.setCorrelationId(correlationId)
.setSequenceSize(sequenceSize)
.setSequenceNumber(sequenceNumber)
.setReturnAddress(replyChannel)
.setReplyChannel(replyChannel)
.build();
return message;
}

2
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java
View File

@@ -143,7 +143,7 @@ public class ResequencerTests {
.setCorrelationId(correlationId)
.setSequenceSize(sequenceSize)
.setSequenceNumber(sequenceNumber)
.setReturnAddress(replyChannel)
.setReplyChannel(replyChannel)
.build();
return message;
}

2
org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java
View File

@@ -64,7 +64,7 @@ public class DefaultMessageBusTests {
context.getBeanFactory().registerSingleton("sourceChannel", sourceChannel);
context.getBeanFactory().registerSingleton("targetChannel", targetChannel);
Message<String> message = MessageBuilder.withPayload("test")
.setReturnAddress("targetChannel").build();
.setReplyChannelName("targetChannel").build();
sourceChannel.send(message);
AbstractReplyProducingMessageConsumer consumer = new AbstractReplyProducingMessageConsumer() {
public void onMessage(Message<?> message, ReplyMessageHolder replyHolder) {

6
org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java
View File

@@ -217,9 +217,9 @@ public class MessageChannelTemplateTests {
}
};
MessageChannelTemplate template = new MessageChannelTemplate();
Message<String> message1 = MessageBuilder.withPayload("test1").setReturnAddress(replyChannel).build();
Message<String> message2 = MessageBuilder.withPayload("test2").setReturnAddress(replyChannel).build();
Message<String> message3 = MessageBuilder.withPayload("test3").setReturnAddress(replyChannel).build();
Message<String> message1 = MessageBuilder.withPayload("test1").setReplyChannel(replyChannel).build();
Message<String> message2 = MessageBuilder.withPayload("test2").setReplyChannel(replyChannel).build();
Message<String> message3 = MessageBuilder.withPayload("test3").setReplyChannel(replyChannel).build();
template.send(message1, this.requestChannel);
template.send(message2, this.requestChannel);
template.send(message3, this.requestChannel);

2
org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
View File

@@ -168,7 +168,7 @@ public class AggregatorParserTests {
.setCorrelationId(correlationId)
.setSequenceSize(sequenceSize)
.setSequenceNumber(sequenceNumber)
.setReturnAddress(outputChannel).build();
.setReplyChannel(outputChannel).build();
}
}

4
org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java
View File

@@ -58,7 +58,7 @@ public class EndpointParserTests {
MessageChannel inputChannel = (MessageChannel) context.getBean("testChannel");
QueueChannel replyChannel = new QueueChannel();
Message<?> message = MessageBuilder.withPayload("test")
.setReturnAddress(replyChannel).build();
.setReplyChannel(replyChannel).build();
inputChannel.send(message);
Message<?> reply = replyChannel.receive(500);
assertNotNull(reply);
@@ -72,7 +72,7 @@ public class EndpointParserTests {
MessageChannel inputChannel = (MessageChannel) context.getBean("testChannel");
MessageChannel replyChannel = new QueueChannel();
Message<?> message = MessageBuilder.withPayload(123)
.setReturnAddress(replyChannel).build();
.setReplyChannel(replyChannel).build();
inputChannel.send(message);
}

2
org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java
View File

@@ -124,7 +124,7 @@ public class ResequencerParserTests {
.setCorrelationId(correlationId)
.setSequenceSize(sequenceSize)
.setSequenceNumber(sequenceNumber)
.setReturnAddress(outputChannel)
.setReplyChannel(outputChannel)
.build();
}

3
org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java
View File

@@ -189,7 +189,8 @@ public class MessagingAnnotationPostProcessorTests {
messageBus.start();
ServiceActivatorAnnotatedBean bean = new ServiceActivatorAnnotatedBean();
postProcessor.postProcessAfterInitialization(bean, "testBean");
Message<?> message = MessageBuilder.withPayload("test").setReturnAddress("outputChannel").build();
Message<?> message = MessageBuilder.withPayload("test")
.setReplyChannelName("outputChannel").build();
inputChannel.send(message);
Message<?> reply = outputChannel.receive(0);
assertNotNull(reply);

10
org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java
View File

@@ -42,7 +42,7 @@ public class ReturnAddressTests {
PollableChannel channel5 = (PollableChannel) context.getBean("channel5");
context.start();
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress(channel5).build();
.setReplyChannel(channel5).build();
channel3.send(message);
Message<?> response = channel5.receive(3000);
assertNotNull(response);
@@ -57,7 +57,7 @@ public class ReturnAddressTests {
PollableChannel channel5 = (PollableChannel) context.getBean("channel5");
context.start();
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress("channel5").build();
.setReplyChannelName("channel5").build();
channel3.send(message);
Message<?> response = channel5.receive(3000);
assertNotNull(response);
@@ -72,7 +72,7 @@ public class ReturnAddressTests {
PollableChannel replyChannel = (PollableChannel) context.getBean("replyChannel");
context.start();
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress(replyChannel).build();
.setReplyChannel(replyChannel).build();
channel1.send(message);
Message<?> response = replyChannel.receive(3000);
assertNotNull(response);
@@ -89,7 +89,7 @@ public class ReturnAddressTests {
PollableChannel replyChannel = (PollableChannel) context.getBean("replyChannel");
context.start();
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress("replyChannel").build();
.setReplyChannelName("replyChannel").build();
channel1.send(message);
Message<?> response = replyChannel.receive(3000);
assertNotNull(response);
@@ -133,7 +133,7 @@ public class ReturnAddressTests {
PollableChannel replyChannel = (PollableChannel) context.getBean("replyChannel");
context.start();
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress("channel5").build();
.setReplyChannelName("channel5").build();
channel4.send(message);
Message<?> response = replyChannel.receive(3000);
assertNotNull(response);

17
org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java
View File

@@ -64,7 +64,7 @@ public class ServiceActivatorEndpointTests {
QueueChannel channel2 = new QueueChannel(1);
ServiceActivatingConsumer endpoint = this.createEndpoint();
endpoint.setOutputChannel(channel1);
Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress(channel2).build();
Message<?> message = MessageBuilder.withPayload("foo").setReplyChannel(channel2).build();
endpoint.onMessage(message);
Message<?> reply1 = channel1.receive(0);
assertNotNull(reply1);
@@ -77,7 +77,7 @@ public class ServiceActivatorEndpointTests {
public void returnAddressHeader() {
QueueChannel channel = new QueueChannel(1);
ServiceActivatingConsumer endpoint = this.createEndpoint();
Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress(channel).build();
Message<?> message = MessageBuilder.withPayload("foo").setReplyChannel(channel).build();
endpoint.onMessage(message);
Message<?> reply = channel.receive(0);
assertNotNull(reply);
@@ -92,7 +92,8 @@ public class ServiceActivatorEndpointTests {
channelResolver.addChannel(channel);
ServiceActivatingConsumer endpoint = this.createEndpoint();
endpoint.setChannelResolver(channelResolver);
Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress("testChannel").build();
Message<?> message = MessageBuilder.withPayload("foo")
.setReplyChannelName("testChannel").build();
endpoint.onMessage(message);
Message<?> reply = channel.receive(0);
assertNotNull(reply);
@@ -115,7 +116,7 @@ public class ServiceActivatorEndpointTests {
channelResolver.addChannel(replyChannel2);
endpoint.setChannelResolver(channelResolver);
Message<String> testMessage1 = MessageBuilder.withPayload("bar")
.setReturnAddress(replyChannel1).build();
.setReplyChannel(replyChannel1).build();
endpoint.onMessage(testMessage1);
Message<?> reply1 = replyChannel1.receive(50);
assertNotNull(reply1);
@@ -123,7 +124,7 @@ public class ServiceActivatorEndpointTests {
Message<?> reply2 = replyChannel2.receive(0);
assertNull(reply2);
Message<String> testMessage2 = MessageBuilder.fromMessage(testMessage1)
.setReturnAddress("replyChannel2").build();
.setReplyChannelName("replyChannel2").build();
endpoint.onMessage(testMessage2);
reply1 = replyChannel1.receive(0);
assertNull(reply1);
@@ -136,7 +137,7 @@ public class ServiceActivatorEndpointTests {
public void noOutputChannelFallsBackToReturnAddress() {
QueueChannel channel = new QueueChannel(1);
ServiceActivatingConsumer endpoint = this.createEndpoint();
Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress(channel).build();
Message<?> message = MessageBuilder.withPayload("foo").setReplyChannel(channel).build();
endpoint.onMessage(message);
Message<?> reply = channel.receive(0);
assertNotNull(reply);
@@ -294,7 +295,7 @@ public class ServiceActivatorEndpointTests {
}
}, "handle");
Message<String> message = MessageBuilder.withPayload("test")
.setReturnAddress(replyChannel).build();
.setReplyChannel(replyChannel).build();
endpoint.onMessage(message);
Message<?> reply = replyChannel.receive(500);
assertNull(reply.getHeaders().getCorrelationId());
@@ -311,7 +312,7 @@ public class ServiceActivatorEndpointTests {
}
}, "handle");
Message<String> message = MessageBuilder.withPayload("test")
.setReturnAddress(replyChannel).build();
.setReplyChannel(replyChannel).build();
endpoint.onMessage(message);
Message<?> reply = replyChannel.receive(500);
Object correlationId = reply.getHeaders().getCorrelationId();