From 5946cb048beef8ea8d1adb24bb6695db7b54b2c0 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 5 Nov 2010 11:36:10 -0400 Subject: [PATCH] INT-1554 general polishing --- .../xmpp/config/XmppConnectionParser.java | 2 ++ .../XmppRosterEventInboundEndpointParser.java | 2 ++ .../XmppRosterEventMessageDrivenEndpoint.java | 32 ++++++------------- ...RosterEventMessageDrivenEndpointTests.java | 8 ++--- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionParser.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionParser.java index 8c3f66cb52..372d76404e 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionParser.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionParser.java @@ -24,6 +24,8 @@ import org.springframework.util.StringUtils; import org.w3c.dom.Element; /** + * Parser for 'xmpp:xmpp-connection' element + * * @author Oleg Zhurakousky * @since 2.0 */ diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppRosterEventInboundEndpointParser.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppRosterEventInboundEndpointParser.java index df9fe02e2c..8789072956 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppRosterEventInboundEndpointParser.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppRosterEventInboundEndpointParser.java @@ -23,6 +23,8 @@ import org.springframework.util.Assert; import org.w3c.dom.Element; /** + * Parser for 'xmpp:roster-event-inbound-channel-adapter' element. + * * @author Josh Long * @author Oleg Zhurakousky * @since 2.0 diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java index 4cda7eac6d..8aac117f33 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java @@ -49,9 +49,7 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint { private volatile MessageChannel requestChannel; - private volatile XMPPConnection xmppConnection; - - //private volatile InboundMessageMapper messageMapper; + private final XMPPConnection xmppConnection; private final MessagingTemplate messagingTemplate = new MessagingTemplate(); @@ -59,15 +57,9 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint { private volatile boolean initialized; - /** - * This will be injected or configured via a xmpp-connection-factory element. - * - * @param xmppConnection the connection - */ - public void setXmppConnection(XMPPConnection xmppConnection) { + public XmppRosterEventMessageDrivenEndpoint(XMPPConnection xmppConnection){ this.xmppConnection = xmppConnection; } - /** * @param requestChannel the channel on which the inbound message should be sent */ @@ -75,10 +67,6 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint { this.requestChannel = requestChannel; } -// public void setMessageMapper(InboundMessageMapper messageMapper) { -// this.messageMapper = messageMapper; -// } - @Override protected void doStart() { Assert.isTrue(this.initialized, this.getComponentType() + " must be initialized"); @@ -92,9 +80,6 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint { @Override protected void onInit() throws Exception { -// if (null == this.messageMapper) { -// this.messageMapper = new XmppPresenceMessageMapper(); -// } this.messagingTemplate.setDefaultChannel(requestChannel); this.messagingTemplate.afterPropertiesSet(); this.initialized = true; @@ -102,13 +87,13 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint { /** * Called whenever an event happens related to the {@link Roster} - * - * @param presence the {@link Presence} object representing the new state + * + * @param payload */ - private void forwardRosterEventMessage(Presence presence) { - Message message = null; + private void forwardRosterEventMessage(Object payload) { + Message message = null; try { - message = MessageBuilder.withPayload(presence).build(); + message = MessageBuilder.withPayload(payload).build(); messagingTemplate.send(requestChannel, message); } catch (Exception e) { @@ -128,14 +113,17 @@ public class XmppRosterEventMessageDrivenEndpoint extends AbstractEndpoint { class EventForwardingRosterListener implements RosterListener { public void entriesAdded(final Collection entries) { logger.debug("entries added: " + StringUtils.join(entries.iterator(), ",")); + forwardRosterEventMessage(entries); } public void entriesUpdated(final Collection entries) { logger.debug("entries updated: " + StringUtils.join(entries.iterator(), ",")); + forwardRosterEventMessage(entries); } public void entriesDeleted(final Collection entries) { logger.debug("entries deleted: " + StringUtils.join(entries.iterator(), ",")); + forwardRosterEventMessage(entries); } public void presenceChanged(final Presence presence) { diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java index f3c382672a..47a08ed520 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java @@ -65,8 +65,7 @@ public class XmppRosterEventMessageDrivenEndpointTests { return null; } }).when(roster).removeRosterListener(Mockito.any(RosterListener.class)); - XmppRosterEventMessageDrivenEndpoint rosterEndpoint = new XmppRosterEventMessageDrivenEndpoint(); - rosterEndpoint.setXmppConnection(connection); + XmppRosterEventMessageDrivenEndpoint rosterEndpoint = new XmppRosterEventMessageDrivenEndpoint(connection); rosterEndpoint.afterPropertiesSet(); assertEquals(0, rosterSet.size()); rosterEndpoint.start(); @@ -77,7 +76,7 @@ public class XmppRosterEventMessageDrivenEndpointTests { @Test(expected=IllegalArgumentException.class) public void testNonInitializedFailure(){ - XmppRosterEventMessageDrivenEndpoint rosterEndpoint = new XmppRosterEventMessageDrivenEndpoint(); + XmppRosterEventMessageDrivenEndpoint rosterEndpoint = new XmppRosterEventMessageDrivenEndpoint(mock(XMPPConnection.class)); rosterEndpoint.start(); } @@ -86,8 +85,7 @@ public class XmppRosterEventMessageDrivenEndpointTests { XMPPConnection connection = mock(XMPPConnection.class); Roster roster = mock(Roster.class); when(connection.getRoster()).thenReturn(roster); - XmppRosterEventMessageDrivenEndpoint rosterEndpoint = new XmppRosterEventMessageDrivenEndpoint(); - rosterEndpoint.setXmppConnection(connection); + XmppRosterEventMessageDrivenEndpoint rosterEndpoint = new XmppRosterEventMessageDrivenEndpoint(connection); QueueChannel channel = new QueueChannel(); rosterEndpoint.setRequestChannel(channel); rosterEndpoint.afterPropertiesSet();