Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-4179: Upgrade to Spring Social Twitter 2.0

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4179
This commit is contained in:
Artem Bilan
2016-12-03 12:50:41 -05:00
parent 00796702c0
commit 7a78db8db5
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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'

7
spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java
View File

@@ -88,10 +88,7 @@ abstract class AbstractTwitterMessageSource<T> 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<T> 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();

6
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java
View File

@@ -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<Tweet> tweets = new ArrayList<Tweet>();

6
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java
View File

@@ -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<String>("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<String, Object> requestParameters = tweetData.toRequestParameters();
MultiValueMap<String, Object> requestParameters = tweetData.toTweetParameters();
assertEquals("bar", requestParameters.getFirst("status"));
assertNull(requestParameters.getFirst("media"));
MultiValueMap<String, Object> uploadMediaParameters = tweetData.toUploadMediaParameters();