diff --git a/build.gradle b/build.gradle index 5c42ab0405..e0795333c8 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ subprojects { subproject -> springDataRedisVersion = '1.0.2.RELEASE' springGemfireVersion = '1.3.1.RELEASE' springSecurityVersion = '3.1.3.RELEASE' - springSocialTwitterVersion = '1.0.1.RELEASE' + springSocialTwitterVersion = '1.0.4.RELEASE' springWsVersion = '2.1.1.RELEASE' springRetryVersion = '1.0.2.RELEASE' } diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java index 7d21cf4880..ad9175e84a 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java @@ -42,7 +42,7 @@ public class MentionsReceivingMessageSource extends AbstractTwitterMessageSource @Override protected List pollForTweets(long sinceId) { - return this.getTwitter().timelineOperations().getMentions(1, 20, sinceId, 0); + return this.getTwitter().timelineOperations().getMentions(20, sinceId, 0); } } diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java index bd8c7e4d77..d84ce95b3f 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java @@ -22,6 +22,7 @@ import java.util.List; import org.springframework.social.twitter.api.SearchResults; import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.Twitter; +import org.springframework.social.twitter.api.impl.SearchParameters; import org.springframework.util.Assert; /** @@ -51,7 +52,8 @@ public class SearchReceivingMessageSource extends AbstractTwitterMessageSource pollForTweets(long sinceId) { - SearchResults results = this.getTwitter().searchOperations().search(query, 1, 20, sinceId, 0); + SearchParameters searchParameters = new SearchParameters(query).count(20).sinceId(sinceId); + SearchResults results = this.getTwitter().searchOperations().search(searchParameters); return (results != null) ? results.getTweets() : Collections.emptyList(); } diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSource.java index f05b0c280a..fbc5d6a226 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSource.java @@ -43,7 +43,7 @@ public class TimelineReceivingMessageSource extends AbstractTwitterMessageSource @Override protected List pollForTweets(long sinceId) { - return this.getTwitter().timelineOperations().getHomeTimeline(1, 20, sinceId, 0); + return this.getTwitter().timelineOperations().getHomeTimeline(20, sinceId, 0); } } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java index cea2258ba2..7fb524243c 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java @@ -31,15 +31,18 @@ import java.util.Properties; import org.junit.Ignore; import org.junit.Test; + import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.core.io.ClassPathResource; import org.springframework.integration.Message; import org.springframework.integration.store.metadata.SimpleMetadataStore; import org.springframework.integration.test.util.TestUtils; +import org.springframework.social.twitter.api.SearchMetadata; import org.springframework.social.twitter.api.SearchOperations; import org.springframework.social.twitter.api.SearchResults; import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.Twitter; +import org.springframework.social.twitter.api.impl.SearchParameters; import org.springframework.social.twitter.api.impl.TwitterTemplate; @@ -81,7 +84,7 @@ public class SearchReceivingMessageSourceTests { @Test public void testSearchReceivingMessageSourceInit() { - final SearchReceivingMessageSource messageSource = new SearchReceivingMessageSource(new TwitterTemplate()); + final SearchReceivingMessageSource messageSource = new SearchReceivingMessageSource(new TwitterTemplate("test")); messageSource.setComponentName("twitterSearchMessageSource"); final Object metadataStore = TestUtils.getPropertyValue(messageSource, "metadataStore"); @@ -115,10 +118,10 @@ public class SearchReceivingMessageSourceTests { public void testPollForTweetsNullResults() { final TwitterTemplate twitterTemplate = mock(TwitterTemplate.class); - final SearchOperations so = mock(SearchOperations.class); + final SearchOperations so = mock(SearchOperations.class); when(twitterTemplate.searchOperations()).thenReturn(so); - when(twitterTemplate.searchOperations().search(SEARCH_QUERY, 1, 20, 0, 0)).thenReturn(null); + when(twitterTemplate.searchOperations().search(SEARCH_QUERY, 20, 0, 0)).thenReturn(null); final SearchReceivingMessageSource messageSource = new SearchReceivingMessageSource(twitterTemplate); messageSource.setQuery(SEARCH_QUERY); @@ -130,9 +133,8 @@ public class SearchReceivingMessageSourceTests { final List tweets = messageSource.pollForTweets(0); - assertNotNull(tweets); - assertTrue(tweets.isEmpty()); - + assertNotNull(tweets); + assertTrue(tweets.isEmpty()); } /** @@ -155,12 +157,13 @@ public class SearchReceivingMessageSourceTests { tweets.add(tweet2); tweets.add(tweet3); - final SearchResults results = new SearchResults(tweets, 111, 111); + final SearchResults results = new SearchResults(tweets, new SearchMetadata(111, 111)); twitterTemplate = mock(TwitterTemplate.class); when(twitterTemplate.searchOperations()).thenReturn(so); - when(twitterTemplate.searchOperations().search(SEARCH_QUERY, 1, 20, 0, 0)).thenReturn(results); + SearchParameters params = new SearchParameters(SEARCH_QUERY).count(20).sinceId(0); + when(twitterTemplate.searchOperations().search(params)).thenReturn(results); final SearchReceivingMessageSource messageSource = new SearchReceivingMessageSource(twitterTemplate); @@ -168,9 +171,8 @@ public class SearchReceivingMessageSourceTests { final List tweetSearchResults = messageSource.pollForTweets(0); - assertNotNull(tweetSearchResults); - assertTrue(tweetSearchResults.size() == 3); - + assertNotNull(tweetSearchResults); + assertEquals(3, tweetSearchResults.size()); } }