This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 57a7146265cc96ffb8c26c793ad914528b93ed8d
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Oct 12 10:56:37 2018 +0200

    [CAMEL-12814] Remove deprecated twitter component
    
    # Conflicts:
    #   components/readme.adoc
---
 .../src/main/docs/twitter-component.adoc           | 335 ---------------------
 .../component/twitter/AbstractTwitterEndpoint.java |   7 +-
 .../twitter/CommonPropertiesTwitterEndpoint.java   |  34 ---
 .../camel/component/twitter/TwitterComponent.java  |  73 -----
 .../camel/component/twitter/TwitterEndpoint.java   |   3 +-
 .../component/twitter/TwitterEndpointDirect.java   | 193 ------------
 .../component/twitter/TwitterEndpointEvent.java    | 101 -------
 .../component/twitter/TwitterEndpointPolling.java  | 198 ------------
 .../camel/component/twitter/TwitterHelper.java     |  94 ------
 .../twitter/consumer/TwitterConsumerDirect.java    |  49 ---
 .../twitter/consumer/TwitterConsumerEvent.java     |  70 -----
 .../twitter/consumer/TwitterConsumerPolling.java   |  77 -----
 .../services/org/apache/camel/component/twitter    |  18 --
 .../SearchDirectCustomComponentTest.java           |  48 ---
 components/readme.adoc                             |   2 +-
 .../TwitterComponentAutoConfiguration.java         | 128 --------
 .../springboot/TwitterComponentConfiguration.java  | 151 ----------
 17 files changed, 6 insertions(+), 1575 deletions(-)

