From 7a78db8db5ebd583aa5f4cc4bf482795e7eecf67 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Sat, 3 Dec 2016 12:50:41 -0500 Subject: [PATCH] INT-4179: Upgrade to Spring Social Twitter 2.0 JIRA: https://jira.spring.io/browse/INT-4179 --- build.gradle | 2 +- .../twitter/inbound/AbstractTwitterMessageSource.java | 7 ++----- .../SearchReceivingMessageSourceWithRedisTests.java | 6 +++--- .../outbound/StatusUpdatingMessageHandlerTests.java | 6 +++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index c7d3fbf422..20991dc7c1 100644 --- a/build.gradle +++ b/build.gradle @@ -128,7 +128,7 @@ subprojects { subproject -> springDataRedisVersion = '2.0.0.BUILD-SNAPSHOT' springGemfireVersion = '2.0.0.BUILD-SNAPSHOT' springSecurityVersion = '4.2.0.RELEASE' - springSocialTwitterVersion = '1.1.2.RELEASE' + springSocialTwitterVersion = '2.0.0.BUILD-SNAPSHOT' springRetryVersion = '1.2.0.RC1' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.BUILD-SNAPSHOT' springWsVersion = '2.4.0.RELEASE' 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 0809d3c410..df785abd37 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 @@ -88,10 +88,7 @@ abstract class AbstractTwitterMessageSource extends IntegrationObjectSupport this.twitter = twitter; if (this.twitter.isAuthorized()) { UserOperations userOperations = this.twitter.userOperations(); - String profileId = String.valueOf(userOperations.getProfileId()); - if (profileId != null) { - metadataKey += "." + profileId; - } + metadataKey += "." + userOperations.getProfileId(); } this.metadataKey = metadataKey; } @@ -206,7 +203,7 @@ abstract class AbstractTwitterMessageSource extends IntegrationObjectSupport private long getIdForTweet(T twitterMessage) { if (twitterMessage instanceof Tweet) { - return ((Tweet) twitterMessage).getId(); + return Long.parseLong(((Tweet) twitterMessage).getId()); } else if (twitterMessage instanceof DirectMessage) { return ((DirectMessage) twitterMessage).getId(); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java index 9a0f89925b..2d479a7a3c 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java @@ -150,15 +150,15 @@ public class SearchReceivingMessageSourceWithRedisTests extends RedisAvailableTe SearchOperations so = mock(SearchOperations.class); Tweet tweet3 = mock(Tweet.class); - given(tweet3.getId()).willReturn(3L); + given(tweet3.getId()).willReturn("3"); given(tweet3.getCreatedAt()).willReturn(new GregorianCalendar(2013, 2, 20).getTime()); Tweet tweet1 = mock(Tweet.class); - given(tweet1.getId()).willReturn(1L); + given(tweet1.getId()).willReturn("1"); given(tweet1.getCreatedAt()).willReturn(new GregorianCalendar(2013, 0, 20).getTime()); final Tweet tweet2 = mock(Tweet.class); - given(tweet2.getId()).willReturn(2L); + given(tweet2.getId()).willReturn("2"); given(tweet2.getCreatedAt()).willReturn(new GregorianCalendar(2013, 1, 20).getTime()); final List tweets = new ArrayList(); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java index 91471b7e4d..aa9a4af22e 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java @@ -74,7 +74,7 @@ public class StatusUpdatingMessageHandlerTests { prop.getProperty("z_oleg.oauth.consumerSecret"), prop.getProperty("z_oleg.oauth.accessToken"), prop.getProperty("z_oleg.oauth.accessTokenSecret")); - Message message1 = MessageBuilder.withPayload("Polishing #springintegration migration to Spring Social. test").build(); + Message message1 = new GenericMessage<>("Polishing #springintegration migration to Spring Social. test"); StatusUpdatingMessageHandler handler = new StatusUpdatingMessageHandler(template); handler.afterPropertiesSet(); handler.handleMessage(message1); @@ -90,7 +90,7 @@ public class StatusUpdatingMessageHandlerTests { this.in1.send(new GenericMessage("foo")); Mockito.verify(timelineOperations).updateStatus(argument.capture()); - assertEquals("foo", argument.getValue().toRequestParameters().getFirst("status")); + assertEquals("foo", argument.getValue().toTweetParameters().getFirst("status")); Mockito.reset(timelineOperations); @@ -101,7 +101,7 @@ public class StatusUpdatingMessageHandlerTests { Mockito.verify(timelineOperations).updateStatus(argument.capture()); TweetData tweetData = argument.getValue(); - MultiValueMap requestParameters = tweetData.toRequestParameters(); + MultiValueMap requestParameters = tweetData.toTweetParameters(); assertEquals("bar", requestParameters.getFirst("status")); assertNull(requestParameters.getFirst("media")); MultiValueMap uploadMediaParameters = tweetData.toUploadMediaParameters();