From 7733a27ea6380cf182cd9070cb4f7a68655d149d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 28 Oct 2010 10:28:48 -0400 Subject: [PATCH] INT-1471, more polishing, renamed In/Out adapters to include Receiving/Sending in the class names --- .../twitter/config/TwitterNamespaceHandler.java | 10 +++++----- ...r.java => TwitterReceivingMessageSourceParser.java} | 2 +- ...er.java => TwitterSendingMessageHandlerParser.java} | 2 +- ...e.java => DirectMessageReceivingMessageSource.java} | 2 +- ...eSource.java => MentionReceivingMessageSource.java} | 2 +- ....java => TimelineUpdateReceivingMessageSource.java} | 2 +- ...er.java => DirectMessageSendingMessageHandler.java} | 2 +- ...r.java => TimelineUpdateSendingMessageHandler.java} | 2 +- .../OutboundDirectMessageMessageHandlerTests.java | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/{TwitterMessageSourceParser.java => TwitterReceivingMessageSourceParser.java} (96%) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/{TwitterMessageHandlerParser.java => TwitterSendingMessageHandlerParser.java} (95%) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/{DirectMessageMessageSource.java => DirectMessageReceivingMessageSource.java} (95%) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/{MentionMessageSource.java => MentionReceivingMessageSource.java} (95%) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/{TimelineUpdateMessageSource.java => TimelineUpdateReceivingMessageSource.java} (94%) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/{OutboundDirectMessageMessageHandler.java => DirectMessageSendingMessageHandler.java} (95%) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/{OutboundTimelineUpdateMessageHandler.java => TimelineUpdateSendingMessageHandler.java} (92%) diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java index ac87d5da85..6fc7c21f5e 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java @@ -35,13 +35,13 @@ public class TwitterNamespaceHandler extends AbstractIntegrationNamespaceHandler registerBeanDefinitionParser("twitter-connection", new ConnectionParser()); // inbound - registerBeanDefinitionParser("inbound-update-channel-adapter", new TwitterMessageSourceParser()); - registerBeanDefinitionParser("inbound-dm-channel-adapter", new TwitterMessageSourceParser()); - registerBeanDefinitionParser("inbound-mention-channel-adapter", new TwitterMessageSourceParser()); + registerBeanDefinitionParser("inbound-update-channel-adapter", new TwitterReceivingMessageSourceParser()); + registerBeanDefinitionParser("inbound-dm-channel-adapter", new TwitterReceivingMessageSourceParser()); + registerBeanDefinitionParser("inbound-mention-channel-adapter", new TwitterReceivingMessageSourceParser()); // outbound - registerBeanDefinitionParser("outbound-update-channel-adapter", new TwitterMessageHandlerParser()); - registerBeanDefinitionParser("outbound-dm-channel-adapter", new TwitterMessageHandlerParser()); + registerBeanDefinitionParser("outbound-update-channel-adapter", new TwitterSendingMessageHandlerParser()); + registerBeanDefinitionParser("outbound-dm-channel-adapter", new TwitterSendingMessageHandlerParser()); } } diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterMessageSourceParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java similarity index 96% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterMessageSourceParser.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java index d17e549ff6..d694620ad0 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterMessageSourceParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java @@ -34,7 +34,7 @@ import org.springframework.integration.config.xml.IntegrationNamespaceUtils; * @author Oleg Zhurakousky * @since 2.0 */ -public class TwitterMessageSourceParser extends AbstractPollingInboundChannelAdapterParser { +public class TwitterReceivingMessageSourceParser extends AbstractPollingInboundChannelAdapterParser { @Override protected BeanMetadataElement parseSource(Element element, ParserContext parserContext) { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterMessageHandlerParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java similarity index 95% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterMessageHandlerParser.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java index ebe26ec40f..fb900b34cf 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterMessageHandlerParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java @@ -33,7 +33,7 @@ import org.springframework.integration.config.xml.IntegrationNamespaceUtils; * @author Oleg Zhurakousky * @since 2.0 */ -public class TwitterMessageHandlerParser extends AbstractOutboundChannelAdapterParser { +public class TwitterSendingMessageHandlerParser extends AbstractOutboundChannelAdapterParser { @Override protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSource.java similarity index 95% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageMessageSource.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSource.java index 2c385d1bb2..7b50d037c8 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSource.java @@ -30,7 +30,7 @@ import twitter4j.Paging; * @author Oleg Zhurakousky * @since 2.0 */ -public class DirectMessageMessageSource extends AbstractTwitterMessageSource { +public class DirectMessageReceivingMessageSource extends AbstractTwitterMessageSource { @Override public String getComponentType() { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionReceivingMessageSource.java similarity index 95% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionMessageSource.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionReceivingMessageSource.java index 7743569ff9..658bb70d85 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionReceivingMessageSource.java @@ -28,7 +28,7 @@ import twitter4j.Status; * @author Josh Long * @author Oleg Zhurakousky */ -public class MentionMessageSource extends AbstractTwitterMessageSource { +public class MentionReceivingMessageSource extends AbstractTwitterMessageSource { @Override public String getComponentType() { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSource.java similarity index 94% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateMessageSource.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSource.java index 141efde423..c8a1d9e610 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSource.java @@ -29,7 +29,7 @@ import twitter4j.Status; * @author Oleg Zhurakousky * @since 2.0 */ -public class TimelineUpdateMessageSource extends AbstractTwitterMessageSource { +public class TimelineUpdateReceivingMessageSource extends AbstractTwitterMessageSource { @Override public String getComponentType() { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandler.java similarity index 95% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandler.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandler.java index 920729db0c..157cdedd10 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandler.java @@ -30,7 +30,7 @@ import twitter4j.TwitterException; * @author Oleg Zhurakousky * @since 2.0 */ -public class OutboundDirectMessageMessageHandler extends AbstractOutboundTwitterEndpointSupport { +public class DirectMessageSendingMessageHandler extends AbstractOutboundTwitterEndpointSupport { @Override protected void handleMessageInternal(Message message) throws Exception { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundTimelineUpdateMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandler.java similarity index 92% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundTimelineUpdateMessageHandler.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandler.java index 5e77773d72..170e920eca 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundTimelineUpdateMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandler.java @@ -27,7 +27,7 @@ import twitter4j.StatusUpdate; * @author Josh Long * @since 2.0 */ -public class OutboundTimelineUpdateMessageHandler extends AbstractOutboundTwitterEndpointSupport { +public class TimelineUpdateSendingMessageHandler extends AbstractOutboundTwitterEndpointSupport { @Override protected void handleMessageInternal(Message message) throws Exception { StatusUpdate statusUpdate = this.supportStatusUpdate.fromMessage(message); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java index 4cba993ac4..8f462ac938 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java @@ -43,7 +43,7 @@ public class OutboundDirectMessageMessageHandlerTests { .setHeader(TwitterHeaders.DISPLAY_COORDINATES, true) .setHeader(TwitterHeaders.DM_TARGET_USER_ID, "foo"); - OutboundDirectMessageMessageHandler handler = new OutboundDirectMessageMessageHandler(); + DirectMessageSendingMessageHandler handler = new DirectMessageSendingMessageHandler(); handler.setConfiguration(this.getTestConfiguration()); handler.afterPropertiesSet();