diff --git a/components/camel-twitter/src/main/docs/twitter-component.adoc 
b/components/camel-twitter/src/main/docs/twitter-component.adoc
deleted file mode 100644
index d875dfd..0000000
--- a/components/camel-twitter/src/main/docs/twitter-component.adoc
+++ /dev/null
@@ -1,335 +0,0 @@
-[[twitter-component]]
-== Twitter Component (deprecated)
-
-*Available as of Camel version 2.10*
-
-[IMPORTANT]
-====================================================================================
-The composite twitter component has been deprecated. Use individual component 
for directmessage, search, streaming and timeline.
-
-* <<twitter-component,Twitter Components>>
-  ** <<twitter-directmessage-component,Twitter Direct Message>>
-  ** <<twitter-search-component,Twitter Search>>
-  ** <<twitter-streaming-component,Twitter Streaming>>
-  ** <<twitter-timeline-component,Twitter Timeline>>
-====================================================================================
-
-The Twitter component enables 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>
-----
-
-### URI format
-
-[source]
-----
-twitter://endpoint[?options]
-----
-
-### Twitter component
-
-The twitter component can be configured with the Twitter account
-settings which is mandatory to configure before using.
-
-
-
-
-
-// component options: START
-The Twitter component supports 9 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
-|===
-// component options: END
-
-
-
-
-
-You can also configure these options directly in the endpoint.
-
-### 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
-|directmessage |direct, polling |twitter4j.DirectMessage | 
-
-|search |direct, polling |twitter4j.Status | 
-
-|streaming/filter |event, polling |twitter4j.Status | 
-
-|streaming/sample |event, polling |twitter4j.Status | 
-
-|streaming/user |event, polling |twitter4j.Status |**Camel 2.16**: To
-receive tweets from protected users and accounts.
-
-|timeline/home |direct, polling |twitter4j.Status | 
-
-|timeline/mentions |direct, polling |twitter4j.Status | 
-
-|[line-through]*timeline/public* |[line-through]*direct, polling*
-|[line-through]*twitter4j.Status* |[line-through]*@deprecated. Use
-timeline/home or direct/home instead. Removed from *Camel 2.11*
-onwards.*
-
-|timeline/retweetsofme |direct, polling |twitter4j.Status | 
-
-|timeline/user |direct, polling |twitter4j.Status | 
-
-|[line-through]*trends/daily* |[line-through]**Camel 2.10.1:* direct,
-polling* |[line-through]*twitter4j.Status* |[line-through]*@deprecated.
-Removed from Camel 2.11 onwards.*
-
-|[line-through]*trends/weekly* |[line-through]**Camel 2.10.1:* direct,
-polling* |[line-through]*twitter4j.Status* |[line-through]*@deprecated.
-Removed from Camel 2.11 onwards.*
-|=======================================================================
-
-### Producer endpoints
-
-[width="100%",cols="20%,80%",options="header",]
-|==============================
-|Endpoint |Body Type
-|directmessage |String
-|search |List<twitter4j.Status>
-|timeline/user |String
-|==============================
-
-### URI options
-
-
-
-
-
-
-
-// endpoint options: START
-The Twitter endpoint is configured using URI syntax:
-
-----
-twitter:kind
-----
-
-with the following path and query parameters:
-
-==== Path Parameters (1 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *kind* | *Required* The kind of endpoint |  | String
-|===
-
-
-==== Query Parameters (44 parameters):
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *user* (common) | Username, used for user timeline consumption, direct 
message production, etc. |  | 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
-| *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
-| *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. |  | 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 search and 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-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when 
using a custom scheduler or any of the Quartz2, 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
-
-
-The component supports 10 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.component.twitter.access-token* | The access token |  | String
-| *camel.component.twitter.access-token-secret* | The access token secret |  | 
String
-| *camel.component.twitter.consumer-key* | The consumer key |  | String
-| *camel.component.twitter.consumer-secret* | The consumer secret |  | String
-| *camel.component.twitter.enabled* | Enable twitter component | true | Boolean
-| *camel.component.twitter.http-proxy-host* | The http proxy host which can be 
used for the camel-twitter. |  | String
-| *camel.component.twitter.http-proxy-password* | The http proxy password 
which can be used for the camel-twitter. |  | String
-| *camel.component.twitter.http-proxy-port* | The http proxy port which can be 
used for the camel-twitter. |  | Integer
-| *camel.component.twitter.http-proxy-user* | The http proxy user which can be 
used for the camel-twitter. |  | String
-| *camel.component.twitter.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
-
-
-
-
-
-
-
-
-### 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` |*Camel 2.11.0:* This header can override
-the option of `lang` which set the search language for the search
-endpoint dynamically
-
-|`CamelTwitterCount` |*Camel 2.11.0* This header can override the option
-of `count` which sets the max twitters that will be returned.
-
-|`CamelTwitterNumberOfPages` |*Camel 2.11.0* 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?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?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?consumerKey=[s]&consumerSecret=[s]&accessToken=[s]&accessTokenSecret=[s]");
-----
-
-### Example
-
-See also the link:twitter-websocket-example.html[Twitter Websocket
-Example].
-
-### 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 142478f..8486d43 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
@@ -18,7 +18,6 @@ package org.apache.camel.component.twitter;
 
 import org.apache.camel.Consumer;
 import org.apache.camel.api.management.ManagedAttribute;
-import org.apache.camel.component.twitter.consumer.TwitterConsumerPolling;
 import org.apache.camel.component.twitter.data.EndpointType;
 import org.apache.camel.impl.DefaultPollingEndpoint;
 import org.apache.camel.spi.UriParam;
@@ -28,9 +27,11 @@ import org.apache.camel.spi.UriParam;
  */
 public abstract class AbstractTwitterEndpoint extends DefaultPollingEndpoint 
implements TwitterEndpoint {
 
-    @UriParam(optionalPrefix = "consumer.", defaultValue = "" + 
TwitterConsumerPolling.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
+    public static final long DEFAULT_CONSUMER_DELAY = 30 * 1000L;
+
+    @UriParam(optionalPrefix = "consumer.", defaultValue = "" + 
DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
         description = "Milliseconds before the next poll.")
-    private long delay = TwitterConsumerPolling.DEFAULT_CONSUMER_DELAY;
+    private long delay = DEFAULT_CONSUMER_DELAY;
 
     @UriParam
     private TwitterConfiguration properties;
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/CommonPropertiesTwitterEndpoint.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/CommonPropertiesTwitterEndpoint.java
deleted file mode 100644
index 4772f5b..0000000
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/CommonPropertiesTwitterEndpoint.java
+++ /dev/null
@@ -1,34 +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 This has been introduced to just keep deprecated endpoints 
working as is.
- * Remove this once Endpoint{Direct,Event,Polling} is removed.
- */
-@Deprecated
-public interface CommonPropertiesTwitterEndpoint extends TwitterEndpoint {
-
-    String getKeywords();
-
-    void setKeywords(String keywords);
-
-    String getUser();
-    
-    void setUser(String user);
-
-}
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java
deleted file mode 100644
index 92ea505..0000000
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java
+++ /dev/null
@@ -1,73 +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.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.spi.Metadata;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Twitter component
- * 
- * @deprecated Use
- * {@link 
org.apache.camel.component.twitter.directmessage.TwitterDirectMessageComponent},
- * {@link org.apache.camel.component.twitter.search.TwitterSearchComponent},
- * {@link 
org.apache.camel.component.twitter.streaming.TwitterStreamingComponent} or
- * {@link org.apache.camel.component.twitter.timeline.TwitterTimelineComponent}
- * instead.
- */
-@Deprecated
-@Metadata(label = "verifiers", enums = "parameters,connectivity")
-public class TwitterComponent extends AbstractTwitterComponent {
-
-    private static final Logger LOG = 
LoggerFactory.getLogger(TwitterComponent.class);
-
-    public TwitterComponent() {
-        super("twitter");
-    }
-
-    public TwitterComponent(CamelContext context) {
-        super(context, "twitter");
-    }
-
-    @Override
-    protected Endpoint doCreateEndpoint(TwitterConfiguration properties, 
String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        String[] tokens = remaining.split("/");
-        LOG.warn("The scheme syntax 'twitter:{}' has been deprecated. Use 
'twitter-{}' instead.", tokens[0], tokens[0]);
-
-        CommonPropertiesTwitterEndpoint endpoint;
-
-        switch (properties.getType()) {
-        case POLLING:
-            endpoint = new TwitterEndpointPolling(uri, remaining, this, 
properties);
-            break;
-        case EVENT:
-            endpoint = new TwitterEndpointEvent(uri,  remaining, this, 
properties);
-            break;
-        default:
-            endpoint = new TwitterEndpointDirect(uri, remaining, this, 
properties);
-            break;
-        }
-        endpoint.setUser(getAndRemoveParameter(parameters, "user", 
String.class));
-        endpoint.setKeywords(getAndRemoveParameter(parameters, "keywords", 
String.class));
-        return endpoint;
-    }
-}
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java
index fbc699d..75e56ab 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java
@@ -20,9 +20,8 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.component.twitter.data.EndpointType;
 
 /**
- * @deprecated Migrate with {@link AbstractTwitterEndpoint} in 3.0
+ *
  */
-@Deprecated
 public interface TwitterEndpoint extends Endpoint {
 
     TwitterConfiguration getProperties();
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java
deleted file mode 100644
index 02b9ec8..0000000
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java
+++ /dev/null
@@ -1,193 +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 org.apache.camel.Consumer;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.ServiceStatus;
-import org.apache.camel.api.management.ManagedAttribute;
-import org.apache.camel.component.direct.DirectEndpoint;
-import 
org.apache.camel.component.twitter.consumer.AbstractTwitterConsumerHandler;
-import org.apache.camel.component.twitter.consumer.TwitterConsumerDirect;
-import org.apache.camel.component.twitter.data.EndpointType;
-
-/**
- * Twitter direct endpoint.
- * 
- */
-@Deprecated
-public class TwitterEndpointDirect extends DirectEndpoint implements 
CommonPropertiesTwitterEndpoint {
-    private final String kind;
-
-    // only TwitterEndpointPolling is annotated
-    private TwitterConfiguration properties;
-
-    private String user;
-
-    private String keywords;
-
-    public TwitterEndpointDirect(String uri, String remaining, 
TwitterComponent component, TwitterConfiguration properties) {
-        super(uri, component);
-        this.kind = remaining;
-        this.properties = properties;
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) throws Exception {
-        AbstractTwitterConsumerHandler twitter4jConsumer = 
TwitterHelper.createConsumer(this, getEndpointUri(), kind);
-        TwitterConsumerDirect answer = new TwitterConsumerDirect(this, 
processor, twitter4jConsumer);
-        configureConsumer(answer);
-        return answer;
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        return TwitterHelper.createProducer(this, getEndpointUri(), kind);
-    }
-
-    @ManagedAttribute
-    public boolean isSingleton() {
-        return true;
-    }
-
-    public TwitterConfiguration getProperties() {
-        return properties;
-    }
-
-    public void setProperties(TwitterConfiguration properties) {
-        this.properties = properties;
-    }
-
-    @ManagedAttribute(description = "Camel ID")
-    public String getCamelId() {
-        return getCamelContext().getName();
-    }
-
-    @ManagedAttribute(description = "Camel ManagementName")
-    public String getCamelManagementName() {
-        return getCamelContext().getManagementName();
-    }
-
-    @ManagedAttribute(description = "Endpoint Uri", mask = true)
-    @Override
-    public String getEndpointUri() {
-        return super.getEndpointUri();
-    }
-
-    @ManagedAttribute(description = "Service State")
-    public String getState() {
-        ServiceStatus status = this.getStatus();
-        // if no status exists then its stopped
-        if (status == null) {
-            status = ServiceStatus.Stopped;
-        }
-        return status.name();
-    }
-
-    @ManagedAttribute
-    public String getUser() {
-        return user;
-    }
-
-    @ManagedAttribute
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @ManagedAttribute
-    public String getKeywords() {
-        return keywords;
-    }
-
-    @ManagedAttribute
-    public void setKeywords(String keywords) {
-        this.keywords = keywords;
-    }
-
-    @ManagedAttribute
-    public String getLocations() {
-        return getProperties().getLocations();
-    }
-
-    @ManagedAttribute
-    public void setLocations(String locations) {
-        getProperties().setLocations(locations);
-    }
-
-    @ManagedAttribute
-    public void setFilterOld(boolean filterOld) {
-        getProperties().setFilterOld(filterOld);
-    }
-
-    @ManagedAttribute
-    public boolean isFilterOld() {
-        return getProperties().isFilterOld();
-    }
-
-    @ManagedAttribute
-    public void setSinceId(long sinceId) {
-        getProperties().setSinceId(sinceId);
-    }
-
-    @ManagedAttribute
-    public long getSinceId() {
-        return getProperties().getSinceId();
-    }
-
-    @ManagedAttribute
-    public void setLang(String lang) {
-        getProperties().setLang(lang);
-    }
-
-    @ManagedAttribute
-    public String getLang() {
-        return getProperties().getLang();
-    }
-
-    @ManagedAttribute
-    public void setCount(Integer count) {
-        getProperties().setCount(count);
-    }
-
-    @ManagedAttribute
-    public Integer getCount() {
-        return getProperties().getCount();
-    }
-
-    @ManagedAttribute
-    public void setNumberOfPages(Integer numberOfPages) {
-        getProperties().setNumberOfPages(numberOfPages);
-    }
-
-    @ManagedAttribute
-    public Integer getNumberOfPages() {
-        return getProperties().getNumberOfPages();
-    }
-
-    @Override
-    public EndpointType getEndpointType() {
-        return EndpointType.DIRECT;
-    }
-
-    @Override
-    public ExchangePattern getExchangePattern() {
-        return ExchangePattern.InOptionalOut;
-    }
-
-}
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointEvent.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointEvent.java
deleted file mode 100644
index b8d8922..0000000
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointEvent.java
+++ /dev/null
@@ -1,101 +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 org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import 
org.apache.camel.component.twitter.consumer.AbstractTwitterConsumerHandler;
-import org.apache.camel.component.twitter.consumer.TwitterConsumerEvent;
-import org.apache.camel.component.twitter.data.EndpointType;
-import org.apache.camel.impl.DefaultEndpoint;
-
-@Deprecated
-public class TwitterEndpointEvent extends DefaultEndpoint implements 
CommonPropertiesTwitterEndpoint {
-    private final String kind;
-
-    // only TwitterEndpointPolling is annotated
-    private TwitterConfiguration properties;
-
-    private String user;
-
-    private String keywords;
-
-    public TwitterEndpointEvent(String uri, String remaining, TwitterComponent 
component, TwitterConfiguration properties) {
-        super(uri, component);
-        this.kind = remaining;
-        this.properties = properties;
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) throws Exception {
-        AbstractTwitterConsumerHandler twitter4jConsumer = 
TwitterHelper.createConsumer(this, getEndpointUri(), kind);
-        return new TwitterConsumerEvent(this, processor, twitter4jConsumer);
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        throw new UnsupportedOperationException("Producer not supported");
-    }
-
-    public TwitterConfiguration getProperties() {
-        return properties;
-    }
-
-    public void setProperties(TwitterConfiguration properties) {
-        this.properties = properties;
-    }
-
-    @Override
-    public EndpointType getEndpointType() {
-        return EndpointType.EVENT;
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return true;
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        super.doStop();
-        if (properties.getTwitterStream() != null) {
-            properties.getTwitterStream().shutdown();
-        }
-    }
-
-    @Override
-    public String getUser() {
-        return user;
-    }
-
-    @Override
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @Override
-    public String getKeywords() {
-        return keywords;
-    }
-
-    @Override
-    public void setKeywords(String keywords) {
-        this.keywords = keywords;
-    }
-
-}
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java
deleted file mode 100644
index d745d1c..0000000
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java
+++ /dev/null
@@ -1,198 +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 org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.api.management.ManagedAttribute;
-import org.apache.camel.api.management.ManagedResource;
-import 
org.apache.camel.component.twitter.consumer.AbstractTwitterConsumerHandler;
-import org.apache.camel.component.twitter.consumer.TwitterConsumerPolling;
-import org.apache.camel.component.twitter.data.EndpointType;
-import org.apache.camel.impl.DefaultPollingEndpoint;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
-
-/**
- * Use twitter-directmessage, twitter-search, twitter-streaming and 
twitter-timeline instead of this component.
- * @deprecated
- */
-@Deprecated
-@ManagedResource(description = "Managed Twitter Endpoint")
-@UriEndpoint(firstVersion = "2.10.0", scheme = "twitter", title = "Twitter", 
syntax = "twitter:kind", consumerClass = AbstractTwitterConsumerHandler.class, 
label = "api,social")
-public class TwitterEndpointPolling extends DefaultPollingEndpoint implements 
CommonPropertiesTwitterEndpoint {
-    @UriPath(description = "The kind of endpoint", enums = 
"directmessage,search,streaming/filter,streaming/sample,streaming/user"
-            + 
",timeline/home,timeline/mentions,timeline/retweetsofme,timeline/user") 
@Metadata(required = "true")
-    private final String kind;
-
-    @UriParam(optionalPrefix = "consumer.", defaultValue = "" + 
TwitterConsumerPolling.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
-            description = "Milliseconds before the next poll.")
-    private long delay = TwitterConsumerPolling.DEFAULT_CONSUMER_DELAY;
-
-    @UriParam
-    private TwitterConfiguration properties;
-
-    @UriParam(description = "Username, used for user timeline consumption, 
direct message production, etc.")
-    private String user;
-
-    @UriParam(description = "Can be used for search and streaming/filter. 
Multiple values can be separated with comma.", label = "consumer,filter")
-    private String keywords;
-
-    public TwitterEndpointPolling(String uri, String remaining, 
TwitterComponent component, TwitterConfiguration properties) {
-        super(uri, component);
-        this.kind = remaining;
-        this.properties = properties;
-
-        setDelay(delay); // reconfigure the default delay
-    }
-
-    @Override
-    public Consumer createConsumer(Processor processor) throws Exception {
-        AbstractTwitterConsumerHandler twitter4jConsumer = 
TwitterHelper.createConsumer(this, getEndpointUri(), kind);
-        // update the pulling lastID with sinceId
-        twitter4jConsumer.setLastId(properties.getSinceId());
-        TwitterConsumerPolling tc = new TwitterConsumerPolling(this, 
processor, twitter4jConsumer);
-        configureConsumer(tc);
-        return tc;
-    }
-
-    @Override
-    public Producer createProducer() throws Exception {
-        return TwitterHelper.createProducer(this, getEndpointUri(), kind);
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return true;
-    }
-
-    public TwitterConfiguration getProperties() {
-        return properties;
-    }
-
-    public void setProperties(TwitterConfiguration properties) {
-        this.properties = properties;
-    }
-
-    @ManagedAttribute
-    public String getUser() {
-        return user;
-    }
-
-    @ManagedAttribute
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @ManagedAttribute
-    public String getKeywords() {
-        return keywords;
-    }
-
-    @ManagedAttribute
-    public void setKeywords(String keywords) {
-        this.keywords = keywords;
-    }
-
-    @ManagedAttribute
-    public String getLocations() {
-        return getProperties().getLocations();
-    }
-
-    @ManagedAttribute
-    public void setLocations(String locations) {
-        getProperties().setLocations(locations);
-    }
-
-    @ManagedAttribute
-    public void setFilterOld(boolean filterOld) {
-        getProperties().setFilterOld(filterOld);
-    }
-
-    @ManagedAttribute
-    public boolean isFilterOld() {
-        return getProperties().isFilterOld();
-    }
-
-    @ManagedAttribute
-    public void setSinceId(long sinceId) {
-        getProperties().setSinceId(sinceId);
-    }
-
-    @ManagedAttribute
-    public long getSinceId() {
-        return getProperties().getSinceId();
-    }
-
-    @ManagedAttribute
-    public void setLang(String lang) {
-        getProperties().setLang(lang);
-    }
-
-    @ManagedAttribute
-    public String getLang() {
-        return getProperties().getLang();
-    }
-
-    @ManagedAttribute
-    public void setCount(Integer count) {
-        getProperties().setCount(count);
-    }
-
-    @ManagedAttribute
-    public Integer getCount() {
-        return getProperties().getCount();
-    }
-
-    @ManagedAttribute
-    public void setNumberOfPages(Integer numberOfPages) {
-        getProperties().setNumberOfPages(numberOfPages);
-    }
-
-    @ManagedAttribute
-    public Integer getNumberOfPages() {
-        return getProperties().getNumberOfPages();
-    }
-
-    @ManagedAttribute
-    public boolean isSortById() {
-        return getProperties().isSortById();
-    }
-
-    @ManagedAttribute
-    public void setSortById(boolean sortById) {
-        getProperties().setSortById(sortById);
-    }
-
-    @Override
-    public EndpointType getEndpointType() {
-        return EndpointType.POLLING;
-    }
-
-    /**
-     * Milliseconds before the next poll.
-     */
-    @Override
-    public void setDelay(long delay) {
-        super.setDelay(delay);
-        this.delay = delay;
-    }
-
-}
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java
index 03061cc..fcd567c 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java
@@ -61,65 +61,6 @@ public final class TwitterHelper {
         message.setHeader(TwitterConstants.TWITTER_USER_ROLE + index, role);
     }
 
-    @Deprecated
-    public static AbstractTwitterConsumerHandler 
createConsumer(CommonPropertiesTwitterEndpoint te, String uri, String 
remaining) throws IllegalArgumentException {
-        String[] tokens = remaining.split("/");
-        
-        if (tokens.length > 0) {
-            switch (ConsumerType.fromString(tokens[0])) {
-            case DIRECTMESSAGE:
-                return new DirectMessageConsumerHandler(te);
-            case SEARCH:
-                boolean hasNoKeywords = te.getKeywords() == null
-                    || te.getKeywords().trim().isEmpty();
-                if (hasNoKeywords) {
-                    throw new IllegalArgumentException("Type set to SEARCH but 
no keywords were provided.");
-                } else {
-                    return new SearchConsumerHandler(te, te.getKeywords());
-                }
-            case STREAMING:
-                if (tokens.length > 1) {
-                    switch (StreamingType.fromString(tokens[1])) {
-                    case SAMPLE:
-                        return new SampleStreamingConsumerHandler(te);
-                    case FILTER:
-                        return new FilterStreamingConsumerHandler(te, 
te.getKeywords());
-                    case USER:
-                        return new UserStreamingConsumerHandler(te);
-                    default:
-                        break;
-                    }
-                }
-                break;
-            case TIMELINE:
-                if (tokens.length > 1) {
-                    switch (TimelineType.fromString(tokens[1])) {
-                    case HOME:
-                        return new HomeConsumerHandler(te);
-                    case MENTIONS:
-                        return new MentionsConsumerHandler(te);
-                    case RETWEETSOFME:
-                        return new RetweetsConsumerHandler(te);
-                    case USER:
-                        if (te.getUser() == null || 
te.getUser().trim().isEmpty()) {
-                            throw new IllegalArgumentException("Fetch type set 
to USER TIMELINE but no user was set.");
-                        } else {
-                            return new UserConsumerHandler(te, te.getUser());
-                        }
-                    default:
-                        break;
-                    }
-                }
-                break;
-            default:
-                break;
-            }
-        }
-
-        throw new IllegalArgumentException("Cannot create any consumer with 
uri " + uri
-            + ". A consumer type was not provided (or an incorrect pairing was 
used).");
-    }
-
     public static Consumer createConsumer(Processor processor, 
AbstractTwitterEndpoint endpoint, AbstractTwitterConsumerHandler handler) 
throws Exception {
         Consumer answer = new DefaultTwitterConsumer(endpoint, processor, 
handler);
         switch (endpoint.getEndpointType()) {
@@ -136,41 +77,6 @@ public final class TwitterHelper {
         return answer;
     }
 
-    @Deprecated
-    public static Producer createProducer(CommonPropertiesTwitterEndpoint te, 
String uri, String remaining) throws IllegalArgumentException {
-        String[] tokens = remaining.split("/");
-
-        if (tokens.length > 0) {
-            switch (ConsumerType.fromString(tokens[0])) {
-            case DIRECTMESSAGE:
-                if (te.getUser() == null || te.getUser().trim().isEmpty()) {
-                    throw new IllegalArgumentException(
-                        "Producer type set to DIRECT MESSAGE but no recipient 
user was set.");
-                } else {
-                    return new DirectMessageProducer(te, te.getUser());
-                }
-            case TIMELINE:
-                if (tokens.length > 1) {
-                    switch (TimelineType.fromString(tokens[1])) {
-                    case USER:
-                        return new UserProducer(te);
-                    default:
-                        break;
-                    }
-                }
-                break;
-            case SEARCH:
-                return new SearchProducer(te, te.getKeywords());
-            default:
-                break;
-            }
-
-        }
-
-        throw new IllegalArgumentException("Cannot create any producer with 
uri " + uri
-            + ". A producer type was not provided (or an incorrect pairing was 
used).");
-    }
-
     public static <T extends Enum<T>> T enumFromString(T[] values, String uri, 
T defaultValue) {
         for (int i = values.length - 1; i >= 0; i--) {
             if (values[i].name().equalsIgnoreCase(uri)) {
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
deleted file mode 100644
index 3ae4ba6..0000000
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.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.consumer;
-
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.twitter.TwitterEndpoint;
-import org.apache.camel.impl.DefaultConsumer;
-
-/**
- * Camel DirectConsumer implementation.
- */
-@Deprecated
-public class TwitterConsumerDirect extends DefaultConsumer {
-
-    private final AbstractTwitterConsumerHandler twitter4jConsumer;
-
-    public TwitterConsumerDirect(TwitterEndpoint endpoint, Processor 
processor, AbstractTwitterConsumerHandler twitter4jConsumer) {
-        super(endpoint, processor);
-
-        this.twitter4jConsumer = twitter4jConsumer;
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-
-        List<Exchange> exchanges = twitter4jConsumer.directConsume();
-        for (int i = 0; i < exchanges.size(); i++) {
-            getProcessor().process(exchanges.get(i));
-        }
-    }
-}
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
deleted file mode 100644
index 6c3f87c..0000000
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
+++ /dev/null
@@ -1,70 +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.consumer;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.twitter.TwitterEndpoint;
-import 
org.apache.camel.component.twitter.streaming.AbstractStreamingConsumerHandler;
-import org.apache.camel.impl.DefaultConsumer;
-
-@Deprecated
-public class TwitterConsumerEvent extends DefaultConsumer implements 
TwitterEventListener {
-    private final AbstractTwitterConsumerHandler twitter4jConsumer;
-
-    public TwitterConsumerEvent(TwitterEndpoint endpoint, Processor processor, 
AbstractTwitterConsumerHandler twitter4jConsumer) {
-        super(endpoint, processor);
-        this.twitter4jConsumer = twitter4jConsumer;
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-
-        if (twitter4jConsumer instanceof AbstractStreamingConsumerHandler) {
-            ((AbstractStreamingConsumerHandler) 
twitter4jConsumer).setEventListener(this);
-            ((AbstractStreamingConsumerHandler) twitter4jConsumer).start();
-        }
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        if (twitter4jConsumer instanceof AbstractStreamingConsumerHandler) {
-            ((AbstractStreamingConsumerHandler) 
twitter4jConsumer).removeEventListener(this);
-            ((AbstractStreamingConsumerHandler) twitter4jConsumer).stop();
-        }
-
-        super.doStop();
-    }
-
-    @Override
-    public void onEvent(Exchange exchange) {
-        if (!isRunAllowed()) {
-            return;
-        }
-
-        try {
-            getProcessor().process(exchange);
-        } catch (Exception e) {
-            exchange.setException(e);
-        }
-
-        if (exchange.getException() != null) {
-            getExceptionHandler().handleException("Error processing exchange 
on status update", exchange, exchange.getException());
-        }
-    }
-}
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerPolling.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerPolling.java
deleted file mode 100644
index 0adbb3c..0000000
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerPolling.java
+++ /dev/null
@@ -1,77 +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.consumer;
-
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.twitter.TwitterEndpoint;
-import org.apache.camel.component.twitter.TwitterEndpointPolling;
-import 
org.apache.camel.component.twitter.streaming.AbstractStreamingConsumerHandler;
-import org.apache.camel.impl.ScheduledPollConsumer;
-
-/**
- * Provides a scheduled polling consumer
- */
-@Deprecated
-public class TwitterConsumerPolling extends ScheduledPollConsumer {
-
-    public static final long DEFAULT_CONSUMER_DELAY = 30 * 1000L;
-    private final AbstractTwitterConsumerHandler twitter4jConsumer;
-
-    public TwitterConsumerPolling(TwitterEndpoint endpoint, Processor 
processor, AbstractTwitterConsumerHandler twitter4jConsumer) {
-        super(endpoint, processor);
-        setDelay(DEFAULT_CONSUMER_DELAY);
-        this.twitter4jConsumer = twitter4jConsumer;
-    }
-
-    @Override
-    public TwitterEndpointPolling getEndpoint() {
-        return (TwitterEndpointPolling) super.getEndpoint();
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-        if (twitter4jConsumer instanceof AbstractStreamingConsumerHandler) {
-            ((AbstractStreamingConsumerHandler) twitter4jConsumer).start();
-        }
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        if (twitter4jConsumer instanceof AbstractStreamingConsumerHandler) {
-            ((AbstractStreamingConsumerHandler) twitter4jConsumer).stop();
-        }
-
-        super.doStop();
-    }
-
-    @Override
-    protected int poll() throws Exception {
-        List<Exchange> exchanges = twitter4jConsumer.pollConsume();
-
-        int index = 0;
-        for (; index < exchanges.size(); index++) {
-            getProcessor().process(exchanges.get(index));
-        }
-
-        return index;
-    }
-
-}
diff --git 
a/components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/component/twitter
 
b/components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/component/twitter
deleted file mode 100644
index f0472a4..0000000
--- 
a/components/camel-twitter/src/main/resources/META-INF/services/org/apache/camel/component/twitter
+++ /dev/null
@@ -1,18 +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.
-#
-
-class=org.apache.camel.component.twitter.TwitterComponent
diff --git 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchDirectCustomComponentTest.java
 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchDirectCustomComponentTest.java
deleted file mode 100644
index 69078b8..0000000
--- 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchDirectCustomComponentTest.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.deprecated;
-
-import org.apache.camel.component.twitter.CamelTwitterConsumerTestSupport;
-import org.apache.camel.component.twitter.TwitterComponent;
-import org.apache.camel.impl.JndiRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * consumes tweets
- */
-@Deprecated
-public class SearchDirectCustomComponentTest extends 
CamelTwitterConsumerTestSupport {
-
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry registry = super.createRegistry();
-        registry.bind("my-twitter", new TwitterComponent());
-
-        return registry;
-    }
-
-    @Override
-    protected String getUri() {
-        return "my-twitter://search?type=direct&keywords=java&";
-    }
-
-    @Override
-    protected Logger getLogger() {
-        return LoggerFactory.getLogger(SearchDirectCustomComponentTest.class);
-    }
-}
diff --git a/components/readme.adoc b/components/readme.adoc
index 847f24f..fadba62 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^^^^^^^^^
 
 // components: START
-Number of Components: 302 in 204 JAR artifacts (22 deprecated)
+Number of Components: 281 in 185 JAR artifacts (1 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
diff --git 
a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
deleted file mode 100644
index 423b6d4..0000000
--- 
a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.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.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.TwitterComponent;
-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.util.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,
-        TwitterComponentAutoConfiguration.GroupConditions.class})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,
-        TwitterComponentConfiguration.class})
-public class TwitterComponentAutoConfiguration {
-
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(TwitterComponentAutoConfiguration.class);
-    @Autowired
-    private ApplicationContext applicationContext;
-    @Autowired
-    private CamelContext camelContext;
-    @Autowired
-    private TwitterComponentConfiguration configuration;
-    @Autowired(required = false)
-    private List<ComponentCustomizer<TwitterComponent>> customizers;
-
-    static class GroupConditions extends GroupCondition {
-        public GroupConditions() {
-            super("camel.component", "camel.component.twitter");
-        }
-    }
-
-    @Lazy
-    @Bean(name = "twitter-component")
-    @ConditionalOnMissingBean(TwitterComponent.class)
-    public TwitterComponent configureTwitterComponent() throws Exception {
-        TwitterComponent component = new TwitterComponent();
-        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<TwitterComponent> customizer : 
customizers) {
-                boolean useCustomizer = (customizer instanceof HasId)
-                        ? HierarchicalPropertiesEvaluator.evaluate(
-                                applicationContext.getEnvironment(),
-                                "camel.component.customizer",
-                                "camel.component.twitter.customizer",
-                                ((HasId) customizer).getId())
-                        : HierarchicalPropertiesEvaluator.evaluate(
-                                applicationContext.getEnvironment(),
-                                "camel.component.customizer",
-                                "camel.component.twitter.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/springboot/TwitterComponentConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentConfiguration.java
deleted file mode 100644
index 961785c..0000000
--- 
a/platforms/spring-boot/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentConfiguration.java
+++ /dev/null
@@ -1,151 +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.springboot;
-
-import javax.annotation.Generated;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Use twitter-directmessage, twitter-search, twitter-streaming and
- * twitter-timeline instead of this component.
- * 
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.twitter")
-public class TwitterComponentConfiguration
-        extends
-            ComponentConfigurationPropertiesCommon {
-
-    /**
-     * Whether to enable auto configuration of the twitter 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;
-
-    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;
-    }
-}
\ No newline at end of file

Reply via email to