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

INT-1522 added XmppMessageSendingMessageHandlerTests with initial tests

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-10-14 18:16:55 -04:00
parent 8d83fa7919
commit 63d947a26b
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-xmpp/pom.xml
View File

@@ -47,6 +47,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>

37
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandler.java
View File

@@ -20,7 +20,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jivesoftware.smack.Chat;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.springframework.context.Lifecycle;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.handler.AbstractMessageHandler;
import org.springframework.integration.xmpp.XmppHeaders;
import org.springframework.util.Assert;
@@ -29,6 +31,7 @@ import org.springframework.util.StringUtils;
/**
* @author Josh Long
* @author Mario Gray
* @author Oleg Zhurakousky
* @since 2.0
*/
public class XmppMessageSendingMessageHandler extends AbstractMessageHandler implements Lifecycle {
@@ -43,25 +46,22 @@ public class XmppMessageSendingMessageHandler extends AbstractMessageHandler imp
}
protected void handleMessageInternal(final org.springframework.integration.Message<?> message) {
// pre-reqs: user to send, string to send as msg body
String messageBody = null;
String destinationUser = null;
Object payload = message.getPayload();
Assert.isInstanceOf(String.class, payload, "Only payload of type String is suported. You " +
"can apply transformer prior to sending message to this handler");
messageBody = (String) payload;
destinationUser = (String) message.getHeaders().get(XmppHeaders.CHAT_TO_USER);
Assert.state(StringUtils.hasText(destinationUser), "'" + XmppHeaders.CHAT_TO_USER + "' header must not be null");
String threadId = (String) message.getHeaders().get(XmppHeaders.CHAT_THREAD_ID);
Chat chat = getOrCreateChatWithParticipant(destinationUser, threadId);
// TODO - figure out what to do with chat.threadId?
try {
// pre-reqs: user to send, string to send as msg body
String messageBody = null;
String destinationUser = null;
Object payload = message.getPayload();
if (payload instanceof String) {
messageBody = (String) payload;
}
destinationUser = (String) message.getHeaders().get(XmppHeaders.CHAT_TO_USER);
Assert.state(StringUtils.hasText(destinationUser), "the destination user must not be null");
Assert.state(StringUtils.hasText(messageBody), "the message body must not be null");
String threadId = (String) message.getHeaders().get(XmppHeaders.CHAT_THREAD_ID);
Chat chat = getOrCreateChatWithParticipant(destinationUser, threadId);
if (chat != null) {
chat.sendMessage(messageBody);
}
}
catch (Exception e) {
logger.debug("failed to send XMPP message", e);
chat.sendMessage(messageBody);
} catch (XMPPException e) {
throw new MessageHandlingException(message, e);
}
}
@@ -93,6 +93,7 @@ public class XmppMessageSendingMessageHandler extends AbstractMessageHandler imp
chat = xmppConnection.getChatManager().createChat(userId, thread, null);
}
}
Assert.notNull(chat, "Failed to obtain Chat instance");
return chat;
}

7
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml
View File

@@ -26,17 +26,16 @@
<context:component-scan base-package="org.springframework.integration.xmpp"/>
<context:property-placeholder location="file://${user.home}/Desktop/xmpp.properties" ignore-unresolvable="true"/>
<context:property-placeholder location="classpath:test.properties" ignore-unresolvable="true"/>
<beans:bean id="xmppProducer"
class="org.springframework.integration.xmpp.messages.XmppMessageProducer"
p:recipient="starbuxman@gmail.com"/>
p:recipient="${recipient.address}"/>
<poller default="true">
<interval-trigger fixed-rate="true" interval="10" time-unit="SECONDS"/>
</poller>
<xmpp:xmpp-connection
id="testConnection"
<xmpp:xmpp-connection id="testConnection"
user="${user.2.login}"
password="${user.2.password}"
host="${user.2.host}"