diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java index 07edacdf67..80bc0a9b2c 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java @@ -55,7 +55,7 @@ public class HeaderMappingMessageConverter implements MessageConverter { public Object fromMessage(javax.jms.Message jmsMessage) throws JMSException, MessageConversionException { Object payload = this.converter.fromMessage(jmsMessage); Map headerMap = this.headerMapper.mapToMessageHeaders(jmsMessage); - Message message = MessageBuilder.fromPayload(payload).copyHeaders(headerMap).build(); + Message message = MessageBuilder.withPayload(payload).copyHeaders(headerMap).build(); return message; } diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/DefaultFileNameGeneratorTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/DefaultFileNameGeneratorTests.java index 21c5bf2a71..7482523471 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/DefaultFileNameGeneratorTests.java +++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/file/DefaultFileNameGeneratorTests.java @@ -32,7 +32,7 @@ public class DefaultFileNameGeneratorTests { @Test public void testWithFileNamePropertyProvided() { - Message message = MessageBuilder.fromPayload("testing") + Message message = MessageBuilder.withPayload("testing") .setHeader(FileNameGenerator.FILENAME_PROPERTY_KEY, "foo.bar").build(); FileNameGenerator generator = new DefaultFileNameGenerator(); String filename = generator.generateFileName(message); diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java index 3779ddcea3..158aa82a46 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java +++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java @@ -38,7 +38,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testJmsReplyToMappedFromHeader() throws JMSException { Destination replyTo = new Destination() {}; - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.REPLY_TO, replyTo).build(); DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper(); javax.jms.Message jmsMessage = new StubTextMessage(); @@ -49,7 +49,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testJmsReplyToIgnoredIfIncorrectType() throws JMSException { - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.REPLY_TO, "not-a-destination").build(); DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper(); javax.jms.Message jmsMessage = new StubTextMessage(); @@ -60,7 +60,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testJmsCorrelationIdMappedFromHeader() throws JMSException { String jmsCorrelationId = "ABC-123"; - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.CORRELATION_ID, jmsCorrelationId).build(); DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper(); javax.jms.Message jmsMessage = new StubTextMessage(); @@ -71,7 +71,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testJmsCorrelationIdIgnoredIfIncorrectType() throws JMSException { - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.CORRELATION_ID, new Integer(123)).build(); DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper(); javax.jms.Message jmsMessage = new StubTextMessage(); @@ -82,7 +82,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testJmsTypeMappedFromHeader() throws JMSException { String jmsType = "testing"; - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.TYPE, jmsType).build(); DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper(); javax.jms.Message jmsMessage = new StubTextMessage(); @@ -93,7 +93,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testJmsTypeIgnoredIfIncorrectType() throws JMSException { - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.TYPE, new Integer(123)).build(); DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper(); javax.jms.Message jmsMessage = new StubTextMessage(); @@ -103,7 +103,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testUserDefinedPropertyMappedFromHeader() throws JMSException { - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.USER_PREFIX + "foo", new Integer(123)) .build(); DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper(); @@ -118,7 +118,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testUserDefinedPropertyWithUnsupportedType() throws JMSException { Destination destination = new Destination() {}; - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.USER_PREFIX + "destination", destination) .build(); DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper(); @@ -178,7 +178,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testJMSExceptionIsNotFatal() throws JMSException { - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.USER_PREFIX + "foo", new Integer(123)) .setHeader(JmsHeaders.USER_PREFIX + "bad", new Integer(456)) .setHeader(JmsHeaders.USER_PREFIX + "bar", new Integer(789)) @@ -204,7 +204,7 @@ public class DefaultJmsHeaderMapperTests { @Test public void testIllegalArgumentExceptionIsNotFatal() throws JMSException { - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader(JmsHeaders.USER_PREFIX + "foo", new Integer(123)) .setHeader(JmsHeaders.USER_PREFIX + "bad", new Integer(456)) .setHeader(JmsHeaders.USER_PREFIX + "bar", new Integer(789)) diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java index f3d25c5296..c361b44132 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java +++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java @@ -94,7 +94,7 @@ public class MailTargetTests { @Test public void testDefaultMailHeaderGenerator() { org.springframework.integration.message.Message message = - MessageBuilder.fromPayload(MailTestsHelper.MESSAGE_TEXT) + MessageBuilder.withPayload(MailTestsHelper.MESSAGE_TEXT) .setHeader(MailHeaders.SUBJECT, MailTestsHelper.SUBJECT) .setHeader(MailHeaders.TO, MailTestsHelper.TO) .setHeader(MailHeaders.CC, MailTestsHelper.CC) diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/RmiHandlerTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/RmiHandlerTests.java index 1ff94a891d..7d8a3658d5 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/RmiHandlerTests.java +++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/RmiHandlerTests.java @@ -61,7 +61,7 @@ public class RmiHandlerTests { @Test public void testSerializableAttribute() throws RemoteException { - Message requestMessage = MessageBuilder.fromPayload("test") + Message requestMessage = MessageBuilder.withPayload("test") .setHeader("testAttribute", "foo").build(); Message replyMessage = handler.handle(requestMessage); assertNotNull(replyMessage); @@ -77,7 +77,7 @@ public class RmiHandlerTests { @Test(expected=MessageHandlingException.class) public void testNonSerializableAttribute() throws RemoteException { - Message requestMessage = MessageBuilder.fromPayload("test") + Message requestMessage = MessageBuilder.withPayload("test") .setHeader("testAttribute", new NonSerializableTestObject()).build(); handler.handle(requestMessage); } diff --git a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java index 2d89f14dc6..b9c167d02f 100644 --- a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java +++ b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java @@ -64,7 +64,7 @@ public class ApplicationEventInboundChannelAdapter extends AbstractMessageProduc } private boolean sendEventAsMessage(ApplicationEvent event) { - return this.sendMessage(MessageBuilder.fromPayload(event).build()); + return this.sendMessage(MessageBuilder.withPayload(event).build()); } } diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java index 3a03db27aa..3690219b90 100644 --- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java +++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java @@ -40,7 +40,7 @@ public class WebServiceDemo { // Create the Message object // In this case the service expects a SoapAction header - Message message = MessageBuilder.fromPayload(requestXml) + Message message = MessageBuilder.withPayload(requestXml) .setHeader(AbstractWebServiceHandler.SOAP_ACTION_PROPERTY_KEY, "http://tempuri.org/FahrenheitToCelsius") .build(); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractInOutEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractInOutEndpoint.java index f067d291be..236fd0aa01 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractInOutEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractInOutEndpoint.java @@ -158,7 +158,7 @@ public abstract class AbstractInOutEndpoint extends AbstractMessageConsumingEndp builder = MessageBuilder.fromMessage((Message) result); } else { - builder = MessageBuilder.fromPayload(result); + builder = MessageBuilder.withPayload(result); } return builder.copyHeadersIfAbsent(requestHeaders) .setHeaderIfAbsent(MessageHeaders.CORRELATION_ID, requestHeaders.getId()) 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 02cdb42e8b..2ce61d00f3 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 @@ -64,7 +64,7 @@ public final class MessageBuilder { * * @param payload the payload for the new message */ - public static MessageBuilder fromPayload(T payload) { + public static MessageBuilder withPayload(T payload) { MessageBuilder builder = new MessageBuilder(payload); return builder; } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractSplitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractSplitter.java index b4ee40ebd1..b8b4387daa 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractSplitter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractSplitter.java @@ -65,7 +65,7 @@ public abstract class AbstractSplitter implements Splitter { return setSplitMessageHeaders(MessageBuilder.fromMessage((Message) item), requestHeaders.getId(), sequenceNumber, sequenceSize); } - return setSplitMessageHeaders(MessageBuilder.fromPayload(item), + return setSplitMessageHeaders(MessageBuilder.withPayload(item), requestHeaders.getId(), sequenceNumber, sequenceSize); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java index c8fd9698e2..1e274c5fa1 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java @@ -35,7 +35,7 @@ public abstract class AbstractHeaderTransformer implements Transformer { try { Map headerMap = new HashMap(message.getHeaders()); this.transformHeaders(headerMap); - return MessageBuilder.fromPayload(message.getPayload()).copyHeaders(headerMap).build(); + return MessageBuilder.withPayload(message.getPayload()).copyHeaders(headerMap).build(); } catch (Exception e) { throw new MessagingException(message, "failed to transform message headers", e); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java index 5f52c73663..1b8dfbcdd3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java @@ -32,7 +32,7 @@ public abstract class AbstractPayloadTransformer implements Transformer { try { @SuppressWarnings("unchecked") U result = this.transformPayload((T) message.getPayload()); - return MessageBuilder.fromPayload(result).copyHeaders(message.getHeaders()).build(); + return MessageBuilder.withPayload(result).copyHeaders(message.getHeaders()).build(); } catch (Exception e) { throw new MessagingException(message, "failed to transform message payload", e); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java index ea2476978b..31148052c7 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java @@ -66,7 +66,7 @@ public class MethodInvokingTransformer implements Transformer { return builder.build(); } else { - return MessageBuilder.fromPayload(result).copyHeaders(message.getHeaders()).build(); + return MessageBuilder.withPayload(result).copyHeaders(message.getHeaders()).build(); } } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java index 99458895cd..6dcfc8b7b6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java @@ -241,7 +241,7 @@ public class AggregatorEndpointTests { private static Message createMessage(String payload, Object correlationId, int sequenceSize, int sequenceNumber, MessageChannel replyChannel) { - Message message = MessageBuilder.fromPayload(payload) + Message message = MessageBuilder.withPayload(payload) .setCorrelationId(correlationId) .setSequenceSize(sequenceSize) .setSequenceNumber(sequenceNumber) diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java index dd477621a0..427306d513 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java @@ -32,9 +32,9 @@ public class MessageSequenceComparatorTests { @Test public void testLessThan() { MessageSequenceComparator comparator = new MessageSequenceComparator(); - Message message1 = MessageBuilder.fromPayload("test1") + Message message1 = MessageBuilder.withPayload("test1") .setSequenceNumber(1).build(); - Message message2 = MessageBuilder.fromPayload("test2") + Message 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 message1 = MessageBuilder.fromPayload("test1") + Message message1 = MessageBuilder.withPayload("test1") .setSequenceNumber(3).build(); - Message message2 = MessageBuilder.fromPayload("test2") + Message 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 message1 = MessageBuilder.fromPayload("test1") + Message message1 = MessageBuilder.withPayload("test1") .setSequenceNumber(5).build(); - Message message2 = MessageBuilder.fromPayload("test2") + Message message2 = MessageBuilder.withPayload("test2") .setSequenceNumber(3).build(); assertEquals(1, comparator.compare(message1, message2)); } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerEndpointTests.java index 32796fff19..8be2517686 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerEndpointTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerEndpointTests.java @@ -125,7 +125,7 @@ public class ResequencerEndpointTests { private static Message createMessage(String payload, Object correlationId, int sequenceSize, int sequenceNumber, MessageChannel replyChannel) { - Message message = MessageBuilder.fromPayload(payload) + Message message = MessageBuilder.withPayload(payload) .setCorrelationId(correlationId) .setSequenceSize(sequenceSize) .setSequenceNumber(sequenceNumber) diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java index 9cff953a10..278cf66b4d 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java @@ -35,7 +35,7 @@ public class SequenceSizeCompletionStrategyTests { @Test public void testIncompleteList() { - Message message = MessageBuilder.fromPayload("test1") + Message message = MessageBuilder.withPayload("test1") .setSequenceSize(2).build(); List> messages = new ArrayList>(); messages.add(message); @@ -45,9 +45,9 @@ public class SequenceSizeCompletionStrategyTests { @Test public void testCompleteList() { - Message message1 = MessageBuilder.fromPayload("test1") + Message message1 = MessageBuilder.withPayload("test1") .setSequenceSize(2).build(); - Message message2 = MessageBuilder.fromPayload("test2") + Message message2 = MessageBuilder.withPayload("test2") .setSequenceSize(2).build(); List> messages = new ArrayList>(); messages.add(message1); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java index b559c294ca..e28f37d825 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java @@ -55,7 +55,7 @@ public class DefaultMessageBusTests { sourceChannel.setBeanName("sourceChannel"); targetChannel.setBeanName("targetChannel"); bus.registerChannel(sourceChannel); - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setReturnAddress("targetChannel").build(); sourceChannel.send(message); bus.registerChannel(targetChannel); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java index d342656399..6de915d24f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java @@ -101,7 +101,7 @@ public class PriorityChannelTests { private static Message createPriorityMessage(MessagePriority priority) { - return MessageBuilder.fromPayload("test-" + priority).setPriority(priority).build(); + return MessageBuilder.withPayload("test-" + priority).setPriority(priority).build(); } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java index 9ed770823f..cbb6ac6c5f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java @@ -225,9 +225,9 @@ public class QueueChannelTests { long time = System.currentTimeMillis(); long past = time - minute; long future = time + minute; - Message expiredMessage = MessageBuilder.fromPayload("test1") + Message expiredMessage = MessageBuilder.withPayload("test1") .setExpirationDate(past).build(); - Message unexpiredMessage = MessageBuilder.fromPayload("test2") + Message unexpiredMessage = MessageBuilder.withPayload("test2") .setExpirationDate(future).build(); assertTrue(channel.send(expiredMessage, 0)); assertTrue(channel.send(unexpiredMessage, 0)); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java index b27cba07ab..74d58ae8b6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java @@ -161,11 +161,11 @@ public class ChannelParserTests { ApplicationContext context = new ClassPathXmlApplicationContext( "priorityChannelParserTests.xml", this.getClass()); PollableChannel channel = (PollableChannel) context.getBean("priorityChannelWithDefaultComparator"); - Message lowPriorityMessage = MessageBuilder.fromPayload("low") + Message lowPriorityMessage = MessageBuilder.withPayload("low") .setPriority(MessagePriority.LOW).build(); - Message midPriorityMessage = MessageBuilder.fromPayload("mid") + Message midPriorityMessage = MessageBuilder.withPayload("mid") .setPriority(MessagePriority.NORMAL).build(); - Message highPriorityMessage = MessageBuilder.fromPayload("high") + Message highPriorityMessage = MessageBuilder.withPayload("high") .setPriority(MessagePriority.HIGH).build(); channel.send(lowPriorityMessage); channel.send(highPriorityMessage); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestTransformer.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestTransformer.java index a14d7fd08e..38c8e72864 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestTransformer.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestTransformer.java @@ -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(); } } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java index 49df958fa2..bc7a9a222d 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java @@ -97,7 +97,7 @@ public class WireTapTests { QueueChannel secondaryChannel = new QueueChannel(); mainChannel.addInterceptor(new WireTap(secondaryChannel)); String headerName = "testAttribute"; - Message message = MessageBuilder.fromPayload("testing") + Message message = MessageBuilder.withPayload("testing") .setHeader(headerName, new Integer(123)).build(); mainChannel.send(message); Message original = mainChannel.receive(0); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index a6a4eebe2f..861795a16a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -160,7 +160,7 @@ public class AggregatorParserTests { private static Message 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) diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java index 5de34b920c..b32be1fd3b 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java @@ -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); } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java index f016bc87d7..9a7bbb3a64 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java @@ -118,7 +118,7 @@ public class ResequencerParserTests { private static Message 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) diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java index 0a6e2a316a..b5dce559f5 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java @@ -41,7 +41,7 @@ public class ReturnAddressTests { MessageChannel channel3 = (MessageChannel) context.getBean("channel3"); PollableChannel channel5 = (PollableChannel) context.getBean("channel5"); context.start(); - Message message = MessageBuilder.fromPayload("*") + Message 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 message = MessageBuilder.fromPayload("*") + Message 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 message = MessageBuilder.fromPayload("*") + Message 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 message = MessageBuilder.fromPayload("*") + Message 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 message = MessageBuilder.fromPayload("*") + Message message = MessageBuilder.withPayload("*") .setReturnAddress("channel5").build(); channel4.send(message); Message response = replyChannel.receive(3000); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java index 7d6614ff85..a8bef339af 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java @@ -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 testMessage1 = MessageBuilder.fromPayload("bar") + Message 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 message = MessageBuilder.fromPayload("test") + Message 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 message = MessageBuilder.fromPayload("test") + Message 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 message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setReturnAddress(replyChannel).build(); endpoint.onMessage(message); Message reply = replyChannel.receive(500); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java index d025260f18..dac71a8bd1 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java @@ -39,7 +39,7 @@ public class CorrelationIdTests { @Test public void testCorrelationIdPassedIfAvailable() { Object correlationId = "123-ABC"; - Message message = MessageBuilder.fromPayload("test") + Message 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 message = MessageBuilder.fromPayload("test").build(); + Message 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 message = MessageBuilder.fromPayload("test") + Message 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 message = MessageBuilder.fromPayload("test") + Message 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(); } } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java index 02e537eece..3ae50646d4 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/ReplyMessageCorrelatorTests.java @@ -33,7 +33,7 @@ public class ReplyMessageCorrelatorTests { public void testReceiversPrecedeReply() throws InterruptedException { final ReplyMessageCorrelator correlator = new ReplyMessageCorrelator(); QueueChannel replyChannel = new QueueChannel(); - Message message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setCorrelationId("123").setReturnAddress(replyChannel).build(); correlator.handle(message); Message reply = replyChannel.receive(0); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java index 27ad9aaa5e..f4e63f24da 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java @@ -57,7 +57,7 @@ public class MethodArgumentMessageMapperTests { public void testRequiredHeaderProvided() throws Exception { Method method = TestService.class.getMethod("requiredHeader", Integer.class); MethodArgumentMessageMapper mapper = new MethodArgumentMessageMapper(method); - Message message = MessageBuilder.fromPayload("foo") + Message 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 mapper = new MethodArgumentMessageMapper(method); - Message message = MessageBuilder.fromPayload("foo") + Message 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 mapper = new MethodArgumentMessageMapper(method); - Message message = MessageBuilder.fromPayload("foo") + Message 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 mapper = new MethodArgumentMessageMapper(method); - Message message = MessageBuilder.fromPayload("foo") + Message 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 mapper = new MethodArgumentMessageMapper(method); - Message message = MessageBuilder.fromPayload("test") + Message 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 message = MessageBuilder.fromPayload(payload) + Message 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 mapper = new MethodArgumentMessageMapper(method); - Message message = MessageBuilder.fromPayload("test") + Message 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 payload = new HashMap(); payload.put("attrib1", new Integer(123)); payload.put("attrib2", new Integer(456)); - Message> message = MessageBuilder.fromPayload(payload) + Message> message = MessageBuilder.withPayload(payload) .setHeader("attrib1", new Integer(123)) .setHeader("attrib2", new Integer(456)).build(); Object[] args = (Object[]) mapper.mapMessage(message); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java index 0ded280a78..22f592af11 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java @@ -30,13 +30,13 @@ public class MessageBuilderTests { @Test public void testSimpleMessageCreation() { - Message message = MessageBuilder.fromPayload("foo").build(); + Message message = MessageBuilder.withPayload("foo").build(); assertEquals("foo", message.getPayload()); } @Test public void testHeaderValues() { - Message message = MessageBuilder.fromPayload("test") + Message 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 message1 = MessageBuilder.fromPayload("test1") + Message message1 = MessageBuilder.withPayload("test1") .setHeader("foo", "1") .setHeader("bar", "2") .build(); - Message message2 = MessageBuilder.fromPayload("test2") + Message 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 message1 = MessageBuilder.fromPayload("test1") + Message message1 = MessageBuilder.withPayload("test1") .setHeader("foo", "bar").build(); - Message message2 = MessageBuilder.fromPayload("test2") + Message message2 = MessageBuilder.withPayload("test2") .setHeader("foo", 123) .copyHeadersIfAbsent(message1.getHeaders()) .build(); @@ -77,7 +77,7 @@ public class MessageBuilderTests { @Test public void createFromMessage() { - Message message1 = MessageBuilder.fromPayload("test") + Message message1 = MessageBuilder.withPayload("test") .setHeader("foo", "bar").build(); Message message2 = MessageBuilder.fromMessage(message1).build(); assertEquals("test", message2.getPayload()); @@ -86,14 +86,14 @@ public class MessageBuilderTests { @Test public void testPriority() { - Message importantMessage = MessageBuilder.fromPayload(1) + Message importantMessage = MessageBuilder.withPayload(1) .setPriority(MessagePriority.HIGHEST).build(); assertEquals(MessagePriority.HIGHEST, importantMessage.getHeaders().getPriority()); } @Test public void testNonDestructiveSet() { - Message message1 = MessageBuilder.fromPayload(1) + Message message1 = MessageBuilder.withPayload(1) .setPriority(MessagePriority.HIGHEST).build(); Message 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 expiredMessage = MessageBuilder.fromPayload(1) + Message 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 expiredMessage = MessageBuilder.fromPayload(1) + Message expiredMessage = MessageBuilder.withPayload(1) .setExpirationDate(new Date(past)).build(); assertEquals(past, expiredMessage.getHeaders().getExpirationDate()); } @Test public void testRemove() { - Message message1 = MessageBuilder.fromPayload(1) + Message message1 = MessageBuilder.withPayload(1) .setHeader("foo", "bar").build(); Message message2 = MessageBuilder.fromMessage(message1) .removeHeader("foo") @@ -129,7 +129,7 @@ public class MessageBuilderTests { @Test public void testSettingToNullRemoves() { - Message message1 = MessageBuilder.fromPayload(1) + Message message1 = MessageBuilder.withPayload(1) .setHeader("foo", "bar").build(); Message message2 = MessageBuilder.fromMessage(message1) .setHeader("foo", null) diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java index b993d596c2..3a40686912 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java @@ -81,9 +81,9 @@ public class MessageChannelTemplateTests { } }; MessageChannelTemplate template = new MessageChannelTemplate(); - Message message1 = MessageBuilder.fromPayload("test1").setReturnAddress(replyChannel).build(); - Message message2 = MessageBuilder.fromPayload("test2").setReturnAddress(replyChannel).build(); - Message message3 = MessageBuilder.fromPayload("test3").setReturnAddress(replyChannel).build(); + Message message1 = MessageBuilder.withPayload("test1").setReturnAddress(replyChannel).build(); + Message message2 = MessageBuilder.withPayload("test2").setReturnAddress(replyChannel).build(); + Message message3 = MessageBuilder.withPayload("test3").setReturnAddress(replyChannel).build(); template.send(message1, this.requestChannel); template.send(message2, this.requestChannel); template.send(message3, this.requestChannel); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java index 6d538e7c63..ee85c11f0e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java @@ -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 message = MessageBuilder.fromPayload("foo") + Message 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 message = MessageBuilder.fromPayload("foo") + Message message = MessageBuilder.withPayload("foo") .setHeader("prop", "bar") .setHeader("number", 42).build(); Object result = invoker.invokeMethod(message); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java index 9ec65fd12e..cd295189e3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java @@ -32,7 +32,7 @@ public class UnexpiredMessageSelectorTests { @Test public void testExpiredMessageRejected() { long past = System.currentTimeMillis() - 60000; - Message message = MessageBuilder.fromPayload("expired") + Message 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 message = MessageBuilder.fromPayload("unexpired") + Message 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 message = MessageBuilder.fromPayload("unexpired").build(); + Message message = MessageBuilder.withPayload("unexpired").build(); UnexpiredMessageSelector selector = new UnexpiredMessageSelector(); assertTrue(selector.accept(message)); } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java index 308d0cfc25..fcc7dc325c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java @@ -92,7 +92,7 @@ public class MethodInvokingRouterTests { MethodInvokingChannelResolver resolver = new MethodInvokingChannelResolver(testBean, routingMethod); RouterEndpoint endpoint = new RouterEndpoint(resolver); endpoint.setChannelRegistry(channelRegistry); - Message message = MessageBuilder.fromPayload("bar") + Message message = MessageBuilder.withPayload("bar") .setHeader("targetChannel", "foo").build(); endpoint.onMessage(message); Message fooReply = fooChannel.receive(0); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java index 5ff50fb9b6..2c4f8655d3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java @@ -35,7 +35,7 @@ public class DefaultSplitterTests { @Test public void splitMessageWithArrayPayload() throws Exception { String[] payload = new String[] { "x", "y", "z" }; - Message message = MessageBuilder.fromPayload(payload).build(); + Message message = MessageBuilder.withPayload(payload).build(); DefaultSplitter splitter = new DefaultSplitter(); List> replies = splitter.split(message); assertEquals(3, replies.size()); @@ -53,7 +53,7 @@ public class DefaultSplitterTests { @Test public void splitMessageWithCollectionPayload() throws Exception { List payload = Arrays.asList(new String[] { "x", "y", "z" }); - Message> message = MessageBuilder.fromPayload(payload).build(); + Message> message = MessageBuilder.withPayload(payload).build(); DefaultSplitter splitter = new DefaultSplitter(); List> replies = splitter.split(message); assertEquals(3, replies.size()); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java index 6a94ca1513..24952d3195 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java @@ -283,7 +283,7 @@ public class MethodInvokingSplitterTests { @Test public void splitMessageHeader() throws Exception { - Message message = MessageBuilder.fromPayload("ignored") + Message message = MessageBuilder.withPayload("ignored") .setHeader("testHeader", "foo.bar").build(); MethodInvokingSplitter splitter = this.getSplitter("splitHeader"); List> replies = splitter.split(message); @@ -297,7 +297,7 @@ public class MethodInvokingSplitterTests { @Test public void splitPayloadAndHeader() throws Exception { - Message message = MessageBuilder.fromPayload("a.b") + Message 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); diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java index 0892b83e65..5bbaf9c3f1 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java @@ -39,7 +39,7 @@ public class HeaderTransformerTests { headers.put("header2", "baz"); } }; - Message message = MessageBuilder.fromPayload("foo").setHeader("header1", "bar").build(); + Message 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 message = MessageBuilder.fromPayload("foo").setHeader("header1", "bar").build(); + Message 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 message = MessageBuilder.fromPayload("foo").setHeader("header1", "bar").build(); + Message message = MessageBuilder.withPayload("foo").setHeader("header1", "bar").build(); Message result = transformer.transform(message); assertNull(result.getHeaders().get("header1")); } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java index c233f3540c..bb5b771a10 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java @@ -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 message = MessageBuilder.fromPayload("foo") + Message 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 message = MessageBuilder.fromPayload("foo") + Message 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 message = MessageBuilder.fromPayload("foo") + Message 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 message = MessageBuilder.fromPayload("foo").setHeader("number", 99).build(); + Message 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 message = MessageBuilder.fromPayload("foo").build(); + Message 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 message = MessageBuilder.fromPayload("test") + Message 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 message = MessageBuilder.fromPayload("test") + Message message = MessageBuilder.withPayload("test") .setHeader("prop1", "bad") .setHeader("prop3", "baz").build(); Message result = transformer.transform(message);