removed 'lastPage' boolean flag from SearchResults since it was never being used (was always false)
This commit is contained in:
@@ -32,14 +32,11 @@ public class SearchResults {
|
||||
|
||||
private long sinceId;
|
||||
|
||||
private boolean lastPage;
|
||||
|
||||
|
||||
public SearchResults(List<Tweet> tweets, long maxId, long sinceId, boolean lastPage) {
|
||||
public SearchResults(List<Tweet> tweets, long maxId, long sinceId) {
|
||||
this.tweets = tweets;
|
||||
this.maxId = maxId;
|
||||
this.sinceId = sinceId;
|
||||
this.lastPage = lastPage;
|
||||
}
|
||||
|
||||
|
||||
@@ -64,12 +61,4 @@ public class SearchResults {
|
||||
return sinceId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns <code>true</code> if this is the last page of matching {@link Tweet}s,
|
||||
* <code>false</code> if there are more pages that follow this one.
|
||||
*/
|
||||
public boolean isLastPage() {
|
||||
return lastPage;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ public class Twitter4jTemplate implements TwitterOperations {
|
||||
if (result != null) {
|
||||
List<twitter4j.Tweet> t4jTweets = result.getTweets();
|
||||
List<Tweet> tweets = this.buildTweetsFromTwitterResponses(t4jTweets);
|
||||
SearchResults results = new SearchResults(tweets, result.getMaxId(), result.getSinceId(), false);
|
||||
SearchResults results = new SearchResults(tweets, result.getMaxId(), result.getSinceId());
|
||||
return results;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ abstract class AbstractTwitterMessageSource<T> extends IntegrationObjectSupport
|
||||
|
||||
private final TweetComparator tweetComparator = new TweetComparator();
|
||||
|
||||
private final Object markerGuard = new Object();
|
||||
private final Object lastEnqueuedIdMonitor = new Object();
|
||||
|
||||
|
||||
public AbstractTwitterMessageSource(TwitterOperations twitterOperations) {
|
||||
@@ -148,11 +148,11 @@ abstract class AbstractTwitterMessageSource<T> extends IntegrationObjectSupport
|
||||
}
|
||||
|
||||
private void enqueue(Tweet tweet) {
|
||||
synchronized (this.markerGuard) {
|
||||
synchronized (this.lastEnqueuedIdMonitor) {
|
||||
long id = tweet.getId();
|
||||
if (id > this.lastEnqueuedId) {
|
||||
this.lastEnqueuedId = id;
|
||||
this.tweets.add(tweet);
|
||||
this.lastEnqueuedId = id;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user