diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java index df44d61319..b2631e8f33 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java @@ -23,7 +23,7 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessageExchangeTemplate; +import org.springframework.integration.message.MessageChannelTemplate; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -39,7 +39,7 @@ public class ApplicationEventSource implements ApplicationListener { private List> eventTypes = new ArrayList>(); - private final MessageExchangeTemplate messageExchangeTemplate = new MessageExchangeTemplate(); + private final MessageChannelTemplate channelTemplate = new MessageChannelTemplate(); public ApplicationEventSource(MessageChannel channel) { @@ -72,7 +72,7 @@ public class ApplicationEventSource implements ApplicationListener { } private boolean sendMessage(ApplicationEvent event) { - return this.messageExchangeTemplate.send( + return this.channelTemplate.send( new GenericMessage(event), this.channel); } diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java index 1c1a854389..ac9a02a2b3 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java @@ -21,7 +21,7 @@ import javax.jms.MessageListener; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageDeliveryException; -import org.springframework.integration.message.MessageExchangeTemplate; +import org.springframework.integration.message.MessageChannelTemplate; import org.springframework.integration.message.MessagingException; import org.springframework.jms.support.converter.MessageConverter; import org.springframework.util.Assert; @@ -38,7 +38,7 @@ public class ChannelPublishingJmsListener implements MessageListener { private final MessageConverter converter; - private final MessageExchangeTemplate messageExchangeTemplate = new MessageExchangeTemplate(); + private final MessageChannelTemplate channelTemplate = new MessageChannelTemplate(); public ChannelPublishingJmsListener(MessageChannel channel, MessageConverter converter) { @@ -52,7 +52,7 @@ public class ChannelPublishingJmsListener implements MessageListener { public void onMessage(javax.jms.Message jmsMessage) { try { Message messageToSend = (Message) this.converter.fromMessage(jmsMessage); - if (!this.messageExchangeTemplate.send(messageToSend, this.channel)) { + if (!this.channelTemplate.send(messageToSend, this.channel)) { throw new MessageDeliveryException(messageToSend, "failed to send Message to channel: " + this.channel); } } diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java index 5d75f454ef..538559f3f3 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java +++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java @@ -25,7 +25,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.adapter.httpinvoker.HttpInvokerGateway; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.MessageExchangeTemplate; +import org.springframework.integration.message.MessageChannelTemplate; /** * @author Mark Fisher @@ -41,8 +41,8 @@ public class HttpInvokerGatewayParserTests { DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); assertEquals(true, accessor.getPropertyValue("expectReply")); assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessageExchangeTemplate template = (MessageExchangeTemplate) - accessor.getPropertyValue("messageExchangeTemplate"); + MessageChannelTemplate template = (MessageChannelTemplate) + accessor.getPropertyValue("channelTemplate"); DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout")); assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout")); @@ -57,8 +57,8 @@ public class HttpInvokerGatewayParserTests { DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); assertEquals(true, accessor.getPropertyValue("expectReply")); assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessageExchangeTemplate template = (MessageExchangeTemplate) - accessor.getPropertyValue("messageExchangeTemplate"); + MessageChannelTemplate template = (MessageChannelTemplate) + accessor.getPropertyValue("channelTemplate"); DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout")); assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout")); @@ -73,8 +73,8 @@ public class HttpInvokerGatewayParserTests { DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); assertEquals(false, accessor.getPropertyValue("expectReply")); assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessageExchangeTemplate template = (MessageExchangeTemplate) - accessor.getPropertyValue("messageExchangeTemplate"); + MessageChannelTemplate template = (MessageChannelTemplate) + accessor.getPropertyValue("channelTemplate"); DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout")); assertEquals(456L, templateAccessor.getPropertyValue("receiveTimeout")); diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java index 4f75aa8982..b66e0dd654 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java +++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java @@ -26,7 +26,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.adapter.rmi.RmiGateway; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.MessageExchangeTemplate; +import org.springframework.integration.message.MessageChannelTemplate; /** * @author Mark Fisher @@ -42,8 +42,8 @@ public class RmiGatewayParserTests { DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); assertEquals(true, accessor.getPropertyValue("expectReply")); assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessageExchangeTemplate template = (MessageExchangeTemplate) - accessor.getPropertyValue("messageExchangeTemplate"); + MessageChannelTemplate template = (MessageChannelTemplate) + accessor.getPropertyValue("channelTemplate"); DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout")); assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout")); @@ -58,8 +58,8 @@ public class RmiGatewayParserTests { DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); assertEquals(false, accessor.getPropertyValue("expectReply")); assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessageExchangeTemplate template = (MessageExchangeTemplate) - accessor.getPropertyValue("messageExchangeTemplate"); + MessageChannelTemplate template = (MessageChannelTemplate) + accessor.getPropertyValue("channelTemplate"); DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout")); assertEquals(456L, templateAccessor.getPropertyValue("receiveTimeout")); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java index dac4352330..fe2c0eaa4d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java @@ -24,7 +24,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.ConfigurationException; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; -import org.springframework.integration.message.MessageExchangeTemplate; +import org.springframework.integration.message.MessageChannelTemplate; import org.springframework.integration.message.MessagingException; import org.springframework.integration.scheduling.TaskScheduler; import org.springframework.integration.scheduling.TaskSchedulerAware; @@ -53,7 +53,7 @@ public abstract class AbstractEndpoint implements MessageEndpoint, ChannelRegist private volatile ErrorHandler errorHandler; - private final MessageExchangeTemplate messageExchangeTemplate = new MessageExchangeTemplate(); + private final MessageChannelTemplate channelTemplate = new MessageChannelTemplate(); /** @@ -91,8 +91,8 @@ public abstract class AbstractEndpoint implements MessageEndpoint, ChannelRegist this.transactionDefinition= transactionDefinition; } - protected MessageExchangeTemplate getMessageExchangeTemplate() { - return this.messageExchangeTemplate; + protected MessageChannelTemplate getChannelTemplate() { + return this.channelTemplate; } /** 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 2032673e40..f067d291be 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 @@ -138,7 +138,7 @@ public abstract class AbstractInOutEndpoint extends AbstractMessageConsumingEndp } } } - return this.getMessageExchangeTemplate().send(replyMessage, replyChannel); + return this.getChannelTemplate().send(replyMessage, replyChannel); } private Message buildReplyMessage(Object result, MessageHeaders requestHeaders) { diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java index 1fa2ce11c5..5d46faf399 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java @@ -17,10 +17,10 @@ package org.springframework.integration.gateway; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.MessageExchangeTemplate; +import org.springframework.integration.message.MessageChannelTemplate; /** - * A convenient base class providing access to a {@link MessageExchangeTemplate} and exposing setter methods for + * A convenient base class providing access to a {@link MessageChannelTemplate} and exposing setter methods for * configuring request and reply {@link MessageChannel MessageChannels}. May be used as a base class for framework * components so that the details of messaging are well-encapsulated and hidden from application code. For example, * see {@link SimpleMessagingGateway}. @@ -29,7 +29,7 @@ import org.springframework.integration.message.MessageExchangeTemplate; */ public abstract class MessagingGatewaySupport { - private final MessageExchangeTemplate messageExchangeTemplate = new MessageExchangeTemplate(); + private final MessageChannelTemplate channelTemplate = new MessageChannelTemplate(); /** @@ -39,7 +39,7 @@ public abstract class MessagingGatewaySupport { * @param requestTimeout the timeout value in milliseconds */ public void setRequestTimeout(long requestTimeout) { - this.messageExchangeTemplate.setSendTimeout(requestTimeout); + this.channelTemplate.setSendTimeout(requestTimeout); } /** @@ -49,15 +49,15 @@ public abstract class MessagingGatewaySupport { * @param replyTimeout the timeout value in milliseconds */ public void setReplyTimeout(long replyTimeout) { - this.messageExchangeTemplate.setReceiveTimeout(replyTimeout); + this.channelTemplate.setReceiveTimeout(replyTimeout); } /** - * Retrieve the {@link MessageExchangeTemplate} for performing + * Retrieve the {@link MessageChannelTemplate} for performing * send and receive operations across channels. */ - protected final MessageExchangeTemplate getMessageExchangeTemplate() { - return this.messageExchangeTemplate; + protected final MessageChannelTemplate getChannelTemplate() { + return this.channelTemplate; } } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java index 196e642c9b..f4a2ea68fc 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java @@ -126,7 +126,7 @@ public class SimpleMessagingGateway extends MessagingGatewaySupport implements M Message message = (object instanceof Message) ? (Message) object : this.messageCreator.createMessage(object); if (message != null) { - if (!this.getMessageExchangeTemplate().send(message, this.requestChannel)) { + if (!this.getChannelTemplate().send(message, this.requestChannel)) { throw new MessageDeliveryException(message, "failed to send Message to channel"); } } @@ -137,7 +137,7 @@ public class SimpleMessagingGateway extends MessagingGatewaySupport implements M throw new IllegalStateException( "no-arg receive is not supported, because no reply channel has been configured"); } - Message message = this.getMessageExchangeTemplate().receive(this.replyChannel); + Message message = this.getChannelTemplate().receive(this.replyChannel); return (message != null) ? this.messageMapper.mapMessage(message) : null; } @@ -171,7 +171,7 @@ public class SimpleMessagingGateway extends MessagingGatewaySupport implements M return this.sendAndReceiveWithReplyMessageCorrelator(message); } else { - return this.getMessageExchangeTemplate().sendAndReceive(message, this.requestChannel); + return this.getChannelTemplate().sendAndReceive(message, this.requestChannel); } } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageExchangeTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageChannelTemplate.java similarity index 85% rename from org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageExchangeTemplate.java rename to org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageChannelTemplate.java index 40fec6ba2d..1fcb27519a 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageExchangeTemplate.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/AsyncMessageChannelTemplate.java @@ -25,16 +25,16 @@ import org.springframework.integration.channel.PollableChannel; import org.springframework.util.Assert; /** - * An asynchronous version of the {@link MessageExchangeTemplate}. + * An asynchronous version of the {@link MessageChannelTemplate}. * * @author Mark Fisher */ -public class AsyncMessageExchangeTemplate extends MessageExchangeTemplate { +public class AsyncMessageChannelTemplate extends MessageChannelTemplate { private final TaskExecutor taskExecutor; - public AsyncMessageExchangeTemplate(TaskExecutor taskExecutor) { + public AsyncMessageChannelTemplate(TaskExecutor taskExecutor) { Assert.notNull(taskExecutor, "TaskExecutor must not be null"); this.taskExecutor = taskExecutor; } @@ -49,7 +49,7 @@ public class AsyncMessageExchangeTemplate extends MessageExchangeTemplate { public boolean send(final Message message, final MessageChannel channel) { this.taskExecutor.execute(new Runnable() { public void run() { - AsyncMessageExchangeTemplate.super.send(message, channel); + AsyncMessageChannelTemplate.super.send(message, channel); } }); return true; @@ -64,7 +64,7 @@ public class AsyncMessageExchangeTemplate extends MessageExchangeTemplate { public Message sendAndReceive(final Message request, final MessageChannel channel) { FutureTask> task = new FutureTask>(new Callable>() { public Message call() throws Exception { - return AsyncMessageExchangeTemplate.super.sendAndReceive(request, channel); + return AsyncMessageChannelTemplate.super.sendAndReceive(request, channel); } }); this.taskExecutor.execute(task); @@ -79,7 +79,7 @@ public class AsyncMessageExchangeTemplate extends MessageExchangeTemplate { public Message receive(final PollableChannel channel) { FutureTask> task = new FutureTask>(new Callable>() { public Message call() throws Exception { - return AsyncMessageExchangeTemplate.super.receive(channel); + return AsyncMessageChannelTemplate.super.receive(channel); } }); this.taskExecutor.execute(task); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageExchangeTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageChannelTemplate.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/message/MessageExchangeTemplate.java rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageChannelTemplate.java index 771295d670..c983af1ad6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageExchangeTemplate.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageChannelTemplate.java @@ -46,7 +46,7 @@ import org.springframework.util.Assert; * * @author Mark Fisher */ -public class MessageExchangeTemplate implements InitializingBean { +public class MessageChannelTemplate implements InitializingBean { protected final Log logger = LogFactory.getLog(this.getClass()); @@ -73,7 +73,6 @@ public class MessageExchangeTemplate implements InitializingBean { /** * Specify the timeout value to use for send operations. - * Note that this value will only apply to {@link BlockingTarget}s. * * @param sendTimeout the send timeout in milliseconds */ diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterEndpoint.java index 4e3c8b4ab6..a60daeb981 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterEndpoint.java @@ -61,7 +61,7 @@ public class RouterEndpoint extends AbstractMessageConsumingEndpoint { * default, there is no timeout, meaning the send will block indefinitely. */ public void setTimeout(long timeout) { - this.getMessageExchangeTemplate().setSendTimeout(timeout); + this.getChannelTemplate().setSendTimeout(timeout); } /** @@ -81,7 +81,7 @@ public class RouterEndpoint extends AbstractMessageConsumingEndpoint { if (results != null) { for (MessageChannel channel : results) { if (channel != null) { - if (this.getMessageExchangeTemplate().send(message, channel)) { + if (this.getChannelTemplate().send(message, channel)) { sent = true; } } @@ -89,11 +89,11 @@ public class RouterEndpoint extends AbstractMessageConsumingEndpoint { } if (!sent) { if (this.defaultOutputChannel != null) { - sent = this.getMessageExchangeTemplate().send(message, this.defaultOutputChannel); + sent = this.getChannelTemplate().send(message, this.defaultOutputChannel); } else if (this.resolutionRequired) { throw new MessageDeliveryException(message, - "no target resolved by router and no default output channel defined"); + "no channel resolved by router and no default output channel defined"); } } } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageExchangeTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java similarity index 94% rename from org.springframework.integration/src/test/java/org/springframework/integration/message/MessageExchangeTemplateTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java index 79696ef082..b993d596c2 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageExchangeTemplateTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageChannelTemplateTests.java @@ -36,7 +36,7 @@ import org.springframework.integration.endpoint.AbstractInOutEndpoint; /** * @author Mark Fisher */ -public class MessageExchangeTemplateTests { +public class MessageChannelTemplateTests { private QueueChannel requestChannel; @@ -61,7 +61,7 @@ public class MessageExchangeTemplateTests { @Test public void testSendAndReceive() { - MessageExchangeTemplate template = new MessageExchangeTemplate(); + MessageChannelTemplate template = new MessageChannelTemplate(); Message reply = template.sendAndReceive(new StringMessage("test"), this.requestChannel); assertEquals("TEST", reply.getPayload()); } @@ -80,7 +80,7 @@ public class MessageExchangeTemplateTests { return true; } }; - MessageExchangeTemplate template = new MessageExchangeTemplate(); + 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();