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

INT-1129 renamed MessageChannelTemplate to MessagingTemplate

Browse Source
This commit is contained in:
Mark Fisher
2010-07-27 14:34:28 +00:00
parent f64fb54b34
commit cc8d445280
28 changed files with 269 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java
View File

@@ -25,7 +25,7 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.springframework.context.Lifecycle;
import org.springframework.integration.channel.MessageChannelTemplate;
import org.springframework.integration.channel.MessagingTemplate;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.message.MessageBuilder;
@@ -63,7 +63,7 @@ import org.springframework.integration.xmpp.XmppHeaders;
* @see ChatManager the ChatManager class that
* keeps watch over all Chats between the client and any other
* participants.
* @see MessageChannelTemplate
* @see MessagingTemplate
* handles all interesing operations on any Spring Integration channels.
* @see XMPPConnection the XMPPConnection (as
* created by {@link XmppConnectionFactory}
@@ -72,7 +72,7 @@ public class XmppMessageDrivenEndpoint extends AbstractEndpoint implements Lifec
private static final Log logger = LogFactory.getLog(XmppMessageDrivenEndpoint.class);
private final MessageChannelTemplate channelTemplate = new MessageChannelTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
private volatile MessageChannel requestChannel;
@@ -80,6 +80,7 @@ public class XmppMessageDrivenEndpoint extends AbstractEndpoint implements Lifec
private volatile boolean extractPayload = true;
/**
* This will be injected or configured via a <em>xmpp-connection-factory</em> element.
*
@@ -93,7 +94,7 @@ public class XmppMessageDrivenEndpoint extends AbstractEndpoint implements Lifec
* @param requestChannel the channel on which the inbound message should be sent
*/
public void setRequestChannel(final MessageChannel requestChannel) {
this.channelTemplate.setDefaultChannel(requestChannel);
this.messagingTemplate.setDefaultChannel(requestChannel);
this.requestChannel = requestChannel;
}
@@ -123,7 +124,7 @@ public class XmppMessageDrivenEndpoint extends AbstractEndpoint implements Lifec
@Override
protected void onInit() throws Exception {
channelTemplate.afterPropertiesSet();
messagingTemplate.afterPropertiesSet();
xmppConnection.addPacketListener(new PacketListener() {
public void processPacket(final Packet packet) {
org.jivesoftware.smack.packet.Message message = (org.jivesoftware.smack.packet.Message) packet;
@@ -137,7 +138,7 @@ public class XmppMessageDrivenEndpoint extends AbstractEndpoint implements Lifec
MessageBuilder<?> messageBuilder = MessageBuilder.withPayload(payload)
.setHeader(XmppHeaders.TYPE, xmppMessage.getType())
.setHeader(XmppHeaders.CHAT, chat);
channelTemplate.send(messageBuilder.build(), requestChannel);
messagingTemplate.send(messageBuilder.build(), requestChannel);
}
}

18
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java
View File

@@ -26,7 +26,7 @@ import org.jivesoftware.smack.packet.Presence;
import org.springframework.context.Lifecycle;
import org.springframework.integration.channel.MessageChannelTemplate;
import org.springframework.integration.channel.MessagingTemplate;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.AbstractEndpoint;
@@ -44,11 +44,18 @@ import java.util.Collection;
* @since 2.0
*/
public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint implements Lifecycle {
private static final Log logger = LogFactory.getLog(XmppRosterEventMessageDrivenEndpoint.class);
private volatile MessageChannel requestChannel;
private volatile XMPPConnection xmppConnection;
private InboundMessageMapper<Presence> messageMapper;
private final MessageChannelTemplate channelTemplate = new MessageChannelTemplate();
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
/**
* This will be injected or configured via a <em>xmpp-connection-factory</em> element.
@@ -63,7 +70,7 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint imple
* @param requestChannel the channel on which the inbound message should be sent
*/
public void setRequestChannel(final MessageChannel requestChannel) {
this.channelTemplate.setDefaultChannel(requestChannel);
this.messagingTemplate.setDefaultChannel(requestChannel);
this.requestChannel = requestChannel;
}
@@ -88,7 +95,7 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint imple
this.messageMapper = new XmppPresenceMessageMapper();
}
this.channelTemplate.afterPropertiesSet();
this.messagingTemplate.afterPropertiesSet();
this.xmppConnection.getRoster().addRosterListener(new EventForwardingRosterListener());
}
@@ -100,7 +107,7 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint imple
protected void forwardRosterEventMessage(Presence presence) {
try {
Message<?> msg = this.messageMapper.toMessage(presence);
channelTemplate.send(msg, requestChannel);
messagingTemplate.send(msg, requestChannel);
} catch (Exception e) {
logger.error("Failed to map packet to message ", e);
}
@@ -131,4 +138,5 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint imple
forwardRosterEventMessage(presence);
}
}
}

11
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java
View File

@@ -25,16 +25,13 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.channel.MessageChannelTemplate;
import org.springframework.integration.channel.MessagingTemplate;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.*;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Mark Fisher
* @author Josh Long
@@ -55,8 +52,7 @@ public class XmppHeaderEnricherParserTests {
@Test
public void to() {
MessageChannelTemplate messageChannelTemplate = new MessageChannelTemplate();
MessagingTemplate messagingTemplate = new MessagingTemplate();
output.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message)
throws MessageRejectedException, MessageHandlingException,
@@ -65,6 +61,7 @@ public class XmppHeaderEnricherParserTests {
logger.debug(String.format("%s=%s (class: %s)", h, message.getHeaders().get(h), message.getHeaders().get(h).getClass().toString()));
}
});
messageChannelTemplate.send(MessageBuilder.withPayload("foo").build(), input);
messagingTemplate.send(MessageBuilder.withPayload("foo").build(), input);
}
}