This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 752938a CAMEL-13537 - camel-soroushbot - Authorization token should
not both be path and query
752938a is described below
commit 752938a0e6f88cb23852c69a7cf5a6100f85f380
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri May 17 11:30:39 2019 +0200
CAMEL-13537 - camel-soroushbot - Authorization token should not both be
path and query
---
components/camel-soroush/src/main/docs/soroush-component.adoc | 4 ++--
.../camel/component/soroushbot/component/SoroushBotEndpoint.java | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/components/camel-soroush/src/main/docs/soroush-component.adoc
b/components/camel-soroush/src/main/docs/soroush-component.adoc
index 09cb21a..7ab7eea 100644
--- a/components/camel-soroush/src/main/docs/soroush-component.adoc
+++ b/components/camel-soroush/src/main/docs/soroush-component.adoc
@@ -90,7 +90,6 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *authorizationToken* (security) | The authorization token for using the bot.
if uri path does not contain authorization token, this token will be used. | |
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
| *concurrentConsumers* (consumer) | Number of Thread created by consumer in
the route. if you use this method for parallelism, it is guaranteed that
messages from same user always execute in the same thread and therefore
messages from the same user are processed sequentially. Default value notice:
using SoroushBotSingleThreadConsumer | 1 | Integer
| *queueCapacityPerThread* (consumer) | Maximum capacity of each queue when
concurrentConsumers is greater than 1. if a queue become full, every message
that should go to that queue will be dropped. If bridgeErrorHandler is set to
true, an exchange with CongestionException is directed to ErrorHandler. You can
then processed the error using onException(CongestionException.class) route.
Default value notice: infinite capacity | 0 | Integer
@@ -108,6 +107,7 @@ with the following path and query parameters:
| *retryExponentialCoefficient* (global) | Coefficient to compute back off
time when using Exponential Back Off strategy | 2 | Long
| *retryLinearIncrement* (global) | The amount of time (in millisecond) which
adds to waiting time when using Linear back off strategy | 10000 | Long
| *retryWaitingTime* (global) | Waiting time before retry failed request
(Millisecond). If backOffStrategy is not Fixed this is the based value for
computing back off waiting time. the first retry is always happen immediately
after failure and retryWaitingTime do not apply to the first retry. | 1000 |
Long
+| *authorizationToken* (security) | The authorization token for using the bot.
if uri path does not contain authorization token, this token will be used. | |
String
| *autoUploadFile* (sendMessage) | Automatically upload attachments when a
message goes to the sendMessage endpoint and the SoroushMessage.file
(SoroushMessage.thumbnail) has been set and
SoroushMessage.fileUrl(SoroushMessage.thumbnailUrl) is null | true | Boolean
| *forceUpload* (uploadFile) | Force to upload
SoroushMessage.file(SoroushMessage.thumbnail) if exists, even if the
SoroushMessage.fileUrl(SoroushMessage.thumbnailUrl) is not null in the message
| false | Boolean
|===
@@ -277,4 +277,4 @@ One way to handle these exceptions is by using
`onException` route definition:
onException(CongestionException.class).log("Failed to processing ${id}")
-------------
-_Developed and supported by https://www.mohaymen.ir[Mohaymen ICT]_
\ No newline at end of file
+_Developed and supported by https://www.mohaymen.ir[Mohaymen ICT]_
diff --git
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
index e818887..95b9f67 100644
---
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
+++
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
@@ -63,10 +63,6 @@ public class SoroushBotEndpoint extends DefaultEndpoint {
@UriPath(name = "endpoint", description = "The endpoint type. Support
`getMessage` as consumer and `sendMessage`,`uploadFile`,`downloadFile` as
producer")
@Metadata(required = true)
Endpoint type;
- @UriPath(label = "global,security", description = "The authorization token
for using"
- + " the bot (ask the @mrbot) e.g.
9yDv09nqKvP9CkBGKNmKQHir1dj2qLpN-YWa8hP7Rm3LK\"\n"
- + " +
\"3MqQXYdXZIA5W4e0agPiUb-3eUKX69ozUNdY9yZBMlJiwnlksslkjWjsxcARo5cYtDnKTElig0xa\"\n"
- + " + \"e1Cjt1Bexz2cw-t6cJ7t1f ")
@UriParam(label = "global,security", description = "The authorization
token for using"
+ " the bot. if uri path does not contain authorization token,
this token will be used.", secret = true)
String authorizationToken;
