From 8c63cc003a7702ef411aaf727ab06389272a28ec Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 11 Nov 2010 10:07:59 -0500 Subject: [PATCH] INT-1602 changed to receive HOME Timeline updates instead of Friends --- .../integration/twitter/core/Twitter4jTemplate.java | 8 ++++---- .../integration/twitter/core/TwitterOperations.java | 4 ++-- .../inbound/TimelineUpdateReceivingMessageSource.java | 4 ++-- .../integration/twitter/core/Twitter4jTemplateTests.java | 8 ++++---- .../TimelineUpdateReceivingMessageSourceTests.java | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) 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 f0b2edb754..e37e2e6ecf 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 @@ -115,9 +115,9 @@ public class Twitter4jTemplate implements TwitterOperations{ } } @Override - public List getFriendsTimeline() { + public List getHomeTimeline() { try { - ResponseList timelines = twitter.getFriendsTimeline(); + ResponseList timelines = twitter.getHomeTimeline(); return this.buildTweetsFromTwitterResponses(timelines); } catch (Exception e) { @@ -125,9 +125,9 @@ public class Twitter4jTemplate implements TwitterOperations{ } } @Override - public List getFriendsTimeline(long sinceId) { + public List getHomeTimeline(long sinceId) { try { - ResponseList timelines = twitter.getFriendsTimeline(new Paging(sinceId)); + ResponseList timelines = twitter.getHomeTimeline(new Paging(sinceId)); return this.buildTweetsFromTwitterResponses(timelines); } catch (Exception e) { 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 183cbb0866..e001582cc3 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 @@ -36,9 +36,9 @@ public interface TwitterOperations { List getMentions(long sinceId); - List getFriendsTimeline(); + List getHomeTimeline(); - List getFriendsTimeline(long sinceId); + List getHomeTimeline(long sinceId); void sendDirectMessage(String userName, String text); 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/TimelineUpdateReceivingMessageSource.java index ab4c592c00..29b0b0d4d2 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/TimelineUpdateReceivingMessageSource.java @@ -48,8 +48,8 @@ public class TimelineUpdateReceivingMessageSource extends AbstractTwitterMessage long sinceId = getMarkerId(); if (tweets.size() <= prefetchThreshold){ List tweets = !hasMarkedStatus() - ? twitter.getFriendsTimeline() - : twitter.getFriendsTimeline(sinceId); + ? twitter.getHomeTimeline() + : twitter.getHomeTimeline(sinceId); forwardAll(tweets); } } catch (Exception e) { 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 2560377f7c..021cc1c4d8 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 @@ -89,10 +89,10 @@ public class Twitter4jTemplateTests { @Test public void testGetFriendsTimeline() throws Exception{ - template.getFriendsTimeline(); - template.getFriendsTimeline(123); - verify(twitter, times(1)).getFriendsTimeline(); - verify(twitter, times(1)).getFriendsTimeline(Mockito.any(Paging.class)); + template.getHomeTimeline(); + template.getHomeTimeline(123); + verify(twitter, times(1)).getHomeTimeline(); + verify(twitter, times(1)).getHomeTimeline(Mockito.any(Paging.class)); } @Test 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 a585fd6372..62045b0f4d 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 @@ -131,7 +131,7 @@ public class TimelineUpdateReceivingMessageSourceTests { Tweet message = (Tweet) msg.poll(); assertEquals(2000, message.getId()); Thread.sleep(1000); - verify(twitter, times(1)).getFriendsTimeline(2000); + verify(twitter, times(1)).getHomeTimeline(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(); @@ -209,12 +209,12 @@ public class TimelineUpdateReceivingMessageSourceTests { SampleResoponceList testMessages = new SampleResoponceList(); testMessages.add(firstMessage); testMessages.add(secondMessage); - when(tw.getFriendsTimeline()).thenReturn(testMessages); + when(tw.getHomeTimeline()).thenReturn(testMessages); testMessages = new SampleResoponceList(); testMessages.add(thirdMessage); testMessages.add(fourthMessage); - when(tw.getFriendsTimeline(Mockito.any(Paging.class))).thenReturn(testMessages); + when(tw.getHomeTimeline(Mockito.any(Paging.class))).thenReturn(testMessages); } @SuppressWarnings({ "rawtypes", "serial" })