From 50d97f12cc23a53527b7c763fd8530a1e4d3f639 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 3 Nov 2010 20:24:28 -0400 Subject: [PATCH] INT-1580 code cleanup --- .../xmpp/config/XmppConnectionParser.java | 2 +- .../xmpp/config/XmppNamespaceHandler.java | 46 ++++--------------- .../messages/ConsoleChatTests-context.xml | 13 ------ .../OutboundXmppEndpointTests-context.xml | 14 ------ .../src/test/java/test.properties | 8 ---- 5 files changed, 10 insertions(+), 73 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 634c20e44a..8c3f66cb52 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 @@ -33,7 +33,7 @@ public class XmppConnectionParser extends AbstractSingleBeanDefinitionParser { @Override protected String getBeanClassName(Element element) { - return "org.springframework.integration.xmpp" + ".XmppConnectionFactoryBean"; + return "org.springframework.integration.xmpp.XmppConnectionFactoryBean"; } @Override diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppNamespaceHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppNamespaceHandler.java index af39d46b26..888e16e782 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppNamespaceHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppNamespaceHandler.java @@ -54,40 +54,6 @@ public class XmppNamespaceHandler extends NamespaceHandlerSupport { registerBeanDefinitionParser("header-enricher", new XmppHeaderEnricherParser()); } - - -// private static void configureXMPPConnection(Element element, BeanDefinitionBuilder builder, ParserContext parserContext) { -// String ref = element.getAttribute("xmpp-connection"); -// if (StringUtils.hasText(ref)) { -// builder.addPropertyReference("xmppConnection", ref); -// } else { -// for (String attribute : attributes) { -// IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, attribute); -// } -// } -// } - - - // connection management - -// private static class XmppConnectionParser extends AbstractSingleBeanDefinitionParser { -// -// @Override -// protected String getBeanClassName(Element element) { -// return PACKAGE_NAME + ".XmppConnectionFactory"; -// } -// -// @Override -// protected boolean shouldGenerateIdAsFallback() { -// return true; -// } -// -// @Override -// protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { -// configureXMPPConnection(element, builder, parserContext); -// } -// } - // messages private static class XmppMessageOutboundEndpointParser extends AbstractOutboundChannelAdapterParser { @@ -96,7 +62,9 @@ public class XmppNamespaceHandler extends NamespaceHandlerSupport { protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( PACKAGE_NAME + ".messages.XmppMessageSendingMessageHandler"); - //configureXMPPConnection(element, builder, parserContext); + String connectionName = element.getAttribute("xmpp-connection"); + Assert.hasText(connectionName, "'xmpp-connection' must be defined"); + builder.addPropertyReference("xmppConnection", connectionName); return builder.getBeanDefinition(); } } @@ -130,7 +98,9 @@ public class XmppNamespaceHandler extends NamespaceHandlerSupport { protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( PACKAGE_NAME + ".presence.XmppRosterEventMessageSendingHandler"); - //configureXMPPConnection(element, builder, parserContext); + String connectionName = element.getAttribute("xmpp-connection"); + Assert.hasText(connectionName, "'xmpp-connection' must be defined"); + builder.addPropertyReference("xmppConnection", connectionName); return builder.getBeanDefinition(); } } @@ -149,7 +119,9 @@ public class XmppNamespaceHandler extends NamespaceHandlerSupport { @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { - //configureXMPPConnection(element, builder, parserContext); + String connectionName = element.getAttribute("xmpp-connection"); + Assert.hasText(connectionName, "'xmpp-connection' must be defined"); + builder.addPropertyReference("xmppConnection", connectionName); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "channel", "requestChannel"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-payload"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup"); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/ConsoleChatTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/ConsoleChatTests-context.xml index 0539c75c35..ca93cc36ee 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/ConsoleChatTests-context.xml +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/ConsoleChatTests-context.xml @@ -1,15 +1,4 @@ - diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml index 57e7fbf9f4..225fd1a909 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml @@ -1,16 +1,4 @@ - - diff --git a/spring-integration-xmpp/src/test/java/test.properties b/spring-integration-xmpp/src/test/java/test.properties index 3809f9d8ca..d2447e3cb2 100644 --- a/spring-integration-xmpp/src/test/java/test.properties +++ b/spring-integration-xmpp/src/test/java/test.properties @@ -14,14 +14,6 @@ # limitations under the License. # # to be able to run these tests, put this file on your desktop and configure as appropriate -user.1.login=user1@gmail.com -user.1.password=password -user.1.host=talk.google.com -user.1.service=gmail.com -user.1.sasl.mechanism=PLAIN -user.1.sasl.index=0 -user.1.resource=resource -user.1.port=5222 user.2.login=springintegration.eip@gmail.com user.2.password=spr1ng1p user.2.host=talk.google.com