From 3f91ba3064405878f111bbb47ae5144fb5307177 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 11 May 2011 17:27:40 -0400
Subject: [PATCH] INT-1902 upgraded Twitter to use Twitter4J-2.1.10

---
 build.gradle                                             | 2 +-
 spring-integration-twitter/pom.xml                       | 2 +-
 .../integration/twitter/core/Twitter4jTemplate.java      | 9 ++++++++-
 .../DirectMessageReceivingMessageSourceTests.java        | 8 ++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 574a293444..bae84a2d1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -385,7 +385,7 @@ project('spring-integration-twitter') {
     dependencies {
         compile project(":spring-integration-core")
         compile "org.springframework:spring-context-support:$springVersion"
-        compile "org.twitter4j:twitter4j-core:2.1.3"
+        compile "org.twitter4j:twitter4j-core:2.1.10"
         compile("javax.activation:activation:$javaxActivationVersion") { optional = true }
         testCompile project(":spring-integration-test")
     }
diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml
index fc0c35e49c..a6a66027e8 100644
--- a/spring-integration-twitter/pom.xml
+++ b/spring-integration-twitter/pom.xml
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>org.twitter4j</groupId>
       <artifactId>twitter4j-core</artifactId>
-      <version>2.1.3</version>
+      <version>2.1.10</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
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 fa7ea85935..d1fb72e052 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
@@ -18,6 +18,7 @@ package org.springframework.integration.twitter.core;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Properties;
 
 import org.springframework.util.Assert;
 
@@ -30,6 +31,8 @@ import twitter4j.Status;
 import twitter4j.StatusUpdate;
 import twitter4j.Twitter;
 import twitter4j.TwitterFactory;
+import twitter4j.conf.Configuration;
+import twitter4j.conf.PropertyConfiguration;
 import twitter4j.http.AccessToken;
 
 /**
@@ -66,7 +69,11 @@ public class Twitter4jTemplate implements TwitterOperations {
 		Assert.hasText(accessToken, "'accessToken' must be provided");
 		Assert.hasText(accessTokenSecret, "'accessTokenSecret' must be provided");
 		AccessToken token = new AccessToken(accessToken, accessTokenSecret);
-		this.twitter = new TwitterFactory().getOAuthAuthorizedInstance(consumerKey, consumerSecret, token);
+		Properties properties = new Properties();
+		properties.put("oauth.consumerKey", consumerKey);
+		properties.put("oauth.consumerSecret", consumerSecret);
+		Configuration configuration = new PropertyConfiguration(properties);
+		this.twitter = new TwitterFactory(configuration).getInstance(token);
 	}
 
 
diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java
index 23f0fdab92..1155006d25 100644
--- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java
+++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java
@@ -73,19 +73,19 @@ public class DirectMessageReceivingMessageSourceTests {
 		
 		firstMessage = mock(DirectMessage.class);
 		when(firstMessage.getCreatedAt()).thenReturn(new Date(5555555555L));
-		when(firstMessage.getId()).thenReturn( 200);
+		when(firstMessage.getId()).thenReturn( (long) 200);
 		
 		secondMessage = mock(DirectMessage.class);
 		when(secondMessage.getCreatedAt()).thenReturn(new Date(2222222222L));
-		when(secondMessage.getId()).thenReturn( 2000);
+		when(secondMessage.getId()).thenReturn( (long) 2000);
 		
 		thirdMessage = mock(DirectMessage.class);
 		when(thirdMessage.getCreatedAt()).thenReturn(new Date(66666666666L));
-		when(thirdMessage.getId()).thenReturn( 3000);
+		when(thirdMessage.getId()).thenReturn( (long) 3000);
 		
 		fourthMessage = mock(DirectMessage.class);
 		when(fourthMessage.getCreatedAt()).thenReturn(new Date(77777777777L));
-		when(fourthMessage.getId()).thenReturn( 4000);
+		when(fourthMessage.getId()).thenReturn( (long) 4000);
 		
 		tw = mock(Twitter.class);
 		Field twField = Twitter4jTemplate.class.getDeclaredField("twitter");