From 426c5713fd42ecea69d5d7c26c9a3cbc3f54f429 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 11 Nov 2010 15:16:46 -0500 Subject: [PATCH] INT-1603 renamed components and methods to be more consistent --- .../config/TwitterReceivingMessageSourceParser.java | 4 ++-- .../config/TwitterSendingMessageHandlerParser.java | 2 +- .../integration/twitter/core/Twitter4jTemplate.java | 4 ++-- .../integration/twitter/core/TwitterOperations.java | 4 ++-- .../twitter/inbound/AbstractTwitterMessageSource.java | 2 +- ...Source.java => MentionsReceivingMessageSource.java} | 4 ++-- ...Source.java => TimelineReceivingMessageSource.java} | 8 ++++---- ...Handler.java => TimelineSendingMessageHandler.java} | 4 ++-- .../twitter/core/Twitter4jTemplateTests.java | 4 ++-- .../TimelineUpdateReceivingMessageSourceTests.java | 10 +++++----- .../TimelineUpdateSendingMessageHandlerTests.java | 4 ++-- 11 files changed, 25 insertions(+), 25 deletions(-) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/{MentionReceivingMessageSource.java => MentionsReceivingMessageSource.java} (91%) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/{TimelineUpdateReceivingMessageSource.java => TimelineReceivingMessageSource.java} (87%) rename spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/{TimelineUpdateSendingMessageHandler.java => TimelineSendingMessageHandler.java} (90%) diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java index a653da452a..d2f9d0b70d 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java @@ -41,13 +41,13 @@ public class TwitterReceivingMessageSourceParser extends AbstractPollingInboundC String elementName = element.getLocalName().trim(); String className = null; if ("inbound-channel-adapter".equals(elementName)) { - className = BASE_PACKAGE + ".inbound.TimelineUpdateReceivingMessageSource"; + className = BASE_PACKAGE + ".inbound.TimelineReceivingMessageSource"; } else if ("dm-inbound-channel-adapter".equals(elementName)) { className = BASE_PACKAGE + ".inbound.DirectMessageReceivingMessageSource"; } else if ("mentions-inbound-channel-adapter".equals(elementName)) { - className = BASE_PACKAGE + ".inbound.MentionReceivingMessageSource"; + className = BASE_PACKAGE + ".inbound.MentionsReceivingMessageSource"; } else { parserContext.getReaderContext().error("element '" + elementName + "' is not supported by this parser.", element); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java index 2e8bd8bf73..f60d84f8a7 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java @@ -38,7 +38,7 @@ public class TwitterSendingMessageHandlerParser extends AbstractOutboundChannelA String elementName = element.getLocalName().trim(); String className = null; if ("outbound-channel-adapter".equals(elementName)) { - className = BASE_PACKAGE + ".outbound.TimelineUpdateSendingMessageHandler"; + className = BASE_PACKAGE + ".outbound.TimelineSendingMessageHandler"; } else if ("dm-outbound-channel-adapter".equals(elementName)) { className = BASE_PACKAGE + ".outbound.DirectMessageSendingMessageHandler"; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java index fdfcffcaa5..bdb3da7023 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java @@ -124,7 +124,7 @@ public class Twitter4jTemplate implements TwitterOperations{ } } @Override - public List getHomeTimeline() { + public List getTimeline() { try { ResponseList timelines = twitter.getHomeTimeline(); return this.buildTweetsFromTwitterResponses(timelines); @@ -134,7 +134,7 @@ public class Twitter4jTemplate implements TwitterOperations{ } } @Override - public List getHomeTimeline(long sinceId) { + public List getTimeline(long sinceId) { try { ResponseList timelines = twitter.getHomeTimeline(new Paging(sinceId)); return this.buildTweetsFromTwitterResponses(timelines); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterOperations.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterOperations.java index 884cc26188..5bd2104463 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterOperations.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterOperations.java @@ -118,9 +118,9 @@ public interface TwitterOperations { List getMentions(long sinceId); - List getHomeTimeline(); + List getTimeline(); - List getHomeTimeline(long sinceId); + List getTimeline(long sinceId); void sendDirectMessage(String userName, String text); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java index 8f63ff534e..239ef400f8 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java @@ -178,7 +178,7 @@ public abstract class AbstractTwitterMessageSource extends AbstractEndpoint synchronized (this.markerGuard) { long id = tweet.getId(); - + if (id > this.markerId) { this.markerId = id; tweets.add(tweet); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionReceivingMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java similarity index 91% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionReceivingMessageSource.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java index 28f41e8fd8..5c4330d5a1 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionReceivingMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java @@ -27,9 +27,9 @@ import org.springframework.integration.twitter.core.TwitterOperations; * @author Josh Long * @author Oleg Zhurakousky */ -public class MentionReceivingMessageSource extends AbstractTwitterMessageSource { +public class MentionsReceivingMessageSource extends AbstractTwitterMessageSource { - public MentionReceivingMessageSource(TwitterOperations twitter){ + public MentionsReceivingMessageSource(TwitterOperations twitter){ super(twitter); } @Override diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSource.java similarity index 87% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSource.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSource.java index fa93daab73..054d4b34aa 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSource.java @@ -30,9 +30,9 @@ import org.springframework.integration.twitter.core.TwitterOperations; * @author Oleg Zhurakousky * @since 2.0 */ -public class TimelineUpdateReceivingMessageSource extends AbstractTwitterMessageSource { +public class TimelineReceivingMessageSource extends AbstractTwitterMessageSource { - public TimelineUpdateReceivingMessageSource(TwitterOperations twitter){ + public TimelineReceivingMessageSource(TwitterOperations twitter){ super(twitter); } @Override @@ -48,8 +48,8 @@ public class TimelineUpdateReceivingMessageSource extends AbstractTwitterMessage long sinceId = getMarkerId(); if (tweets.size() <= prefetchThreshold){ List tweets = !hasMarkedStatus() - ? twitter.getHomeTimeline() - : twitter.getHomeTimeline(sinceId); + ? twitter.getTimeline() + : twitter.getTimeline(sinceId); forwardAll(tweets); } } catch (Exception e) { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineSendingMessageHandler.java similarity index 90% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandler.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineSendingMessageHandler.java index c0f1c36847..cff1f22390 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/TimelineSendingMessageHandler.java @@ -28,9 +28,9 @@ import org.springframework.integration.twitter.core.TwitterOperations; * @author Oleg Zhurakousky * @since 2.0 */ -public class TimelineUpdateSendingMessageHandler extends AbstractOutboundTwitterEndpointSupport { +public class TimelineSendingMessageHandler extends AbstractOutboundTwitterEndpointSupport { - public TimelineUpdateSendingMessageHandler(TwitterOperations twitter){ + public TimelineSendingMessageHandler(TwitterOperations twitter){ super(twitter); } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java index 0cc3990aa2..0ec2ce3b2d 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java @@ -95,8 +95,8 @@ public class Twitter4jTemplateTests { @Test public void testGetFriendsTimeline() throws Exception{ - template.getHomeTimeline(); - template.getHomeTimeline(123); + template.getTimeline(); + template.getTimeline(123); verify(twitter, times(1)).getHomeTimeline(); verify(twitter, times(1)).getHomeTimeline(Mockito.any(Paging.class)); } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSourceTests.java index fb0dc8e224..444a7832c2 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineUpdateReceivingMessageSourceTests.java @@ -101,7 +101,7 @@ public class TimelineUpdateReceivingMessageSourceTests { @Test public void testSuccessfullInitialization() throws Exception{ when(tw.isOAuthEnabled()).thenReturn(true); - TimelineUpdateReceivingMessageSource source = new TimelineUpdateReceivingMessageSource(twitter); + TimelineReceivingMessageSource source = new TimelineReceivingMessageSource(twitter); ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); scheduler.afterPropertiesSet(); source.setTaskScheduler(scheduler); @@ -118,7 +118,7 @@ public class TimelineUpdateReceivingMessageSourceTests { public void testSuccessfullInitializationWithMessages() throws Exception{ this.setUpMockScenarioForMessagePolling(); - TimelineUpdateReceivingMessageSource source = new TimelineUpdateReceivingMessageSource(twitter); + TimelineReceivingMessageSource source = new TimelineReceivingMessageSource(twitter); ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); scheduler.afterPropertiesSet(); source.setTaskScheduler(scheduler); @@ -132,7 +132,7 @@ public class TimelineUpdateReceivingMessageSourceTests { Tweet message = (Tweet) msg.poll(); assertEquals(2000, message.getId()); Thread.sleep(1000); - verify(twitter, times(1)).getHomeTimeline(2000); + verify(twitter, times(1)).getTimeline(2000); // based on the Mock, the Queue shoud now have 2 mopre messages third and fourth assertTrue(((Queue)TestUtils.getPropertyValue(source, "tweets")).size() == 2); source.stop(); @@ -154,7 +154,7 @@ public class TimelineUpdateReceivingMessageSourceTests { PropertiesPersistingMetadataStore store = new PropertiesPersistingMetadataStore(); store.afterPropertiesSet(); bf.registerSingleton(IntegrationContextUtils.METADATA_STORE_BEAN_NAME, store); - TimelineUpdateReceivingMessageSource source = new TimelineUpdateReceivingMessageSource(twitter); + TimelineReceivingMessageSource source = new TimelineReceivingMessageSource(twitter); source.setBeanFactory(bf); ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); scheduler.afterPropertiesSet(); @@ -181,7 +181,7 @@ public class TimelineUpdateReceivingMessageSourceTests { store = new PropertiesPersistingMetadataStore(); store.afterPropertiesSet(); bf.registerSingleton(IntegrationContextUtils.METADATA_STORE_BEAN_NAME, store); - source = new TimelineUpdateReceivingMessageSource(twitter); + source = new TimelineReceivingMessageSource(twitter); source.setBeanFactory(bf); scheduler = new ThreadPoolTaskScheduler(); scheduler.afterPropertiesSet(); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandlerTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandlerTests.java index 26c1d0917f..39e1f5f3e7 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandlerTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandlerTests.java @@ -58,7 +58,7 @@ public class TimelineUpdateSendingMessageHandlerTests { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testSendingStatusUpdate() throws Exception{ - TimelineUpdateSendingMessageHandler handler = new TimelineUpdateSendingMessageHandler(twitterOperations); + TimelineSendingMessageHandler handler = new TimelineSendingMessageHandler(twitterOperations); Tweet tweet = new Tweet(); tweet.setText("writing twitter tests"); handler.handleMessage(new GenericMessage(tweet)); @@ -67,7 +67,7 @@ public class TimelineUpdateSendingMessageHandlerTests { } @Test public void testSendingStatusUpdateWithHeaders() throws Exception{ - TimelineUpdateSendingMessageHandler handler = new TimelineUpdateSendingMessageHandler(twitterOperations); + TimelineSendingMessageHandler handler = new TimelineSendingMessageHandler(twitterOperations); Message message = MessageBuilder.withPayload("writing twitter tests") .setHeader(TwitterHeaders.IN_REPLY_TO_STATUS_ID, new Long(123)) .setHeader(TwitterHeaders.PLACE_ID, "123")