camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/4] camel git commit: CAMEL-11791: Polished. This closes #1957
Date Tue, 26 Sep 2017 06:34:38 GMT
CAMEL-11791: Polished. This closes #1957


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

Branch: refs/heads/camel-2.19.x
Commit: 7bcefc1a9f5e6b082223d02b6cc1c0ba83094c0f
Parents: 99f0f24
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Sep 26 08:31:33 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Sep 26 08:34:03 2017 +0200

----------------------------------------------------------------------
 .../camel-rabbitmq/src/main/docs/rabbitmq-component.adoc     | 6 +++---
 .../apache/camel/component/rabbitmq/RabbitMQEndpoint.java    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7bcefc1a/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..428f294 100644
--- a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
+++ b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
@@ -108,14 +108,14 @@ with the following path and query parameters:
 | **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
-| **networkRecoveryInterval** (advanced) | Network recovery interval in milliseconds (interval
used when recovering from network failure) |  | Integer
+| **networkRecoveryInterval** (advanced) | Network recovery interval in milliseconds (interval
used when recovering from network failure) | 5000 | 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
 | **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
-| **requestTimeout** (advanced) | Set timeout for waiting for a reply when using the InOut
Exchange Pattern (in milliseconds) |  | long
-| **requestTimeoutChecker Interval** (advanced) | Set requestTimeoutCheckerInterval for inOut
exchange |  | long
+| **requestTimeout** (advanced) | Set timeout for waiting for a reply when using the InOut
Exchange Pattern (in milliseconds) | 20000 | long
+| **requestTimeoutChecker Interval** (advanced) | Set requestTimeoutCheckerInterval for inOut
exchange | 1000 | long
 | **synchronous** (advanced) | Sets whether synchronous processing should be strictly used
or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | **topologyRecoveryEnabled** (advanced) | Enables connection topology recovery (should topology
recovery be performed) |  | Boolean
 | **transferException** (advanced) | When true and an inOut Exchange failed on the consumer
side send the caused Exception back in the response | false | boolean

http://git-wip-us.apache.org/repos/asf/camel/blob/7bcefc1a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index 2f064cd..9efb4ee 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -75,7 +75,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint implements AsyncEndpoint
{
     private boolean autoDelete = true;
     @UriParam(label = "common", defaultValue = "true")
     private boolean durable = true;
-    @UriParam(label = "common", defaultValue = "false")
+    @UriParam(label = "common")
     private boolean exclusive;
     @UriParam(label = "producer")
     private boolean bridgeEndpoint;
@@ -111,7 +111,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint implements AsyncEndpoint
{
     private ConnectionFactory connectionFactory;
     @UriParam(label = "advanced")
     private Boolean automaticRecoveryEnabled;
-    @UriParam(label = "advanced")
+    @UriParam(label = "advanced", defaultValue = "5000")
     private Integer networkRecoveryInterval = 5000;
     @UriParam(label = "advanced")
     private Boolean topologyRecoveryEnabled;
@@ -160,9 +160,9 @@ public class RabbitMQEndpoint extends DefaultEndpoint implements AsyncEndpoint
{
     @UriParam(label = "advanced")
     @Deprecated
     private ArgsConfigurer exchangeArgsConfigurer;
-    @UriParam(label = "advanced")
+    @UriParam(label = "advanced", defaultValue = "20000")
     private long requestTimeout = 20000;
-    @UriParam(label = "advanced")
+    @UriParam(label = "advanced", defaultValue = "1000")
     private long requestTimeoutCheckerInterval = 1000;
     @UriParam(label = "advanced")
     private boolean transferException;


Mime
View raw message