You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2019/08/09 09:01:49 UTC
[camel] branch master updated: CAMEL-13787: Remove
twitter-streaming component
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 698f6bc CAMEL-13787: Remove twitter-streaming component
698f6bc is described below
commit 698f6bcebb59e95a143af7602e23524881b7d655
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Aug 9 07:32:36 2019 +0100
CAMEL-13787: Remove twitter-streaming component
---
MIGRATION.md | 2 +
components/camel-twitter/pom.xml | 5 -
.../main/docs/twitter-directmessage-component.adoc | 17 +-
.../src/main/docs/twitter-search-component.adoc | 17 +-
.../src/main/docs/twitter-streaming-component.adoc | 141 ------------
.../src/main/docs/twitter-timeline-component.adoc | 17 +-
.../camel-twitter/src/main/docs/twitter.adoc | 149 ------------
.../component/twitter/AbstractTwitterEndpoint.java | 5 +-
.../component/twitter/TwitterConfiguration.java | 52 ++---
.../consumer/AbstractTwitterConsumerHandler.java | 4 +-
.../twitter/consumer/DefaultTwitterConsumer.java | 34 +--
.../camel/component/twitter/data/ConsumerType.java | 2 +-
.../camel/component/twitter/data/EndpointType.java | 2 +-
.../component/twitter/data/StreamingType.java | 29 ---
.../AbstractStreamingConsumerHandler.java | 128 -----------
.../streaming/FilterStreamingConsumerHandler.java | 80 -------
.../streaming/SampleStreamingConsumerHandler.java | 40 ----
.../streaming/TwitterStreamingComponent.java | 48 ----
.../streaming/TwitterStreamingEndpoint.java | 84 -------
.../streaming/UserStreamingConsumerHandler.java | 226 ------------------
.../camel/component/twitter/SearchEventTest.java | 91 --------
.../TwitterComponentVerifierExtensionTest.java | 24 --
.../twitter/TwitterComponentVerifierTest.java | 24 --
.../component/twitter/UriConfigurationTest.java | 18 --
.../camel/component/twitter/UserStreamingTest.java | 49 ----
.../deprecated/DirectMessageDirectTest.java | 53 -----
.../deprecated/DirectMessagePollingTest.java | 52 -----
.../twitter/deprecated/HomeTimeLineDirectTest.java | 38 ---
.../deprecated/HomeTimeLinePollingTest.java | 37 ---
.../deprecated/SearchByExchangeDirectTest.java | 140 -----------
.../twitter/deprecated/SearchDirectTest.java | 38 ---
.../twitter/deprecated/SearchEventTest.java | 93 --------
.../twitter/deprecated/SearchPollingTest.java | 37 ---
.../twitter/deprecated/UserProducerInOnlyTest.java | 79 -------
.../twitter/deprecated/UserProducerInOutTest.java | 84 -------
.../twitter/deprecated/UserStreamingTest.java | 51 ----
.../twitter/deprecated/UserTimeLineDirectTest.java | 38 ---
.../deprecated/UserTimeLinePollingTest.java | 38 ---
...terStreamingComponentVerifierExtensionTest.java | 26 ---
.../TwitterStreamingComponentVerifierTest.java | 26 ---
components/readme.adoc | 5 +-
.../builder/endpoint/EndpointBuilderFactory.java | 1 -
...TwitterDirectMessageEndpointBuilderFactory.java | 84 +++----
.../dsl/TwitterSearchEndpointBuilderFactory.java | 84 +++----
.../TwitterStreamingEndpointBuilderFactory.java | 256 ---------------------
.../dsl/TwitterTimelineEndpointBuilderFactory.java | 84 +++----
...TwitterStreamingComponentAutoConfiguration.java | 129 -----------
.../TwitterStreamingComponentConfiguration.java | 164 -------------
.../src/main/resources/META-INF/spring.factories | 3 +-
.../apache/camel/itest/karaf/CamelTwitterTest.java | 1 -
.../camel/itest/springboot/CamelTwitterTest.java | 1 -
51 files changed, 137 insertions(+), 2793 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 83b705a..94cbd57 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -114,6 +114,8 @@ The `camel-zookeeper` has its route policy functionality removed, instead use `Z
The `camel-jetty` component no longer supports producer (eg to) which has been removed, instead use `camel-http4` component instead.
+The `twitter-streaming` component has been removed as it relied on the deprecated Twitter Streaming API and is no longer functional.
+
### Renamed components
The `test` component has been renamed to `dataset-test` and moved out of `camel-core` into `camel-dataset` JAR.
diff --git a/components/camel-twitter/pom.xml b/components/camel-twitter/pom.xml
index 6c588d3..2a1d9c8 100644
--- a/components/camel-twitter/pom.xml
+++ b/components/camel-twitter/pom.xml
@@ -46,11 +46,6 @@
<artifactId>twitter4j-core</artifactId>
<version>${twitter4j-version}</version>
</dependency>
- <dependency>
- <groupId>org.twitter4j</groupId>
- <artifactId>twitter4j-stream</artifactId>
- <version>${twitter4j-version}</version>
- </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc b/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
index f19ef61..6a35398 100644
--- a/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
@@ -50,7 +50,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (44 parameters):
+=== Query Parameters (43 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -58,17 +58,16 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *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
-| *distanceMetric* (consumer) | Used by the non-stream geography search, to search by radius using the configured metrics. The unit can either be mi for miles, or km for kilometers. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | km | String
+| *type* (consumer) | Endpoint type to use. | polling | EndpointType
+| *distanceMetric* (consumer) | Used by the geography search, to search by radius using the configured metrics. The unit can either be mi for miles, or km for kilometers. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | km | String
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
| *extendedMode* (consumer) | Used for enabling full text from twitter (eg receive tweets that contains more than 140 characters). | true | boolean
-| *latitude* (consumer) | Used by the non-stream geography search to search by latitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can be used for streaming/filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon. | | String
-| *longitude* (consumer) | Used by the non-stream geography search to search by longitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
+| *latitude* (consumer) | Used by the geography search to search by latitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
+| *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can be used for filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon. | | String
+| *longitude* (consumer) | Used by the geography search to search by longitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
-| *radius* (consumer) | Used by the non-stream geography search to search by radius. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *twitterStream* (consumer) | To use a custom instance of TwitterStream | | TwitterStream
+| *radius* (consumer) | Used by the geography search to search by radius. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
@@ -77,7 +76,7 @@ with the following path and query parameters:
| *lang* (filter) | The lang string ISO_639-1 which will be used for searching | | String
| *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
| *sinceId* (filter) | 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. | 1 | long
-| *userIds* (filter) | To filter by user ids for streaming/filter. Multiple values can be separated by comma. | | String
+| *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. | | String
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
| *backoffMultiplier* (scheduler) | 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. | | int
diff --git a/components/camel-twitter/src/main/docs/twitter-search-component.adoc b/components/camel-twitter/src/main/docs/twitter-search-component.adoc
index 7419209..40c6e84 100644
--- a/components/camel-twitter/src/main/docs/twitter-search-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-search-component.adoc
@@ -59,7 +59,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (44 parameters):
+=== Query Parameters (43 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -67,17 +67,16 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *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
-| *distanceMetric* (consumer) | Used by the non-stream geography search, to search by radius using the configured metrics. The unit can either be mi for miles, or km for kilometers. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | km | String
+| *type* (consumer) | Endpoint type to use. | polling | EndpointType
+| *distanceMetric* (consumer) | Used by the geography search, to search by radius using the configured metrics. The unit can either be mi for miles, or km for kilometers. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | km | String
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
| *extendedMode* (consumer) | Used for enabling full text from twitter (eg receive tweets that contains more than 140 characters). | true | boolean
-| *latitude* (consumer) | Used by the non-stream geography search to search by latitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can be used for streaming/filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon. | | String
-| *longitude* (consumer) | Used by the non-stream geography search to search by longitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
+| *latitude* (consumer) | Used by the geography search to search by latitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
+| *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can be used for filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon. | | String
+| *longitude* (consumer) | Used by the geography search to search by longitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
-| *radius* (consumer) | Used by the non-stream geography search to search by radius. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *twitterStream* (consumer) | To use a custom instance of TwitterStream | | TwitterStream
+| *radius* (consumer) | Used by the geography search to search by radius. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
@@ -86,7 +85,7 @@ with the following path and query parameters:
| *lang* (filter) | The lang string ISO_639-1 which will be used for searching | | String
| *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
| *sinceId* (filter) | 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. | 1 | long
-| *userIds* (filter) | To filter by user ids for streaming/filter. Multiple values can be separated by comma. | | String
+| *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. | | String
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
| *backoffMultiplier* (scheduler) | 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. | | int
diff --git a/components/camel-twitter/src/main/docs/twitter-streaming-component.adoc b/components/camel-twitter/src/main/docs/twitter-streaming-component.adoc
deleted file mode 100644
index 99852d4..0000000
--- a/components/camel-twitter/src/main/docs/twitter-streaming-component.adoc
+++ /dev/null
@@ -1,141 +0,0 @@
-[[twitter-streaming-component]]
-= Twitter Streaming Component
-
-*Available as of Camel version 2.10*
-
-The Twitter Streaming component consumes twitter statuses using Streaming API.
-
-== Component Options
-
-// component options: START
-The Twitter Streaming component supports 10 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *accessToken* (security) | The access token | | String
-| *accessTokenSecret* (security) | The access token secret | | String
-| *consumerKey* (security) | The consumer key | | String
-| *consumerSecret* (security) | The consumer secret | | String
-| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. | | String
-| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. | | String
-| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. | | String
-| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. | | int
-| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
-| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-|===
-// component options: END
-
-
-== Endpoint Options
-
-// endpoint options: START
-The Twitter Streaming endpoint is configured using URI syntax:
-
-----
-twitter-streaming:streamingType
-----
-
-with the following path and query parameters:
-
-=== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *streamingType* | *Required* The streaming type to consume. | | StreamingType
-|===
-
-
-=== Query Parameters (44 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *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
-| *distanceMetric* (consumer) | Used by the non-stream geography search, to search by radius using the configured metrics. The unit can either be mi for miles, or km for kilometers. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | km | String
-| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
-| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
-| *extendedMode* (consumer) | Used for enabling full text from twitter (eg receive tweets that contains more than 140 characters). | true | boolean
-| *latitude* (consumer) | Used by the non-stream geography search to search by latitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can be used for streaming/filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon. | | String
-| *longitude* (consumer) | Used by the non-stream geography search to search by longitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
-| *radius* (consumer) | Used by the non-stream geography search to search by radius. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *twitterStream* (consumer) | To use a custom instance of TwitterStream | | TwitterStream
-| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *count* (filter) | Limiting number of results per page. | 5 | Integer
-| *filterOld* (filter) | Filter out old tweets, that has previously been polled. This state is stored in memory only, and based on last tweet id. | true | boolean
-| *keywords* (filter) | Can be used for a streaming filter. Multiple values can be separated with comma. | | String
-| *lang* (filter) | The lang string ISO_639-1 which will be used for searching | | String
-| *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
-| *sinceId* (filter) | 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. | 1 | long
-| *userIds* (filter) | To filter by user ids for streaming/filter. Multiple values can be separated by comma. | | String
-| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
-| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
-| *backoffMultiplier* (scheduler) | 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. | | int
-| *delay* (scheduler) | Milliseconds before the next poll. | 30000 | long
-| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
-| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
-| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
-| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
-| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
-| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
-| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
-| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. | | String
-| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. | | String
-| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. | | Integer
-| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. | | String
-| *accessToken* (security) | The access token. Can also be configured on the TwitterComponent level instead. | | String
-| *accessTokenSecret* (security) | The access secret. Can also be configured on the TwitterComponent level instead. | | String
-| *consumerKey* (security) | The consumer key. Can also be configured on the TwitterComponent level instead. | | String
-| *consumerSecret* (security) | The consumer secret. Can also be configured on the TwitterComponent level instead. | | String
-|===
-// endpoint options: END
-// spring-boot-auto-configure options: START
-== Spring Boot Auto-Configuration
-
-When using Spring Boot make sure to use the following Maven dependency to have support for auto configuration:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-twitter-starter</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-
-The component supports 11 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.component.twitter-streaming.access-token* | The access token | | String
-| *camel.component.twitter-streaming.access-token-secret* | The access token secret | | String
-| *camel.component.twitter-streaming.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.twitter-streaming.consumer-key* | The consumer key | | String
-| *camel.component.twitter-streaming.consumer-secret* | The consumer secret | | String
-| *camel.component.twitter-streaming.enabled* | Whether to enable auto configuration of the twitter-streaming component. This is enabled by default. | | Boolean
-| *camel.component.twitter-streaming.http-proxy-host* | The http proxy host which can be used for the camel-twitter. | | String
-| *camel.component.twitter-streaming.http-proxy-password* | The http proxy password which can be used for the camel-twitter. | | String
-| *camel.component.twitter-streaming.http-proxy-port* | The http proxy port which can be used for the camel-twitter. | | Integer
-| *camel.component.twitter-streaming.http-proxy-user* | The http proxy user which can be used for the camel-twitter. | | String
-| *camel.component.twitter-streaming.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
-|===
-// spring-boot-auto-configure options: END
-
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 4d9ca89..7e7ecd3 100644
--- a/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
@@ -50,7 +50,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (45 parameters):
+=== Query Parameters (44 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -59,17 +59,16 @@ with the following path and query parameters:
| *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
-| *distanceMetric* (consumer) | Used by the non-stream geography search, to search by radius using the configured metrics. The unit can either be mi for miles, or km for kilometers. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | km | String
+| *type* (consumer) | Endpoint type to use. | polling | EndpointType
+| *distanceMetric* (consumer) | Used by the geography search, to search by radius using the configured metrics. The unit can either be mi for miles, or km for kilometers. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | km | String
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
| *extendedMode* (consumer) | Used for enabling full text from twitter (eg receive tweets that contains more than 140 characters). | true | boolean
-| *latitude* (consumer) | Used by the non-stream geography search to search by latitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can be used for streaming/filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon. | | String
-| *longitude* (consumer) | Used by the non-stream geography search to search by longitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
+| *latitude* (consumer) | Used by the geography search to search by latitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
+| *locations* (consumer) | Bounding boxes, created by pairs of lat/lons. Can be used for filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon. | | String
+| *longitude* (consumer) | Used by the geography search to search by longitude. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
-| *radius* (consumer) | Used by the non-stream geography search to search by radius. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
-| *twitterStream* (consumer) | To use a custom instance of TwitterStream | | TwitterStream
+| *radius* (consumer) | Used by the geography search to search by radius. You need to configure all the following options: longitude, latitude, radius, and distanceMetric. | | Double
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
@@ -78,7 +77,7 @@ with the following path and query parameters:
| *lang* (filter) | The lang string ISO_639-1 which will be used for searching | | String
| *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
| *sinceId* (filter) | 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. | 1 | long
-| *userIds* (filter) | To filter by user ids for streaming/filter. Multiple values can be separated by comma. | | String
+| *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. | | String
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
| *backoffMultiplier* (scheduler) | 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. | | int
diff --git a/components/camel-twitter/src/main/docs/twitter.adoc b/components/camel-twitter/src/main/docs/twitter.adoc
deleted file mode 100644
index 8bd14fb..0000000
--- a/components/camel-twitter/src/main/docs/twitter.adoc
+++ /dev/null
@@ -1,149 +0,0 @@
-= Twitter Components
-
-*Available as of Camel version 2.10*
-
-The Camel Twitter consists of 4 components:
-
-* xref:twitter-directmessage-component.adoc[Twitter Direct Message]
-* xref:twitter-search-component.adoc[Twitter Search]
-* xref:twitter-streaming-component.adoc[Twitter Streaming]
-* xref:twitter-timeline-component.adoc[Twitter Timeline]
-
-The Twitter components enable the most useful features of the Twitter
-API by encapsulating http://twitter4j.org/[Twitter4J]. It allows direct,
-polling, or event-driven consumption of timelines, users, trends, and
-direct messages. Also, it supports producing messages as status updates
-or direct messages.
-
-Twitter now requires the use of OAuth for all client application
-authentication. In order to use camel-twitter with your account, you'll
-need to create a new application within Twitter at
-https://dev.twitter.com/apps/new and grant the application access to
-your account. Finally, generate your access token and secret.
-
-Maven users will need to add the following dependency to their pom.xml
-for this component:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-twitter</artifactId>
- <version>${camel-version}</version>
-</dependency>
-----
-
-== Consumer endpoints
-
-Rather than the endpoints returning a List through one single route
-exchange, camel-twitter creates one route exchange per returned object.
-As an example, if "timeline/home" results in five statuses, the route
-will be executed five times (one for each Status).
-
-[width="100%",cols="10%,10%,10%,70%",options="header",]
-|=======================================================================
-|Endpoint |Context |Body Type |Notice
-|xref:twitter-directmessage-component.adoc[twitter-directmessage] |direct, polling |twitter4j.DirectMessage |
-
-|xref:twitter-search-component.adoc[twitter-search] |direct, polling |twitter4j.Status |
-
-|xref:twitter-streaming-component.adoc[twitter-streaming] |event, polling |twitter4j.Status |
-
-|xref:twitter-timeline-component.adoc[twitter-timeline] |direct, polling |twitter4j.Status |
-|=======================================================================
-
-== Producer endpoints
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|==============================
-|Endpoint |Body Type |Notice
-|xref:twitter-directmessage-component.adoc[twitter-directmessage] |String |
-|xref:twitter-search-component.adoc[twitter-search] |List<twitter4j.Status> |
-|xref:twitter-timeline-component.adoc[twitter-timeline] |String |Only 'user' timelineType is supported for producer
-|==============================
-
-== Message headers
-
-[width="100%",cols="20%,80%",options="header",]
-|=======================================================================
-|Name |Description
-|`CamelTwitterKeywords` |This header is used by the search producer to
-change the search key words dynamically.
-
-|`CamelTwitterSearchLanguage` |This header can override
-the option of `lang` which set the search language for the search
-endpoint dynamically
-
-|`CamelTwitterCount` |This header can override the option
-of `count` which sets the max twitters that will be returned.
-
-|`CamelTwitterNumberOfPages` |This header can override
-the option of `numberOfPages` which sets how many pages we want to
-twitter returns.
-|=======================================================================
-
-== Message body
-
-All message bodies utilize objects provided by the Twitter4J API.
-
-== Use cases
-
-NOTE: *API Rate Limits:* Twitter REST APIs encapsulated by http://twitter4j.org/[Twitter4J] are
-subjected to https://dev.twitter.com/rest/public/rate-limiting[API Rate
-Limiting]. You can find the per method limits in the
-https://dev.twitter.com/rest/public/rate-limits[API Rate Limits]
-documentation. Note that endpoints/resources not listed in that page are
-default to 15 requests per allotted user per window.
-
-=== To create a status update within your Twitter profile, send this producer a String body:
-
-[source,java]
-----
-from("direct:foo")
- .to("twitter-timeline://user?consumerKey=[s]&consumerSecret=[s]&accessToken=[s]&accessTokenSecret=[s]);
-----
-
-=== To poll, every 60 sec., all statuses on your home timeline:
-
-[source,java]
-----
-from("twitter-timeline://home?type=polling&delay=60&consumerKey=[s]&consumerSecret=[s]&accessToken=[s]&accessTokenSecret=[s]")
- .to("bean:blah");
-----
-
-=== To search for all statuses with the keyword 'camel' only once:
-
-[source,java]
-----
-from("twitter-search://foo?type=polling&keywords=camel&consumerKey=[s]&consumerSecret=[s]&accessToken=[s]&accessTokenSecret=[s]")
- .to("bean:blah");
-----
-
-=== Searching using a producer with static keywords:
-
-[source,java]
-----
-from("direct:foo")
- .to("twitter-search://foo?keywords=camel&consumerKey=[s]&consumerSecret=[s]&accessToken=[s]&accessTokenSecret=[s]");
-----
-
-=== Searching using a producer with dynamic keywords from header:
-
-In the `bar` header we have the keywords we want to search, so we can
-assign this value to the `CamelTwitterKeywords` header:
-
-[source,java]
-----
-from("direct:foo")
- .setHeader("CamelTwitterKeywords", header("bar"))
- .to("twitter-search://foo?consumerKey=[s]&consumerSecret=[s]&accessToken=[s]&accessTokenSecret=[s]");
-----
-
-== See Also
-
-* Configuring Camel
-* Component
-* Endpoint
-* Getting Started
-
-* Twitter Websocket Example
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/AbstractTwitterEndpoint.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/AbstractTwitterEndpoint.java
index 7bb33ed..3c4ac98 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/AbstractTwitterEndpoint.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/AbstractTwitterEndpoint.java
@@ -45,9 +45,6 @@ public abstract class AbstractTwitterEndpoint extends DefaultPollingEndpoint imp
@Override
protected void doStop() throws Exception {
super.doStop();
- if (properties.getType() == EndpointType.EVENT && properties.getTwitterStream() != null) {
- properties.getTwitterStream().shutdown();
- }
}
@Override
@@ -57,7 +54,7 @@ public abstract class AbstractTwitterEndpoint extends DefaultPollingEndpoint imp
@Override
@ManagedAttribute
-public TwitterConfiguration getProperties() {
+ public TwitterConfiguration getProperties() {
return properties;
}
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 1854674..783a925 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
@@ -22,15 +22,13 @@ import org.apache.camel.spi.UriParams;
import org.apache.camel.util.ObjectHelper;
import twitter4j.Twitter;
import twitter4j.TwitterFactory;
-import twitter4j.TwitterStream;
-import twitter4j.TwitterStreamFactory;
import twitter4j.conf.Configuration;
import twitter4j.conf.ConfigurationBuilder;
@UriParams
public class TwitterConfiguration {
- @UriParam(label = "consumer", defaultValue = "polling", enums = "polling,direct,event")
+ @UriParam(label = "consumer", defaultValue = "polling", enums = "polling,direct")
private EndpointType type = EndpointType.POLLING;
@UriParam(label = "security", secret = true)
private String accessToken;
@@ -76,24 +74,20 @@ public class TwitterConfiguration {
private boolean extendedMode = true;
/**
- * Singleton, on demand instances of Twitter4J's Twitter & TwitterStream.
+ * Singleton, on demand instances of Twitter4J's Twitter.
* This should not be created by an endpoint's doStart(), etc., since
- * instances of twitter and/or twitterStream can be supplied by the route
- * itself. Further, as an example, we don't want to initialize twitter
- * if we only need twitterStream.
+ * instances of twitter can be supplied by the route
+ * itself.
*/
private Twitter twitter;
- @UriParam(label = "consumer,advanced")
- private TwitterStream twitterStream;
-
/**
* Ensures required fields are available.
*/
public void checkComplete() {
- if (twitter == null && twitterStream == null
- && (ObjectHelper.isEmpty(consumerKey) || ObjectHelper.isEmpty(consumerSecret) || ObjectHelper.isEmpty(accessToken) || ObjectHelper.isEmpty(accessTokenSecret))) {
- throw new IllegalArgumentException("twitter or twitterStream or all of consumerKey, consumerSecret, accessToken, and accessTokenSecret must be set!");
+ if (twitter == null &&
+ (ObjectHelper.isEmpty(consumerKey) || ObjectHelper.isEmpty(consumerSecret) || ObjectHelper.isEmpty(accessToken) || ObjectHelper.isEmpty(accessTokenSecret))) {
+ throw new IllegalArgumentException("twitter or all of consumerKey, consumerSecret, accessToken, and accessTokenSecret must be set!");
}
}
@@ -137,24 +131,6 @@ public class TwitterConfiguration {
this.twitter = twitter;
}
- public TwitterStream getTwitterStream() {
- return twitterStream;
- }
-
- /**
- * To use a custom instance of TwitterStream
- */
- public void setTwitterStream(TwitterStream twitterStream) {
- this.twitterStream = twitterStream;
- }
-
- public TwitterStream createTwitterStream() {
- if (twitterStream == null) {
- twitterStream = new TwitterStreamFactory(getConfiguration()).getInstance();
- }
- return twitterStream;
- }
-
public String getConsumerKey() {
return consumerKey;
}
@@ -204,7 +180,7 @@ public class TwitterConfiguration {
}
/**
- * Endpoint type to use. Only streaming supports event type.
+ * Endpoint type to use.
*/
public void setType(EndpointType type) {
this.type = type;
@@ -215,7 +191,7 @@ public class TwitterConfiguration {
}
/**
- * Bounding boxes, created by pairs of lat/lons. Can be used for streaming/filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon.
+ * Bounding boxes, created by pairs of lat/lons. Can be used for filter. A pair is defined as lat,lon. And multiple paris can be separated by semi colon.
*/
public void setLocations(String locations) {
this.locations = locations;
@@ -226,7 +202,7 @@ public class TwitterConfiguration {
}
/**
- * To filter by user ids for streaming/filter. Multiple values can be separated by comma.
+ * To filter by user ids for filter. Multiple values can be separated by comma.
*/
public void setUserIds(String userIds) {
this.userIds = userIds;
@@ -348,7 +324,7 @@ public class TwitterConfiguration {
}
/**
- * Used by the non-stream geography search to search by longitude.
+ * Used by the geography search to search by longitude.
* <p/>
* You need to configure all the following options: longitude, latitude, radius, and distanceMetric.
*/
@@ -361,7 +337,7 @@ public class TwitterConfiguration {
}
/**
- * Used by the non-stream geography search to search by latitude.
+ * Used by the geography search to search by latitude.
* <p/>
* You need to configure all the following options: longitude, latitude, radius, and distanceMetric.
*/
@@ -374,7 +350,7 @@ public class TwitterConfiguration {
}
/**
- * Used by the non-stream geography search to search by radius.
+ * Used by the geography search to search by radius.
* <p/>
* You need to configure all the following options: longitude, latitude, radius, and distanceMetric.
*/
@@ -387,7 +363,7 @@ public class TwitterConfiguration {
}
/**
- * Used by the non-stream geography search, to search by radius using the configured metrics.
+ * Used by the geography search, to search by radius using the configured metrics.
* <p/>
* The unit can either be mi for miles, or km for kilometers.
* <p/>
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 ae5ebc1..067ab19 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
@@ -48,8 +48,8 @@ public abstract class AbstractTwitterConsumerHandler {
/**
* Called by polling consumers during each poll. It needs to be separate
- * from directConsume() since, as an example, streaming API polling allows
- * tweets to build up between polls.
+ * from directConsume() since, as an example, to allow tweets to build
+ * up between polls.
*/
public abstract List<Exchange> pollConsume() throws TwitterException;
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/DefaultTwitterConsumer.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/DefaultTwitterConsumer.java
index 3d9208f..1c1a686 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/DefaultTwitterConsumer.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/DefaultTwitterConsumer.java
@@ -21,11 +21,11 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.twitter.AbstractTwitterEndpoint;
-import org.apache.camel.component.twitter.streaming.AbstractStreamingConsumerHandler;
+import org.apache.camel.component.twitter.data.EndpointType;
import org.apache.camel.support.ScheduledPollConsumer;
/**
- * Provides a scheduled polling consumer as well as event based consumer for streaming.
+ * Provides a scheduled polling consumer.
*/
public class DefaultTwitterConsumer extends ScheduledPollConsumer implements TwitterEventListener {
@@ -48,19 +48,7 @@ public class DefaultTwitterConsumer extends ScheduledPollConsumer implements Twi
@Override
protected void doStart() throws Exception {
super.doStart();
- switch (endpoint.getEndpointType()) {
- case POLLING:
- if (handler instanceof AbstractStreamingConsumerHandler) {
- ((AbstractStreamingConsumerHandler) handler).start();
- }
- break;
- case EVENT:
- if (handler instanceof AbstractStreamingConsumerHandler) {
- ((AbstractStreamingConsumerHandler) handler).setEventListener(this);
- ((AbstractStreamingConsumerHandler) handler).start();
- }
- break;
- default:
+ if (endpoint.getEndpointType().equals(EndpointType.DIRECT)) {
List<Exchange> exchanges = handler.directConsume();
for (int i = 0; i < exchanges.size(); i++) {
getProcessor().process(exchanges.get(i));
@@ -70,22 +58,6 @@ public class DefaultTwitterConsumer extends ScheduledPollConsumer implements Twi
@Override
protected void doStop() throws Exception {
- switch (endpoint.getEndpointType()) {
- case POLLING:
- if (handler instanceof AbstractStreamingConsumerHandler) {
- ((AbstractStreamingConsumerHandler) handler).stop();
- }
- break;
- case EVENT:
- if (handler instanceof AbstractStreamingConsumerHandler) {
- ((AbstractStreamingConsumerHandler) handler).removeEventListener(this);
- ((AbstractStreamingConsumerHandler) handler).stop();
- }
- break;
- default:
- break;
- }
-
super.doStop();
}
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java
index c6f1f1f..80d56f2 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.twitter.data;
import org.apache.camel.component.twitter.TwitterHelper;
public enum ConsumerType {
- TIMELINE, SEARCH, DIRECTMESSAGE, STREAMING, UNKNOWN;
+ TIMELINE, SEARCH, DIRECTMESSAGE, UNKNOWN;
private static final ConsumerType[] VALUES = values();
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java
index bda8d5d..df70e66 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.twitter.data;
import org.apache.camel.component.twitter.TwitterHelper;
public enum EndpointType {
- POLLING, DIRECT, EVENT;
+ POLLING, DIRECT;
private static final EndpointType[] VALUES = values();
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/StreamingType.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/StreamingType.java
deleted file mode 100644
index d7fdebe..0000000
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/StreamingType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.data;
-
-import org.apache.camel.component.twitter.TwitterHelper;
-
-public enum StreamingType {
- SAMPLE, FILTER, USER, UNKNOWN;
-
- private static final StreamingType[] VALUES = values();
-
- public static StreamingType fromString(String uri) {
- return TwitterHelper.enumFromString(VALUES, uri, StreamingType.UNKNOWN);
- }
-}
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/AbstractStreamingConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/AbstractStreamingConsumerHandler.java
deleted file mode 100644
index 93e6f4f..0000000
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/AbstractStreamingConsumerHandler.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Service;
-import org.apache.camel.component.twitter.TwitterEndpoint;
-import org.apache.camel.component.twitter.consumer.AbstractTwitterConsumerHandler;
-import org.apache.camel.component.twitter.consumer.TwitterEventListener;
-import org.apache.camel.component.twitter.consumer.TwitterEventType;
-import twitter4j.Status;
-import twitter4j.StatusDeletionNotice;
-import twitter4j.StatusListener;
-import twitter4j.TwitterException;
-import twitter4j.TwitterStream;
-
-/**
- * Super class providing consuming capabilities for the streaming API.
- */
-public abstract class AbstractStreamingConsumerHandler extends AbstractTwitterConsumerHandler implements StatusListener, Service {
- private final TwitterStream twitterStream;
- private final List<Exchange> receivedStatuses;
- private final AtomicReference<TwitterEventListener> twitterEventListener;
- private boolean clear;
-
- public AbstractStreamingConsumerHandler(TwitterEndpoint te) {
- super(te);
- this.receivedStatuses = new ArrayList<>();
- this.twitterStream = te.getProperties().createTwitterStream();
- this.twitterStream.addListener(this);
- this.twitterEventListener = new AtomicReference<>();
- this.clear = true;
- }
-
- @Override
- public List<Exchange> pollConsume() throws TwitterException {
- List<Exchange> result;
-
- synchronized (receivedStatuses) {
- clear = true;
- result = Collections.unmodifiableList(new ArrayList<>(receivedStatuses));
- }
-
- return result;
- }
-
- @Override
- public List<Exchange> directConsume() throws TwitterException {
- return Collections.emptyList();
- }
-
- @Override
- public void onException(Exception ex) {
- }
-
- @Override
- public void onStatus(Status status) {
- onEvent(TwitterEventType.STATUS.createExchange(endpoint, status));
- }
-
- @Override
- public void onDeletionNotice(StatusDeletionNotice statusDeletionNotice) {
- // noop
- }
-
- @Override
- public void onTrackLimitationNotice(int numberOfLimitedStatuses) {
- // noop
- }
-
- @Override
- public void onScrubGeo(long userId, long upToStatusId) {
- // noop
- }
-
- public void setEventListener(TwitterEventListener tweeterStatusListener) {
- twitterEventListener.set(tweeterStatusListener);
- }
-
- public void removeEventListener(TwitterEventListener tweeterStatusListener) {
- twitterEventListener.compareAndSet(tweeterStatusListener, null);
- }
-
- @Override
- public void stop() {
- twitterStream.removeListener(this);
- twitterStream.shutdown();
- twitterStream.cleanUp();
- }
-
- protected TwitterStream getTwitterStream() {
- return twitterStream;
- }
-
- protected void onEvent(Exchange exchange) {
- TwitterEventListener listener = twitterEventListener.get();
- if (listener != null) {
- listener.onEvent(exchange);
- } else {
- synchronized (receivedStatuses) {
- if (clear) {
- receivedStatuses.clear();
- clear = false;
- }
- receivedStatuses.add(exchange);
- }
- }
- }
-}
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/FilterStreamingConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/FilterStreamingConsumerHandler.java
deleted file mode 100644
index 1b690f5..0000000
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/FilterStreamingConsumerHandler.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming;
-
-import org.apache.camel.component.twitter.TwitterEndpoint;
-import twitter4j.FilterQuery;
-import twitter4j.StallWarning;
-
-/**
- * Consumes the filter stream
- */
-public class FilterStreamingConsumerHandler extends AbstractStreamingConsumerHandler {
-
- private String keywords;
-
- public FilterStreamingConsumerHandler(TwitterEndpoint endpoint, String keywords) {
- super(endpoint);
- this.keywords = keywords;
- }
-
- @Override
- public void start() {
- getTwitterStream().filter(createFilter());
- }
-
- @Override
- public void onStallWarning(StallWarning stallWarning) {
- // noop
- }
-
- private FilterQuery createFilter() {
- FilterQuery filterQuery = new FilterQuery();
- String allLocationsString = endpoint.getProperties().getLocations();
- if (allLocationsString != null) {
- String[] locationStrings = allLocationsString.split(";");
- double[][] locations = new double[locationStrings.length][2];
- for (int i = 0; i < locationStrings.length; i++) {
- String[] coords = locationStrings[i].split(",");
- locations[i][0] = Double.valueOf(coords[0]);
- locations[i][1] = Double.valueOf(coords[1]);
- }
- filterQuery.locations(locations);
- }
-
- String keywords = this.keywords;
- if (keywords != null && keywords.length() > 0) {
- filterQuery.track(keywords.split(","));
- }
-
- String userIds = endpoint.getProperties().getUserIds();
- if (userIds != null) {
- String[] stringUserIds = userIds.split(",");
- long[] longUserIds = new long[stringUserIds.length];
- for (int i = 0; i < stringUserIds.length; i++) {
- longUserIds[i] = Long.valueOf(stringUserIds[i]);
- }
- filterQuery.follow(longUserIds);
- }
-
- if (allLocationsString == null && keywords == null && userIds == null) {
- throw new IllegalArgumentException("At least one filter parameter is required");
- }
-
- return filterQuery;
- }
-}
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/SampleStreamingConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/SampleStreamingConsumerHandler.java
deleted file mode 100644
index 0648a0e..0000000
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/SampleStreamingConsumerHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming;
-
-import org.apache.camel.component.twitter.TwitterEndpoint;
-import twitter4j.StallWarning;
-
-/**
- * Consumes the sample stream
- */
-public class SampleStreamingConsumerHandler extends AbstractStreamingConsumerHandler {
-
- public SampleStreamingConsumerHandler(TwitterEndpoint endpoint) {
- super(endpoint);
- }
-
- @Override
- public void start() {
- getTwitterStream().sample();
- }
-
- @Override
- public void onStallWarning(StallWarning stallWarning) {
- // noop
- }
-}
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponent.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponent.java
deleted file mode 100644
index 45d325a..0000000
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponent.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.component.twitter.AbstractTwitterComponent;
-import org.apache.camel.component.twitter.TwitterConfiguration;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
-
-/**
- * Twitter Streaming component.
- */
-@Metadata(label = "verifiers", enums = "parameters,connectivity")
-@Component("twitter-streaming")
-public class TwitterStreamingComponent extends AbstractTwitterComponent {
-
- public TwitterStreamingComponent() {
- super("twitter-streaming");
- }
-
- public TwitterStreamingComponent(CamelContext context) {
- super(context, "twitter-streaming");
- }
-
- @Override
- protected Endpoint doCreateEndpoint(TwitterConfiguration properties, String uri, String remaining, Map<String, Object> parameters) throws Exception {
- String keywords = getAndRemoveParameter(parameters, "keywords", String.class);
- return new TwitterStreamingEndpoint(uri, remaining, keywords, this, properties);
- }
-}
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
deleted file mode 100644
index b2ba9d2..0000000
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/TwitterStreamingEndpoint.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming;
-
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.component.twitter.AbstractTwitterEndpoint;
-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.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
-
-/**
- * The Twitter Streaming component consumes twitter statuses using Streaming API.
- */
-@UriEndpoint(firstVersion = "2.10.0", scheme = "twitter-streaming", title = "Twitter Streaming", syntax = "twitter-streaming:streamingType",
- consumerOnly = true, label = "api,social")
-public class TwitterStreamingEndpoint extends AbstractTwitterEndpoint {
-
- @UriPath(description = "The streaming type to consume.")
- @Metadata(required = true)
- private StreamingType streamingType;
-
- @UriParam(description = "Can be used for a streaming filter. Multiple values can be separated with comma.", label = "consumer,filter")
- private String keywords;
-
- public TwitterStreamingEndpoint(String uri, String remaining, String keywords, TwitterStreamingComponent component, TwitterConfiguration properties) {
- super(uri, component, properties);
- if (remaining == null) {
- throw new IllegalArgumentException(String.format("The streaming type must be specified for '%s'", uri));
- }
- this.streamingType = component.getCamelContext().getTypeConverter().convertTo(StreamingType.class, remaining);
- this.keywords = keywords;
- }
-
- @Override
- public Producer createProducer() throws Exception {
- throw new UnsupportedOperationException("Producer not supported for twitter-streaming");
- }
-
- @Override
- public Consumer createConsumer(Processor processor) throws Exception {
- AbstractTwitterConsumerHandler handler;
- switch (streamingType) {
- case SAMPLE:
- handler = new SampleStreamingConsumerHandler(this);
- break;
- case FILTER:
- handler = new FilterStreamingConsumerHandler(this, keywords);
- break;
- case USER:
- handler = new UserStreamingConsumerHandler(this);
- break;
- default:
- throw new IllegalArgumentException("Cannot create any consumer with uri " + getEndpointUri()
- + ". A streaming type was not provided (or an incorrect pairing was used).");
- }
- return TwitterHelper.createConsumer(processor, this, handler);
- }
-
- public StreamingType getStreamingType() {
- return streamingType;
- }
-
-}
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/UserStreamingConsumerHandler.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/UserStreamingConsumerHandler.java
deleted file mode 100644
index 2aaca5f..0000000
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/streaming/UserStreamingConsumerHandler.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.component.twitter.TwitterConstants;
-import org.apache.camel.component.twitter.TwitterEndpoint;
-import org.apache.camel.component.twitter.TwitterHelper;
-import org.apache.camel.component.twitter.consumer.TwitterEventType;
-import twitter4j.DirectMessage;
-import twitter4j.StallWarning;
-import twitter4j.Status;
-import twitter4j.User;
-import twitter4j.UserList;
-import twitter4j.UserStreamListener;
-
-public class UserStreamingConsumerHandler extends AbstractStreamingConsumerHandler implements UserStreamListener {
-
- public UserStreamingConsumerHandler(TwitterEndpoint endpoint) {
- super(endpoint);
- }
-
- @Override
- public void start() {
- getTwitterStream().user();
- }
-
- @Override
- public void onDeletionNotice(long directMessageId, long userId) {
- // noop
- }
-
- @Override
- public void onFriendList(long[] friendIds) {
- // noop
- }
-
- @Override
- public void onFavorite(User source, User target, Status favoritedStatus) {
- Exchange exchange = TwitterEventType.FAVORITE.createExchange(endpoint, favoritedStatus);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, target, "target");
-
- onEvent(exchange);
- }
-
- @Override
- public void onUnfavorite(User source, User target, Status unfavoritedStatus) {
- Exchange exchange = TwitterEventType.UNFAVORITE.createExchange(endpoint, unfavoritedStatus);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, target, "target");
-
- onEvent(exchange);
- }
-
- @Override
- public void onFollow(User source, User followedUser) {
- Exchange exchange = TwitterEventType.FOLLOW.createExchange(endpoint);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, followedUser, "followed");
-
- onEvent(exchange);
- }
-
- @Override
- public void onUnfollow(User source, User unfollowedUser) {
- Exchange exchange = TwitterEventType.UNFOLLOW.createExchange(endpoint);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, unfollowedUser, "unfollowed");
-
- onEvent(exchange);
- }
-
- @Override
- public void onDirectMessage(DirectMessage directMessage) {
- onEvent(TwitterEventType.DIRECT_MESSAGE.createExchange(endpoint, directMessage));
- }
-
- @Override
- public void onUserListMemberAddition(User addedMember, User listOwner, UserList list) {
- Exchange exchange = TwitterEventType.USERLIST_MEMBER_ADDITION.createExchange(endpoint, list);
- TwitterHelper.setUserHeader(exchange, 1, addedMember, "addedMember");
- TwitterHelper.setUserHeader(exchange, 2, listOwner, "listOwner");
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserListMemberDeletion(User deletedMember, User listOwner, UserList list) {
- Exchange exchange = TwitterEventType.USERLIST_MEMBER_DELETION.createExchange(endpoint, list);
- TwitterHelper.setUserHeader(exchange, 1, deletedMember, "deletedMember");
- TwitterHelper.setUserHeader(exchange, 2, listOwner, "listOwner");
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserListSubscription(User subscriber, User listOwner, UserList list) {
- Exchange exchange = TwitterEventType.USERLIST_SUBSCRIPTION.createExchange(endpoint, list);
- TwitterHelper.setUserHeader(exchange, 1, subscriber, "subscriber");
- TwitterHelper.setUserHeader(exchange, 2, listOwner, "listOwner");
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserListUnsubscription(User subscriber, User listOwner, UserList list) {
- Exchange exchange = TwitterEventType.USERLIST_UNSUBSCRIPTION.createExchange(endpoint, list);
- TwitterHelper.setUserHeader(exchange, 1, subscriber, "subscriber");
- TwitterHelper.setUserHeader(exchange, 2, listOwner, "listOwner");
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserListCreation(User user, UserList userList) {
- Exchange exchange = TwitterEventType.USERLIST_CREATION.createExchange(endpoint, userList);
- TwitterHelper.setUserHeader(exchange, user);
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserListUpdate(User user, UserList userList) {
- Exchange exchange = TwitterEventType.USERLIST_UPDATE.createExchange(endpoint, userList);
- TwitterHelper.setUserHeader(exchange, user);
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserListDeletion(User user, UserList userList) {
- Exchange exchange = TwitterEventType.USERLIST_DELETETION.createExchange(endpoint, userList);
- TwitterHelper.setUserHeader(exchange, user);
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserProfileUpdate(User user) {
- Exchange exchange = TwitterEventType.USER_PROFILE_UPDATE.createExchange(endpoint);
- TwitterHelper.setUserHeader(exchange, user);
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserSuspension(long suspendedUser) {
- Exchange exchange = TwitterEventType.USER_SUSPENSION.createExchange(endpoint);
- exchange.getIn().setHeader(TwitterConstants.TWITTER_USER, suspendedUser);
-
- onEvent(exchange);
- }
-
- @Override
- public void onUserDeletion(long deletedUser) {
- Exchange exchange = TwitterEventType.USER_DELETION.createExchange(endpoint);
- exchange.getIn().setHeader(TwitterConstants.TWITTER_USER, deletedUser);
-
- onEvent(exchange);
- }
-
- @Override
- public void onBlock(User source, User blockedUser) {
- Exchange exchange = TwitterEventType.BLOCK.createExchange(endpoint);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, blockedUser, "blocked");
-
- onEvent(exchange);
- }
-
- @Override
- public void onUnblock(User source, User unblockedUser) {
- Exchange exchange = TwitterEventType.UNBLOCK.createExchange(endpoint);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, unblockedUser, "unblocked");
-
- onEvent(exchange);
- }
-
- @Override
- public void onStallWarning(StallWarning stallWarning) {
- // noop
- }
-
- @Override
- public void onRetweetedRetweet(User source, User target, Status retweetedStatus) {
- Exchange exchange = TwitterEventType.RETWEETED_RETWEET.createExchange(endpoint, retweetedStatus);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, target, "target");
-
- onEvent(exchange);
- }
-
- @Override
- public void onFavoritedRetweet(User source, User target, Status favoritedRetweeet) {
- Exchange exchange = TwitterEventType.FAVORITED_RETWEET.createExchange(endpoint, favoritedRetweeet);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, target, "target");
-
- onEvent(exchange);
- }
-
- @Override
- public void onQuotedTweet(User source, User target, Status quotingTweet) {
- Exchange exchange = TwitterEventType.QUOTED_TWEET.createExchange(endpoint, quotingTweet);
- TwitterHelper.setUserHeader(exchange, 1, source, "source");
- TwitterHelper.setUserHeader(exchange, 2, target, "target");
-
- onEvent(exchange);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
deleted file mode 100644
index 7ac66cf..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.apache.camel.EndpointInject;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spi.Registry;
-import org.apache.camel.support.SimpleRegistry;
-import org.junit.Test;
-import twitter4j.Status;
-import twitter4j.StatusListener;
-import twitter4j.TwitterStream;
-
-public class SearchEventTest extends CamelTwitterTestSupport {
-
- @EndpointInject("mock:result")
- protected MockEndpoint resultEndpoint;
-
- private TwitterStream twitterStream;
- private StatusListener listener;
-
- @Test
- public void testSearchTimeline() throws Exception {
- resultEndpoint.expectedMinimumMessageCount(1);
- Status status = (Status) Proxy.newProxyInstance(getClass().getClassLoader(),
- new Class[]{Status.class},
- new TwitterHandler());
-
- listener.onStatus(status);
- //"#cameltest tweet");
- resultEndpoint.assertIsSatisfied();
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- public void configure() {
- from("twitter-streaming://filter?type=event&twitterStream=#twitterStream&keywords=#cameltest")
- .transform(body().convertToString()).to("mock:result");
- }
- };
- }
-
- @Override
- protected Registry createCamelRegistry() throws Exception {
- twitterStream = (TwitterStream) Proxy.newProxyInstance(getClass().getClassLoader(),
- new Class[]{TwitterStream.class},
- new TwitterHandler());
- Registry registry = new SimpleRegistry();
- registry.bind("twitterStream", twitterStream);
- return registry;
- }
-
- public class TwitterHandler implements InvocationHandler {
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- //mock some methods
- if ("addListener".equals(method.getName())) {
- listener = (StatusListener) args[0];
- } else if ("toString".equals(method.getName())) {
- return this.toString();
- } else if ("getText".equals(method.getName())) {
- return "#cameltest tweet";
- } else if ("getUser".equals(method.getName())) {
- return Proxy.newProxyInstance(getClass().getClassLoader(),
- new Class[]{twitter4j.User.class},
- new TwitterHandler());
- }
- return null;
- }
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/TwitterComponentVerifierExtensionTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/TwitterComponentVerifierExtensionTest.java
deleted file mode 100644
index 052186e..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/TwitterComponentVerifierExtensionTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter;
-
-public class TwitterComponentVerifierExtensionTest extends AbstractComponentVerifierExtensionTest {
- @Override
- protected String getComponentScheme() {
- return "twitter";
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/TwitterComponentVerifierTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/TwitterComponentVerifierTest.java
deleted file mode 100644
index b358355..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/TwitterComponentVerifierTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter;
-
-public class TwitterComponentVerifierTest extends AbstractComponentVerifierTest {
- @Override
- protected String getComponentScheme() {
- return "twitter";
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
index 14d59b3..a891f61 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
@@ -18,11 +18,9 @@ package org.apache.camel.component.twitter;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.component.twitter.data.StreamingType;
import org.apache.camel.component.twitter.data.TimelineType;
import org.apache.camel.component.twitter.directmessage.TwitterDirectMessageEndpoint;
import org.apache.camel.component.twitter.search.TwitterSearchEndpoint;
-import org.apache.camel.component.twitter.streaming.TwitterStreamingEndpoint;
import org.apache.camel.component.twitter.timeline.TwitterTimelineEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
@@ -80,22 +78,6 @@ public class UriConfigurationTest extends Assert {
}
@Test
- public void testStreamingEndpoint() throws Exception {
- Endpoint endpoint = context.getEndpoint("twitter-streaming:filter");
- assertTrue("Endpoint not a TwitterStreamingEndpoint: " + endpoint, endpoint instanceof TwitterStreamingEndpoint);
- TwitterStreamingEndpoint streamingEndpoint = (TwitterStreamingEndpoint)endpoint;
- assertEquals(StreamingType.FILTER, streamingEndpoint.getStreamingType());
- endpoint = context.getEndpoint("twitter-streaming:sample");
- assertTrue("Endpoint not a TwitterStreamingEndpoint: " + endpoint, endpoint instanceof TwitterStreamingEndpoint);
- streamingEndpoint = (TwitterStreamingEndpoint)endpoint;
- assertEquals(StreamingType.SAMPLE, streamingEndpoint.getStreamingType());
- endpoint = context.getEndpoint("twitter-streaming:user");
- assertTrue("Endpoint not a TwitterStreamingEndpoint: " + endpoint, endpoint instanceof TwitterStreamingEndpoint);
- streamingEndpoint = (TwitterStreamingEndpoint)endpoint;
- assertEquals(StreamingType.USER, streamingEndpoint.getStreamingType());
- }
-
- @Test
public void testTimelineEndpoint() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-timeline:home");
assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint, endpoint instanceof TwitterTimelineEndpoint);
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserStreamingTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserStreamingTest.java
deleted file mode 100644
index 128b6c5..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserStreamingTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter;
-
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore
-public class UserStreamingTest extends CamelTwitterTestSupport {
-
- @Test
- public void testUserStreaming() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:user-streaming");
- mock.setResultWaitTime(TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES));
- mock.expectedMessageCount(1);
- mock.assertIsSatisfied();
- }
-
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- @Override
- public void configure() {
- from("twitter-streaming://user?type=event&" + getUriTokens())
- .to("log:org.apache.camel.component.twitter?level=INFO&showHeaders=true")
- .to("mock:user-streaming");
- }
- };
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/DirectMessageDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/DirectMessageDirectTest.java
deleted file mode 100644
index fa3ecd2..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/DirectMessageDirectTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class DirectMessageDirectTest extends CamelTwitterConsumerTestSupport {
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- /* Uncomment when you need a test direct message
- TwitterConfiguration properties = new TwitterConfiguration();
- properties.setConsumerKey(consumerKey);
- properties.setConsumerSecret(consumerSecret);
- properties.setAccessToken(accessToken);
- properties.setAccessTokenSecret(accessTokenSecret);
- Twitter twitter = properties.getTwitter();
- twitter.sendDirectMessage(twitter.getScreenName(), "Test Direct Message: " + new Date().toString());
- */
- }
-
- @Override
- protected String getUri() {
- return "twitter://directmessage?type=direct&";
- }
-
- @Override
- protected Logger getLogger() {
- return LoggerFactory.getLogger(DirectMessageDirectTest.class);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/DirectMessagePollingTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/DirectMessagePollingTest.java
deleted file mode 100644
index fa7a108..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/DirectMessagePollingTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class DirectMessagePollingTest extends CamelTwitterConsumerTestSupport {
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- /* Uncomment when you need a test direct message
- TwitterConfiguration properties = new TwitterConfiguration();
- properties.setConsumerKey(consumerKey);
- properties.setConsumerSecret(consumerSecret);
- properties.setAccessToken(accessToken);
- properties.setAccessTokenSecret(accessTokenSecret);
- Twitter twitter = properties.getTwitter();
- twitter.sendDirectMessage(twitter.getScreenName(), "Test Direct Message: " + new Date().toString());
- */
- }
-
- @Override
- protected String getUri() {
- return "twitter://directmessage?type=polling&";
- }
-
- @Override
- protected Logger getLogger() {
- return LoggerFactory.getLogger(DirectMessagePollingTest.class);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/HomeTimeLineDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/HomeTimeLineDirectTest.java
deleted file mode 100644
index 3649cab..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/HomeTimeLineDirectTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class HomeTimeLineDirectTest extends CamelTwitterConsumerTestSupport {
-
- @Override
- protected String getUri() {
- return "twitter://timeline/home?type=direct&";
- }
-
- @Override
- protected Logger getLogger() {
- return LoggerFactory.getLogger(HomeTimeLineDirectTest.class);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/HomeTimeLinePollingTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/HomeTimeLinePollingTest.java
deleted file mode 100644
index b7b0b29..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/HomeTimeLinePollingTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class HomeTimeLinePollingTest extends CamelTwitterConsumerTestSupport {
- @Override
- protected String getUri() {
- return "twitter://timeline/home?type=polling&";
- }
-
- @Override
- protected Logger getLogger() {
- return LoggerFactory.getLogger(HomeTimeLinePollingTest.class);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchByExchangeDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchByExchangeDirectTest.java
deleted file mode 100644
index 59f3866..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchByExchangeDirectTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.twitter.CamelTwitterTestSupport;
-import org.apache.camel.component.twitter.TwitterConstants;
-import org.junit.Test;
-
-@Deprecated
-public class SearchByExchangeDirectTest extends CamelTwitterTestSupport {
-
- @Produce("direct:start")
- protected ProducerTemplate template;
-
- @Produce("direct:header")
- protected ProducerTemplate templateHeader;
-
- @Produce("direct:double")
- protected ProducerTemplate templateDouble;
-
- @Test
- public void testSearchTimelineWithStaticQuery() throws Exception {
- template.sendBody(null);
-
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMinimumMessageCount(1);
- mock.assertIsSatisfied();
- List<Exchange> tweets = mock.getExchanges();
- for (Exchange e : tweets) {
- log.info("Tweet: " + e.getIn().getBody(String.class));
- }
- }
-
- @Test
- public void testSearchTimelineWithDynamicQuery() throws Exception {
- templateHeader.sendBodyAndHeader(null, TwitterConstants.TWITTER_KEYWORDS, "java");
-
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMinimumMessageCount(1);
- mock.assertIsSatisfied();
- List<Exchange> tweets = mock.getExchanges();
- for (Exchange e : tweets) {
- log.info("Tweet: " + e.getIn().getBody(String.class));
- }
- }
-
- @Test
- public void testSearchTimelineWithDynamicQuerySinceId() throws Exception {
- Map<String, Object> headers = new HashMap<>();
- headers.put(TwitterConstants.TWITTER_KEYWORDS, "java");
- headers.put(TwitterConstants.TWITTER_SINCEID, new Long(258347905419730944L));
- templateHeader.sendBodyAndHeaders(null, headers);
-
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMinimumMessageCount(1);
- mock.assertIsSatisfied();
- List<Exchange> tweets = mock.getExchanges();
- for (Exchange e : tweets) {
- log.info("Tweet: " + e.getIn().getBody(String.class));
- }
- }
-
- @Test
- public void testSearchTimelineWithDynamicQuerySinceIdAndMaxId() throws Exception {
- Map<String, Object> headers = new HashMap<>();
- headers.put(TwitterConstants.TWITTER_KEYWORDS, "java");
- headers.put(TwitterConstants.TWITTER_SINCEID, new Long(258347905419730944L));
- headers.put(TwitterConstants.TWITTER_MAXID, new Long(258348815243960320L));
- templateHeader.sendBodyAndHeaders(null, headers);
-
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMinimumMessageCount(0);
- }
-
- @Test
- public void testDoubleSearchKeepingOld() throws Exception {
- templateDouble.sendBodyAndHeader(null, TwitterConstants.TWITTER_KEYWORDS, "java");
-
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMinimumMessageCount(1);
- mock.assertIsSatisfied();
- List<Exchange> tweets = mock.getExchanges();
- for (Exchange e : tweets) {
- log.info("Tweet: " + e.getIn().getBody(String.class));
- }
-
- // calls the same query again, expecting to receive the same amount of
- // tweets, because we told this route to not filter old(consumed) tweets
- int total = mock.getReceivedCounter();
- templateDouble.sendBodyAndHeader(null, TwitterConstants.TWITTER_KEYWORDS, "java");
-
- // due race condition
- assertTrue(mock.getReceivedCounter() >= total);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- public void configure() {
- from("direct:start")
- .toF("twitter://search?%s&keywords=java", getUriTokens())
- .split().body()
- .to("mock:result");
-
- from("direct:header")
- .toF("twitter://search?%s", getUriTokens())
- .split().body()
- .to("mock:result");
-
- from("direct:double")
- .toF("twitter://search?filterOld=false&%s", getUriTokens())
- .split().body()
- .to("mock:result");
- }
- };
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchDirectTest.java
deleted file mode 100644
index 3f2c0ab..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchDirectTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class SearchDirectTest extends CamelTwitterConsumerTestSupport {
-
- @Override
- protected String getUri() {
- return "twitter://search?type=direct&keywords=java&";
- }
-
- @Override
- protected Logger getLogger() {
- return LoggerFactory.getLogger(SearchDirectTest.class);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java
deleted file mode 100644
index bc7fa7e..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.apache.camel.EndpointInject;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.twitter.CamelTwitterTestSupport;
-import org.apache.camel.spi.Registry;
-import org.apache.camel.support.SimpleRegistry;
-import org.junit.Test;
-import twitter4j.Status;
-import twitter4j.StatusListener;
-import twitter4j.TwitterStream;
-
-@Deprecated
-public class SearchEventTest extends CamelTwitterTestSupport {
-
- @EndpointInject("mock:result")
- protected MockEndpoint resultEndpoint;
-
- private TwitterStream twitterStream;
- private StatusListener listener;
-
- @Test
- public void testSearchTimeline() throws Exception {
- resultEndpoint.expectedMinimumMessageCount(1);
- Status status = (Status) Proxy.newProxyInstance(getClass().getClassLoader(),
- new Class[]{Status.class},
- new TwitterHandler());
-
- listener.onStatus(status);
- //"#cameltest tweet");
- resultEndpoint.assertIsSatisfied();
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- public void configure() {
- from("twitter://streaming/filter?type=event&twitterStream=#twitterStream&keywords=#cameltest")
- .transform(body().convertToString()).to("mock:result");
- }
- };
- }
-
- @Override
- protected Registry createCamelRegistry() throws Exception {
- twitterStream = (TwitterStream) Proxy.newProxyInstance(getClass().getClassLoader(),
- new Class[]{TwitterStream.class},
- new TwitterHandler());
- Registry registry = new SimpleRegistry();
- registry.bind("twitterStream", twitterStream);
- return registry;
- }
-
- public class TwitterHandler implements InvocationHandler {
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- //mock some methods
- if ("addListener".equals(method.getName())) {
- listener = (StatusListener) args[0];
- } else if ("toString".equals(method.getName())) {
- return this.toString();
- } else if ("getText".equals(method.getName())) {
- return "#cameltest tweet";
- } else if ("getUser".equals(method.getName())) {
- return Proxy.newProxyInstance(getClass().getClassLoader(),
- new Class[]{twitter4j.User.class},
- new TwitterHandler());
- }
- return null;
- }
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchPollingTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchPollingTest.java
deleted file mode 100644
index 61ebfdc..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchPollingTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class SearchPollingTest extends CamelTwitterConsumerTestSupport {
- @Override
- protected String getUri() {
- return "twitter://search?type=polling&keywords=java&delay=5000&";
- }
-
- @Override
- protected Logger getLogger() {
- return LoggerFactory.getLogger(SearchPollingTest.class);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOnlyTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOnlyTest.java
deleted file mode 100644
index 85046a4..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOnlyTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.twitter.CamelTwitterTestSupport;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.hamcrest.core.Is.is;
-
-/**
- * Tests posting a twitter update with the default In Message Exchange Pattern
- */
-@Deprecated
-public class UserProducerInOnlyTest extends CamelTwitterTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(UserProducerInOnlyTest.class);
-
- @EndpointInject("mock:result")
- protected MockEndpoint resultEndpoint;
-
- @Test
- public void testPostStatusUpdateRequestResponse() throws Exception {
- Date now = new Date();
- String tweet = "UserProducerInOnlyTest: This is a tweet posted on " + now.toString();
- LOG.info("Tweet: " + tweet);
- ProducerTemplate producerTemplate = context.createProducerTemplate();
- // send tweet to the twitter endpoint
- producerTemplate.sendBodyAndHeader("direct:tweets", tweet, "customHeader", 12312);
-
-
- resultEndpoint.expectedMessageCount(1);
- resultEndpoint.expectedBodyReceived().body(String.class);
- // Message headers should be preserved
- resultEndpoint.expectedHeaderReceived("customHeader", 12312);
- resultEndpoint.assertIsSatisfied();
-
- List<Exchange> tweets = resultEndpoint.getExchanges();
- assertNotNull(tweets);
- assertThat(tweets.size(), is(1));
- String receivedTweet = tweets.get(0).getIn().getBody(String.class);
- assertThat(receivedTweet, is(tweet));
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- public void configure() {
- from("direct:tweets")
- //.to("log:org.apache.camel.component.twitter?level=INFO&showAll=true&multiline=true")
- .to("twitter://timeline/user?" + getUriTokens())
- //.to("log:org.apache.camel.component.twitter?level=INFO&showAll=true&multiline=true")
- .to("mock:result");
- }
- };
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOutTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOutTest.java
deleted file mode 100644
index b6c8046..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOutTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.twitter.CamelTwitterTestSupport;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import twitter4j.Status;
-
-import static org.hamcrest.core.Is.is;
-
-/**
- * Tests posting a twitter update and getting the status update id from the Twitter API response
- */
-@Deprecated
-public class UserProducerInOutTest extends CamelTwitterTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(UserProducerInOutTest.class);
-
- @EndpointInject("mock:result")
- protected MockEndpoint resultEndpoint;
-
- @Test
- public void testPostStatusUpdateRequestResponse() throws Exception {
- Date now = new Date();
- String tweet = "UserProducerInOutTest: This is a tweet posted on " + now.toString();
- LOG.info("Tweet: " + tweet);
- ProducerTemplate producerTemplate = context.createProducerTemplate();
- // send tweet to the twitter endpoint
- producerTemplate.sendBodyAndHeader("direct:tweets", tweet, "customHeader", 12312);
-
-
- resultEndpoint.expectedMessageCount(1);
- resultEndpoint.expectedBodyReceived().body(Status.class);
- // Message headers should be preserved
- resultEndpoint.expectedHeaderReceived("customHeader", 12312);
- resultEndpoint.assertIsSatisfied();
-
- List<Exchange> tweets = resultEndpoint.getExchanges();
- assertNotNull(tweets);
- assertThat(tweets.size(), is(1));
- Status receivedTweet = tweets.get(0).getIn().getBody(Status.class);
- assertNotNull(receivedTweet);
- // The identifier for the published tweet should be there
- assertNotNull(receivedTweet.getId());
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- public void configure() {
- from("direct:tweets")
- //.to("log:org.apache.camel.component.twitter?level=INFO&showAll=true&multiline=true")
- .inOut("twitter://timeline/user?" + getUriTokens())
- //.to("log:org.apache.camel.component.twitter?level=INFO&showAll=true&multiline=true")
- //.transform().simple("The tweet '${body.text}' was published with the id '${body.id}'")
- //.to("log:org.apache.camel.component.twitter?level=INFO&showAll=true&multiline=true")
- .to("mock:result");
- }
- };
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserStreamingTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserStreamingTest.java
deleted file mode 100644
index 5959eba..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserStreamingTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.twitter.CamelTwitterTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Deprecated
-@Ignore
-public class UserStreamingTest extends CamelTwitterTestSupport {
-
- @Test
- public void testUserStreaming() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:user-streaming");
- mock.setResultWaitTime(TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES));
- mock.expectedMessageCount(1);
- mock.assertIsSatisfied();
- }
-
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- @Override
- public void configure() {
- from("twitter://streaming/user?type=event&" + getUriTokens())
- .to("log:org.apache.camel.component.twitter?level=INFO&showHeaders=true")
- .to("mock:user-streaming");
- }
- };
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserTimeLineDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserTimeLineDirectTest.java
deleted file mode 100644
index 62bdaf6..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserTimeLineDirectTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class UserTimeLineDirectTest extends CamelTwitterConsumerTestSupport {
-
- @Override
- protected String getUri() {
- return "twitter://timeline/user?type=direct&user=brettemeyer&";
- }
-
- @Override
- protected Logger getLogger() {
- return LoggerFactory.getLogger(UserTimeLineDirectTest.class);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserTimeLinePollingTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserTimeLinePollingTest.java
deleted file mode 100644
index 8718473..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserTimeLinePollingTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.deprecated;
-
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class UserTimeLinePollingTest extends CamelTwitterConsumerTestSupport {
-
- @Override
- protected String getUri() {
- return "twitter://timeline/user?type=polling&user=brettemeyer&";
- }
-
- @Override
- protected Logger getLogger() {
- return LoggerFactory.getLogger(UserTimeLinePollingTest.class);
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponentVerifierExtensionTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponentVerifierExtensionTest.java
deleted file mode 100644
index 1953136..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponentVerifierExtensionTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming;
-
-import org.apache.camel.component.twitter.AbstractComponentVerifierExtensionTest;
-
-public class TwitterStreamingComponentVerifierExtensionTest extends AbstractComponentVerifierExtensionTest {
- @Override
- protected String getComponentScheme() {
- return "twitter-streaming";
- }
-}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponentVerifierTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponentVerifierTest.java
deleted file mode 100644
index 8caee4e..0000000
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/streaming/TwitterStreamingComponentVerifierTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming;
-
-import org.apache.camel.component.twitter.AbstractComponentVerifierTest;
-
-public class TwitterStreamingComponentVerifierTest extends AbstractComponentVerifierTest {
- @Override
- protected String getComponentScheme() {
- return "twitter-streaming";
- }
-}
diff --git a/components/readme.adoc b/components/readme.adoc
index 0b29a5b..904753f 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1,7 +1,7 @@
= Components
// components: START
-Number of Components: 297 in 234 JAR artifacts (0 deprecated)
+Number of Components: 296 in 234 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -838,9 +838,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated)
| link:camel-twitter/src/main/docs/twitter-search-component.adoc[Twitter Search] (camel-twitter) +
`twitter-search:keywords` | 2.10 | The Twitter Search component consumes search results.
-| link:camel-twitter/src/main/docs/twitter-streaming-component.adoc[Twitter Streaming] (camel-twitter) +
-`twitter-streaming:streamingType` | 2.10 | The Twitter Streaming component consumes twitter statuses using Streaming API.
-
| link:camel-twitter/src/main/docs/twitter-timeline-component.adoc[Twitter Timeline] (camel-twitter) +
`twitter-timeline:timelineType` | 2.10 | The Twitter Timeline component consumes twitter timeline or update the status of specific user.
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index b50f932..9f6f420 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -301,7 +301,6 @@ public interface EndpointBuilderFactory extends
TwilioEndpointBuilderFactory,
TwitterDirectMessageEndpointBuilderFactory,
TwitterSearchEndpointBuilderFactory,
- TwitterStreamingEndpointBuilderFactory,
TwitterTimelineEndpointBuilderFactory,
UndertowEndpointBuilderFactory,
ValidatorEndpointBuilderFactory,
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
index 585f745..95fbbfe 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
@@ -111,7 +111,7 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Endpoint type to use. Only streaming supports event type.
+ * Endpoint type to use.
*
* The option is a:
* <code>org.apache.camel.component.twitter.data.EndpointType</code>
@@ -125,7 +125,7 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Endpoint type to use. Only streaming supports event type.
+ * Endpoint type to use.
*
* The option will be converted to a
* <code>org.apache.camel.component.twitter.data.EndpointType</code>
@@ -248,8 +248,8 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * To filter by user ids for streaming/filter. Multiple values can be
- * separated by comma.
+ * To filter by user ids for filter. Multiple values can be separated by
+ * comma.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -767,9 +767,9 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return (TwitterDirectMessageEndpointConsumerBuilder) this;
}
/**
- * Used by the non-stream geography search, to search by radius using
- * the configured metrics. The unit can either be mi for miles, or km
- * for kilometers. You need to configure all the following options:
+ * Used by the geography search, to search by radius using the
+ * configured metrics. The unit can either be mi for miles, or km for
+ * kilometers. You need to configure all the following options:
* longitude, latitude, radius, and distanceMetric.
*
* The option is a: <code>java.lang.String</code> type.
@@ -865,9 +865,9 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by latitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by latitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -879,9 +879,9 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by latitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by latitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -893,9 +893,9 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Bounding boxes, created by pairs of lat/lons. Can be used for
- * streaming/filter. A pair is defined as lat,lon. And multiple paris
- * can be separated by semi colon.
+ * Bounding boxes, created by pairs of lat/lons. Can be used for filter.
+ * A pair is defined as lat,lon. And multiple paris can be separated by
+ * semi colon.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -907,9 +907,9 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by longitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by longitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -921,9 +921,9 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by longitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by longitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -967,9 +967,9 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by radius. You need
- * to configure all the following options: longitude, latitude, radius,
- * and distanceMetric.
+ * Used by the geography search to search by radius. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -981,9 +981,9 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by radius. You need
- * to configure all the following options: longitude, latitude, radius,
- * and distanceMetric.
+ * Used by the geography search to search by radius. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -995,31 +995,6 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
return this;
}
/**
- * To use a custom instance of TwitterStream.
- *
- * The option is a: <code>twitter4j.TwitterStream</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedTwitterDirectMessageEndpointConsumerBuilder twitterStream(
- Object twitterStream) {
- setProperty("twitterStream", twitterStream);
- return this;
- }
- /**
- * To use a custom instance of TwitterStream.
- *
- * The option will be converted to a
- * <code>twitter4j.TwitterStream</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedTwitterDirectMessageEndpointConsumerBuilder twitterStream(
- String twitterStream) {
- setProperty("twitterStream", twitterStream);
- return this;
- }
- /**
* Whether the endpoint should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities.
*
@@ -1504,8 +1479,7 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
*/
enum EndpointType {
POLLING,
- DIRECT,
- EVENT;
+ DIRECT;
}
/**
* Twitter Direct Message (camel-twitter)
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
index 01cbecb..d3bc0c1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
@@ -110,7 +110,7 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Endpoint type to use. Only streaming supports event type.
+ * Endpoint type to use.
*
* The option is a:
* <code>org.apache.camel.component.twitter.data.EndpointType</code>
@@ -123,7 +123,7 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Endpoint type to use. Only streaming supports event type.
+ * Endpoint type to use.
*
* The option will be converted to a
* <code>org.apache.camel.component.twitter.data.EndpointType</code>
@@ -243,8 +243,8 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * To filter by user ids for streaming/filter. Multiple values can be
- * separated by comma.
+ * To filter by user ids for filter. Multiple values can be separated by
+ * comma.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -754,9 +754,9 @@ public interface TwitterSearchEndpointBuilderFactory {
return (TwitterSearchEndpointConsumerBuilder) this;
}
/**
- * Used by the non-stream geography search, to search by radius using
- * the configured metrics. The unit can either be mi for miles, or km
- * for kilometers. You need to configure all the following options:
+ * Used by the geography search, to search by radius using the
+ * configured metrics. The unit can either be mi for miles, or km for
+ * kilometers. You need to configure all the following options:
* longitude, latitude, radius, and distanceMetric.
*
* The option is a: <code>java.lang.String</code> type.
@@ -852,9 +852,9 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by latitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by latitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -866,9 +866,9 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by latitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by latitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -880,9 +880,9 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Bounding boxes, created by pairs of lat/lons. Can be used for
- * streaming/filter. A pair is defined as lat,lon. And multiple paris
- * can be separated by semi colon.
+ * Bounding boxes, created by pairs of lat/lons. Can be used for filter.
+ * A pair is defined as lat,lon. And multiple paris can be separated by
+ * semi colon.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -894,9 +894,9 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by longitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by longitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -908,9 +908,9 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by longitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by longitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -954,9 +954,9 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by radius. You need
- * to configure all the following options: longitude, latitude, radius,
- * and distanceMetric.
+ * Used by the geography search to search by radius. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -968,9 +968,9 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by radius. You need
- * to configure all the following options: longitude, latitude, radius,
- * and distanceMetric.
+ * Used by the geography search to search by radius. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -982,31 +982,6 @@ public interface TwitterSearchEndpointBuilderFactory {
return this;
}
/**
- * To use a custom instance of TwitterStream.
- *
- * The option is a: <code>twitter4j.TwitterStream</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedTwitterSearchEndpointConsumerBuilder twitterStream(
- Object twitterStream) {
- setProperty("twitterStream", twitterStream);
- return this;
- }
- /**
- * To use a custom instance of TwitterStream.
- *
- * The option will be converted to a
- * <code>twitter4j.TwitterStream</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedTwitterSearchEndpointConsumerBuilder twitterStream(
- String twitterStream) {
- setProperty("twitterStream", twitterStream);
- return this;
- }
- /**
* Whether the endpoint should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities.
*
@@ -1484,8 +1459,7 @@ public interface TwitterSearchEndpointBuilderFactory {
*/
enum EndpointType {
POLLING,
- DIRECT,
- EVENT;
+ DIRECT;
}
/**
* Twitter Search (camel-twitter)
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterStreamingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterStreamingEndpointBuilderFactory.java
deleted file mode 100644
index 3fda973..0000000
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterStreamingEndpointBuilderFactory.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.builder.endpoint.dsl;
-
-import javax.annotation.Generated;
-import org.apache.camel.builder.EndpointConsumerBuilder;
-import org.apache.camel.builder.EndpointProducerBuilder;
-import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-
-/**
- * The Twitter Streaming component consumes twitter statuses using Streaming
- * API.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface TwitterStreamingEndpointBuilderFactory {
-
-
- /**
- * Builder for endpoint for the Twitter Streaming component.
- */
- public interface TwitterStreamingEndpointBuilder
- extends
- EndpointConsumerBuilder {
- default AdvancedTwitterStreamingEndpointBuilder advanced() {
- return (AdvancedTwitterStreamingEndpointBuilder) this;
- }
- /**
- * The http proxy host which can be used for the camel-twitter. Can also
- * be configured on the TwitterComponent level instead.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: proxy
- */
- default TwitterStreamingEndpointBuilder httpProxyHost(
- String httpProxyHost) {
- setProperty("httpProxyHost", httpProxyHost);
- return this;
- }
- /**
- * The http proxy password which can be used for the camel-twitter. Can
- * also be configured on the TwitterComponent level instead.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: proxy
- */
- default TwitterStreamingEndpointBuilder httpProxyPassword(
- String httpProxyPassword) {
- setProperty("httpProxyPassword", httpProxyPassword);
- return this;
- }
- /**
- * The http proxy port which can be used for the camel-twitter. Can also
- * be configured on the TwitterComponent level instead.
- *
- * The option is a: <code>java.lang.Integer</code> type.
- *
- * Group: proxy
- */
- default TwitterStreamingEndpointBuilder httpProxyPort(
- Integer httpProxyPort) {
- setProperty("httpProxyPort", httpProxyPort);
- return this;
- }
- /**
- * The http proxy port which can be used for the camel-twitter. Can also
- * be configured on the TwitterComponent level instead.
- *
- * The option will be converted to a <code>java.lang.Integer</code>
- * type.
- *
- * Group: proxy
- */
- default TwitterStreamingEndpointBuilder httpProxyPort(
- String httpProxyPort) {
- setProperty("httpProxyPort", httpProxyPort);
- return this;
- }
- /**
- * The http proxy user which can be used for the camel-twitter. Can also
- * be configured on the TwitterComponent level instead.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: proxy
- */
- default TwitterStreamingEndpointBuilder httpProxyUser(
- String httpProxyUser) {
- setProperty("httpProxyUser", httpProxyUser);
- return this;
- }
- /**
- * The access token. Can also be configured on the TwitterComponent
- * level instead.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: security
- */
- default TwitterStreamingEndpointBuilder accessToken(String accessToken) {
- setProperty("accessToken", accessToken);
- return this;
- }
- /**
- * The access secret. Can also be configured on the TwitterComponent
- * level instead.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: security
- */
- default TwitterStreamingEndpointBuilder accessTokenSecret(
- String accessTokenSecret) {
- setProperty("accessTokenSecret", accessTokenSecret);
- return this;
- }
- /**
- * The consumer key. Can also be configured on the TwitterComponent
- * level instead.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: security
- */
- default TwitterStreamingEndpointBuilder consumerKey(String consumerKey) {
- setProperty("consumerKey", consumerKey);
- return this;
- }
- /**
- * The consumer secret. Can also be configured on the TwitterComponent
- * level instead.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: security
- */
- default TwitterStreamingEndpointBuilder consumerSecret(
- String consumerSecret) {
- setProperty("consumerSecret", consumerSecret);
- return this;
- }
- }
-
- /**
- * Advanced builder for endpoint for the Twitter Streaming component.
- */
- public interface AdvancedTwitterStreamingEndpointBuilder
- extends
- EndpointConsumerBuilder {
- default TwitterStreamingEndpointBuilder basic() {
- return (TwitterStreamingEndpointBuilder) this;
- }
- /**
- * Whether the endpoint should use basic property binding (Camel 2.x) or
- * the newer property binding with additional capabilities.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Group: advanced
- */
- default AdvancedTwitterStreamingEndpointBuilder basicPropertyBinding(
- boolean basicPropertyBinding) {
- setProperty("basicPropertyBinding", basicPropertyBinding);
- return this;
- }
- /**
- * Whether the endpoint should use basic property binding (Camel 2.x) or
- * the newer property binding with additional capabilities.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Group: advanced
- */
- default AdvancedTwitterStreamingEndpointBuilder basicPropertyBinding(
- String basicPropertyBinding) {
- setProperty("basicPropertyBinding", basicPropertyBinding);
- return this;
- }
- /**
- * Sets whether synchronous processing should be strictly used, or Camel
- * is allowed to use asynchronous processing (if supported).
- *
- * The option is a: <code>boolean</code> type.
- *
- * Group: advanced
- */
- default AdvancedTwitterStreamingEndpointBuilder synchronous(
- boolean synchronous) {
- setProperty("synchronous", synchronous);
- return this;
- }
- /**
- * Sets whether synchronous processing should be strictly used, or Camel
- * is allowed to use asynchronous processing (if supported).
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Group: advanced
- */
- default AdvancedTwitterStreamingEndpointBuilder synchronous(
- String synchronous) {
- setProperty("synchronous", synchronous);
- return this;
- }
- }
-
- /**
- * Proxy enum for
- * <code>org.apache.camel.component.twitter.data.EndpointType</code> enum.
- */
- enum EndpointType {
- POLLING,
- DIRECT,
- EVENT;
- }
- /**
- * Twitter Streaming (camel-twitter)
- * The Twitter Streaming component consumes twitter statuses using Streaming
- * API.
- *
- * Category: api,social
- * Available as of version: 2.10
- * Maven coordinates: org.apache.camel:camel-twitter
- *
- * Syntax: <code>twitter-streaming:streamingType</code>
- *
- * Path parameter: streamingType (required)
- * The streaming type to consume.
- * The value can be one of: SAMPLE, FILTER, USER, UNKNOWN
- */
- default TwitterStreamingEndpointBuilder twitterStreaming(String path) {
- class TwitterStreamingEndpointBuilderImpl extends AbstractEndpointBuilder implements TwitterStreamingEndpointBuilder, AdvancedTwitterStreamingEndpointBuilder {
- public TwitterStreamingEndpointBuilderImpl(String path) {
- super("twitter-streaming", path);
- }
- }
- return new TwitterStreamingEndpointBuilderImpl(path);
- }
-}
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
index 635e432..7ef646d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
@@ -122,7 +122,7 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Endpoint type to use. Only streaming supports event type.
+ * Endpoint type to use.
*
* The option is a:
* <code>org.apache.camel.component.twitter.data.EndpointType</code>
@@ -135,7 +135,7 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Endpoint type to use. Only streaming supports event type.
+ * Endpoint type to use.
*
* The option will be converted to a
* <code>org.apache.camel.component.twitter.data.EndpointType</code>
@@ -257,8 +257,8 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * To filter by user ids for streaming/filter. Multiple values can be
- * separated by comma.
+ * To filter by user ids for filter. Multiple values can be separated by
+ * comma.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -771,9 +771,9 @@ public interface TwitterTimelineEndpointBuilderFactory {
return (TwitterTimelineEndpointConsumerBuilder) this;
}
/**
- * Used by the non-stream geography search, to search by radius using
- * the configured metrics. The unit can either be mi for miles, or km
- * for kilometers. You need to configure all the following options:
+ * Used by the geography search, to search by radius using the
+ * configured metrics. The unit can either be mi for miles, or km for
+ * kilometers. You need to configure all the following options:
* longitude, latitude, radius, and distanceMetric.
*
* The option is a: <code>java.lang.String</code> type.
@@ -869,9 +869,9 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by latitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by latitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -883,9 +883,9 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by latitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by latitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -897,9 +897,9 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Bounding boxes, created by pairs of lat/lons. Can be used for
- * streaming/filter. A pair is defined as lat,lon. And multiple paris
- * can be separated by semi colon.
+ * Bounding boxes, created by pairs of lat/lons. Can be used for filter.
+ * A pair is defined as lat,lon. And multiple paris can be separated by
+ * semi colon.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -911,9 +911,9 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by longitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by longitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -925,9 +925,9 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by longitude. You
- * need to configure all the following options: longitude, latitude,
- * radius, and distanceMetric.
+ * Used by the geography search to search by longitude. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -971,9 +971,9 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by radius. You need
- * to configure all the following options: longitude, latitude, radius,
- * and distanceMetric.
+ * Used by the geography search to search by radius. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option is a: <code>java.lang.Double</code> type.
*
@@ -985,9 +985,9 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * Used by the non-stream geography search to search by radius. You need
- * to configure all the following options: longitude, latitude, radius,
- * and distanceMetric.
+ * Used by the geography search to search by radius. You need to
+ * configure all the following options: longitude, latitude, radius, and
+ * distanceMetric.
*
* The option will be converted to a <code>java.lang.Double</code> type.
*
@@ -999,31 +999,6 @@ public interface TwitterTimelineEndpointBuilderFactory {
return this;
}
/**
- * To use a custom instance of TwitterStream.
- *
- * The option is a: <code>twitter4j.TwitterStream</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedTwitterTimelineEndpointConsumerBuilder twitterStream(
- Object twitterStream) {
- setProperty("twitterStream", twitterStream);
- return this;
- }
- /**
- * To use a custom instance of TwitterStream.
- *
- * The option will be converted to a
- * <code>twitter4j.TwitterStream</code> type.
- *
- * Group: consumer (advanced)
- */
- default AdvancedTwitterTimelineEndpointConsumerBuilder twitterStream(
- String twitterStream) {
- setProperty("twitterStream", twitterStream);
- return this;
- }
- /**
* Whether the endpoint should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities.
*
@@ -1528,8 +1503,7 @@ public interface TwitterTimelineEndpointBuilderFactory {
*/
enum EndpointType {
POLLING,
- DIRECT,
- EVENT;
+ DIRECT;
}
/**
* Twitter Timeline (camel-twitter)
diff --git a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/streaming/springboot/TwitterStreamingComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/streaming/springboot/TwitterStreamingComponentAutoConfiguration.java
deleted file mode 100644
index 77ea860..0000000
--- a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/streaming/springboot/TwitterStreamingComponentAutoConfiguration.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming.springboot;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.twitter.streaming.TwitterStreamingComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spi.HasId;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.apache.camel.support.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@Configuration
-@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
- TwitterStreamingComponentAutoConfiguration.GroupConditions.class})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,
- TwitterStreamingComponentConfiguration.class})
-public class TwitterStreamingComponentAutoConfiguration {
-
- private static final Logger LOGGER = LoggerFactory
- .getLogger(TwitterStreamingComponentAutoConfiguration.class);
- @Autowired
- private ApplicationContext applicationContext;
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private TwitterStreamingComponentConfiguration configuration;
- @Autowired(required = false)
- private List<ComponentCustomizer<TwitterStreamingComponent>> customizers;
-
- static class GroupConditions extends GroupCondition {
- public GroupConditions() {
- super("camel.component", "camel.component.twitter-streaming");
- }
- }
-
- @Lazy
- @Bean(name = "twitter-streaming-component")
- @ConditionalOnMissingBean(TwitterStreamingComponent.class)
- public TwitterStreamingComponent configureTwitterStreamingComponent()
- throws Exception {
- TwitterStreamingComponent component = new TwitterStreamingComponent();
- component.setCamelContext(camelContext);
- Map<String, Object> parameters = new HashMap<>();
- IntrospectionSupport.getProperties(configuration, parameters, null,
- false);
- for (Map.Entry<String, Object> entry : parameters.entrySet()) {
- Object value = entry.getValue();
- Class<?> paramClass = value.getClass();
- if (paramClass.getName().endsWith("NestedConfiguration")) {
- Class nestedClass = null;
- try {
- nestedClass = (Class) paramClass.getDeclaredField(
- "CAMEL_NESTED_CLASS").get(null);
- HashMap<String, Object> nestedParameters = new HashMap<>();
- IntrospectionSupport.getProperties(value, nestedParameters,
- null, false);
- Object nestedProperty = nestedClass.newInstance();
- CamelPropertiesHelper.setCamelProperties(camelContext,
- nestedProperty, nestedParameters, false);
- entry.setValue(nestedProperty);
- } catch (NoSuchFieldException e) {
- }
- }
- }
- CamelPropertiesHelper.setCamelProperties(camelContext, component,
- parameters, false);
- if (ObjectHelper.isNotEmpty(customizers)) {
- for (ComponentCustomizer<TwitterStreamingComponent> customizer : customizers) {
- boolean useCustomizer = (customizer instanceof HasId)
- ? HierarchicalPropertiesEvaluator.evaluate(
- applicationContext.getEnvironment(),
- "camel.component.customizer",
- "camel.component.twitter-streaming.customizer",
- ((HasId) customizer).getId())
- : HierarchicalPropertiesEvaluator.evaluate(
- applicationContext.getEnvironment(),
- "camel.component.customizer",
- "camel.component.twitter-streaming.customizer");
- if (useCustomizer) {
- LOGGER.debug("Configure component {}, with customizer {}",
- component, customizer);
- customizer.customize(component);
- }
- }
- }
- return component;
- }
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/streaming/springboot/TwitterStreamingComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/streaming/springboot/TwitterStreamingComponentConfiguration.java
deleted file mode 100644
index 906e5b6..0000000
--- a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/streaming/springboot/TwitterStreamingComponentConfiguration.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.twitter.streaming.springboot;
-
-import javax.annotation.Generated;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * The Twitter Streaming component consumes twitter statuses using Streaming
- * API.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.twitter-streaming")
-public class TwitterStreamingComponentConfiguration
- extends
- ComponentConfigurationPropertiesCommon {
-
- /**
- * Whether to enable auto configuration of the twitter-streaming component.
- * This is enabled by default.
- */
- private Boolean enabled;
- /**
- * The access token
- */
- private String accessToken;
- /**
- * The access token secret
- */
- private String accessTokenSecret;
- /**
- * The consumer key
- */
- private String consumerKey;
- /**
- * The consumer secret
- */
- private String consumerSecret;
- /**
- * The http proxy host which can be used for the camel-twitter.
- */
- private String httpProxyHost;
- /**
- * The http proxy user which can be used for the camel-twitter.
- */
- private String httpProxyUser;
- /**
- * The http proxy password which can be used for the camel-twitter.
- */
- private String httpProxyPassword;
- /**
- * The http proxy port which can be used for the camel-twitter.
- */
- private Integer httpProxyPort;
- /**
- * Whether the component should resolve property placeholders on itself when
- * starting. Only properties which are of String type can use property
- * placeholders.
- */
- private Boolean resolvePropertyPlaceholders = true;
- /**
- * Whether the component should use basic property binding (Camel 2.x) or
- * the newer property binding with additional capabilities
- */
- private Boolean basicPropertyBinding = false;
-
- public String getAccessToken() {
- return accessToken;
- }
-
- public void setAccessToken(String accessToken) {
- this.accessToken = accessToken;
- }
-
- public String getAccessTokenSecret() {
- return accessTokenSecret;
- }
-
- public void setAccessTokenSecret(String accessTokenSecret) {
- this.accessTokenSecret = accessTokenSecret;
- }
-
- public String getConsumerKey() {
- return consumerKey;
- }
-
- public void setConsumerKey(String consumerKey) {
- this.consumerKey = consumerKey;
- }
-
- public String getConsumerSecret() {
- return consumerSecret;
- }
-
- public void setConsumerSecret(String consumerSecret) {
- this.consumerSecret = consumerSecret;
- }
-
- public String getHttpProxyHost() {
- return httpProxyHost;
- }
-
- public void setHttpProxyHost(String httpProxyHost) {
- this.httpProxyHost = httpProxyHost;
- }
-
- public String getHttpProxyUser() {
- return httpProxyUser;
- }
-
- public void setHttpProxyUser(String httpProxyUser) {
- this.httpProxyUser = httpProxyUser;
- }
-
- public String getHttpProxyPassword() {
- return httpProxyPassword;
- }
-
- public void setHttpProxyPassword(String httpProxyPassword) {
- this.httpProxyPassword = httpProxyPassword;
- }
-
- public Integer getHttpProxyPort() {
- return httpProxyPort;
- }
-
- public void setHttpProxyPort(Integer httpProxyPort) {
- this.httpProxyPort = httpProxyPort;
- }
-
- public Boolean getResolvePropertyPlaceholders() {
- return resolvePropertyPlaceholders;
- }
-
- public void setResolvePropertyPlaceholders(
- Boolean resolvePropertyPlaceholders) {
- this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
- }
-
- public Boolean getBasicPropertyBinding() {
- return basicPropertyBinding;
- }
-
- public void setBasicPropertyBinding(Boolean basicPropertyBinding) {
- this.basicPropertyBinding = basicPropertyBinding;
- }
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/resources/META-INF/spring.factories
index eaa614e..284a0d5 100644
--- a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/resources/META-INF/spring.factories
@@ -17,8 +17,7 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.twitter.timeline.springboot.TwitterTimelineComponentAutoConfiguration,\
org.apache.camel.component.twitter.search.springboot.TwitterSearchComponentAutoConfiguration,\
-org.apache.camel.component.twitter.directmessage.springboot.TwitterDirectMessageComponentAutoConfiguration,\
-org.apache.camel.component.twitter.streaming.springboot.TwitterStreamingComponentAutoConfiguration
+org.apache.camel.component.twitter.directmessage.springboot.TwitterDirectMessageComponentAutoConfiguration
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
index 211746b..9a586f8 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
@@ -28,7 +28,6 @@ public class CamelTwitterTest extends BaseKarafTest {
@Test
public void test() throws Exception {
testComponent(COMPONENT, "twitter-timeline");
- testComponent(COMPONENT, "twitter-streaming");
testComponent(COMPONENT, "twitter-search");
testComponent(COMPONENT, "twitter-directmessage");
}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelTwitterTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelTwitterTest.java
index 828deb6..bcdc1e7 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelTwitterTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelTwitterTest.java
@@ -44,7 +44,6 @@ public class CamelTwitterTest extends AbstractSpringBootTestSupport {
this.runComponentTest(config, "twitter-directmessage");
this.runComponentTest(config, "twitter-search");
this.runComponentTest(config, "twitter-timeline");
- this.runComponentTest(config, "twitter-streaming");
this.runModuleUnitTestsIfEnabled(config);
}