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 2016/07/20 18:50:45 UTC

[1/2] camel git commit: CAMEL-10163: camel-twitter - Component docs - Some options are labelled wrong

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 414be8407 -> 1ac5c475e
  refs/heads/master 451eca81d -> 90c7886e9


CAMEL-10163: camel-twitter - Component docs - Some options are labelled wrong


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/90c7886e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/90c7886e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/90c7886e

Branch: refs/heads/master
Commit: 90c7886e972529bbfbdb5d3ad0c60524cdbbcf39
Parents: 451eca8
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 20 14:49:30 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 20 14:49:30 2016 -0400

----------------------------------------------------------------------
 components/camel-twitter/src/main/docs/twitter.adoc | 16 +++++++++-------
 .../component/twitter/TwitterConfiguration.java     | 14 +++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/90c7886e/components/camel-twitter/src/main/docs/twitter.adoc
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/docs/twitter.adoc b/components/camel-twitter/src/main/docs/twitter.adoc
index 5b6dc9e..69723fb 100644
--- a/components/camel-twitter/src/main/docs/twitter.adoc
+++ b/components/camel-twitter/src/main/docs/twitter.adoc
@@ -148,6 +148,7 @@ URI options
 
 
 
+
 // endpoint options: START
 The Twitter component supports 43 endpoint options which are listed below:
 
@@ -174,6 +175,13 @@ The Twitter component supports 43 endpoint options which are listed below:
 | twitterStream | consumer (advanced) |  | TwitterStream | To use a custom instance of TwitterStream
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
 | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+| count | filter |  | Integer | Limiting number of results per page.
+| filterOld | filter | true | boolean | Filter out old tweets that has previously been polled. This state is stored in memory only and based on last tweet id.
+| keywords | filter |  | String | Can be used for search and streaming/filter. Multiple values can be separated with comma.
+| lang | filter |  | String | The lang string ISO_639-1 which will be used for searching
+| numberOfPages | filter | 1 | Integer | The number of pages result which you want camel-twitter to consume.
+| sinceId | filter | 1 | long | The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running.
+| userIds | filter |  | String | To filter by user ids for streaming/filter. Multiple values can be separated by comma.
 | backoffErrorThreshold | scheduler |  | int | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.
 | backoffIdleThreshold | scheduler |  | int | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
@@ -187,13 +195,6 @@ The Twitter component supports 43 endpoint options which are listed below:
 | startScheduler | scheduler | true | boolean | Whether the scheduler should be auto started.
 | timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay options.
 | useFixedDelay | scheduler | true | boolean | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.
-| count | filter |  | Integer | Limiting number of results per page.
-| filterOld | filter | true | boolean | Filter out old tweets that has previously been polled. This state is stored in memory only and based on last tweet id.
-| keywords | filter |  | String | Can be used for search and streaming/filter. Multiple values can be separated with comma.
-| lang | filter |  | String | The lang string ISO_639-1 which will be used for searching
-| numberOfPages | filter | 1 | Integer | The number of pages result which you want camel-twitter to consume.
-| sinceId | filter | 1 | long | The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running.
-| userIds | filter |  | String | To filter by user ids for streaming/filter. Multiple values can be separated by comma.
 | httpProxyHost | proxy |  | String | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead.
 | httpProxyPassword | proxy |  | String | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead.
 | httpProxyPort | proxy |  | Integer | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead.
@@ -207,6 +208,7 @@ The Twitter component supports 43 endpoint options which are listed below:
 
 
 
+
 [[Twitter-Messageheaders]]
 Message headers
 ^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/camel/blob/90c7886e/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
index e586a58..c665c20 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
@@ -46,19 +46,19 @@ public class TwitterConfiguration {
     private String consumerSecret;
     @UriParam
     private String user;
-    @UriParam(label = "filter")
+    @UriParam(label = "consumer,filter")
     private String keywords;
-    @UriParam(label = "filter")
+    @UriParam(label = "consumer,filter")
     private String userIds;
-    @UriParam(label = "filter", defaultValue = "true")
+    @UriParam(label = "consumer,filter", defaultValue = "true")
     private boolean filterOld = true;
-    @UriParam(label = "filter", defaultValue = "1")
+    @UriParam(label = "consumer,filter", defaultValue = "1")
     private long sinceId  = 1;
-    @UriParam(label = "filter")
+    @UriParam(label = "consumer,filter")
     private String lang;
-    @UriParam(label = "filter")
+    @UriParam(label = "consumer,filter")
     private Integer count;
-    @UriParam(label = "filter", defaultValue = "1")
+    @UriParam(label = "consumer,filter", defaultValue = "1")
     private Integer numberOfPages = 1;
     @UriParam(label = "proxy")
     private String httpProxyHost;


[2/2] camel git commit: CAMEL-10163: camel-twitter - Component docs - Some options are labelled wrong

Posted by da...@apache.org.
CAMEL-10163: camel-twitter - Component docs - Some options are labelled wrong


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ac5c475
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ac5c475
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ac5c475

Branch: refs/heads/camel-2.17.x
Commit: 1ac5c475eea1567ea466cf19ac387c66bb001a3e
Parents: 414be84
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 20 14:49:30 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 20 14:50:38 2016 -0400

----------------------------------------------------------------------
 .../camel/component/twitter/TwitterConfiguration.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1ac5c475/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
index e586a58..c665c20 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
@@ -46,19 +46,19 @@ public class TwitterConfiguration {
     private String consumerSecret;
     @UriParam
     private String user;
-    @UriParam(label = "filter")
+    @UriParam(label = "consumer,filter")
     private String keywords;
-    @UriParam(label = "filter")
+    @UriParam(label = "consumer,filter")
     private String userIds;
-    @UriParam(label = "filter", defaultValue = "true")
+    @UriParam(label = "consumer,filter", defaultValue = "true")
     private boolean filterOld = true;
-    @UriParam(label = "filter", defaultValue = "1")
+    @UriParam(label = "consumer,filter", defaultValue = "1")
     private long sinceId  = 1;
-    @UriParam(label = "filter")
+    @UriParam(label = "consumer,filter")
     private String lang;
-    @UriParam(label = "filter")
+    @UriParam(label = "consumer,filter")
     private Integer count;
-    @UriParam(label = "filter", defaultValue = "1")
+    @UriParam(label = "consumer,filter", defaultValue = "1")
     private Integer numberOfPages = 1;
     @UriParam(label = "proxy")
     private String httpProxyHost;