You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/07/20 14:48:58 UTC
[1/6] camel git commit: CAMEL-11168: Add deprecationNote to @Metadata
Repository: camel
Updated Branches:
refs/heads/master e68111ec1 -> 155a58d6b
CAMEL-11168: Add deprecationNote to @Metadata
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/155a58d6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/155a58d6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/155a58d6
Branch: refs/heads/master
Commit: 155a58d6b4877a78507cbcaa5cd9a7997e194abd
Parents: d44a3b8
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 20 16:48:13 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 20 16:48:21 2017 +0200
----------------------------------------------------------------------
camel-core/src/main/docs/bean-component.adoc | 2 +-
camel-core/src/main/docs/bean-language.adoc | 2 +-
camel-core/src/main/docs/class-component.adoc | 2 +-
components/camel-amqp/src/main/docs/amqp-component.adoc | 2 +-
.../src/main/docs/atmosphere-websocket-component.adoc | 2 +-
components/camel-cache/src/main/docs/cache-component.adoc | 2 +-
.../src/main/docs/disruptor-component.adoc | 2 +-
components/camel-ejb/src/main/docs/ejb-component.adoc | 2 +-
components/camel-elsql/src/main/docs/elsql-component.adoc | 2 +-
.../camel-facebook/src/main/docs/facebook-component.adoc | 2 +-
components/camel-http/src/main/docs/http-component.adoc | 2 +-
components/camel-http4/src/main/docs/http4-component.adoc | 2 +-
.../src/main/docs/infinispan-component.adoc | 2 +-
components/camel-irc/src/main/docs/irc-component.adoc | 2 +-
.../camel-jetty9/src/main/docs/jetty-component.adoc | 8 ++++----
components/camel-jms/src/main/docs/jms-component.adoc | 2 +-
components/camel-mqtt/src/main/docs/mqtt-component.adoc | 2 +-
.../src/main/docs/netty-http-component.adoc | 4 ++--
components/camel-netty/src/main/docs/netty-component.adoc | 4 ++--
.../src/main/docs/netty4-http-component.adoc | 4 ++--
.../camel-netty4/src/main/docs/netty4-component.adoc | 4 ++--
.../camel-rabbitmq/src/main/docs/rabbitmq-component.adoc | 10 +++++-----
components/camel-sql/src/main/docs/sql-component.adoc | 2 +-
components/camel-ssh/src/main/docs/ssh-component.adoc | 2 +-
.../src/main/docs/zookeeper-component.adoc | 2 +-
components/readme.adoc | 2 +-
26 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/camel-core/src/main/docs/bean-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/bean-component.adoc b/camel-core/src/main/docs/bean-component.adoc
index d634d11..8b97f90 100644
--- a/camel-core/src/main/docs/bean-component.adoc
+++ b/camel-core/src/main/docs/bean-component.adoc
@@ -45,7 +45,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| **method** (producer) | Sets the name of the method to invoke on the bean | | String
| **cache** (advanced) | If enabled Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. | false | boolean
-| **multiParameterArray** (advanced) | How to treat the parameters which are passed from the message body; if it is true the message body should be an array of parameters. Note: This option is used internally by Camel and is not intended for end users to use. | false | boolean
+| **multiParameterArray** (advanced) | *Deprecated* How to treat the parameters which are passed from the message body; if it is true the message body should be an array of parameters. Note: This option is used internally by Camel and is not intended for end users to use. Deprecation note: This option is used internally by Camel, and is not intended for end users to use. | false | boolean
| **parameters** (advanced) | Used for configuring additional properties on the bean | | Map
| **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/camel-core/src/main/docs/bean-language.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/bean-language.adoc b/camel-core/src/main/docs/bean-language.adoc
index f9ce814..d04f025 100644
--- a/camel-core/src/main/docs/bean-language.adoc
+++ b/camel-core/src/main/docs/bean-language.adoc
@@ -30,7 +30,7 @@ The Bean method language supports 5 options which are listed below.
[width="100%",cols="2,1m,1m,6",options="header"]
|=======================================================================
| Name | Default | Java Type | Description
-| bean | | String | Either a reference or a class name of the bean to use
+| bean | | String | *Deprecated* Either a reference or a class name of the bean to use
| ref | | String | Reference to bean to lookup in the registry
| method | | String | Name of method to call
| beanType | | String | Class name of the bean to use
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/camel-core/src/main/docs/class-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/class-component.adoc b/camel-core/src/main/docs/class-component.adoc
index 9724888..c52a1dc 100644
--- a/camel-core/src/main/docs/class-component.adoc
+++ b/camel-core/src/main/docs/class-component.adoc
@@ -48,7 +48,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| **method** (producer) | Sets the name of the method to invoke on the bean | | String
| **cache** (advanced) | If enabled Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. | false | boolean
-| **multiParameterArray** (advanced) | How to treat the parameters which are passed from the message body; if it is true the message body should be an array of parameters. Note: This option is used internally by Camel and is not intended for end users to use. | false | boolean
+| **multiParameterArray** (advanced) | *Deprecated* How to treat the parameters which are passed from the message body; if it is true the message body should be an array of parameters. Note: This option is used internally by Camel and is not intended for end users to use. Deprecation note: This option is used internally by Camel, and is not intended for end users to use. | false | boolean
| **parameters** (advanced) | Used for configuring additional properties on the bean | | Map
| **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-amqp/src/main/docs/amqp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 44bc8ca..650ee87 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -86,7 +86,7 @@ The AMQP component supports 75 options which are listed below.
| **pubSubNoLocal** (advanced) | Specifies whether to inhibit the delivery of messages published by its own connection. | false | boolean
| **receiveTimeout** (advanced) | The timeout for receiving messages (in milliseconds). | 1000 | long
| **recoveryInterval** (advanced) | Specifies the interval between recovery attempts i.e. when a connection is being refreshed in milliseconds. The default is 5000 ms that is 5 seconds. | 5000 | long
-| **subscriptionDurable** (common) | Deprecated: Enabled by default if you specify a durableSubscriptionName and a clientId. | false | boolean
+| **subscriptionDurable** (common) | *Deprecated* Deprecated: Enabled by default if you specify a durableSubscriptionName and a clientId. | false | boolean
| **taskExecutor** (consumer) | Allows you to specify a custom task executor for consuming messages. | | TaskExecutor
| **timeToLive** (producer) | When sending messages specifies the time-to-live of the message (in milliseconds). | -1 | long
| **transacted** (transaction) | Specifies whether to use transacted mode | false | boolean
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
index 69a9711..ef7fcb0 100644
--- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
+++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -103,7 +103,7 @@ with the following path and query parameters:
| **throwExceptionOnFailure** (producer) | Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | true | boolean
| **cookieHandler** (producer) | Configure a cookie handler to maintain a HTTP session | | CookieHandler
| **okStatusCodeRange** (producer) | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included. | 200-299 | String
-| **urlRewrite** (producer) | Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html | | UrlRewrite
+| **urlRewrite** (producer) | *Deprecated* Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html | | UrlRewrite
| **mapHttpMessageBody** (advanced) | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping. | true | boolean
| **mapHttpMessageFormUrl EncodedBody** (advanced) | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | true | boolean
| **mapHttpMessageHeaders** (advanced) | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | true | boolean
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-cache/src/main/docs/cache-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cache/src/main/docs/cache-component.adoc b/components/camel-cache/src/main/docs/cache-component.adoc
index 52f3c87..289892a 100644
--- a/components/camel-cache/src/main/docs/cache-component.adoc
+++ b/components/camel-cache/src/main/docs/cache-component.adoc
@@ -85,7 +85,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| **diskExpiryThreadInterval Seconds** (common) | The number of seconds between runs of the disk expiry thread. | | long
| **diskPersistent** (common) | Whether the disk store persists between restarts of the application. | false | boolean
-| **diskStorePath** (common) | This parameter is ignored. CacheManager sets it using setter injection. | | String
+| **diskStorePath** (common) | *Deprecated* This parameter is ignored. CacheManager sets it using setter injection. | | String
| **eternal** (common) | Sets whether elements are eternal. If eternal timeouts are ignored and the element never expires. | false | boolean
| **key** (common) | The default key to use. If a key is provided in the message header then the key from the header takes precedence. | | String
| **maxElementsInMemory** (common) | The number of elements that may be stored in the defined cache in memory. | 1000 | int
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-disruptor/src/main/docs/disruptor-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/main/docs/disruptor-component.adoc b/components/camel-disruptor/src/main/docs/disruptor-component.adoc
index 0c8e2d0..536a844 100644
--- a/components/camel-disruptor/src/main/docs/disruptor-component.adoc
+++ b/components/camel-disruptor/src/main/docs/disruptor-component.adoc
@@ -106,7 +106,7 @@ The Disruptor component supports 8 options which are listed below.
| **defaultProducerType** (producer) | To configure the default value for DisruptorProducerType The default value is Multi. | Multi | DisruptorProducerType
| **defaultWaitStrategy** (consumer) | To configure the default value for DisruptorWaitStrategy The default value is Blocking. | Blocking | DisruptorWaitStrategy
| **defaultBlockWhenFull** (producer) | To configure the default value for block when full The default value is true. | true | boolean
-| **queueSize** (common) | To configure the ring buffer size | | int
+| **queueSize** (common) | *Deprecated* To configure the ring buffer size | | int
| **bufferSize** (common) | To configure the ring buffer size | 1024 | 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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-ejb/src/main/docs/ejb-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ejb/src/main/docs/ejb-component.adoc b/components/camel-ejb/src/main/docs/ejb-component.adoc
index 42406b6..b64d444 100644
--- a/components/camel-ejb/src/main/docs/ejb-component.adoc
+++ b/components/camel-ejb/src/main/docs/ejb-component.adoc
@@ -70,7 +70,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| **method** (producer) | Sets the name of the method to invoke on the bean | | String
| **cache** (advanced) | If enabled Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. | false | boolean
-| **multiParameterArray** (advanced) | How to treat the parameters which are passed from the message body.true means the message body should be an array of parameters.. Deprecation note: This option is used internally by Camel and is not intended for end users to use. | false | boolean
+| **multiParameterArray** (advanced) | *Deprecated* How to treat the parameters which are passed from the message body.true means the message body should be an array of parameters.. Deprecation note: This option is used internally by Camel and is not intended for end users to use. Deprecation note: This option is used internally by Camel, and is not intended for end users to use. | false | boolean
| **parameters** (advanced) | Used for configuring additional properties on the bean | | Map
| **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-elsql/src/main/docs/elsql-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc b/components/camel-elsql/src/main/docs/elsql-component.adoc
index 0efcb8b..5d083ce 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -88,7 +88,7 @@ with the following path and query parameters:
| **allowNamedParameters** (common) | Whether to allow using named parameters in the queries. | true | boolean
| **databaseVendor** (common) | To use a vendor specific com.opengamma.elsql.ElSqlConfig | | ElSqlDatabaseVendor
| **dataSource** (common) | Sets the DataSource to use to communicate with the database. | | DataSource
-| **dataSourceRef** (common) | Sets the reference to a DataSource to lookup from the registry to use for communicating with the database. | | String
+| **dataSourceRef** (common) | *Deprecated* Sets the reference to a DataSource to lookup from the registry to use for communicating with the database. | | String
| **outputClass** (common) | Specify the full package and class name to use as conversion when outputType=SelectOne. | | String
| **outputHeader** (common) | Store the query result in a header instead of the message body. By default outputHeader == null and the query result is stored in the message body any existing content in the message body is discarded. If outputHeader is set the value is used as the name of the header to store the query result and the original message body is preserved. | | String
| **outputType** (common) | Make the output of consumer or producer to SelectList as List of Map or SelectOne as single Java object in the following way:a) If the query has only single column then that JDBC Column object is returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object.b) If the query has more than one column then it will return a Map of that result.c) If the outputClass is set then it will convert the query result into an Java bean object by calling all the setters that match the column names.It will assume your class has a default constructor to create instance with.d) If the query resulted in more than one rows it throws an non-unique result exception.StreamList streams the result of the query using an Iterator. This can be used with the Splitter EIP in streaming mode to process the ResultSet in streaming fashion. | SelectList | SqlOutputType
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-facebook/src/main/docs/facebook-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/main/docs/facebook-component.adoc b/components/camel-facebook/src/main/docs/facebook-component.adoc
index 1823609..ad65096 100644
--- a/components/camel-facebook/src/main/docs/facebook-component.adoc
+++ b/components/camel-facebook/src/main/docs/facebook-component.adoc
@@ -94,7 +94,7 @@ with the following path and query parameters:
| **appId** (common) | The ID of the Facebook Application | | String
| **center** (common) | Location latitude and longitude | | GeoLocation
| **checkinId** (common) | The checkin ID | | String
-| **checkinUpdate** (common) | The checkin to be created. Deprecated instead create a Post with an attached location | | CheckinUpdate
+| **checkinUpdate** (common) | *Deprecated* The checkin to be created. Deprecated instead create a Post with an attached location | | CheckinUpdate
| **clientURL** (common) | Facebook4J API client URL | | String
| **clientVersion** (common) | Facebook4J client API version | | String
| **commentId** (common) | The comment ID | | String
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-http/src/main/docs/http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc
index 5830634..f20599f 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -174,7 +174,7 @@ with the following path and query parameters:
| **transferException** (producer) | If enabled and an Exchange failed processing on the consumer side and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| **cookieHandler** (producer) | Configure a cookie handler to maintain a HTTP session | | CookieHandler
| **okStatusCodeRange** (producer) | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included. | 200-299 | String
-| **urlRewrite** (producer) | Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html | | UrlRewrite
+| **urlRewrite** (producer) | *Deprecated* Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html | | UrlRewrite
| **httpClientConfigurer** (advanced) | Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc | | HttpClientConfigurer
| **httpClientOptions** (advanced) | To configure the HttpClient using the key/values from the Map. | | Map
| **httpConnectionManager** (advanced) | To use a custom HttpConnectionManager to manage connections | | HttpConnectionManager
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-http4/src/main/docs/http4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc
index a2c9be3..1ebe77b 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -123,7 +123,7 @@ with the following path and query parameters:
| **transferException** (producer) | If enabled and an Exchange failed processing on the consumer side and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| **cookieHandler** (producer) | Configure a cookie handler to maintain a HTTP session | | CookieHandler
| **okStatusCodeRange** (producer) | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included. | 200-299 | String
-| **urlRewrite** (producer) | Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html | | UrlRewrite
+| **urlRewrite** (producer) | *Deprecated* Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html | | UrlRewrite
| **clientBuilder** (advanced) | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. | | HttpClientBuilder
| **clientConnectionManager** (advanced) | To use a custom HttpClientConnectionManager to manage connections | | HttpClientConnection Manager
| **connectionsPerRoute** (advanced) | The maximum number of connections per route. | 20 | int
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-infinispan/src/main/docs/infinispan-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/docs/infinispan-component.adoc b/components/camel-infinispan/src/main/docs/infinispan-component.adoc
index b92e5bd..4cdcb70 100644
--- a/components/camel-infinispan/src/main/docs/infinispan-component.adoc
+++ b/components/camel-infinispan/src/main/docs/infinispan-component.adoc
@@ -78,7 +78,7 @@ with the following path and query parameters:
| **queryBuilder** (common) | Specifies the query builder. | | InfinispanQueryBuilder
| **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
| **clusteredListener** (consumer) | If true the listener will be installed for the entire cluster | false | boolean
-| **command** (consumer) | The operation to perform. | PUT | String
+| **command** (consumer) | *Deprecated* The operation to perform. | PUT | String
| **customListener** (consumer) | Returns the custom listener in use if provided | | InfinispanCustom Listener
| **eventTypes** (consumer) | Specifies the set of event types to register by the consumer. Multiple event can be separated by comma. The possible event types are: CACHE_ENTRY_ACTIVATED CACHE_ENTRY_PASSIVATED CACHE_ENTRY_VISITED CACHE_ENTRY_LOADED CACHE_ENTRY_EVICTED CACHE_ENTRY_CREATED CACHE_ENTRY_REMOVED CACHE_ENTRY_MODIFIED TRANSACTION_COMPLETED TRANSACTION_REGISTERED CACHE_ENTRY_INVALIDATED DATA_REHASHED TOPOLOGY_CHANGED PARTITION_STATUS_CHANGED | | String
| **sync** (consumer) | If true the consumer will receive notifications synchronously | true | boolean
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-irc/src/main/docs/irc-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-irc/src/main/docs/irc-component.adoc b/components/camel-irc/src/main/docs/irc-component.adoc
index 05f280a..6f68e41 100644
--- a/components/camel-irc/src/main/docs/irc-component.adoc
+++ b/components/camel-irc/src/main/docs/irc-component.adoc
@@ -76,7 +76,7 @@ with the following path and query parameters:
| **autoRejoin** (common) | Whether to auto re-join when being kicked | true | boolean
| **namesOnJoin** (common) | Sends NAMES command to channel after joining it. link onReply has to be true in order to process the result which will have the header value irc.num = '353'. | false | boolean
| **nickname** (common) | The nickname used in chat. | | String
-| **persistent** (common) | Use persistent messages. | true | boolean
+| **persistent** (common) | *Deprecated* Use persistent messages. | true | boolean
| **realname** (common) | The IRC user's actual name. | | 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
| **exceptionHandler** (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-jetty9/src/main/docs/jetty-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc
index 27d78cb..13fbf9c 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -147,9 +147,9 @@ with the following path and query parameters:
| **filterInitParameters** (consumer) | Configuration of the filter init parameters. These parameters will be applied to the filter list before starting the jetty server. | | Map
| **filtersRef** (consumer) | Allows using a custom filters which is putted into a list and can be find in the Registry. Multiple values can be separated by comma. | | String
| **handlers** (consumer) | Specifies a comma-delimited set of Handler instances to lookup in your Registry. These handlers are added to the Jetty servlet context (for example to add security). Important: You can not use different handlers with different Jetty endpoints using the same port number. The handlers is associated to the port number. If you need different handlers then use different port numbers. | | String
-| **httpBindingRef** (consumer) | Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | | String
+| **httpBindingRef** (consumer) | *Deprecated* Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | | String
| **multipartFilter** (consumer) | Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true. | | Filter
-| **multipartFilterRef** (consumer) | Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true. | | String
+| **multipartFilterRef** (consumer) | *Deprecated* Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true. | | String
| **optionsEnabled** (consumer) | Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off. | false | boolean
| **traceEnabled** (consumer) | Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off. | false | boolean
| **bridgeEndpoint** (producer) | If the option is true HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | boolean
@@ -165,9 +165,9 @@ with the following path and query parameters:
| **httpClient** (producer) | Sets a shared HttpClient to use for all producers created by this endpoint. By default each producer will use a new http client and not share. Important: Make sure to handle the lifecycle of the shared client such as stopping the client when it is no longer in use. Camel will call the start method on the client to ensure its started when this endpoint creates a producer. This options should only be used in special circumstances. | | HttpClient
| **httpClientParameters** (producer) | Configuration of Jetty's HttpClient. For example setting httpClient.idleTimeout=30000 sets the idle timeout to 30 seconds. And httpClient.timeout=30000 sets the request timeout to 30 seconds in case you want to timeout sooner if you have long running request/response calls. | | Map
| **jettyBinding** (producer) | To use a custom JettyHttpBinding which be used to customize how a response should be written for the producer. | | JettyHttpBinding
-| **jettyBindingRef** (producer) | To use a custom JettyHttpBinding which be used to customize how a response should be written for the producer. | | String
+| **jettyBindingRef** (producer) | *Deprecated* To use a custom JettyHttpBinding which be used to customize how a response should be written for the producer. | | String
| **okStatusCodeRange** (producer) | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included. | 200-299 | String
-| **urlRewrite** (producer) | Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html | | UrlRewrite
+| **urlRewrite** (producer) | *Deprecated* Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html | | UrlRewrite
| **mapHttpMessageBody** (advanced) | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping. | true | boolean
| **mapHttpMessageFormUrl EncodedBody** (advanced) | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | true | boolean
| **mapHttpMessageHeaders** (advanced) | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | true | boolean
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-jms/src/main/docs/jms-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index 52cb2f6..55ef547 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -247,7 +247,7 @@ The JMS component supports 75 options which are listed below.
| **pubSubNoLocal** (advanced) | Specifies whether to inhibit the delivery of messages published by its own connection. | false | boolean
| **receiveTimeout** (advanced) | The timeout for receiving messages (in milliseconds). | 1000 | long
| **recoveryInterval** (advanced) | Specifies the interval between recovery attempts i.e. when a connection is being refreshed in milliseconds. The default is 5000 ms that is 5 seconds. | 5000 | long
-| **subscriptionDurable** (common) | Deprecated: Enabled by default if you specify a durableSubscriptionName and a clientId. | false | boolean
+| **subscriptionDurable** (common) | *Deprecated* Deprecated: Enabled by default if you specify a durableSubscriptionName and a clientId. | false | boolean
| **taskExecutor** (consumer) | Allows you to specify a custom task executor for consuming messages. | | TaskExecutor
| **timeToLive** (producer) | When sending messages specifies the time-to-live of the message (in milliseconds). | -1 | long
| **transacted** (transaction) | Specifies whether to use transacted mode | false | boolean
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-mqtt/src/main/docs/mqtt-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mqtt/src/main/docs/mqtt-component.adoc b/components/camel-mqtt/src/main/docs/mqtt-component.adoc
index d8242d1..121380c 100644
--- a/components/camel-mqtt/src/main/docs/mqtt-component.adoc
+++ b/components/camel-mqtt/src/main/docs/mqtt-component.adoc
@@ -100,7 +100,7 @@ with the following path and query parameters:
| **sendBufferSize** (common) | Sets the size of the internal socket send buffer. Defaults to 65536 (64k) | 65536 | int
| **sendWaitInSeconds** (common) | The maximum time the Component will wait for a receipt from the MQTT broker to acknowledge a published message before throwing an exception | 5 | int
| **sslContext** (common) | To configure security using SSLContext configuration | | SSLContext
-| **subscribeTopicName** (common) | These are set on the Endpoint - together with properties inherited from MQTT | | String
+| **subscribeTopicName** (common) | *Deprecated* These are set on the Endpoint - together with properties inherited from MQTT | | String
| **subscribeTopicNames** (common) | A comma-delimited list of Topics to subscribe to for messages. Note that each item of this list can contain MQTT wildcards ( and/or ) in order to subscribe to topics matching a certain pattern within a hierarchy. For example is a wildcard for all topics at a level within the hierarchy so if a broker has topics topics/one and topics/two then topics/ can be used to subscribe to both. A caveat to consider here is that if the broker adds topics/three the route would also begin to receive messages from that topic. | | String
| **trafficClass** (common) | Sets traffic class or type-of-service octet in the IP header for packets sent from the transport. Defaults to 8 which means the traffic should be optimized for throughput. | 8 | int
| **version** (common) | Set to 3.1.1 to use MQTT version 3.1.1. Otherwise defaults to the 3.1 protocol version. | 3.1 | String
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-netty-http/src/main/docs/netty-http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/docs/netty-http-component.adoc b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
index c33165b..f9469d7 100644
--- a/components/camel-netty-http/src/main/docs/netty-http-component.adoc
+++ b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
@@ -182,9 +182,9 @@ with the following path and query parameters:
| **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
| **transferException** (advanced) | If enabled and an Exchange failed processing on the consumer side and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| **transferExchange** (advanced) | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body Out body fault body In headers Out headers fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
-| **decoder** (codec) | To use a single decoder. This options is deprecated use encoders instead. | | ChannelHandler
+| **decoder** (codec) | *Deprecated* To use a single decoder. This options is deprecated use encoders instead. | | ChannelHandler
| **decoders** (codec) | A list of decoders to be used. You can use a String which have values separated by comma and have the values be looked up in the Registry. Just remember to prefix the value with so Camel knows it should lookup. | | String
-| **encoder** (codec) | To use a single encoder. This options is deprecated use encoders instead. | | ChannelHandler
+| **encoder** (codec) | *Deprecated* To use a single encoder. This options is deprecated use encoders instead. | | ChannelHandler
| **encoders** (codec) | A list of encoders to be used. You can use a String which have values separated by comma and have the values be looked up in the Registry. Just remember to prefix the value with so Camel knows it should lookup. | | String
| **enabledProtocols** (security) | Which protocols to enable when using SSL | TLSv1,TLSv1.1,TLSv1.2 | String
| **keyStoreFile** (security) | Client side certificate keystore to be used for encryption | | File
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-netty/src/main/docs/netty-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/docs/netty-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc
index b388442..3856c76 100644
--- a/components/camel-netty/src/main/docs/netty-component.adoc
+++ b/components/camel-netty/src/main/docs/netty-component.adoc
@@ -145,11 +145,11 @@ with the following path and query parameters:
| **transferExchange** (advanced) | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body Out body fault body In headers Out headers fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
| **allowDefaultCodec** (codec) | The netty component installs a default codec if both encoder/deocder is null and textline is false. Setting allowDefaultCodec to false prevents the netty component from installing a default codec as the first element in the filter chain. | true | boolean
| **autoAppendDelimiter** (codec) | Whether or not to auto append missing end delimiter when sending using the textline codec. | true | boolean
-| **decoder** (codec) | A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. Must override org.jboss.netty.channel.ChannelUpStreamHandler. | | ChannelHandler
+| **decoder** (codec) | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. Must override org.jboss.netty.channel.ChannelUpStreamHandler. | | ChannelHandler
| **decoderMaxLineLength** (codec) | The max line length to use for the textline codec. | 1024 | int
| **decoders** (codec) | A list of decoders to be used. You can use a String which have values separated by comma and have the values be looked up in the Registry. Just remember to prefix the value with so Camel knows it should lookup. | | String
| **delimiter** (codec) | The delimiter to use for the textline codec. Possible values are LINE and NULL. | LINE | TextLineDelimiter
-| **encoder** (codec) | A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. Must override org.jboss.netty.channel.ChannelDownStreamHandler. | | ChannelHandler
+| **encoder** (codec) | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. Must override org.jboss.netty.channel.ChannelDownStreamHandler. | | ChannelHandler
| **encoders** (codec) | A list of encoders to be used. You can use a String which have values separated by comma and have the values be looked up in the Registry. Just remember to prefix the value with so Camel knows it should lookup. | | String
| **encoding** (codec) | The encoding (a charset name) to use for the textline codec. If not provided Camel will use the JVM default Charset. | | String
| **textline** (codec) | Only used for TCP. If no codec is specified you can use this flag to indicate a text line based codec; if not specified or the value is false then Object Serialization is assumed over TCP. | false | boolean
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
index 62ef156..6f19356 100644
--- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
+++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
@@ -185,9 +185,9 @@ with the following path and query parameters:
| **transferExchange** (advanced) | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body Out body fault body In headers Out headers fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
| **workerCount** (advanced) | When netty works on nio mode it uses default workerCount parameter from Netty which is cpu_core_threads2. User can use this operation to override the default workerCount from Netty | | int
| **workerGroup** (advanced) | To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consumers or producers. By default each consumer or producer has their own worker pool with 2 x cpu count core threads. | | EventLoopGroup
-| **decoder** (codec) | To use a single decoder. This options is deprecated use encoders instead. | | ChannelHandler
+| **decoder** (codec) | *Deprecated* To use a single decoder. This options is deprecated use encoders instead. | | ChannelHandler
| **decoders** (codec) | A list of decoders to be used. You can use a String which have values separated by comma and have the values be looked up in the Registry. Just remember to prefix the value with so Camel knows it should lookup. | | String
-| **encoder** (codec) | To use a single encoder. This options is deprecated use encoders instead. | | ChannelHandler
+| **encoder** (codec) | *Deprecated* To use a single encoder. This options is deprecated use encoders instead. | | ChannelHandler
| **encoders** (codec) | A list of encoders to be used. You can use a String which have values separated by comma and have the values be looked up in the Registry. Just remember to prefix the value with so Camel knows it should lookup. | | String
| **enabledProtocols** (security) | Which protocols to enable when using SSL | TLSv1,TLSv1.1,TLSv1.2 | String
| **keyStoreFile** (security) | Client side certificate keystore to be used for encryption | | File
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-netty4/src/main/docs/netty4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty4/src/main/docs/netty4-component.adoc
index 6153401..b4756b7 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -150,11 +150,11 @@ with the following path and query parameters:
| **workerGroup** (advanced) | To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consumers or producers. By default each consumer or producer has their own worker pool with 2 x cpu count core threads. | | EventLoopGroup
| **allowDefaultCodec** (codec) | The netty component installs a default codec if both encoder/deocder is null and textline is false. Setting allowDefaultCodec to false prevents the netty component from installing a default codec as the first element in the filter chain. | true | boolean
| **autoAppendDelimiter** (codec) | Whether or not to auto append missing end delimiter when sending using the textline codec. | true | boolean
-| **decoder** (codec) | A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. | | ChannelHandler
+| **decoder** (codec) | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. | | ChannelHandler
| **decoderMaxLineLength** (codec) | The max line length to use for the textline codec. | 1024 | int
| **decoders** (codec) | A list of decoders to be used. You can use a String which have values separated by comma and have the values be looked up in the Registry. Just remember to prefix the value with so Camel knows it should lookup. | | String
| **delimiter** (codec) | The delimiter to use for the textline codec. Possible values are LINE and NULL. | LINE | TextLineDelimiter
-| **encoder** (codec) | A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. | | ChannelHandler
+| **encoder** (codec) | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. | | ChannelHandler
| **encoders** (codec) | A list of encoders to be used. You can use a String which have values separated by comma and have the values be looked up in the Registry. Just remember to prefix the value with so Camel knows it should lookup. | | String
| **encoding** (codec) | The encoding (a charset name) to use for the textline codec. If not provided Camel will use the JVM default Charset. | | String
| **textline** (codec) | Only used for TCP. If no codec is specified you can use this flag to indicate a text line based codec; if not specified or the value is false then Object Serialization is assumed over TCP. | false | boolean
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
index cbd0e2b..c147441 100644
--- a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
+++ b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
@@ -103,14 +103,14 @@ with the following path and query parameters:
| **addresses** (advanced) | If this option is set camel-rabbitmq will try to create connection based on the setting of option addresses. The addresses value is a string which looks like server1:12345 server2:12345 | | Address[]
| **args** (advanced) | Specify arguments for configuring the different RabbitMQ concepts a different prefix is required for each: Exchange: arg.exchange. Queue: arg.queue. Binding: arg.binding. For example to declare a queue with message ttl argument: http://localhost:5672/exchange/queueargs=arg.queue.x-message-ttl=60000 | | Map
| **automaticRecoveryEnabled** (advanced) | Enables connection automatic recovery (uses connection implementation that performs automatic recovery when connection shutdown is not initiated by the application) | | Boolean
-| **bindingArgs** (advanced) | Key/value args for configuring the queue binding parameters when declare=true | | Map
+| **bindingArgs** (advanced) | *Deprecated* Key/value args for configuring the queue binding parameters when declare=true | | Map
| **clientProperties** (advanced) | Connection client properties (client info used in negotiating with the server) | | Map
| **connectionFactory** (advanced) | To use a custom RabbitMQ connection factory. When this option is set all connection options (connectionTimeout requestedChannelMax...) set on URI are not used | | ConnectionFactory
-| **exchangeArgs** (advanced) | Key/value args for configuring the exchange parameters when declare=true | | Map
-| **exchangeArgsConfigurer** (advanced) | Set the configurer for setting the exchange args in Channel.exchangeDeclare | | ArgsConfigurer
+| **exchangeArgs** (advanced) | *Deprecated* Key/value args for configuring the exchange parameters when declare=true | | Map
+| **exchangeArgsConfigurer** (advanced) | *Deprecated* Set the configurer for setting the exchange args in Channel.exchangeDeclare | | ArgsConfigurer
| **networkRecoveryInterval** (advanced) | Network recovery interval in milliseconds (interval used when recovering from network failure) | | Integer
-| **queueArgs** (advanced) | Key/value args for configuring the queue parameters when declare=true | | Map
-| **queueArgsConfigurer** (advanced) | Set the configurer for setting the queue args in Channel.queueDeclare | | ArgsConfigurer
+| **queueArgs** (advanced) | *Deprecated* Key/value args for configuring the queue parameters when declare=true | | Map
+| **queueArgsConfigurer** (advanced) | *Deprecated* Set the configurer for setting the queue args in Channel.queueDeclare | | ArgsConfigurer
| **requestedChannelMax** (advanced) | Connection requested channel max (max number of channels offered) | 0 | int
| **requestedFrameMax** (advanced) | Connection requested frame max (max size of frame offered) | 0 | int
| **requestedHeartbeat** (advanced) | Connection requested heartbeat (heart-beat in seconds offered) | 60 | int
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-sql/src/main/docs/sql-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc b/components/camel-sql/src/main/docs/sql-component.adoc
index e9baa47..23fc706 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -145,7 +145,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| **allowNamedParameters** (common) | Whether to allow using named parameters in the queries. | true | boolean
| **dataSource** (common) | Sets the DataSource to use to communicate with the database. | | DataSource
-| **dataSourceRef** (common) | Sets the reference to a DataSource to lookup from the registry to use for communicating with the database. | | String
+| **dataSourceRef** (common) | *Deprecated* Sets the reference to a DataSource to lookup from the registry to use for communicating with the database. | | String
| **outputClass** (common) | Specify the full package and class name to use as conversion when outputType=SelectOne. | | String
| **outputHeader** (common) | Store the query result in a header instead of the message body. By default outputHeader == null and the query result is stored in the message body any existing content in the message body is discarded. If outputHeader is set the value is used as the name of the header to store the query result and the original message body is preserved. | | String
| **outputType** (common) | Make the output of consumer or producer to SelectList as List of Map or SelectOne as single Java object in the following way: a) If the query has only single column then that JDBC Column object is returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object. b) If the query has more than one column then it will return a Map of that result. c) If the outputClass is set then it will convert the query result into an Java bean object by calling all the setters that match the column names. It will assume your class has a default constructor to create instance with. d) If the query resulted in more than one rows it throws an non-unique result exception. | SelectList | SqlOutputType
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-ssh/src/main/docs/ssh-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc b/components/camel-ssh/src/main/docs/ssh-component.adoc
index d38b469..4b28cda 100644
--- a/components/camel-ssh/src/main/docs/ssh-component.adoc
+++ b/components/camel-ssh/src/main/docs/ssh-component.adoc
@@ -46,7 +46,7 @@ The SSH component supports 12 options which are listed below.
| **keyPairProvider** (security) | Sets the KeyPairProvider reference to use when connecting using Certificates to the remote SSH Server. | | KeyPairProvider
| **keyType** (security) | Sets the key type to pass to the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...) will be passed this value. Defaults to ssh-rsa. | | String
| **timeout** (common) | Sets the timeout in milliseconds to wait in establishing the remote SSH server connection. Defaults to 30000 milliseconds. | | long
-| **certFilename** (security) | Sets the resource path of the certificate to use for Authentication. | | String
+| **certFilename** (security) | *Deprecated* Sets the resource path of the certificate to use for Authentication. | | String
| **certResource** (security) | Sets the resource path of the certificate to use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file based certificate and depends on keyType setting. | | String
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
index ffce3cd..c0bd6f1 100644
--- a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
+++ b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
@@ -74,7 +74,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
| Name | Description | Default | Type
-| **awaitExistence** (common) | Not in use | true | boolean
+| **awaitExistence** (common) | *Deprecated* Not in use | true | boolean
| **listChildren** (common) | Whether the children of the node should be listed | false | boolean
| **timeout** (common) | The time interval to wait on connection before timing out. | 5000 | int
| **backoff** (consumer) | The time interval to backoff for after an error before retrying. | 5000 | long
http://git-wip-us.apache.org/repos/asf/camel/blob/155a58d6/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 07420b7..32efc98 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1009,7 +1009,7 @@ Miscellaneous Components
^^^^^^^^^^^^^^^^^^^^^^^^
// others: START
-Number of Miscellaneous Components: 38 in 38 JAR artifacts (14 deprecated)
+Number of Miscellaneous Components: 37 in 37 JAR artifacts (13 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
[3/6] camel git commit: CAMEL-11168: Add deprecationNote to @Metadata
Posted by da...@apache.org.
CAMEL-11168: Add deprecationNote to @Metadata
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7dde22d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7dde22d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7dde22d3
Branch: refs/heads/master
Commit: 7dde22d34b879fa4b03eb3c0bcc6e5e4e0ba7c94
Parents: e68111e
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 20 15:16:30 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 20 16:48:21 2017 +0200
----------------------------------------------------------------------
.../tools/apt/CoreEipAnnotationProcessor.java | 143 ++++++++++++++-----
.../tools/apt/EndpointAnnotationProcessor.java | 15 +-
.../camel/tools/apt/model/ComponentModel.java | 9 ++
.../camel/tools/apt/model/ComponentOption.java | 12 +-
.../camel/tools/apt/model/EndpointOption.java | 11 +-
.../camel/tools/apt/model/EndpointPath.java | 8 +-
.../tools/apt/EndpointOptionComparatorTest.java | 12 +-
.../maven/packaging/PackageDataFormatMojo.java | 12 ++
.../maven/packaging/PackageLanguageMojo.java | 12 ++
.../camel/maven/packaging/PackageOtherMojo.java | 9 ++
.../maven/packaging/PrepareReadmeMojo.java | 5 +
.../maven/packaging/PrepareUserGuideMojo.java | 4 +
.../SpringBootAutoConfigurationMojo.java | 9 ++
.../camel/maven/packaging/UpdateReadmeMojo.java | 9 ++
.../maven/packaging/model/ComponentModel.java | 9 ++
.../packaging/model/ComponentOptionModel.java | 9 ++
.../maven/packaging/model/DataFormatModel.java | 9 ++
.../packaging/model/DataFormatOptionModel.java | 9 ++
.../camel/maven/packaging/model/EipModel.java | 9 ++
.../maven/packaging/model/EipOptionModel.java | 9 ++
.../packaging/model/EndpointOptionModel.java | 9 ++
.../maven/packaging/model/LanguageModel.java | 9 ++
.../packaging/model/LanguageOptionModel.java | 9 ++
.../camel/maven/packaging/model/OtherModel.java | 9 ++
.../maven/packaging/model/OtherOptionModel.java | 9 ++
.../java/org/apache/camel/spi/Metadata.java | 5 +
26 files changed, 329 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
index 2a0b720..857b95c 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
@@ -174,6 +174,9 @@ public class CoreEipAnnotationProcessor {
buffer.append("\n \"javaType\": \"").append(eipModel.getJavaType()).append("\",");
buffer.append("\n \"label\": \"").append(safeNull(eipModel.getLabel())).append("\",");
buffer.append("\n \"deprecated\": ").append(eipModel.isDeprecated()).append(",");
+ if (eipModel.getDeprecationNode() != null) {
+ buffer.append("\n \"deprecationNote\": \"").append(safeNull(eipModel.getDeprecationNode())).append("\",");
+ }
buffer.append("\n \"input\": ").append(eipModel.getInput()).append(",");
buffer.append("\n \"output\": ").append(eipModel.getOutput());
buffer.append("\n },");
@@ -376,13 +379,17 @@ public class CoreEipAnnotationProcessor {
}
}
- boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
String displayName = null;
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, "attribute", fieldTypeName, required, defaultValue, docComment, deprecated, isEnum, enums, false, null, false);
+ EipOption ep = new EipOption(name, displayName, "attribute", fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote, isEnum, enums, false, null, false);
eipOptions.add(ep);
return false;
@@ -413,14 +420,18 @@ public class CoreEipAnnotationProcessor {
// metadata may overrule element required
required = findRequired(fieldElement, required);
- boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
String displayName = null;
Metadata metadata = fieldElement.getAnnotation(Metadata.class);
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, "value", fieldTypeName, required, defaultValue, docComment, deprecated, false, null, false, null, false);
+ EipOption ep = new EipOption(name, displayName, "value", fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote, false, null, false, null, false);
eipOptions.add(ep);
}
@@ -512,13 +523,17 @@ public class CoreEipAnnotationProcessor {
oneOfTypes.add("otherwise");
}
- boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
String displayName = null;
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, required, defaultValue, docComment, deprecated, isEnum, enums, isOneOf, oneOfTypes, asPredicate);
+ EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote, isEnum, enums, isOneOf, oneOfTypes, asPredicate);
eipOptions.add(ep);
}
}
@@ -555,8 +570,13 @@ public class CoreEipAnnotationProcessor {
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, required, defaultValue, docComment, false, false, null, true, oneOfTypes, false);
+ EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote, false,null, true, oneOfTypes, false);
eipOptions.add(ep);
}
}
@@ -568,57 +588,68 @@ public class CoreEipAnnotationProcessor {
// group
String docComment = findJavaDoc(elementUtils, null, "group", null, classElement, true);
- EipOption ep = new EipOption("group", "Group", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ EipOption ep = new EipOption("group", "Group", "attribute", "java.lang.String", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// group
docComment = findJavaDoc(elementUtils, null, "streamCache", null, classElement, true);
- ep = new EipOption("streamCache", "Stream Cache", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("streamCache", "Stream Cache", "attribute", "java.lang.String", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// trace
docComment = findJavaDoc(elementUtils, null, "trace", null, classElement, true);
- ep = new EipOption("trace", "Trace", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("trace", "Trace", "attribute", "java.lang.String", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// message history
docComment = findJavaDoc(elementUtils, null, "messageHistory", null, classElement, true);
- ep = new EipOption("messageHistory", "Message History", "attribute", "java.lang.String", false, "true", docComment, false, false, null, false, null, false);
+ ep = new EipOption("messageHistory", "Message History", "attribute", "java.lang.String", false, "true", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// log mask
docComment = findJavaDoc(elementUtils, null, "logMask", null, classElement, true);
- ep = new EipOption("logMask", "Log Mask", "attribute", "java.lang.String", false, "false", docComment, false, false, null, false, null, false);
+ ep = new EipOption("logMask", "Log Mask", "attribute", "java.lang.String", false, "false", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// trace
docComment = findJavaDoc(elementUtils, null, "handleFault", null, classElement, true);
- ep = new EipOption("handleFault", "Handle Fault", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("handleFault", "Handle Fault", "attribute", "java.lang.String", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// delayer
docComment = findJavaDoc(elementUtils, null, "delayer", null, classElement, true);
- ep = new EipOption("delayer", "Delayer", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("delayer", "Delayer", "attribute", "java.lang.String", false, "", docComment, false,
+ null, false, null, false, null, false);
eipOptions.add(ep);
// autoStartup
docComment = findJavaDoc(elementUtils, null, "autoStartup", null, classElement, true);
- ep = new EipOption("autoStartup", "Auto Startup", "attribute", "java.lang.String", false, "true", docComment, false, false, null, false, null, false);
+ ep = new EipOption("autoStartup", "Auto Startup", "attribute", "java.lang.String", false, "true", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// startupOrder
docComment = findJavaDoc(elementUtils, null, "startupOrder", null, classElement, true);
- ep = new EipOption("startupOrder", "Startup Order", "attribute", "java.lang.Integer", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("startupOrder", "Startup Order", "attribute", "java.lang.Integer", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// errorHandlerRef
docComment = findJavaDoc(elementUtils, null, "errorHandlerRef", null, classElement, true);
- ep = new EipOption("errorHandlerRef", "Error Handler", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("errorHandlerRef", "Error Handler", "attribute", "java.lang.String", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// routePolicyRef
docComment = findJavaDoc(elementUtils, null, "routePolicyRef", null, classElement, true);
- ep = new EipOption("routePolicyRef", "Route Policy", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("routePolicyRef", "Route Policy", "attribute", "java.lang.String", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// shutdownRoute
@@ -626,7 +657,8 @@ public class CoreEipAnnotationProcessor {
enums.add("Default");
enums.add("Defer");
docComment = findJavaDoc(elementUtils, null, "shutdownRoute", "Default", classElement, true);
- ep = new EipOption("shutdownRoute", "Shutdown Route", "attribute", "org.apache.camel.ShutdownRoute", false, "", docComment, false, true, enums, false, null, false);
+ ep = new EipOption("shutdownRoute", "Shutdown Route", "attribute", "org.apache.camel.ShutdownRoute", false, "", docComment,
+ false, null, true, enums, false, null, false);
eipOptions.add(ep);
// shutdownRunningTask
@@ -634,14 +666,16 @@ public class CoreEipAnnotationProcessor {
enums.add("CompleteCurrentTaskOnly");
enums.add("CompleteAllTasks");
docComment = findJavaDoc(elementUtils, null, "shutdownRunningTask", "CompleteCurrentTaskOnly", classElement, true);
- ep = new EipOption("shutdownRunningTask", "Shutdown Running Task", "attribute", "org.apache.camel.ShutdownRunningTask", false, "", docComment, false, true, enums, false, null, false);
+ ep = new EipOption("shutdownRunningTask", "Shutdown Running Task", "attribute", "org.apache.camel.ShutdownRunningTask", false, "", docComment,
+ false, null, true, enums, false, null, false);
eipOptions.add(ep);
// inputs
Set<String> oneOfTypes = new TreeSet<String>();
oneOfTypes.add("from");
docComment = findJavaDoc(elementUtils, null, "inputs", null, classElement, true);
- ep = new EipOption("inputs", "Inputs", "element", "java.util.List<org.apache.camel.model.FromDefinition>", true, "", docComment, false, false, null, true, oneOfTypes, false);
+ ep = new EipOption("inputs", "Inputs", "element", "java.util.List<org.apache.camel.model.FromDefinition>", true, "", docComment,
+ false, null, false, null, true, oneOfTypes, false);
eipOptions.add(ep);
// outputs
@@ -664,7 +698,8 @@ public class CoreEipAnnotationProcessor {
oneOfTypes.remove("route");
docComment = findJavaDoc(elementUtils, null, "outputs", null, classElement, true);
- ep = new EipOption("outputs", "Outputs", "element", "java.util.List<org.apache.camel.model.ProcessorDefinition<?>>", true, "", docComment, false, false, null, true, oneOfTypes, false);
+ ep = new EipOption("outputs", "Outputs", "element", "java.util.List<org.apache.camel.model.ProcessorDefinition<?>>", true, "", docComment,
+ false, null, false, null, true, oneOfTypes, false);
eipOptions.add(ep);
}
@@ -678,19 +713,22 @@ public class CoreEipAnnotationProcessor {
// id
String docComment = findJavaDoc(elementUtils, null, "id", null, classElement, true);
- EipOption ep = new EipOption("id", "Id", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ EipOption ep = new EipOption("id", "Id", "attribute", "java.lang.String", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// description
docComment = findJavaDoc(elementUtils, null, "description", null, classElement, true);
- ep = new EipOption("description", "Description", "element", "org.apache.camel.model.DescriptionDefinition", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("description", "Description", "element", "org.apache.camel.model.DescriptionDefinition", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
// lets skip custom id as it has no value for end users to configure
if (!skipUnwanted) {
// custom id
docComment = findJavaDoc(elementUtils, null, "customId", null, classElement, true);
- ep = new EipOption("customId", "Custom Id", "attribute", "java.lang.String", false, "", docComment, false, false, null, false, null, false);
+ ep = new EipOption("customId", "Custom Id", "attribute", "java.lang.String", false, "", docComment,
+ false, null, false, null, false, null, false);
eipOptions.add(ep);
}
}
@@ -708,7 +746,8 @@ public class CoreEipAnnotationProcessor {
Set<String> oneOfTypes = new TreeSet<String>();
oneOfTypes.add("route");
- EipOption ep = new EipOption("routes", "Routes", "element", fieldTypeName, false, "", "Contains the Camel routes", false, false, null, true, oneOfTypes, false);
+ EipOption ep = new EipOption("routes", "Routes", "element", fieldTypeName, false, "", "Contains the Camel routes",
+ false, null, false, null, true, oneOfTypes, false);
eipOptions.add(ep);
}
}
@@ -726,7 +765,8 @@ public class CoreEipAnnotationProcessor {
Set<String> oneOfTypes = new TreeSet<String>();
oneOfTypes.add("rest");
- EipOption ep = new EipOption("rests", "Rests", "element", fieldTypeName, false, "", "Contains the rest services defined using the rest-dsl", false, false, null, true, oneOfTypes, false);
+ EipOption ep = new EipOption("rests", "Rests", "element", fieldTypeName, false, "", "Contains the rest services defined using the rest-dsl",
+ false, null, false, null, true, oneOfTypes, false);
eipOptions.add(ep);
}
}
@@ -768,8 +808,13 @@ public class CoreEipAnnotationProcessor {
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, true, "", "", false, false, null, true, oneOfTypes, false);
+ EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, true, "", "", deprecated, deprecationNote,false, null, true, oneOfTypes, false);
eipOptions.add(ep);
}
}
@@ -815,8 +860,13 @@ public class CoreEipAnnotationProcessor {
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, true, "", docComment, false, false, null, true, oneOfTypes, false);
+ EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, true, "", docComment, deprecated, deprecationNote, false, null, true, oneOfTypes, false);
eipOptions.add(ep);
}
}
@@ -868,14 +918,18 @@ public class CoreEipAnnotationProcessor {
}
}
- boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
String displayName = null;
Metadata metadata = fieldElement.getAnnotation(Metadata.class);
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, true, "", docComment, deprecated, false, null, true, oneOfTypes, asPredicate);
+ EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, true, "", docComment, deprecated, deprecationNote, false, null, true, oneOfTypes, asPredicate);
eipOptions.add(ep);
}
}
@@ -899,7 +953,6 @@ public class CoreEipAnnotationProcessor {
// find javadoc from original class as it will override the setExpression method where we can provide the javadoc for the given EIP
String docComment = findJavaDoc(elementUtils, fieldElement, fieldName, name, originalClassType, true);
- boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
// indicate that this element is one of when
Set<String> oneOfTypes = new HashSet<String>();
@@ -913,8 +966,13 @@ public class CoreEipAnnotationProcessor {
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, false, "", docComment, deprecated, false, null, true, oneOfTypes, asPredicate);
+ EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, false, "", docComment, deprecated, deprecationNote, false, null, true, oneOfTypes, asPredicate);
eipOptions.add(ep);
}
}
@@ -1011,6 +1069,7 @@ public class CoreEipAnnotationProcessor {
private String label;
private String description;
private boolean deprecated;
+ private String deprecationNode;
private boolean input;
private boolean output;
private String firstVersion;
@@ -1063,6 +1122,14 @@ public class CoreEipAnnotationProcessor {
this.deprecated = deprecated;
}
+ public String getDeprecationNode() {
+ return deprecationNode;
+ }
+
+ public void setDeprecationNode(String deprecationNode) {
+ this.deprecationNode = deprecationNode;
+ }
+
public boolean isInput() {
return input;
}
@@ -1106,14 +1173,15 @@ public class CoreEipAnnotationProcessor {
private String defaultValue;
private String documentation;
private boolean deprecated;
+ private String deprecationNode;
private boolean enumType;
private Set<String> enums;
private boolean oneOf;
private Set<String> oneOfTypes;
private boolean asPredicate;
- private EipOption(String name, String displayName, String kind, String type, boolean required, String defaultValue, String documentation, boolean deprecated,
- boolean enumType, Set<String> enums, boolean oneOf, Set<String> oneOfTypes, boolean asPredicate) {
+ private EipOption(String name, String displayName, String kind, String type, boolean required, String defaultValue, String documentation,
+ boolean deprecated, String deprecationNode, boolean enumType, Set<String> enums, boolean oneOf, Set<String> oneOfTypes, boolean asPredicate) {
this.name = name;
this.displayName = displayName;
this.kind = kind;
@@ -1122,6 +1190,7 @@ public class CoreEipAnnotationProcessor {
this.defaultValue = defaultValue;
this.documentation = documentation;
this.deprecated = deprecated;
+ this.deprecationNode = deprecationNode;
this.enumType = enumType;
this.enums = enums;
this.oneOf = oneOf;
@@ -1161,6 +1230,10 @@ public class CoreEipAnnotationProcessor {
return deprecated;
}
+ public String getDeprecationNode() {
+ return deprecationNode;
+ }
+
public boolean isEnumType() {
return enumType;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 7a26db9..ac9290d 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -444,6 +444,10 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
String methodName = method.getSimpleName().toString();
boolean deprecated = method.getAnnotation(Deprecated.class) != null;
Metadata metadata = method.getAnnotation(Metadata.class);
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
// must be the setter
boolean isSetter = methodName.startsWith("set") && method.getParameters().size() == 1 & method.getReturnType().getKind().equals(TypeKind.VOID);
@@ -526,7 +530,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
String group = EndpointHelper.labelAsGroupName(label, componentModel.isConsumerOnly(), componentModel.isProducerOnly());
ComponentOption option = new ComponentOption(name, displayName, fieldTypeName, required, defaultValue, defaultValueNote,
- docComment.trim(), deprecated, secret, group, label, isEnum, enums);
+ docComment.trim(), deprecated, deprecationNote, secret, group, label, isEnum, enums);
componentOptions.add(option);
}
@@ -555,6 +559,10 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
Metadata metadata = fieldElement.getAnnotation(Metadata.class);
boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
Boolean secret = metadata != null ? metadata.secret() : null;
UriPath path = fieldElement.getAnnotation(UriPath.class);
@@ -629,7 +637,8 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
String group = EndpointHelper.labelAsGroupName(label, componentModel.isConsumerOnly(), componentModel.isProducerOnly());
boolean isSecret = secret != null ? secret : false;
- EndpointPath ep = new EndpointPath(name, displayName, fieldTypeName, required, defaultValue, docComment, deprecated, isSecret, group, label, isEnum, enums);
+ EndpointPath ep = new EndpointPath(name, displayName, fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote,
+ isSecret, group, label, isEnum, enums);
endpointPaths.add(ep);
}
@@ -724,7 +733,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
boolean isSecret = secret != null ? secret : param.secret();
String group = EndpointHelper.labelAsGroupName(label, componentModel.isConsumerOnly(), componentModel.isProducerOnly());
EndpointOption option = new EndpointOption(name, displayName, fieldTypeName, required, defaultValue, defaultValueNote,
- docComment.trim(), paramOptionalPrefix, paramPrefix, multiValue, deprecated, isSecret, group, label, isEnum, enums);
+ docComment.trim(), paramOptionalPrefix, paramPrefix, multiValue, deprecated, deprecationNote, isSecret, group, label, isEnum, enums);
endpointOptions.add(option);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentModel.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentModel.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentModel.java
index b336a40..3c696c2 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentModel.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentModel.java
@@ -34,6 +34,7 @@ public final class ComponentModel {
private boolean consumerOnly;
private boolean producerOnly;
private boolean deprecated;
+ private String deprecationNode;
private boolean lenientProperties;
private boolean async;
@@ -165,6 +166,14 @@ public final class ComponentModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNode() {
+ return deprecationNode;
+ }
+
+ public void setDeprecationNode(String deprecationNode) {
+ this.deprecationNode = deprecationNode;
+ }
+
public boolean isLenientProperties() {
return lenientProperties;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
index eae23de..3bd678f 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
@@ -32,6 +32,7 @@ public final class ComponentOption {
private String defaultValueNote;
private String documentation;
private boolean deprecated;
+ private String deprecationNode;
private boolean secret;
private String group;
private String label;
@@ -39,7 +40,7 @@ public final class ComponentOption {
private Set<String> enums;
public ComponentOption(String name, String displayName, String type, String required, String defaultValue, String defaultValueNote,
- String documentation, boolean deprecated, boolean secret, String group, String label,
+ String documentation, boolean deprecated, String deprecationNode, boolean secret, String group, String label,
boolean enumType, Set<String> enums) {
this.name = name;
this.displayName = displayName;
@@ -49,6 +50,7 @@ public final class ComponentOption {
this.defaultValueNote = defaultValueNote;
this.documentation = documentation;
this.deprecated = deprecated;
+ this.deprecationNode = deprecationNode;
this.secret = secret;
this.group = group;
this.label = label;
@@ -84,6 +86,10 @@ public final class ComponentOption {
return deprecated;
}
+ public String getDeprecationNode() {
+ return deprecationNode;
+ }
+
public boolean isSecret() {
return secret;
}
@@ -96,6 +102,10 @@ public final class ComponentOption {
sb.append(". Default value notice: ").append(defaultValueNote);
}
+ if (!isNullOrEmpty(deprecationNode)) {
+ sb.append(". Deprecation note: ").append(deprecationNode);
+ }
+
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
index d20bdf4..29d0bab 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
@@ -35,6 +35,7 @@ public final class EndpointOption {
private String prefix;
private boolean multiValue;
private boolean deprecated;
+ private String deprecationNote;
private boolean secret;
private String group;
private String label;
@@ -43,7 +44,7 @@ public final class EndpointOption {
public EndpointOption(String name, String displayName, String type, String required, String defaultValue, String defaultValueNote,
String documentation, String optionalPrefix, String prefix, boolean multiValue,
- boolean deprecated, boolean secret, String group, String label,
+ boolean deprecated, String deprecationNote, boolean secret, String group, String label,
boolean enumType, Set<String> enums) {
this.name = name;
this.displayName = displayName;
@@ -56,6 +57,7 @@ public final class EndpointOption {
this.prefix = prefix;
this.multiValue = multiValue;
this.deprecated = deprecated;
+ this.deprecationNote = deprecationNote;
this.secret = secret;
this.group = group;
this.label = label;
@@ -103,6 +105,10 @@ public final class EndpointOption {
return deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
public boolean isSecret() {
return secret;
}
@@ -114,6 +120,9 @@ public final class EndpointOption {
if (!isNullOrEmpty(defaultValueNote)) {
sb.append(". Default value notice: ").append(defaultValueNote);
}
+ if (!isNullOrEmpty(deprecationNote)) {
+ sb.append(". Deprecation note: ").append(deprecationNote);
+ }
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
index f422b85..41a2072 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
@@ -29,6 +29,7 @@ public final class EndpointPath {
private String defaultValue;
private String documentation;
private boolean deprecated;
+ private String deprecationNote;
private boolean secret;
private String group;
private String label;
@@ -36,7 +37,7 @@ public final class EndpointPath {
private Set<String> enums;
public EndpointPath(String name, String displayName, String type, String required, String defaultValue, String documentation,
- boolean deprecated, boolean secret, String group, String label,
+ boolean deprecated, String deprecationNote, boolean secret, String group, String label,
boolean enumType, Set<String> enums) {
this.name = name;
this.displayName = displayName;
@@ -45,6 +46,7 @@ public final class EndpointPath {
this.defaultValue = defaultValue;
this.documentation = documentation;
this.deprecated = deprecated;
+ this.deprecationNote = deprecationNote;
this.secret = secret;
this.group = group;
this.label = label;
@@ -80,6 +82,10 @@ public final class EndpointPath {
return deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
public boolean isSecret() {
return secret;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java b/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
index 25c88b5..feabf55 100644
--- a/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
+++ b/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
@@ -39,10 +39,14 @@ public class EndpointOptionComparatorTest {
String group3 = EndpointHelper.labelAsGroupName(label3, false, false);
String group4 = EndpointHelper.labelAsGroupName(label4, false, false);
- EndpointOption op1 = new EndpointOption("first", "First", "string", "true", "", "", "blah", null, null, false, false, false, group1, label1, false, null);
- EndpointOption op2 = new EndpointOption("synchronous", "Synchronous", "string", "true", "", "", "blah", null, null, false, false, false, group2, label2, false, null);
- EndpointOption op3 = new EndpointOption("second", "Second", "string", "true", "", "", "blah", null, null, false, false, false, group3, label3, false, null);
- EndpointOption op4 = new EndpointOption("country", "Country", "string", "true", "", "", "blah", null, null, false, false, false, group4, label4, false, null);
+ EndpointOption op1 = new EndpointOption("first", "First", "string", "true", "", "", "blah", null, null, false,
+ false, null, false, group1, label1, false, null);
+ EndpointOption op2 = new EndpointOption("synchronous", "Synchronous", "string", "true", "", "", "blah", null, null, false,
+ false, null, false, group2, label2, false, null);
+ EndpointOption op3 = new EndpointOption("second", "Second", "string", "true", "", "", "blah", null, null, false,
+ false, null, false, group3, label3, false, null);
+ EndpointOption op4 = new EndpointOption("country", "Country", "string", "true", "", "", "blah", null, null, false,
+ false, null, false, group4, label4, false, null);
List<EndpointOption> list = new ArrayList<EndpointOption>();
list.add(op1);
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index b2ec37c..e59e42e 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -274,6 +274,9 @@ public class PackageDataFormatMojo extends AbstractMojo {
if (row.containsKey("deprecated")) {
dataFormatModel.setDeprecated(row.get("deprecated"));
}
+ if (row.containsKey("deprecationNote")) {
+ dataFormatModel.setDeprecationNote(row.get("deprecationNote"));
+ }
if (row.containsKey("javaType")) {
dataFormatModel.setModelJavaType(row.get("javaType"));
}
@@ -488,6 +491,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
private String firstVersion;
private String label;
private String deprecated;
+ private String deprecationNote;
private String javaType;
private String modelJavaType;
private String groupId;
@@ -558,6 +562,14 @@ public class PackageDataFormatMojo extends AbstractMojo {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getJavaType() {
return javaType;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index e6ff6d2..29c2fc2 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -197,6 +197,9 @@ public class PackageLanguageMojo extends AbstractMojo {
if (row.containsKey("deprecated")) {
languageModel.setDeprecated(row.get("deprecated"));
}
+ if (row.containsKey("deprecationNote")) {
+ languageModel.setDeprecationNote(row.get("deprecationNote"));
+ }
if (row.containsKey("javaType")) {
languageModel.setModelJavaType(row.get("javaType"));
}
@@ -403,6 +406,7 @@ public class PackageLanguageMojo extends AbstractMojo {
private String firstVersion;
private String label;
private String deprecated;
+ private String deprecationNote;
private String javaType;
private String modelJavaType;
private String groupId;
@@ -473,6 +477,14 @@ public class PackageLanguageMojo extends AbstractMojo {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getJavaType() {
return javaType;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
index 87e99ed..7739c3c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
@@ -256,6 +256,7 @@ public class PackageOtherMojo extends AbstractMojo {
private String title;
private String description;
private String deprecated;
+ private String deprecationNote;
private String firstVersion;
private String label;
private String groupId;
@@ -294,6 +295,14 @@ public class PackageOtherMojo extends AbstractMojo {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getFirstVersion() {
return firstVersion;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index f9e47be..441034a 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -775,6 +775,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
eip.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
eip.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
eip.setDeprecated("true".equals(JSonSchemaHelper.getSafeValue("deprecated", rows)));
+ eip.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
eip.setInput("true".equals(JSonSchemaHelper.getSafeValue("input", rows)));
eip.setOutput("true".equals(JSonSchemaHelper.getSafeValue("output", rows)));
@@ -794,6 +795,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
component.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
component.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
component.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+ component.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
component.setConsumerOnly(JSonSchemaHelper.getSafeValue("consumerOnly", rows));
component.setProducerOnly(JSonSchemaHelper.getSafeValue("producerOnly", rows));
component.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
@@ -814,6 +816,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
other.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
other.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
other.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+ other.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
other.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
other.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
other.setVersion(JSonSchemaHelper.getSafeValue("version", rows));
@@ -832,6 +835,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
dataFormat.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
dataFormat.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
dataFormat.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+ dataFormat.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
dataFormat.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
dataFormat.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
dataFormat.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
@@ -851,6 +855,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
language.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
language.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
language.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+ language.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
language.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
language.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
language.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
index fbc5bd7..942cdd9 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
@@ -560,6 +560,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
component.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
component.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
component.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+ component.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
component.setConsumerOnly(JSonSchemaHelper.getSafeValue("consumerOnly", rows));
component.setProducerOnly(JSonSchemaHelper.getSafeValue("producerOnly", rows));
component.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
@@ -580,6 +581,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
other.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
other.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
other.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+ other.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
other.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
other.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
other.setVersion(JSonSchemaHelper.getSafeValue("version", rows));
@@ -598,6 +600,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
dataFormat.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
dataFormat.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
dataFormat.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+ dataFormat.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
dataFormat.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
dataFormat.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
dataFormat.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
@@ -617,6 +620,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
language.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
language.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
language.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+ language.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
language.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
language.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
language.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 0980afc..984cfea 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -1791,6 +1791,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
component.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
component.setLabel(getSafeValue("label", rows));
component.setDeprecated(getSafeValue("deprecated", rows));
+ component.setDeprecationNote(getSafeValue("deprecationNote", rows));
component.setConsumerOnly(getSafeValue("consumerOnly", rows));
component.setProducerOnly(getSafeValue("producerOnly", rows));
component.setJavaType(getSafeValue("javaType", rows));
@@ -1807,6 +1808,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
option.setType(getSafeValue("type", row));
option.setJavaType(getSafeValue("javaType", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setDescription(getSafeValue("description", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setEnums(getSafeValue("enum", row));
@@ -1827,6 +1829,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
option.setPrefix(getSafeValue("prefix", row));
option.setMultiValue(getSafeValue("multiValue", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setDescription(getSafeValue("description", row));
option.setEnumValues(getSafeValue("enum", row));
@@ -1847,6 +1850,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
dataFormat.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
dataFormat.setLabel(getSafeValue("label", rows));
dataFormat.setDeprecated(getSafeValue("deprecated", rows));
+ dataFormat.setDeprecationNote(getSafeValue("deprecationNote", rows));
dataFormat.setJavaType(getSafeValue("javaType", rows));
dataFormat.setGroupId(getSafeValue("groupId", rows));
dataFormat.setArtifactId(getSafeValue("artifactId", rows));
@@ -1861,6 +1865,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
option.setType(getSafeValue("type", row));
option.setJavaType(getSafeValue("javaType", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setDescription(getSafeValue("description", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setEnumValues(getSafeValue("enum", row));
@@ -1881,6 +1886,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
language.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
language.setLabel(getSafeValue("label", rows));
language.setDeprecated(getSafeValue("deprecated", rows));
+ language.setDeprecationNote(getSafeValue("deprecationNote", rows));
language.setJavaType(getSafeValue("javaType", rows));
language.setGroupId(getSafeValue("groupId", rows));
language.setArtifactId(getSafeValue("artifactId", rows));
@@ -1895,6 +1901,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
option.setType(getSafeValue("type", row));
option.setJavaType(getSafeValue("javaType", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setDescription(getSafeValue("description", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setEnumValues(getSafeValue("enum", row));
@@ -1914,6 +1921,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
model.setJavaType(getSafeValue("javaType", rows));
model.setLabel(getSafeValue("label", rows));
model.setDeprecated(getSafeValue("deprecated", rows));
+ model.setDeprecationNote(getSafeValue("deprecationNote", rows));
rows = parseJsonSchema("properties", json, true);
for (Map<String, String> row : rows) {
@@ -1927,6 +1935,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
option.setJavaType(getSafeValue("javaType", row));
option.setEnums(getSafeValue("enum", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setDescription(getSafeValue("description", row));
option.setEnums(getSafeValue("enums", row));
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 45200b0..654d0c7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -767,6 +767,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
component.setFirstVersion(getSafeValue("firstVersion", rows));
component.setLabel(getSafeValue("label", rows));
component.setDeprecated(getSafeValue("deprecated", rows));
+ component.setDeprecationNote(getSafeValue("deprecationNote", rows));
component.setConsumerOnly(getSafeValue("consumerOnly", rows));
component.setProducerOnly(getSafeValue("producerOnly", rows));
component.setJavaType(getSafeValue("javaType", rows));
@@ -787,6 +788,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
option.setJavaType(getSafeValue("javaType", row));
option.setEnums(getSafeValue("enum", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setSecret(getSafeValue("secret", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setDescription(getSafeValue("description", row));
@@ -819,6 +821,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
option.setPrefix(getSafeValue("prefix", row));
option.setMultiValue(getSafeValue("multiValue", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setSecret(getSafeValue("secret", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setDescription(getSafeValue("description", row));
@@ -855,6 +858,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
dataFormat.setFirstVersion(getSafeValue("firstVersion", rows));
dataFormat.setLabel(getSafeValue("label", rows));
dataFormat.setDeprecated(getSafeValue("deprecated", rows));
+ dataFormat.setDeprecationNote(getSafeValue("deprecationNote", rows));
dataFormat.setJavaType(getSafeValue("javaType", rows));
dataFormat.setGroupId(getSafeValue("groupId", rows));
dataFormat.setArtifactId(getSafeValue("artifactId", rows));
@@ -869,6 +873,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
option.setType(getSafeValue("type", row));
option.setJavaType(getSafeValue("javaType", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setEnumValues(getSafeValue("enum", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setDescription(getSafeValue("description", row));
@@ -902,6 +907,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
language.setFirstVersion(getSafeValue("firstVersion", rows));
language.setLabel(getSafeValue("label", rows));
language.setDeprecated(getSafeValue("deprecated", rows));
+ language.setDeprecationNote(getSafeValue("deprecationNote", rows));
language.setJavaType(getSafeValue("javaType", rows));
language.setGroupId(getSafeValue("groupId", rows));
language.setArtifactId(getSafeValue("artifactId", rows));
@@ -916,6 +922,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
option.setType(getSafeValue("type", row));
option.setJavaType(getSafeValue("javaType", row));
option.setDeprecated(getSafeValue("deprecated", row));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setEnumValues(getSafeValue("enum", row));
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setDescription(getSafeValue("description", row));
@@ -941,6 +948,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
eip.setJavaType(getSafeValue("javaType", rows));
eip.setLabel(getSafeValue("label", rows));
eip.setDeprecated("true".equals(getSafeValue("deprecated", rows)));
+ eip.setDeprecationNote(getSafeValue("deprecationNote", rows));
eip.setInput("true".equals(getSafeValue("input", rows)));
eip.setOutput("true".equals(getSafeValue("output", rows)));
@@ -953,6 +961,7 @@ public class UpdateReadmeMojo extends AbstractMojo {
option.setJavaType(getSafeValue("javaType", row));
option.setRequired(getSafeValue("required", row));
option.setDeprecated("true".equals(getSafeValue("deprecated", row)));
+ option.setDeprecationNote(getSafeValue("deprecationNote", row));
option.setDescription(getSafeValue("description", row));
option.setInput("true".equals(getSafeValue("input", row)));
option.setOutput("true".equals(getSafeValue("output", row)));
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java
index bb5a391..e067516 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java
@@ -35,6 +35,7 @@ public class ComponentModel {
private String firstVersion;
private String label;
private String deprecated;
+ private String deprecationNote;
private String consumerOnly;
private String producerOnly;
private String javaType;
@@ -129,6 +130,14 @@ public class ComponentModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getConsumerOnly() {
return consumerOnly;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
index 3b1a21c..71ac1c8 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
@@ -32,6 +32,7 @@ public class ComponentOptionModel {
private String type;
private String javaType;
private String deprecated;
+ private String deprecationNote;
private String secret;
private String description;
private String defaultValue;
@@ -104,6 +105,14 @@ public class ComponentOptionModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getSecret() {
return secret;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java
index f35dd1a..e63d71b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java
@@ -33,6 +33,7 @@ public class DataFormatModel {
private String firstVersion;
private String label;
private String deprecated;
+ private String deprecationNote;
private String javaType;
private String groupId;
private String artifactId;
@@ -111,6 +112,14 @@ public class DataFormatModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getJavaType() {
return javaType;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatOptionModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatOptionModel.java
index 9cac68c..ae83683 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatOptionModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatOptionModel.java
@@ -24,6 +24,7 @@ public class DataFormatOptionModel {
private String type;
private String javaType;
private String deprecated;
+ private String deprecationNote;
private String description;
private String defaultValue;
private String enumValues;
@@ -76,6 +77,14 @@ public class DataFormatOptionModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getDescription() {
return description;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipModel.java
index cadd33b..1845151 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipModel.java
@@ -27,6 +27,7 @@ public class EipModel {
private String label;
private String description;
private boolean deprecated;
+ private String deprecationNote;
private boolean input;
private boolean output;
private final List<EipOptionModel> eipOptions = new ArrayList<EipOptionModel>();
@@ -79,6 +80,14 @@ public class EipModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public boolean isInput() {
return input;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
index 76adc84..2e4223d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
@@ -27,6 +27,7 @@ public class EipOptionModel {
private String label;
private String description;
private boolean deprecated;
+ private String deprecationNote;
private boolean input;
private boolean output;
@@ -102,6 +103,14 @@ public class EipOptionModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public boolean isInput() {
return input;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
index ad6103b..f6f3491 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
@@ -31,6 +31,7 @@ public class EndpointOptionModel {
private String prefix;
private String multiValue;
private String deprecated;
+ private String deprecationNote;
private String secret;
private String defaultValue;
private String description;
@@ -127,6 +128,14 @@ public class EndpointOptionModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getSecret() {
return secret;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java
index 137e55d..c664113 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java
@@ -33,6 +33,7 @@ public class LanguageModel {
private String firstVersion;
private String label;
private String deprecated;
+ private String deprecationNote;
private String javaType;
private String groupId;
private String artifactId;
@@ -111,6 +112,14 @@ public class LanguageModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getJavaType() {
return javaType;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageOptionModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageOptionModel.java
index ea4240c..056c9c9 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageOptionModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageOptionModel.java
@@ -24,6 +24,7 @@ public class LanguageOptionModel {
private String type;
private String javaType;
private String deprecated;
+ private String deprecationNote;
private String description;
private String defaultValue;
private String enumValues;
@@ -76,6 +77,14 @@ public class LanguageOptionModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getDescription() {
return description;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java
index a42b25b..3c5f2e1 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java
@@ -30,6 +30,7 @@ public class OtherModel {
private String firstVersion;
private String label;
private String deprecated;
+ private String deprecationNote;
private String groupId;
private String artifactId;
private String version;
@@ -100,6 +101,14 @@ public class OtherModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getGroupId() {
return groupId;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
index 1d825b5..373e70c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
@@ -28,6 +28,7 @@ public class OtherOptionModel {
private String type;
private String javaType;
private String deprecated;
+ private String deprecationNote;
private String secret;
private String description;
private String defaultValue;
@@ -100,6 +101,14 @@ public class OtherOptionModel {
this.deprecated = deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
+ public void setDeprecationNote(String deprecationNote) {
+ this.deprecationNote = deprecationNote;
+ }
+
public String getSecret() {
return secret;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7dde22d3/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Metadata.java
----------------------------------------------------------------------
diff --git a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Metadata.java b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Metadata.java
index b2c77bd..adef691 100644
--- a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Metadata.java
+++ b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Metadata.java
@@ -88,4 +88,9 @@ public @interface Metadata {
*/
String firstVersion() default "";
+ /**
+ * Additional description that can explain the user about the deprecation and give reference to what to use instead.
+ */
+ String deprecationNode() default "";
+
}
[5/6] camel git commit: Revert "CAMEL-11531 - set servlet dependency
as provided"
Posted by da...@apache.org.
Revert "CAMEL-11531 - set servlet dependency as provided"
This reverts commit 45616e17a94a40ead85d44debcbb8850223d27fc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d44a3b8a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d44a3b8a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d44a3b8a
Branch: refs/heads/master
Commit: d44a3b8a0c4fd8c796b97451ebfc86bf2d6cef22
Parents: b36348d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 20 16:23:02 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 20 16:48:21 2017 +0200
----------------------------------------------------------------------
components/camel-http-common/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d44a3b8a/components/camel-http-common/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index bc0ccca..7207b19 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -48,7 +48,6 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api-version}</version>
- <scope>provided</scope>
</dependency>
<!-- testing -->
[4/6] camel git commit: CAMEL-11168: Add deprecationNote to @Metadata
Posted by da...@apache.org.
CAMEL-11168: Add deprecationNote to @Metadata
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b9ce032
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b9ce032
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b9ce032
Branch: refs/heads/master
Commit: 7b9ce032fe64b312d5f77442faa93c55ec503330
Parents: 7dde22d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 20 15:55:38 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 20 16:48:21 2017 +0200
----------------------------------------------------------------------
.../camel/component/bean/BeanEndpoint.java | 4 +-
.../component/binding/BindingEndpoint.java | 2 +-
.../component/dataset/DataSetEndpoint.java | 3 --
.../tools/apt/CoreEipAnnotationProcessor.java | 2 +-
.../tools/apt/EndpointAnnotationProcessor.java | 13 ++++--
.../tools/apt/SpringAnnotationProcessor.java | 42 +++++++++++++++-----
.../tools/apt/helper/JsonSchemaHelper.java | 6 ++-
7 files changed, 51 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7b9ce032/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
index 77075f7..bbaf39d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
@@ -44,8 +44,8 @@ public class BeanEndpoint extends DefaultEndpoint {
+ " Cache can be enabled if the bean in the Registry is defined as a singleton scope.")
private boolean cache;
@UriParam(label = "advanced", description = "How to treat the parameters which are passed from the message body."
- + "true means the message body should be an array of parameters. Note: This option is used internally by Camel, and is not intended for end users to use.")
- @Deprecated
+ + "true means the message body should be an array of parameters.")
+ @Deprecated @Metadata(deprecationNode = "This option is used internally by Camel, and is not intended for end users to use.")
private boolean multiParameterArray;
@UriParam(prefix = "bean.", label = "advanced", description = "Used for configuring additional properties on the bean", multiValue = true)
private Map<String, Object> parameters;
http://git-wip-us.apache.org/repos/asf/camel/blob/7b9ce032/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
index da6e58f..0af96df 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
@@ -52,7 +52,7 @@ import static org.apache.camel.util.CamelContextHelper.getMandatoryEndpoint;
*
* @deprecated use {@link org.apache.camel.spi.Contract} instead
*/
-@Deprecated
+@Deprecated @Metadata(deprecationNode = "Use org.apache.camel.spi.Contract instead")
@UriEndpoint(firstVersion = "2.11.0", scheme = "binding", title = "Binding", syntax = "binding:bindingName:delegateUri",
consumerClass = BindingConsumerProcessor.class, label = "core,transformation")
public class BindingEndpoint extends DefaultEndpoint implements HasBinding {
http://git-wip-us.apache.org/repos/asf/camel/blob/7b9ce032/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index ac3de6a..a781d4f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -89,9 +89,6 @@ public class DataSetEndpoint extends MockEndpoint implements Service {
public Consumer createConsumer(Processor processor) throws Exception {
Consumer answer = new DataSetConsumer(this, processor);
configureConsumer(answer);
-
- // expectedMessageCount((int) size);
-
return answer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7b9ce032/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
index 857b95c..9736311 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
@@ -194,7 +194,7 @@ public class CoreEipAnnotationProcessor {
String doc = entry.getDocumentation();
doc = sanitizeDescription(doc, false);
buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(), entry.getKind(), entry.isRequired(), entry.getType(), entry.getDefaultValue(), doc,
- entry.isDeprecated(), false, null, null, entry.isEnumType(), entry.getEnums(), entry.isOneOf(), entry.getOneOfTypes(),
+ entry.isDeprecated(), entry.getDeprecationNode(), false, null, null, entry.isEnumType(), entry.getEnums(), entry.isOneOf(), entry.getOneOfTypes(),
entry.isAsPredicate(), null, null, false));
}
buffer.append("\n }");
http://git-wip-us.apache.org/repos/asf/camel/blob/7b9ce032/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index ac9290d..a8088da 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -182,6 +182,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
buffer.append("\n \"description\": \"").append(componentModel.getDescription()).append("\",");
buffer.append("\n \"label\": \"").append(getOrElse(componentModel.getLabel(), "")).append("\",");
buffer.append("\n \"deprecated\": ").append(componentModel.isDeprecated()).append(",");
+ buffer.append("\n \"deprecationNote\": \"").append(getOrElse(componentModel.getDeprecationNode(), "")).append("\",");
buffer.append("\n \"async\": ").append(componentModel.isAsync()).append(",");
buffer.append("\n \"consumerOnly\": ").append(componentModel.isConsumerOnly()).append(",");
buffer.append("\n \"producerOnly\": ").append(componentModel.isProducerOnly()).append(",");
@@ -230,7 +231,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
boolean asPredicate = false;
buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(), "property", required, entry.getType(), defaultValue, doc,
- entry.isDeprecated(), entry.isSecret(), entry.getGroup(), entry.getLabel(), entry.isEnumType(), entry.getEnums(),
+ entry.isDeprecated(), entry.getDeprecationNode(), entry.isSecret(), entry.getGroup(), entry.getLabel(), entry.isEnumType(), entry.getEnums(),
false, null, asPredicate, optionalPrefix, prefix, multiValue));
}
buffer.append("\n },");
@@ -282,7 +283,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
boolean asPredicate = false;
buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(), "path", required, entry.getType(), defaultValue, doc,
- entry.isDeprecated(), entry.isSecret(), entry.getGroup(), entry.getLabel(), entry.isEnumType(), entry.getEnums(),
+ entry.isDeprecated(), entry.getDeprecationNote(), entry.isSecret(), entry.getGroup(), entry.getLabel(), entry.isEnumType(), entry.getEnums(),
false, null, asPredicate, optionalPrefix, prefix, multiValue));
}
@@ -328,7 +329,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
boolean asPredicate = false;
buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(), "parameter", required, entry.getType(), defaultValue,
- doc, entry.isDeprecated(), entry.isSecret(), entry.getGroup(), entry.getLabel(), entry.isEnumType(), entry.getEnums(),
+ doc, entry.isDeprecated(), entry.getDeprecationNote(), entry.isSecret(), entry.getGroup(), entry.getLabel(), entry.isEnumType(), entry.getEnums(),
false, null, asPredicate, optionalPrefix, prefix, multiValue));
}
buffer.append("\n }");
@@ -395,6 +396,12 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
model.setDeprecated(deprecated);
+ String deprecationNote = null;
+ if (endpointClassElement.getAnnotation(Metadata.class) != null) {
+ deprecationNote = endpointClassElement.getAnnotation(Metadata.class).deprecationNode();
+ }
+ model.setDeprecationNode(deprecationNote);
+
if (map.containsKey("groupId")) {
model.setGroupId(map.get("groupId"));
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/7b9ce032/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
index 289e22f..a346f5f 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
@@ -149,7 +149,7 @@ public class SpringAnnotationProcessor {
doc = sanitizeDescription(doc, false);
buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(), entry.getKind(), entry.isRequired(), entry.getType(), entry.getDefaultValue(), doc,
- entry.isDeprecated(), false, null, null, entry.isEnumType(), entry.getEnums(), entry.isOneOf(), entry.getOneOfTypes(), entry.isAsPredicate(),
+ entry.isDeprecated(), entry.getDeprecationNote(), false, null, null, entry.isEnumType(), entry.getEnums(), entry.isOneOf(), entry.getOneOfTypes(), entry.isAsPredicate(),
null, null, false));
}
buffer.append("\n }");
@@ -286,12 +286,16 @@ public class SpringAnnotationProcessor {
}
}
- boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
String displayName = null;
Metadata metadata = fieldElement.getAnnotation(Metadata.class);
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
// special for id as its inherited from camel-core
if ("id".equals(name) && isNullOrEmpty(docComment)) {
@@ -302,7 +306,8 @@ public class SpringAnnotationProcessor {
}
}
- EipOption ep = new EipOption(name, displayName, "attribute", fieldTypeName, required, defaultValue, docComment, deprecated, isEnum, enums, false, null, false);
+ EipOption ep = new EipOption(name, displayName, "attribute", fieldTypeName, required, defaultValue, docComment,
+ deprecated, deprecationNote, isEnum, enums, false, null, false);
eipOptions.add(ep);
return false;
@@ -320,7 +325,8 @@ public class SpringAnnotationProcessor {
Set<String> oneOfTypes = new TreeSet<String>();
oneOfTypes.add("route");
- EipOption ep = new EipOption("route", "Route", "element", fieldTypeName, false, "", "Contains the Camel routes", false, false, null, true, oneOfTypes, false);
+ EipOption ep = new EipOption("route", "Route", "element", fieldTypeName, false, "", "Contains the Camel routes",
+ false, null, false, null, true, oneOfTypes, false);
eipOptions.add(ep);
}
@@ -336,7 +342,8 @@ public class SpringAnnotationProcessor {
Set<String> oneOfTypes = new TreeSet<String>();
oneOfTypes.add("rest");
- EipOption ep = new EipOption("rest", "Rest", "element", fieldTypeName, false, "", "Contains the rest services defined using the rest-dsl", false, false, null, true, oneOfTypes, false);
+ EipOption ep = new EipOption("rest", "Rest", "element", fieldTypeName, false, "", "Contains the rest services defined using the rest-dsl",
+ false, null, false, null, true, oneOfTypes, false);
eipOptions.add(ep);
}
@@ -413,15 +420,19 @@ public class SpringAnnotationProcessor {
}
boolean oneOf = !oneOfTypes.isEmpty();
- boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
boolean asPredicate = false;
String displayName = null;
Metadata metadata = fieldElement.getAnnotation(Metadata.class);
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, required, defaultValue, docComment, deprecated, isEnum, enums, oneOf, oneOfTypes, asPredicate);
+ EipOption ep = new EipOption(name, displayName, kind, fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote, isEnum, enums, oneOf, oneOfTypes, asPredicate);
eipOptions.add(ep);
}
}
@@ -461,8 +472,13 @@ public class SpringAnnotationProcessor {
if (metadata != null) {
displayName = metadata.displayName();
}
+ boolean deprecated = fieldElement.getAnnotation(Deprecated.class) != null;
+ String deprecationNote = null;
+ if (metadata != null) {
+ deprecationNote = metadata.deprecationNode();
+ }
- EipOption ep = new EipOption(name, kind, displayName, fieldTypeName, required, defaultValue, docComment, false, false, null, true, oneOfTypes, false);
+ EipOption ep = new EipOption(name, kind, displayName, fieldTypeName, required, defaultValue, docComment, deprecated, deprecationNote, false, null, true, oneOfTypes, false);
eipOptions.add(ep);
}
}
@@ -555,14 +571,15 @@ public class SpringAnnotationProcessor {
private String defaultValue;
private String documentation;
private boolean deprecated;
+ private String deprecationNote;
private boolean enumType;
private Set<String> enums;
private boolean oneOf;
private Set<String> oneOfTypes;
private boolean asPredicate;
- private EipOption(String name, String displayName, String kind, String type, boolean required, String defaultValue, String documentation, boolean deprecated,
- boolean enumType, Set<String> enums, boolean oneOf, Set<String> oneOfTypes, boolean asPredicate) {
+ private EipOption(String name, String displayName, String kind, String type, boolean required, String defaultValue, String documentation,
+ boolean deprecated, String deprecationNote, boolean enumType, Set<String> enums, boolean oneOf, Set<String> oneOfTypes, boolean asPredicate) {
this.name = name;
this.displayName = displayName;
this.kind = kind;
@@ -571,6 +588,7 @@ public class SpringAnnotationProcessor {
this.defaultValue = defaultValue;
this.documentation = documentation;
this.deprecated = deprecated;
+ this.deprecationNote = deprecationNote;
this.enumType = enumType;
this.enums = enums;
this.oneOf = oneOf;
@@ -610,6 +628,10 @@ public class SpringAnnotationProcessor {
return deprecated;
}
+ public String getDeprecationNote() {
+ return deprecationNote;
+ }
+
public boolean isEnumType() {
return enumType;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7b9ce032/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
index baba1c0..7e3ec25 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
@@ -42,7 +42,7 @@ public final class JsonSchemaHelper {
}
public static String toJson(String name, String displayName, String kind, Boolean required, String type, String defaultValue, String description,
- Boolean deprecated, Boolean secret, String group, String label, boolean enumType, Set<String> enums,
+ Boolean deprecated, String deprecationNote, Boolean secret, String group, String label, boolean enumType, Set<String> enums,
boolean oneOfType, Set<String> oneOffTypes, boolean asPredicate, String optionalPrefix, String prefix, boolean multiValue) {
String typeName = JsonSchemaHelper.getType(type, enumType);
@@ -128,6 +128,10 @@ public final class JsonSchemaHelper {
// boolean value
sb.append(deprecated.toString());
}
+ if (!Strings.isNullOrEmpty(deprecationNote)) {
+ sb.append(", \"deprecationNote\": ");
+ sb.append(Strings.doubleQuote(deprecationNote));
+ }
if (secret != null) {
sb.append(", \"secret\": ");
[6/6] camel git commit: Update doap project file to remove old cruft.
When we get a new website we should have better short and descriptions for
Camel.
Posted by da...@apache.org.
Update doap project file to remove old cruft. When we get a new website we should have better short and descriptions for Camel.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79c24e2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79c24e2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79c24e2c
Branch: refs/heads/master
Commit: 79c24e2c57b28caec0662cf3219ba559321dcfe4
Parents: 7b9ce03
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 20 16:02:45 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 20 16:48:21 2017 +0200
----------------------------------------------------------------------
doap.rdf | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/79c24e2c/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index 0db5ea1..2981439 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -25,7 +25,7 @@
<!--
=======================================================================
- Copyright (c) 2008 The Apache Software Foundation.
+ Copyright (c) 2017 The Apache Software Foundation.
All rights reserved.
=======================================================================
@@ -36,22 +36,15 @@
<name>Apache Camel</name>
<homepage rdf:resource="http://camel.apache.org/" />
<asfext:pmc rdf:resource="http://camel.apache.org/" />
- <shortdesc>Apache Camel is a powerful open source integration framework based on known Enterprise Integration Patterns.</shortdesc>
- <description>Apache Camel is a powerful open source integration framework based on known Enterprise Integration Patterns.
-Rules for Camel's routing and mediation engine can be defined in either a Java based DSL, XML or using DSLs for dynamic languages such as Groovy or Scala.</description>
+ <shortdesc>Apache Camel is a powerful open source integration library.</shortdesc>
+ <description>Apache Camel is a powerful open source integration library based on Enterprise Integration Patterns.
+Rules for Camel's routing engine can be defined in either a Java based DSL or XML.</description>
<bug-database rdf:resource="http://issues.apache.org/activemq/browse/CAMEL" />
<mailing-list rdf:resource="http://camel.apache.org/mailing-lists.html" />
<download-page rdf:resource="http://camel.apache.org/download.html" />
<programming-language>Java</programming-language>
<programming-language>XML</programming-language>
- <programming-language>Python</programming-language>
- <programming-language>Groovy</programming-language>
- <programming-language>JavaScript</programming-language>
- <programming-language>Ruby</programming-language>
- <programming-language>SQL</programming-language>
- <programming-language>Scala</programming-language>
- <programming-language>PHP</programming-language>
<category rdf:resource="http://projects.apache.org/category/osgi" />
<category rdf:resource="http://projects.apache.org/category/network-server" />
[2/6] camel git commit: CAMEL-11168: Add deprecationNote to @Metadata
Posted by da...@apache.org.
CAMEL-11168: Add deprecationNote to @Metadata
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b36348d9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b36348d9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b36348d9
Branch: refs/heads/master
Commit: b36348d98fa99584a0d2dec3c5b8eac35f44e253
Parents: 79c24e2
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 20 16:21:48 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 20 16:48:21 2017 +0200
----------------------------------------------------------------------
.../camel-ejb/src/main/docs/ejb-component.adoc | 2 +-
.../camel/maven/packaging/UpdateReadmeMojo.java | 72 ++++++++++++++++++++
2 files changed, 73 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b36348d9/components/camel-ejb/src/main/docs/ejb-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ejb/src/main/docs/ejb-component.adoc b/components/camel-ejb/src/main/docs/ejb-component.adoc
index bd0a44d..42406b6 100644
--- a/components/camel-ejb/src/main/docs/ejb-component.adoc
+++ b/components/camel-ejb/src/main/docs/ejb-component.adoc
@@ -70,7 +70,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| **method** (producer) | Sets the name of the method to invoke on the bean | | String
| **cache** (advanced) | If enabled Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. | false | boolean
-| **multiParameterArray** (advanced) | How to treat the parameters which are passed from the message body.true means the message body should be an array of parameters. Note: This option is used internally by Camel and is not intended for end users to use. | false | boolean
+| **multiParameterArray** (advanced) | How to treat the parameters which are passed from the message body.true means the message body should be an array of parameters.. Deprecation note: This option is used internally by Camel and is not intended for end users to use. | false | boolean
| **parameters** (advanced) | Used for configuring additional properties on the bean | | Map
| **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/b36348d9/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 654d0c7..9d83038 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -797,6 +797,20 @@ public class UpdateReadmeMojo extends AbstractMojo {
String desc = "*Required* " + option.getDescription();
option.setDescription(desc);
}
+ // is the option deprecated then include that as well in the description
+ if ("true".equals(option.getDeprecated())) {
+ String desc = "*Deprecated* " + option.getDescription();
+ option.setDescription(desc);
+ if (!StringHelper.isEmpty(option.getDeprecationNote())) {
+ desc = option.getDescription();
+ if (!desc.endsWith(".")) {
+ desc = desc + ". Deprecation note: " + option.getDeprecationNote();
+ } else {
+ desc = desc + " Deprecation note: " + option.getDeprecationNote();
+ }
+ option.setDescription(desc);
+ }
+ }
component.addComponentOption(option);
// group separate between different options
@@ -830,6 +844,20 @@ public class UpdateReadmeMojo extends AbstractMojo {
String desc = "*Required* " + option.getDescription();
option.setDescription(desc);
}
+ // is the option deprecated then include that as well in the description
+ if ("true".equals(option.getDeprecated())) {
+ String desc = "*Deprecated* " + option.getDescription();
+ option.setDescription(desc);
+ if (!StringHelper.isEmpty(option.getDeprecationNote())) {
+ desc = option.getDescription();
+ if (!desc.endsWith(".")) {
+ desc = desc + ". Deprecation note: " + option.getDeprecationNote();
+ } else {
+ desc = desc + " Deprecation note: " + option.getDeprecationNote();
+ }
+ option.setDescription(desc);
+ }
+ }
// separate the options in path vs parameter so we can generate two different tables
if ("path".equals(option.getKind())) {
component.addEndpointPathOption(option);
@@ -884,6 +912,21 @@ public class UpdateReadmeMojo extends AbstractMojo {
String doc = option.getDescription() + " The default value is either Csv or KeyValue depending on chosen dataformat.";
option.setDescription(doc);
}
+ // lets put required in the description
+ // is the option deprecated then include that as well in the description
+ if ("true".equals(option.getDeprecated())) {
+ String desc = "*Deprecated* " + option.getDescription();
+ option.setDescription(desc);
+ if (!StringHelper.isEmpty(option.getDeprecationNote())) {
+ desc = option.getDescription();
+ if (!desc.endsWith(".")) {
+ desc = desc + ". Deprecation note: " + option.getDeprecationNote();
+ } else {
+ desc = desc + " Deprecation note: " + option.getDeprecationNote();
+ }
+ option.setDescription(desc);
+ }
+ }
// skip option named id
if ("id".equals(option.getName())) {
@@ -927,6 +970,21 @@ public class UpdateReadmeMojo extends AbstractMojo {
option.setDefaultValue(getSafeValue("defaultValue", row));
option.setDescription(getSafeValue("description", row));
+ // is the option deprecated then include that as well in the description
+ if ("true".equals(option.getDeprecated())) {
+ String desc = "*Deprecated* " + option.getDescription();
+ option.setDescription(desc);
+ if (!StringHelper.isEmpty(option.getDeprecationNote())) {
+ desc = option.getDescription();
+ if (!desc.endsWith(".")) {
+ desc = desc + ". Deprecation note: " + option.getDeprecationNote();
+ } else {
+ desc = desc + " Deprecation note: " + option.getDeprecationNote();
+ }
+ option.setDescription(desc);
+ }
+ }
+
// skip option named id/expression
if ("id".equals(option.getName()) || "expression".equals(option.getName())) {
getLog().debug("Skipping option: " + option.getName());
@@ -971,6 +1029,20 @@ public class UpdateReadmeMojo extends AbstractMojo {
String desc = "*Required* " + option.getDescription();
option.setDescription(desc);
}
+ // is the option deprecated then include that as well in the description
+ if (option.isDeprecated()) {
+ String desc = "*Deprecated* " + option.getDescription();
+ option.setDescription(desc);
+ if (!StringHelper.isEmpty(option.getDeprecationNote())) {
+ desc = option.getDescription();
+ if (!desc.endsWith(".")) {
+ desc = desc + ". Deprecation note: " + option.getDeprecationNote();
+ } else {
+ desc = desc + " Deprecation note: " + option.getDeprecationNote();
+ }
+ option.setDescription(desc);
+ }
+ }
// skip option named id/description/expression/outputs
if ("id".equals(option.getName()) || "description".equals(option.getName())