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

Renamed MessageExchangeTemplate to MessageChannelTemplate.

Browse Source
This commit is contained in:
Mark Fisher
2008-09-09 10:36:29 +00:00
parent 04bb57f58d
commit 2a2d076b36
12 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java
View File

@@ -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<Class<? extends ApplicationEvent>> eventTypes = new ArrayList<Class<? extends ApplicationEvent>>();
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<ApplicationEvent>(event), this.channel);
}

6
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java
View File

@@ -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);
}
}

14
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java
View File

@@ -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"));

10
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java
View File

@@ -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"));