You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/07/05 09:26:59 UTC
[1/8] camel git commit: camel-twitter - Added missing option in
component docs
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x e0c5b1483 -> dd9e89637
refs/heads/camel-2.19.x 1a23895dd -> 2bef6f213
refs/heads/master e6bcdba11 -> 1a347d2d9
camel-twitter - Added missing option in component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/57ee8327
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/57ee8327
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/57ee8327
Branch: refs/heads/master
Commit: 57ee832779477cc30d10f23c4d7630d66a4200c0
Parents: e6bcdba
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 5 10:45:54 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 5 10:45:54 2017 +0200
----------------------------------------------------------------------
.../camel-twitter/src/main/docs/twitter-timeline-component.adoc | 3 ++-
.../camel/component/twitter/timeline/TwitterTimelineEndpoint.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/57ee8327/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc b/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
index 6644d21..9dde987 100644
--- a/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
@@ -44,11 +44,12 @@ with the following path and query parameters:
| **timelineType** | *Required* The timeline type to produce/consume. | | TimelineType
|=======================================================================
-#### Query Parameters (41 parameters):
+#### Query Parameters (42 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
| Name | Description | Default | Type
+| **user** (common) | The username when using timelineType=user | | String
| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN or ERROR level and ignored. | false | boolean
| **sendEmptyMessageWhenIdle** (consumer) | If the polling consumer did not poll any files you can enable this option to send an empty message (no body) instead. | false | boolean
| **type** (consumer) | Endpoint type to use. Only streaming supports event type. | polling | EndpointType
http://git-wip-us.apache.org/repos/asf/camel/blob/57ee8327/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
index 32d845d..54b4aa0 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.twitter.consumer.AbstractTwitterConsumerHandle
import org.apache.camel.component.twitter.data.TimelineType;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
/**
@@ -38,7 +39,7 @@ public class TwitterTimelineEndpoint extends AbstractTwitterEndpoint {
@UriPath(description = "The timeline type to produce/consume.")
@Metadata(required = "true")
private TimelineType timelineType;
-
+ @UriParam(description = "The username when using timelineType=user")
private String user;
public TwitterTimelineEndpoint(String uri, String remaining, String user, TwitterTimelineComponent component, TwitterConfiguration properties) {
[5/8] camel git commit: Added a bit of logging
Posted by da...@apache.org.
Added a bit of logging
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1cb6c033
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1cb6c033
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1cb6c033
Branch: refs/heads/camel-2.19.x
Commit: 1cb6c033c90855de6a19a982f2c5be96ad94e6f9
Parents: 1a23895
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 5 10:59:03 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 5 11:23:34 2017 +0200
----------------------------------------------------------------------
.../apache/camel/component/twitter/consumer/TwitterConsumer.java | 4 ++++
.../twitter/consumer/timeline/AbstractStatusConsumer.java | 2 +-
.../camel/component/twitter/consumer/timeline/HomeConsumer.java | 2 ++
.../component/twitter/consumer/timeline/MentionsConsumer.java | 2 ++
.../component/twitter/consumer/timeline/RetweetsConsumer.java | 2 ++
.../camel/component/twitter/consumer/timeline/UserConsumer.java | 2 ++
6 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1cb6c033/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
index b1d9b37..ca877c7 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
@@ -20,6 +20,8 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.component.twitter.TwitterEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import twitter4j.Paging;
import twitter4j.Twitter;
import twitter4j.TwitterException;
@@ -27,6 +29,8 @@ import twitter4j.TwitterException;
public abstract class TwitterConsumer {
+ protected final Logger log = LoggerFactory.getLogger(this.getClass());
+
/**
* Instance of TwitterEndpoint.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/1cb6c033/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java
index 18f0aee..64d6679 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java
@@ -36,7 +36,7 @@ abstract class AbstractStatusConsumer extends TwitterConsumer {
@Override
public List<Exchange> pollConsume() throws TwitterException {
- List<Status> statusList = doPoll();
+ List<Status> statusList = doPoll();
for (int i = 0; i < statusList.size(); i++) {
setLastIdIfGreater(statusList.get(i).getId());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1cb6c033/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
index 252bacc..0b2a934 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
@@ -33,11 +33,13 @@ public class HomeConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getHomeTimeline(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getHomeTimeline(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getHomeTimeline()");
return getTwitter().getHomeTimeline();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1cb6c033/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
index c3671c8..cf07350 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
@@ -33,11 +33,13 @@ public class MentionsConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getMentionsTimeline(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getMentionsTimeline(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getMentionsTimeline()");
return getTwitter().getMentionsTimeline();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1cb6c033/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
index dfd0815..585cff9 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
@@ -33,11 +33,13 @@ public class RetweetsConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getRetweetsOfMe(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getRetweetsOfMe(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getRetweetsOfMe(");
return getTwitter().getRetweetsOfMe();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1cb6c033/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
index 51ef02a..ab20665 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
@@ -33,11 +33,13 @@ public class UserConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getUserTimeline(user={}, sinceId={})", endpoint.getProperties().getUser(), getLastIdPaging().getSinceId());
return getTwitter().getUserTimeline(endpoint.getProperties().getUser(), getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getUserTimeline(user={})", endpoint.getProperties().getUser());
return getTwitter().getUserTimeline(endpoint.getProperties().getUser());
}
}
[6/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.
Posted by da...@apache.org.
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/2bef6f21
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2bef6f21
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2bef6f21
Branch: refs/heads/camel-2.19.x
Commit: 2bef6f2131f31d2f34d87f7ff34a6cbdc31aaf84
Parents: 1cb6c03
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 5 11:20:18 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 5 11:25:14 2017 +0200
----------------------------------------------------------------------
.../component/twitter/consumer/TwitterConsumer.java | 10 +++++++++-
.../twitter/consumer/timeline/HomeConsumer.java | 6 ++++--
.../twitter/consumer/timeline/MentionsConsumer.java | 6 ++++--
.../twitter/consumer/timeline/RetweetsConsumer.java | 6 ++++--
.../twitter/consumer/timeline/UserConsumer.java | 12 ++++++++----
5 files changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2bef6f21/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
index ca877c7..fa27f4c 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
@@ -85,6 +85,14 @@ public abstract class TwitterConsumer {
}
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/2bef6f21/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
index 0b2a934..58d67bd 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.consumer.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 HomeConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> 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/2bef6f21/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
index cf07350..7b53985 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.consumer.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 MentionsConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> 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/2bef6f21/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
index 585cff9..9fff920 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.consumer.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 RetweetsConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> 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/2bef6f21/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
index ab20665..c08fe4b 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.consumer.timeline;
import java.util.List;
import org.apache.camel.component.twitter.TwitterEndpoint;
+import twitter4j.Paging;
import twitter4j.Status;
import twitter4j.TwitterException;
@@ -33,13 +34,16 @@ public class UserConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
- log.trace("doPoll.getUserTimeline(user={}, sinceId={})", endpoint.getProperties().getUser(), getLastIdPaging().getSinceId());
- return getTwitter().getUserTimeline(endpoint.getProperties().getUser(), getLastIdPaging());
+ Paging paging = getLastIdPaging();
+ String user = endpoint.getProperties().getUser();
+ log.trace("doPoll.getUserTimeline(user={}, sinceId={})", user, paging.getSinceId());
+ return getTwitter().getUserTimeline(user, paging);
}
@Override
protected List<Status> doDirect() throws TwitterException {
- log.trace("doDirect.getUserTimeline(user={})", endpoint.getProperties().getUser());
- return getTwitter().getUserTimeline(endpoint.getProperties().getUser());
+ String user = endpoint.getProperties().getUser();
+ log.trace("doDirect.getUserTimeline(user={})", user);
+ return getTwitter().getUserTimeline(user);
}
}
[3/8] camel git commit: Added a bit of logging
Posted by da...@apache.org.
Added a bit of logging
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/509eab16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/509eab16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/509eab16
Branch: refs/heads/master
Commit: 509eab166bc27023e4504f6e93321dee0f993166
Parents: 1abeae7
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 5 10:59:03 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 5 10:59:03 2017 +0200
----------------------------------------------------------------------
.../twitter/consumer/AbstractTwitterConsumerHandler.java | 4 ++++
.../twitter/timeline/AbstractStatusConsumerHandler.java | 2 +-
.../camel/component/twitter/timeline/HomeConsumerHandler.java | 2 ++
.../component/twitter/timeline/MentionsConsumerHandler.java | 2 ++
.../component/twitter/timeline/RetweetsConsumerHandler.java | 2 ++
.../camel/component/twitter/timeline/UserConsumerHandler.java | 2 ++
6 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/509eab16/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 b0ec1f0..1fa515b 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
@@ -20,6 +20,8 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.component.twitter.TwitterEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import twitter4j.Paging;
import twitter4j.Twitter;
import twitter4j.TwitterException;
@@ -27,6 +29,8 @@ import twitter4j.TwitterException;
public abstract class AbstractTwitterConsumerHandler {
+ protected final Logger log = LoggerFactory.getLogger(this.getClass());
+
/**
* Instance of TwitterEndpoint.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/509eab16/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/AbstractStatusConsumerHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/AbstractStatusConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/AbstractStatusConsumerHandler.java
index ec7d801..9de0d40 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/AbstractStatusConsumerHandler.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/AbstractStatusConsumerHandler.java
@@ -36,7 +36,7 @@ abstract class AbstractStatusConsumerHandler extends AbstractTwitterConsumerHand
@Override
public List<Exchange> pollConsume() throws TwitterException {
- List<Status> statusList = doPoll();
+ List<Status> statusList = doPoll();
for (int i = 0; i < statusList.size(); i++) {
setLastIdIfGreater(statusList.get(i).getId());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/509eab16/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 585ab03..2411e0a 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
@@ -33,11 +33,13 @@ public class HomeConsumerHandler extends AbstractStatusConsumerHandler {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getHomeTimeline(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getHomeTimeline(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getHomeTimeline()");
return getTwitter().getHomeTimeline();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/509eab16/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 95a2576..9601c99 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
@@ -33,11 +33,13 @@ public class MentionsConsumerHandler extends AbstractStatusConsumerHandler {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getMentionsTimeline(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getMentionsTimeline(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getMentionsTimeline()");
return getTwitter().getMentionsTimeline();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/509eab16/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 e603ebe..a447e8e 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
@@ -33,11 +33,13 @@ public class RetweetsConsumerHandler extends AbstractStatusConsumerHandler {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getRetweetsOfMe(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getRetweetsOfMe(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getRetweetsOfMe(");
return getTwitter().getRetweetsOfMe();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/509eab16/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 7f45024..effe89f 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
@@ -36,11 +36,13 @@ public class UserConsumerHandler extends AbstractStatusConsumerHandler {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getUserTimeline(user={}, sinceId={})", user, getLastIdPaging().getSinceId());
return getTwitter().getUserTimeline(user, getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getUserTimeline(user={})", user);
return getTwitter().getUserTimeline(user);
}
}
[8/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.
Posted by da...@apache.org.
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/dd9e8963
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dd9e8963
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dd9e8963
Branch: refs/heads/camel-2.18.x
Commit: dd9e896378e2301e2d44cad0e62f5eaed40e9ff1
Parents: 9d8b2cb
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 5 11:20:18 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 5 11:26:20 2017 +0200
----------------------------------------------------------------------
.../component/twitter/consumer/TwitterConsumer.java | 10 +++++++++-
.../twitter/consumer/timeline/HomeConsumer.java | 6 ++++--
.../twitter/consumer/timeline/MentionsConsumer.java | 6 ++++--
.../twitter/consumer/timeline/RetweetsConsumer.java | 6 ++++--
.../twitter/consumer/timeline/UserConsumer.java | 12 ++++++++----
5 files changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dd9e8963/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
index ca877c7..fa27f4c 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
@@ -85,6 +85,14 @@ public abstract class TwitterConsumer {
}
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/dd9e8963/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
index 0b2a934..58d67bd 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.consumer.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 HomeConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> 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/dd9e8963/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
index cf07350..7b53985 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.consumer.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 MentionsConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> 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/dd9e8963/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
index 585cff9..9fff920 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.consumer.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 RetweetsConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> 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/dd9e8963/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
index ab20665..c08fe4b 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.twitter.consumer.timeline;
import java.util.List;
import org.apache.camel.component.twitter.TwitterEndpoint;
+import twitter4j.Paging;
import twitter4j.Status;
import twitter4j.TwitterException;
@@ -33,13 +34,16 @@ public class UserConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
- log.trace("doPoll.getUserTimeline(user={}, sinceId={})", endpoint.getProperties().getUser(), getLastIdPaging().getSinceId());
- return getTwitter().getUserTimeline(endpoint.getProperties().getUser(), getLastIdPaging());
+ Paging paging = getLastIdPaging();
+ String user = endpoint.getProperties().getUser();
+ log.trace("doPoll.getUserTimeline(user={}, sinceId={})", user, paging.getSinceId());
+ return getTwitter().getUserTimeline(user, paging);
}
@Override
protected List<Status> doDirect() throws TwitterException {
- log.trace("doDirect.getUserTimeline(user={})", endpoint.getProperties().getUser());
- return getTwitter().getUserTimeline(endpoint.getProperties().getUser());
+ String user = endpoint.getProperties().getUser();
+ log.trace("doDirect.getUserTimeline(user={})", user);
+ return getTwitter().getUserTimeline(user);
}
}
[2/8] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1abeae7f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1abeae7f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1abeae7f
Branch: refs/heads/master
Commit: 1abeae7f40613a215411b7d254e96891e9a0ba2e
Parents: 57ee832
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 5 10:49:42 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 5 10:49:42 2017 +0200
----------------------------------------------------------------------
.../component/twitter/streaming/TwitterStreamingEndpoint.java | 3 ++-
.../camel/component/twitter/timeline/TwitterTimelineEndpoint.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1abeae7f/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingEndpoint.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingEndpoint.java
index 76228d8..49370d2 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingEndpoint.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingEndpoint.java
@@ -24,6 +24,7 @@ import org.apache.camel.component.twitter.TwitterConfiguration;
import org.apache.camel.component.twitter.TwitterHelper;
import org.apache.camel.component.twitter.consumer.AbstractTwitterConsumerHandler;
import org.apache.camel.component.twitter.data.StreamingType;
+import org.apache.camel.component.twitter.data.TimelineType;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -48,7 +49,7 @@ public class TwitterStreamingEndpoint extends AbstractTwitterEndpoint {
if (remaining == null) {
throw new IllegalArgumentException(String.format("The streaming type must be specified for '%s'", uri));
}
- this.streamingType = StreamingType.valueOf(remaining.toUpperCase());
+ this.streamingType = component.getCamelContext().getTypeConverter().convertTo(StreamingType.class, remaining);
this.keywords = keywords;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1abeae7f/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
index 54b4aa0..0bfd70e 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
@@ -47,7 +47,7 @@ public class TwitterTimelineEndpoint extends AbstractTwitterEndpoint {
if (remaining == null) {
throw new IllegalArgumentException(String.format("The timeline type must be specified for '%s'", uri));
}
- this.timelineType = TimelineType.valueOf(remaining.toUpperCase());
+ this.timelineType = component.getCamelContext().getTypeConverter().convertTo(TimelineType.class, remaining);
this.user = user;
}
[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.
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Wed Jul 5 11:20:18 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
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<Status> 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<Status> 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<Status> 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<Status> 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
[7/8] camel git commit: Added a bit of logging
Posted by da...@apache.org.
Added a bit of logging
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d8b2cbf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d8b2cbf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d8b2cbf
Branch: refs/heads/camel-2.18.x
Commit: 9d8b2cbf46d75c421e561e43dc1f3a3e4f18fb1c
Parents: e0c5b14
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 5 10:59:03 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 5 11:26:06 2017 +0200
----------------------------------------------------------------------
.../apache/camel/component/twitter/consumer/TwitterConsumer.java | 4 ++++
.../twitter/consumer/timeline/AbstractStatusConsumer.java | 2 +-
.../camel/component/twitter/consumer/timeline/HomeConsumer.java | 2 ++
.../component/twitter/consumer/timeline/MentionsConsumer.java | 2 ++
.../component/twitter/consumer/timeline/RetweetsConsumer.java | 2 ++
.../camel/component/twitter/consumer/timeline/UserConsumer.java | 2 ++
6 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9d8b2cbf/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
index b1d9b37..ca877c7 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumer.java
@@ -20,6 +20,8 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.component.twitter.TwitterEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import twitter4j.Paging;
import twitter4j.Twitter;
import twitter4j.TwitterException;
@@ -27,6 +29,8 @@ import twitter4j.TwitterException;
public abstract class TwitterConsumer {
+ protected final Logger log = LoggerFactory.getLogger(this.getClass());
+
/**
* Instance of TwitterEndpoint.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/9d8b2cbf/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java
index 18f0aee..64d6679 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/AbstractStatusConsumer.java
@@ -36,7 +36,7 @@ abstract class AbstractStatusConsumer extends TwitterConsumer {
@Override
public List<Exchange> pollConsume() throws TwitterException {
- List<Status> statusList = doPoll();
+ List<Status> statusList = doPoll();
for (int i = 0; i < statusList.size(); i++) {
setLastIdIfGreater(statusList.get(i).getId());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d8b2cbf/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
index 252bacc..0b2a934 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
@@ -33,11 +33,13 @@ public class HomeConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getHomeTimeline(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getHomeTimeline(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getHomeTimeline()");
return getTwitter().getHomeTimeline();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d8b2cbf/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
index c3671c8..cf07350 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
@@ -33,11 +33,13 @@ public class MentionsConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getMentionsTimeline(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getMentionsTimeline(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getMentionsTimeline()");
return getTwitter().getMentionsTimeline();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d8b2cbf/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
index dfd0815..585cff9 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
@@ -33,11 +33,13 @@ public class RetweetsConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getRetweetsOfMe(sinceId={})", getLastIdPaging().getSinceId());
return getTwitter().getRetweetsOfMe(getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getRetweetsOfMe(");
return getTwitter().getRetweetsOfMe();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d8b2cbf/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
index 51ef02a..ab20665 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
@@ -33,11 +33,13 @@ public class UserConsumer extends AbstractStatusConsumer {
@Override
protected List<Status> doPoll() throws TwitterException {
+ log.trace("doPoll.getUserTimeline(user={}, sinceId={})", endpoint.getProperties().getUser(), getLastIdPaging().getSinceId());
return getTwitter().getUserTimeline(endpoint.getProperties().getUser(), getLastIdPaging());
}
@Override
protected List<Status> doDirect() throws TwitterException {
+ log.trace("doDirect.getUserTimeline(user={})", endpoint.getProperties().getUser());
return getTwitter().getUserTimeline(endpoint.getProperties().getUser());
}
}