From 6c93d80ac3d99a4edb5a253cbd8d580f0a5784ad Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 15 Nov 2010 15:54:27 -0500 Subject: [PATCH] polishing --- .../xmpp/inbound/ChatMessageListeningEndpoint.java | 1 - .../xmpp/inbound/PresenceListeningEndpoint.java | 8 ++++---- .../xmpp/config/InboundXmppEndpointParserTests.java | 9 +++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java index d2ef371f7e..a9009a2132 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java @@ -19,7 +19,6 @@ package org.springframework.integration.xmpp.inbound; import org.jivesoftware.smack.Chat; import org.jivesoftware.smack.PacketListener; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.springframework.integration.MessageChannel; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java index e7919d576d..44ff6521e1 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java @@ -49,7 +49,7 @@ public class PresenceListeningEndpoint extends AbstractXmppConnectionAwareEndpoi private final MessagingTemplate messagingTemplate = new MessagingTemplate(); - private final EventForwardingRosterListener rosterListener = new EventForwardingRosterListener(); + private final PresencePublishingRosterListener rosterListener = new PresencePublishingRosterListener(); public PresenceListeningEndpoint() { @@ -91,10 +91,10 @@ public class PresenceListeningEndpoint extends AbstractXmppConnectionAwareEndpoi /** * RosterListener that subscribes to a given {@link Roster}'s events. - * Presence changes will be forwarded to a message channel. - * All others are only logged at debug level. + * Presence changes will be published to a message channel. + * All other roster events are only logged at debug level. */ - private class EventForwardingRosterListener implements RosterListener { + private class PresencePublishingRosterListener implements RosterListener { public void entriesAdded(Collection entries) { if (logger.isDebugEnabled()) { diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests.java index 2f7c95c687..16be29001b 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.xmpp.config; import static junit.framework.Assert.assertEquals; @@ -28,19 +29,19 @@ import org.springframework.integration.xmpp.inbound.ChatMessageListeningEndpoint /** * @author Oleg Zhurakousky - * */ public class InboundXmppEndpointParserTests { @Test public void testInboundAdapter(){ - ApplicationContext context = - new ClassPathXmlApplicationContext("InboundXmppEndpointParserTests-context.xml", this.getClass()); + ApplicationContext context = new ClassPathXmlApplicationContext( + "InboundXmppEndpointParserTests-context.xml", this.getClass()); ChatMessageListeningEndpoint xmde = context.getBean("xmppInboundAdapter", ChatMessageListeningEndpoint.class); assertFalse(xmde.isAutoStartup()); - DirectChannel channel = (DirectChannel) TestUtils.getPropertyValue(xmde, "requestChannel"); + DirectChannel channel = (DirectChannel) TestUtils.getPropertyValue(xmde, "messagingTemplate.defaultChannel"); assertEquals("xmppInbound", channel.getComponentName()); XMPPConnection connection = (XMPPConnection)TestUtils.getPropertyValue(xmde, "xmppConnection"); assertEquals(connection, context.getBean("testConnection")); } + }