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

Renamed MessageBuilder.fromPayload() to MessageBuilder.withPayload().

Browse Source
This commit is contained in:
Mark Fisher
2008-09-17 22:57:58 +00:00
parent 6d4bc55520
commit 6e56e8acbe
40 changed files with 115 additions and 115 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

@@ -241,7 +241,7 @@ public class AggregatorEndpointTests {
private static Message<?> createMessage(String payload, Object correlationId,
int sequenceSize, int sequenceNumber, MessageChannel replyChannel) {
Message<String> message = MessageBuilder.fromPayload(payload)
Message<String> message = MessageBuilder.withPayload(payload)
.setCorrelationId(correlationId)
.setSequenceSize(sequenceSize)
.setSequenceNumber(sequenceNumber)

12
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java
View File

@@ -32,9 +32,9 @@ public class MessageSequenceComparatorTests {
@Test
public void testLessThan() {
MessageSequenceComparator comparator = new MessageSequenceComparator();
Message<String> message1 = MessageBuilder.fromPayload("test1")
Message<String> message1 = MessageBuilder.withPayload("test1")
.setSequenceNumber(1).build();
Message<String> message2 = MessageBuilder.fromPayload("test2")
Message<String> message2 = MessageBuilder.withPayload("test2")
.setSequenceNumber(2).build();
assertEquals(-1, comparator.compare(message1, message2));
}
@@ -42,9 +42,9 @@ public class MessageSequenceComparatorTests {
@Test
public void testEqual() {
MessageSequenceComparator comparator = new MessageSequenceComparator();
Message<String> message1 = MessageBuilder.fromPayload("test1")
Message<String> message1 = MessageBuilder.withPayload("test1")
.setSequenceNumber(3).build();
Message<String> message2 = MessageBuilder.fromPayload("test2")
Message<String> message2 = MessageBuilder.withPayload("test2")
.setSequenceNumber(3).build();
assertEquals(0, comparator.compare(message1, message2));
}
@@ -52,9 +52,9 @@ public class MessageSequenceComparatorTests {
@Test
public void testGreaterThan() {
MessageSequenceComparator comparator = new MessageSequenceComparator();
Message<String> message1 = MessageBuilder.fromPayload("test1")
Message<String> message1 = MessageBuilder.withPayload("test1")
.setSequenceNumber(5).build();
Message<String> message2 = MessageBuilder.fromPayload("test2")
Message<String> message2 = MessageBuilder.withPayload("test2")
.setSequenceNumber(3).build();
assertEquals(1, comparator.compare(message1, message2));
}

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

@@ -125,7 +125,7 @@ public class ResequencerEndpointTests {
private static Message<?> createMessage(String payload, Object correlationId,
int sequenceSize, int sequenceNumber, MessageChannel replyChannel) {
Message<String> message = MessageBuilder.fromPayload(payload)
Message<String> message = MessageBuilder.withPayload(payload)
.setCorrelationId(correlationId)
.setSequenceSize(sequenceSize)
.setSequenceNumber(sequenceNumber)

6
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java
View File

@@ -35,7 +35,7 @@ public class SequenceSizeCompletionStrategyTests {
@Test
public void testIncompleteList() {
Message<String> message = MessageBuilder.fromPayload("test1")
Message<String> message = MessageBuilder.withPayload("test1")
.setSequenceSize(2).build();
List<Message<?>> messages = new ArrayList<Message<?>>();
messages.add(message);
@@ -45,9 +45,9 @@ public class SequenceSizeCompletionStrategyTests {
@Test
public void testCompleteList() {
Message<String> message1 = MessageBuilder.fromPayload("test1")
Message<String> message1 = MessageBuilder.withPayload("test1")
.setSequenceSize(2).build();
Message<String> message2 = MessageBuilder.fromPayload("test2")
Message<String> message2 = MessageBuilder.withPayload("test2")
.setSequenceSize(2).build();
List<Message<?>> messages = new ArrayList<Message<?>>();
messages.add(message1);

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

@@ -55,7 +55,7 @@ public class DefaultMessageBusTests {
sourceChannel.setBeanName("sourceChannel");
targetChannel.setBeanName("targetChannel");
bus.registerChannel(sourceChannel);
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setReturnAddress("targetChannel").build();
sourceChannel.send(message);
bus.registerChannel(targetChannel);

2
org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java
View File

@@ -101,7 +101,7 @@ public class PriorityChannelTests {
private static Message<String> createPriorityMessage(MessagePriority priority) {
return MessageBuilder.fromPayload("test-" + priority).setPriority(priority).build();
return MessageBuilder.withPayload("test-" + priority).setPriority(priority).build();
}

4
org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java
View File

@@ -225,9 +225,9 @@ public class QueueChannelTests {
long time = System.currentTimeMillis();
long past = time - minute;
long future = time + minute;
Message<String> expiredMessage = MessageBuilder.fromPayload("test1")
Message<String> expiredMessage = MessageBuilder.withPayload("test1")
.setExpirationDate(past).build();
Message<String> unexpiredMessage = MessageBuilder.fromPayload("test2")
Message<String> unexpiredMessage = MessageBuilder.withPayload("test2")
.setExpirationDate(future).build();
assertTrue(channel.send(expiredMessage, 0));
assertTrue(channel.send(unexpiredMessage, 0));

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

@@ -161,11 +161,11 @@ public class ChannelParserTests {
ApplicationContext context = new ClassPathXmlApplicationContext(
"priorityChannelParserTests.xml", this.getClass());
PollableChannel channel = (PollableChannel) context.getBean("priorityChannelWithDefaultComparator");
Message<String> lowPriorityMessage = MessageBuilder.fromPayload("low")
Message<String> lowPriorityMessage = MessageBuilder.withPayload("low")
.setPriority(MessagePriority.LOW).build();
Message<String> midPriorityMessage = MessageBuilder.fromPayload("mid")
Message<String> midPriorityMessage = MessageBuilder.withPayload("mid")
.setPriority(MessagePriority.NORMAL).build();
Message<String> highPriorityMessage = MessageBuilder.fromPayload("high")
Message<String> highPriorityMessage = MessageBuilder.withPayload("high")
.setPriority(MessagePriority.HIGH).build();
channel.send(lowPriorityMessage);
channel.send(highPriorityMessage);

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

@@ -26,7 +26,7 @@ import org.springframework.integration.transformer.Transformer;
public class TestTransformer implements Transformer {
public Message<?> transform(Message<?> message) {
return MessageBuilder.fromPayload(message.getPayload().toString().toUpperCase()).build();
return MessageBuilder.withPayload(message.getPayload().toString().toUpperCase()).build();
}
}

2
org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java
View File

@@ -97,7 +97,7 @@ public class WireTapTests {
QueueChannel secondaryChannel = new QueueChannel();
mainChannel.addInterceptor(new WireTap(secondaryChannel));
String headerName = "testAttribute";
Message<String> message = MessageBuilder.fromPayload("testing")
Message<String> message = MessageBuilder.withPayload("testing")
.setHeader(headerName, new Integer(123)).build();
mainChannel.send(message);
Message<?> original = mainChannel.receive(0);

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

@@ -160,7 +160,7 @@ public class AggregatorParserTests {
private static <T> Message<T> createMessage(T payload, Object correlationId, int sequenceSize, int sequenceNumber,
MessageChannel outputChannel) {
return MessageBuilder.fromPayload(payload)
return MessageBuilder.withPayload(payload)
.setCorrelationId(correlationId)
.setSequenceSize(sequenceSize)
.setSequenceNumber(sequenceNumber)

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

@@ -58,7 +58,7 @@ public class EndpointParserTests {
"endpointWithSelector.xml", this.getClass());
MessageConsumer endpoint = (MessageConsumer) context.getBean("endpoint");
QueueChannel replyChannel = new QueueChannel();
Message<?> message = MessageBuilder.fromPayload("test")
Message<?> message = MessageBuilder.withPayload("test")
.setReturnAddress(replyChannel).build();
endpoint.onMessage(message);
Message<?> reply = replyChannel.receive(500);
@@ -72,7 +72,7 @@ public class EndpointParserTests {
"endpointWithSelector.xml", this.getClass());
MessageConsumer endpoint = (MessageConsumer) context.getBean("endpoint");
MessageChannel replyChannel = new QueueChannel();
Message<?> message = MessageBuilder.fromPayload(123)
Message<?> message = MessageBuilder.withPayload(123)
.setReturnAddress(replyChannel).build();
endpoint.onMessage(message);
}

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

@@ -118,7 +118,7 @@ public class ResequencerParserTests {
private static <T> Message<T> createMessage(T payload, Object correlationId,
int sequenceSize, int sequenceNumber, MessageChannel outputChannel) {
return MessageBuilder.fromPayload(payload)
return MessageBuilder.withPayload(payload)
.setCorrelationId(correlationId)
.setSequenceSize(sequenceSize)
.setSequenceNumber(sequenceNumber)

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

@@ -41,7 +41,7 @@ public class ReturnAddressTests {
MessageChannel channel3 = (MessageChannel) context.getBean("channel3");
PollableChannel channel5 = (PollableChannel) context.getBean("channel5");
context.start();
Message<String> message = MessageBuilder.fromPayload("*")
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress(channel5).build();
channel3.send(message);
Message<?> response = channel5.receive(3000);
@@ -56,7 +56,7 @@ public class ReturnAddressTests {
MessageChannel channel3 = (MessageChannel) context.getBean("channel3");
PollableChannel channel5 = (PollableChannel) context.getBean("channel5");
context.start();
Message<String> message = MessageBuilder.fromPayload("*")
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress("channel5").build();
channel3.send(message);
Message<?> response = channel5.receive(3000);
@@ -71,7 +71,7 @@ public class ReturnAddressTests {
MessageChannel channel1 = (MessageChannel) context.getBean("channel1");
PollableChannel replyChannel = (PollableChannel) context.getBean("replyChannel");
context.start();
Message<String> message = MessageBuilder.fromPayload("*")
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress(replyChannel).build();
channel1.send(message);
Message<?> response = replyChannel.receive(3000);
@@ -88,7 +88,7 @@ public class ReturnAddressTests {
MessageChannel channel1 = (MessageChannel) context.getBean("channel1");
PollableChannel replyChannel = (PollableChannel) context.getBean("replyChannel");
context.start();
Message<String> message = MessageBuilder.fromPayload("*")
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress("replyChannel").build();
channel1.send(message);
Message<?> response = replyChannel.receive(3000);
@@ -132,7 +132,7 @@ public class ReturnAddressTests {
MessageChannel channel4 = (MessageChannel) context.getBean("channel4");
PollableChannel replyChannel = (PollableChannel) context.getBean("replyChannel");
context.start();
Message<String> message = MessageBuilder.fromPayload("*")
Message<String> message = MessageBuilder.withPayload("*")
.setReturnAddress("channel5").build();
channel4.send(message);
Message<?> response = replyChannel.receive(3000);

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

@@ -53,7 +53,7 @@ public class ServiceActivatorEndpointTests {
QueueChannel channel = new QueueChannel(1);
ServiceActivatorEndpoint endpoint = this.createEndpoint();
endpoint.setOutputChannel(channel);
Message<?> message = MessageBuilder.fromPayload("foo").build();
Message<?> message = MessageBuilder.withPayload("foo").build();
endpoint.onMessage(message);
Message<?> reply = channel.receive(0);
assertNotNull(reply);
@@ -66,7 +66,7 @@ public class ServiceActivatorEndpointTests {
QueueChannel channel2 = new QueueChannel(1);
ServiceActivatorEndpoint endpoint = this.createEndpoint();
endpoint.setOutputChannel(channel1);
Message<?> message = MessageBuilder.fromPayload("foo").setReturnAddress(channel2).build();
Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress(channel2).build();
endpoint.onMessage(message);
Message<?> reply1 = channel1.receive(0);
assertNotNull(reply1);
@@ -79,7 +79,7 @@ public class ServiceActivatorEndpointTests {
public void returnAddressHeader() {
QueueChannel channel = new QueueChannel(1);
ServiceActivatorEndpoint endpoint = this.createEndpoint();
Message<?> message = MessageBuilder.fromPayload("foo").setReturnAddress(channel).build();
Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress(channel).build();
endpoint.onMessage(message);
Message<?> reply = channel.receive(0);
assertNotNull(reply);
@@ -94,7 +94,7 @@ public class ServiceActivatorEndpointTests {
channelRegistry.registerChannel(channel);
ServiceActivatorEndpoint endpoint = this.createEndpoint();
endpoint.setChannelRegistry(channelRegistry);
Message<?> message = MessageBuilder.fromPayload("foo").setReturnAddress("testChannel").build();
Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress("testChannel").build();
endpoint.onMessage(message);
Message<?> reply = channel.receive(0);
assertNotNull(reply);
@@ -116,7 +116,7 @@ public class ServiceActivatorEndpointTests {
};
ServiceActivatorEndpoint endpoint = new ServiceActivatorEndpoint(handler, "handle");
endpoint.setChannelRegistry(channelRegistry);
Message<String> testMessage1 = MessageBuilder.fromPayload("bar")
Message<String> testMessage1 = MessageBuilder.withPayload("bar")
.setReturnAddress(replyChannel1).build();
endpoint.onMessage(testMessage1);
Message<?> reply1 = replyChannel1.receive(50);
@@ -138,7 +138,7 @@ public class ServiceActivatorEndpointTests {
public void noOutputChannelFallsBackToReturnAddress() {
QueueChannel channel = new QueueChannel(1);
ServiceActivatorEndpoint endpoint = this.createEndpoint();
Message<?> message = MessageBuilder.fromPayload("foo").setReturnAddress(channel).build();
Message<?> message = MessageBuilder.withPayload("foo").setReturnAddress(channel).build();
endpoint.onMessage(message);
Message<?> reply = channel.receive(0);
assertNotNull(reply);
@@ -148,7 +148,7 @@ public class ServiceActivatorEndpointTests {
@Test(expected = MessagingException.class)
public void noReplyTarget() {
ServiceActivatorEndpoint endpoint = this.createEndpoint();
Message<?> message = MessageBuilder.fromPayload("foo").build();
Message<?> message = MessageBuilder.withPayload("foo").build();
endpoint.onMessage(message);
}
@@ -158,7 +158,7 @@ public class ServiceActivatorEndpointTests {
ServiceActivatorEndpoint endpoint = new ServiceActivatorEndpoint(
new TestNullReplyBean(), "handle");
endpoint.setOutputChannel(channel);
Message<?> message = MessageBuilder.fromPayload("foo").build();
Message<?> message = MessageBuilder.withPayload("foo").build();
endpoint.onMessage(message);
assertNull(channel.receive(0));
}
@@ -170,7 +170,7 @@ public class ServiceActivatorEndpointTests {
new TestNullReplyBean(), "handle");
endpoint.setRequiresReply(true);
endpoint.setOutputChannel(channel);
Message<?> message = MessageBuilder.fromPayload("foo").build();
Message<?> message = MessageBuilder.withPayload("foo").build();
endpoint.onMessage(message);
}
@@ -295,7 +295,7 @@ public class ServiceActivatorEndpointTests {
return message;
}
}, "handle");
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setReturnAddress(replyChannel).build();
endpoint.onMessage(message);
Message<?> reply = replyChannel.receive(500);
@@ -311,7 +311,7 @@ public class ServiceActivatorEndpointTests {
return MessageBuilder.fromMessage(message).build();
}
}, "handle");
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setReturnAddress(replyChannel).build();
endpoint.onMessage(message);
Message<?> reply = replyChannel.receive(500);
@@ -328,7 +328,7 @@ public class ServiceActivatorEndpointTests {
.setCorrelationId("ABC-123").build();
}
}, "handle");
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setReturnAddress(replyChannel).build();
endpoint.onMessage(message);
Message<?> reply = replyChannel.receive(500);

10
org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java
View File

@@ -39,7 +39,7 @@ public class CorrelationIdTests {
@Test
public void testCorrelationIdPassedIfAvailable() {
Object correlationId = "123-ABC";
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setCorrelationId(correlationId).build();
DirectChannel inputChannel = new DirectChannel();
QueueChannel outputChannel = new QueueChannel(1);
@@ -54,7 +54,7 @@ public class CorrelationIdTests {
@Test
public void testCorrelationIdCopiedFromMessageIdByDefault() {
Message<String> message = MessageBuilder.fromPayload("test").build();
Message<String> message = MessageBuilder.withPayload("test").build();
DirectChannel inputChannel = new DirectChannel();
QueueChannel outputChannel = new QueueChannel(1);
ServiceActivatorEndpoint endpoint = new ServiceActivatorEndpoint(new TestBean(), "upperCase");
@@ -68,7 +68,7 @@ public class CorrelationIdTests {
@Test
public void testCorrelationIdCopiedFromMessageCorrelationIdIfAvailable() {
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setCorrelationId("correlationId").build();
DirectChannel inputChannel = new DirectChannel();
QueueChannel outputChannel = new QueueChannel(1);
@@ -85,7 +85,7 @@ public class CorrelationIdTests {
@Test
public void testCorrelationNotPassedFromRequestHeaderIfAlreadySetByHandler() throws Exception {
Object correlationId = "123-ABC";
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setCorrelationId(correlationId).build();
DirectChannel inputChannel = new DirectChannel();
QueueChannel outputChannel = new QueueChannel(1);
@@ -140,7 +140,7 @@ public class CorrelationIdTests {
}
public Message<?> createMessage(String input) {
return MessageBuilder.fromPayload(input).setCorrelationId("456-XYZ").build();
return MessageBuilder.withPayload(input).setCorrelationId("456-XYZ").build();
}
}

2
org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java
View File

@@ -33,7 +33,7 @@ public class ReplyMessageCorrelatorTests {
public void testReceiversPrecedeReply() throws InterruptedException {
final ReplyMessageCorrelator correlator = new ReplyMessageCorrelator();
QueueChannel replyChannel = new QueueChannel();
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setCorrelationId("123").setReturnAddress(replyChannel).build();
correlator.handle(message);
Message<?> reply = replyChannel.receive(0);

16
org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java
View File

@@ -57,7 +57,7 @@ public class MethodArgumentMessageMapperTests {
public void testRequiredHeaderProvided() throws Exception {
Method method = TestService.class.getMethod("requiredHeader", Integer.class);
MethodArgumentMessageMapper<String> mapper = new MethodArgumentMessageMapper<String>(method);
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("num", new Integer(123)).build();
Object[] args = (Object[]) mapper.mapMessage(message);
assertEquals(1, args.length);
@@ -68,7 +68,7 @@ public class MethodArgumentMessageMapperTests {
public void testOptionalAndRequiredHeaderWithOnlyOptionalHeaderProvided() throws Exception {
Method method = TestService.class.getMethod("optionalAndRequiredHeader", String.class, Integer.class);
MethodArgumentMessageMapper<String> mapper = new MethodArgumentMessageMapper<String>(method);
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("prop", "bar").build();
mapper.mapMessage(message);
}
@@ -77,7 +77,7 @@ public class MethodArgumentMessageMapperTests {
public void testOptionalAndRequiredHeaderWithOnlyRequiredHeaderProvided() throws Exception {
Method method = TestService.class.getMethod("optionalAndRequiredHeader", String.class, Integer.class);
MethodArgumentMessageMapper<String> mapper = new MethodArgumentMessageMapper<String>(method);
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("num", new Integer(123)).build();
Object[] args = (Object[]) mapper.mapMessage(message);
assertEquals(2, args.length);
@@ -89,7 +89,7 @@ public class MethodArgumentMessageMapperTests {
public void testOptionalAndRequiredHeaderWithBothHeadersProvided() throws Exception {
Method method = TestService.class.getMethod("optionalAndRequiredHeader", String.class, Integer.class);
MethodArgumentMessageMapper<String> mapper = new MethodArgumentMessageMapper<String>(method);
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("num", new Integer(123))
.setHeader("prop", "bar")
.build();
@@ -103,7 +103,7 @@ public class MethodArgumentMessageMapperTests {
public void testPropertiesMethodWithNonPropertiesPayload() throws Exception {
Method method = TestService.class.getMethod("propertiesMethod", Properties.class);
MethodArgumentMessageMapper<String> mapper = new MethodArgumentMessageMapper<String>(method);
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("prop1", "foo").setHeader("prop2", "bar").build();
Object[] args = (Object[]) mapper.mapMessage(message);
Properties result = (Properties) args[0];
@@ -119,7 +119,7 @@ public class MethodArgumentMessageMapperTests {
Properties payload = new Properties();
payload.setProperty("prop1", "foo");
payload.setProperty("prop2", "bar");
Message<Properties> message = MessageBuilder.fromPayload(payload)
Message<Properties> message = MessageBuilder.withPayload(payload)
.setHeader("prop1", "not").setHeader("prop2", "these").build();
Object[] args = (Object[]) mapper.mapMessage(message);
Properties result = (Properties) args[0];
@@ -133,7 +133,7 @@ public class MethodArgumentMessageMapperTests {
public void testMapMethodWithNonMapPayload() throws Exception {
Method method = TestService.class.getMethod("mapMethod", Map.class);
MethodArgumentMessageMapper<String> mapper = new MethodArgumentMessageMapper<String>(method);
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("attrib1", new Integer(123))
.setHeader("attrib2", new Integer(456)).build();
Object[] args = (Object[]) mapper.mapMessage(message);
@@ -150,7 +150,7 @@ public class MethodArgumentMessageMapperTests {
Map<String, Integer> payload = new HashMap<String, Integer>();
payload.put("attrib1", new Integer(123));
payload.put("attrib2", new Integer(456));
Message<Map<String, Integer>> message = MessageBuilder.fromPayload(payload)
Message<Map<String, Integer>> message = MessageBuilder.withPayload(payload)
.setHeader("attrib1", new Integer(123))
.setHeader("attrib2", new Integer(456)).build();
Object[] args = (Object[]) mapper.mapMessage(message);

26
org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java
View File

@@ -30,13 +30,13 @@ public class MessageBuilderTests {
@Test
public void testSimpleMessageCreation() {
Message<String> message = MessageBuilder.fromPayload("foo").build();
Message<String> message = MessageBuilder.withPayload("foo").build();
assertEquals("foo", message.getPayload());
}
@Test
public void testHeaderValues() {
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("foo", "bar")
.setHeader("count", new Integer(123))
.build();
@@ -46,11 +46,11 @@ public class MessageBuilderTests {
@Test
public void testCopiedHeaderValues() {
Message<String> message1 = MessageBuilder.fromPayload("test1")
Message<String> message1 = MessageBuilder.withPayload("test1")
.setHeader("foo", "1")
.setHeader("bar", "2")
.build();
Message<String> message2 = MessageBuilder.fromPayload("test2")
Message<String> message2 = MessageBuilder.withPayload("test2")
.copyHeaders(message1.getHeaders())
.setHeader("foo", "42")
.setHeaderIfAbsent("bar", "99")
@@ -65,9 +65,9 @@ public class MessageBuilderTests {
@Test
public void copyHeadersIfAbsent() {
Message<String> message1 = MessageBuilder.fromPayload("test1")
Message<String> message1 = MessageBuilder.withPayload("test1")
.setHeader("foo", "bar").build();
Message<String> message2 = MessageBuilder.fromPayload("test2")
Message<String> message2 = MessageBuilder.withPayload("test2")
.setHeader("foo", 123)
.copyHeadersIfAbsent(message1.getHeaders())
.build();
@@ -77,7 +77,7 @@ public class MessageBuilderTests {
@Test
public void createFromMessage() {
Message<String> message1 = MessageBuilder.fromPayload("test")
Message<String> message1 = MessageBuilder.withPayload("test")
.setHeader("foo", "bar").build();
Message<String> message2 = MessageBuilder.fromMessage(message1).build();
assertEquals("test", message2.getPayload());
@@ -86,14 +86,14 @@ public class MessageBuilderTests {
@Test
public void testPriority() {
Message<Integer> importantMessage = MessageBuilder.fromPayload(1)
Message<Integer> importantMessage = MessageBuilder.withPayload(1)
.setPriority(MessagePriority.HIGHEST).build();
assertEquals(MessagePriority.HIGHEST, importantMessage.getHeaders().getPriority());
}
@Test
public void testNonDestructiveSet() {
Message<Integer> message1 = MessageBuilder.fromPayload(1)
Message<Integer> message1 = MessageBuilder.withPayload(1)
.setPriority(MessagePriority.HIGHEST).build();
Message<Integer> message2 = MessageBuilder.fromMessage(message1)
.setHeaderIfAbsent(MessageHeaders.PRIORITY, MessagePriority.LOW)
@@ -104,7 +104,7 @@ public class MessageBuilderTests {
@Test
public void testExpirationDateSetAsLong() {
Long past = System.currentTimeMillis() - (60 * 1000);
Message<Integer> expiredMessage = MessageBuilder.fromPayload(1)
Message<Integer> expiredMessage = MessageBuilder.withPayload(1)
.setExpirationDate(past).build();
assertEquals(past, expiredMessage.getHeaders().getExpirationDate());
}
@@ -112,14 +112,14 @@ public class MessageBuilderTests {
@Test
public void testExpirationDateSetAsDate() {
Long past = System.currentTimeMillis() - (60 * 1000);
Message<Integer> expiredMessage = MessageBuilder.fromPayload(1)
Message<Integer> expiredMessage = MessageBuilder.withPayload(1)
.setExpirationDate(new Date(past)).build();
assertEquals(past, expiredMessage.getHeaders().getExpirationDate());
}
@Test
public void testRemove() {
Message<Integer> message1 = MessageBuilder.fromPayload(1)
Message<Integer> message1 = MessageBuilder.withPayload(1)
.setHeader("foo", "bar").build();
Message<Integer> message2 = MessageBuilder.fromMessage(message1)
.removeHeader("foo")
@@ -129,7 +129,7 @@ public class MessageBuilderTests {
@Test
public void testSettingToNullRemoves() {
Message<Integer> message1 = MessageBuilder.fromPayload(1)
Message<Integer> message1 = MessageBuilder.withPayload(1)
.setHeader("foo", "bar").build();
Message<Integer> message2 = MessageBuilder.fromMessage(message1)
.setHeader("foo", null)

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

@@ -81,9 +81,9 @@ public class MessageChannelTemplateTests {
}
};
MessageChannelTemplate template = new MessageChannelTemplate();
Message<String> message1 = MessageBuilder.fromPayload("test1").setReturnAddress(replyChannel).build();
Message<String> message2 = MessageBuilder.fromPayload("test2").setReturnAddress(replyChannel).build();
Message<String> message3 = MessageBuilder.fromPayload("test3").setReturnAddress(replyChannel).build();
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();
template.send(message1, this.requestChannel);
template.send(message2, this.requestChannel);
template.send(message3, this.requestChannel);

6
org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java
View File

@@ -88,7 +88,7 @@ public class MessageMappingMethodInvokerTests {
public void payloadAndHeaderAnnotationMethodParametersAndObjectAsReturnValue() {
MessageMappingMethodInvoker invoker = new MessageMappingMethodInvoker(
new TestBean(), "acceptPayloadAndHeaderAndReturnObject");
Message<?> request = MessageBuilder.fromPayload("testing")
Message<?> request = MessageBuilder.withPayload("testing")
.setHeader("number", new Integer(123)).build();
Object result = invoker.invokeMethod(request);
assertEquals("testing-123", result);
@@ -135,7 +135,7 @@ public class MessageMappingMethodInvokerTests {
AnnotatedTestService service = new AnnotatedTestService();
Method method = service.getClass().getMethod("messageAndHeader", Message.class, Integer.class);
MessageMappingMethodInvoker invoker = new MessageMappingMethodInvoker(service, method);
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("number", 42).build();
Object result = invoker.invokeMethod(message);
assertEquals("foo-42", result);
@@ -146,7 +146,7 @@ public class MessageMappingMethodInvokerTests {
AnnotatedTestService service = new AnnotatedTestService();
Method method = service.getClass().getMethod("twoHeaders", String.class, Integer.class);
MessageMappingMethodInvoker invoker = new MessageMappingMethodInvoker(service, method);
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("prop", "bar")
.setHeader("number", 42).build();
Object result = invoker.invokeMethod(message);

6
org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java
View File

@@ -32,7 +32,7 @@ public class UnexpiredMessageSelectorTests {
@Test
public void testExpiredMessageRejected() {
long past = System.currentTimeMillis() - 60000;
Message<String> message = MessageBuilder.fromPayload("expired")
Message<String> message = MessageBuilder.withPayload("expired")
.setExpirationDate(past).build();
UnexpiredMessageSelector selector = new UnexpiredMessageSelector();
assertFalse(selector.accept(message));
@@ -41,7 +41,7 @@ public class UnexpiredMessageSelectorTests {
@Test
public void testUnexpiredMessageAccepted() {
long future = System.currentTimeMillis() + 60000;
Message<String> message = MessageBuilder.fromPayload("unexpired")
Message<String> message = MessageBuilder.withPayload("unexpired")
.setExpirationDate(future).build();
UnexpiredMessageSelector selector = new UnexpiredMessageSelector();
assertTrue(selector.accept(message));
@@ -49,7 +49,7 @@ public class UnexpiredMessageSelectorTests {
@Test
public void testMessageWithNullExpirationDateNeverExpires() {
Message<String> message = MessageBuilder.fromPayload("unexpired").build();
Message<String> message = MessageBuilder.withPayload("unexpired").build();
UnexpiredMessageSelector selector = new UnexpiredMessageSelector();
assertTrue(selector.accept(message));
}

2
org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java
View File

@@ -92,7 +92,7 @@ public class MethodInvokingRouterTests {
MethodInvokingChannelResolver resolver = new MethodInvokingChannelResolver(testBean, routingMethod);
RouterEndpoint endpoint = new RouterEndpoint(resolver);
endpoint.setChannelRegistry(channelRegistry);
Message<String> message = MessageBuilder.fromPayload("bar")
Message<String> message = MessageBuilder.withPayload("bar")
.setHeader("targetChannel", "foo").build();
endpoint.onMessage(message);
Message<?> fooReply = fooChannel.receive(0);

4
org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java
View File

@@ -35,7 +35,7 @@ public class DefaultSplitterTests {
@Test
public void splitMessageWithArrayPayload() throws Exception {
String[] payload = new String[] { "x", "y", "z" };
Message<String[]> message = MessageBuilder.fromPayload(payload).build();
Message<String[]> message = MessageBuilder.withPayload(payload).build();
DefaultSplitter splitter = new DefaultSplitter();
List<Message<?>> replies = splitter.split(message);
assertEquals(3, replies.size());
@@ -53,7 +53,7 @@ public class DefaultSplitterTests {
@Test
public void splitMessageWithCollectionPayload() throws Exception {
List<String> payload = Arrays.asList(new String[] { "x", "y", "z" });
Message<List<String>> message = MessageBuilder.fromPayload(payload).build();
Message<List<String>> message = MessageBuilder.withPayload(payload).build();
DefaultSplitter splitter = new DefaultSplitter();
List<Message<?>> replies = splitter.split(message);
assertEquals(3, replies.size());

4
org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java
View File

@@ -283,7 +283,7 @@ public class MethodInvokingSplitterTests {
@Test
public void splitMessageHeader() throws Exception {
Message<String> message = MessageBuilder.fromPayload("ignored")
Message<String> message = MessageBuilder.withPayload("ignored")
.setHeader("testHeader", "foo.bar").build();
MethodInvokingSplitter splitter = this.getSplitter("splitHeader");
List<Message<?>> replies = splitter.split(message);
@@ -297,7 +297,7 @@ public class MethodInvokingSplitterTests {
@Test
public void splitPayloadAndHeader() throws Exception {
Message<String> message = MessageBuilder.fromPayload("a.b")
Message<String> message = MessageBuilder.withPayload("a.b")
.setHeader("testHeader", "c.d").build();
Method splittingMethod = this.testBean.getClass().getMethod("splitPayloadAndHeader", String.class, String.class);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, splittingMethod);

6
org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java
View File

@@ -39,7 +39,7 @@ public class HeaderTransformerTests {
headers.put("header2", "baz");
}
};
Message<String> message = MessageBuilder.fromPayload("foo").setHeader("header1", "bar").build();
Message<String> message = MessageBuilder.withPayload("foo").setHeader("header1", "bar").build();
Message<?> result = transformer.transform(message);
assertEquals("bar", result.getHeaders().get("header1"));
assertEquals("baz", result.getHeaders().get("header2"));
@@ -53,7 +53,7 @@ public class HeaderTransformerTests {
headers.put("header1", "baz");
}
};
Message<String> message = MessageBuilder.fromPayload("foo").setHeader("header1", "bar").build();
Message<String> message = MessageBuilder.withPayload("foo").setHeader("header1", "bar").build();
Message<?> result = transformer.transform(message);
assertEquals("baz", result.getHeaders().get("header1"));
}
@@ -66,7 +66,7 @@ public class HeaderTransformerTests {
headers.remove("header1");
}
};
Message<String> message = MessageBuilder.fromPayload("foo").setHeader("header1", "bar").build();
Message<String> message = MessageBuilder.withPayload("foo").setHeader("header1", "bar").build();
Message<?> result = transformer.transform(message);
assertNull(result.getHeaders().get("header1"));
}

14
org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java
View File

@@ -98,7 +98,7 @@ public class MethodInvokingTransformerTests {
TestBean testBean = new TestBean();
Method testMethod = testBean.getClass().getMethod("headerTest", String.class, Integer.class);
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("number", 123).build();
Message<?> result = transformer.transform(message);
assertEquals("foo123", result.getPayload());
@@ -108,7 +108,7 @@ public class MethodInvokingTransformerTests {
public void headerAnnotationConfiguredWithMethodName() throws Exception {
TestBean testBean = new TestBean();
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "headerTest");
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("number", 123).build();
Message<?> result = transformer.transform(message);
assertEquals("foo123", result.getPayload());
@@ -119,7 +119,7 @@ public class MethodInvokingTransformerTests {
TestBean testBean = new TestBean();
Method testMethod = testBean.getClass().getMethod("headerTest", String.class, Integer.class);
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
Message<String> message = MessageBuilder.fromPayload("foo")
Message<String> message = MessageBuilder.withPayload("foo")
.setHeader("wrong", 123).build();
transformer.transform(message);
}
@@ -129,7 +129,7 @@ public class MethodInvokingTransformerTests {
TestBean testBean = new TestBean();
Method testMethod = testBean.getClass().getMethod("optionalHeaderTest", String.class, Integer.class);
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
Message<String> message = MessageBuilder.fromPayload("foo").setHeader("number", 99).build();
Message<String> message = MessageBuilder.withPayload("foo").setHeader("number", 99).build();
Message<?> result = transformer.transform(message);
assertEquals("foo99", result.getPayload());
}
@@ -139,7 +139,7 @@ public class MethodInvokingTransformerTests {
TestBean testBean = new TestBean();
Method testMethod = testBean.getClass().getMethod("optionalHeaderTest", String.class, Integer.class);
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
Message<String> message = MessageBuilder.fromPayload("foo").build();
Message<String> message = MessageBuilder.withPayload("foo").build();
Message<?> result = transformer.transform(message);
assertEquals("foonull", result.getPayload());
}
@@ -149,7 +149,7 @@ public class MethodInvokingTransformerTests {
TestBean testBean = new TestBean();
Method testMethod = testBean.getClass().getMethod("propertyEnricherTest", String.class);
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, testMethod);
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("prop1", "bad")
.setHeader("prop3", "baz").build();
Message<?> result = transformer.transform(message);
@@ -163,7 +163,7 @@ public class MethodInvokingTransformerTests {
public void headerEnricherConfiguredWithMethodName() throws Exception {
TestBean testBean = new TestBean();
MethodInvokingTransformer transformer = new MethodInvokingTransformer(testBean, "propertyEnricherTest");
Message<String> message = MessageBuilder.fromPayload("test")
Message<String> message = MessageBuilder.withPayload("test")
.setHeader("prop1", "bad")
.setHeader("prop3", "baz").build();
Message<?> result = transformer.transform(message);