Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3F069200CC2 for ; Wed, 5 Jul 2017 11:27:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3C0B7162C50; Wed, 5 Jul 2017 09:27:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 436C7162C53 for ; Wed, 5 Jul 2017 11:27:03 +0200 (CEST) Received: (qmail 56882 invoked by uid 500); 5 Jul 2017 09:27:02 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 56813 invoked by uid 99); 5 Jul 2017 09:27:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jul 2017 09:27:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DD53AE964C; Wed, 5 Jul 2017 09:26:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Wed, 05 Jul 2017 09:27:02 -0000 Message-Id: <21dc2cf21a4941c492b08ae43f37ff76@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/8] camel git commit: CAMEL-11510: camel-twitter fixed paging to use page and count options, so you can get more data, in some of the twitter actions. archived-at: Wed, 05 Jul 2017 09:27:04 -0000 CAMEL-11510: camel-twitter fixed paging to use page and count options, so you can get more data, in some of the twitter actions. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a347d2d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a347d2d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a347d2d Branch: refs/heads/master Commit: 1a347d2d93ae441e2e0c5cfb65a2dfd5bd970c03 Parents: 509eab1 Author: Claus Ibsen Authored: Wed Jul 5 11:20:18 2017 +0200 Committer: Claus Ibsen Committed: Wed Jul 5 11:20:18 2017 +0200 ---------------------------------------------------------------------- .../twitter/consumer/AbstractTwitterConsumerHandler.java | 10 +++++++++- .../component/twitter/timeline/HomeConsumerHandler.java | 6 ++++-- .../twitter/timeline/MentionsConsumerHandler.java | 6 ++++-- .../twitter/timeline/RetweetsConsumerHandler.java | 6 ++++-- .../component/twitter/timeline/UserConsumerHandler.java | 6 ++++-- 5 files changed, 25 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1a347d2d/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/AbstractTwitterConsumerHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/AbstractTwitterConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/AbstractTwitterConsumerHandler.java index 1fa515b..9ccc6d5 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/AbstractTwitterConsumerHandler.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/AbstractTwitterConsumerHandler.java @@ -84,6 +84,14 @@ public abstract class AbstractTwitterConsumerHandler { } protected Paging getLastIdPaging() { - return new Paging(lastId); + Integer pages = endpoint.getProperties().getNumberOfPages(); + Integer count = endpoint.getProperties().getCount(); + if (pages != null && count != null) { + return new Paging(pages, count, lastId); + } else if (pages != null) { + return new Paging(pages, lastId); + } else { + return new Paging(lastId); + } } } http://git-wip-us.apache.org/repos/asf/camel/blob/1a347d2d/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/HomeConsumerHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/HomeConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/HomeConsumerHandler.java index 2411e0a..9f65eba 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/HomeConsumerHandler.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/HomeConsumerHandler.java @@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.timeline; import java.util.List; import org.apache.camel.component.twitter.TwitterEndpoint; +import twitter4j.Paging; import twitter4j.Status; import twitter4j.TwitterException; @@ -33,8 +34,9 @@ public class HomeConsumerHandler extends AbstractStatusConsumerHandler { @Override protected List doPoll() throws TwitterException { - log.trace("doPoll.getHomeTimeline(sinceId={})", getLastIdPaging().getSinceId()); - return getTwitter().getHomeTimeline(getLastIdPaging()); + Paging paging = getLastIdPaging(); + log.trace("doPoll.getHomeTimeline(sinceId={})", paging.getSinceId()); + return getTwitter().getHomeTimeline(paging); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/1a347d2d/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/MentionsConsumerHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/MentionsConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/MentionsConsumerHandler.java index 9601c99..58c6fc6 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/MentionsConsumerHandler.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/MentionsConsumerHandler.java @@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.timeline; import java.util.List; import org.apache.camel.component.twitter.TwitterEndpoint; +import twitter4j.Paging; import twitter4j.Status; import twitter4j.TwitterException; @@ -33,8 +34,9 @@ public class MentionsConsumerHandler extends AbstractStatusConsumerHandler { @Override protected List doPoll() throws TwitterException { - log.trace("doPoll.getMentionsTimeline(sinceId={})", getLastIdPaging().getSinceId()); - return getTwitter().getMentionsTimeline(getLastIdPaging()); + Paging paging = getLastIdPaging(); + log.trace("doPoll.getMentionsTimeline(sinceId={})", paging.getSinceId()); + return getTwitter().getMentionsTimeline(paging); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/1a347d2d/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/RetweetsConsumerHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/RetweetsConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/RetweetsConsumerHandler.java index a447e8e..67b4477 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/RetweetsConsumerHandler.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/RetweetsConsumerHandler.java @@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.timeline; import java.util.List; import org.apache.camel.component.twitter.TwitterEndpoint; +import twitter4j.Paging; import twitter4j.Status; import twitter4j.TwitterException; @@ -33,8 +34,9 @@ public class RetweetsConsumerHandler extends AbstractStatusConsumerHandler { @Override protected List doPoll() throws TwitterException { - log.trace("doPoll.getRetweetsOfMe(sinceId={})", getLastIdPaging().getSinceId()); - return getTwitter().getRetweetsOfMe(getLastIdPaging()); + Paging paging = getLastIdPaging(); + log.trace("doPoll.getRetweetsOfMe(sinceId={})", paging.getSinceId()); + return getTwitter().getRetweetsOfMe(paging); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/1a347d2d/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/UserConsumerHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/UserConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/UserConsumerHandler.java index effe89f..027b0c3 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/UserConsumerHandler.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/UserConsumerHandler.java @@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.timeline; import java.util.List; import org.apache.camel.component.twitter.TwitterEndpoint; +import twitter4j.Paging; import twitter4j.Status; import twitter4j.TwitterException; @@ -36,8 +37,9 @@ public class UserConsumerHandler extends AbstractStatusConsumerHandler { @Override protected List doPoll() throws TwitterException { - log.trace("doPoll.getUserTimeline(user={}, sinceId={})", user, getLastIdPaging().getSinceId()); - return getTwitter().getUserTimeline(user, getLastIdPaging()); + Paging paging = getLastIdPaging(); + log.trace("doPoll.getUserTimeline(user={}, sinceId={})", user, paging.getSinceId()); + return getTwitter().getUserTimeline(user, paging); } @Override