This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 2b4b056 Regen
2b4b056 is described below
commit 2b4b056fceee433ed62f8faccae51348ece75a9e
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Jun 26 07:36:56 2020 +0200
Regen
---
.../resources/org/apache/camel/catalog/components/couchbase.json | 6 +++---
.../org/apache/camel/component/couchbase/CouchbaseProducer.java | 2 +-
docs/components/modules/ROOT/pages/couchbase-component.adoc | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
index 08b28ca..e01ebc1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
@@ -30,9 +30,9 @@
"hostname": { "kind": "path", "displayName": "Hostname", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "The hostname to use" },
"port": { "kind": "path", "displayName": "Port", "group": "common",
"label": "", "required": false, "type": "integer", "javaType": "int",
"deprecated": false, "secret": false, "defaultValue": "8091", "description":
"The port number to use" },
"bucket": { "kind": "parameter", "displayName": "Bucket", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
bucket to use" },
- "collection": { "kind": "parameter", "displayName": "Collection", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "defaultValue":
"_default", "description": "The collection to use" },
+ "collection": { "kind": "parameter", "displayName": "Collection", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
collection to use" },
"key": { "kind": "parameter", "displayName": "Key", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
key to use" },
- "scope": { "kind": "parameter", "displayName": "Scope", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "defaultValue":
"_default", "description": "The scope to use" },
+ "scope": { "kind": "parameter", "displayName": "Scope", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
scope to use" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "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 b [...]
"consumerProcessedStrategy": { "kind": "parameter", "displayName":
"Consumer Processed Strategy", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "none", "description":
"Define the consumer Processed strategy to use" },
"descending": { "kind": "parameter", "displayName": "Descending", "group":
"consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"false", "description": "Define if this operation is descending or not" },
@@ -56,7 +56,7 @@
"startingIdForInsertsFrom": { "kind": "parameter", "displayName":
"Starting Id For Inserts From", "group": "producer", "label": "producer",
"required": false, "type": "integer", "javaType": "long", "deprecated": false,
"secret": false, "description": "Define the starting Id where we are doing an
insert operation" },
"additionalHosts": { "kind": "parameter", "displayName": "Additional
Hosts", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "The additional hosts" },
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
- "queryTimeout": { "kind": "parameter", "displayName": "Query Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "secret": false,
"defaultValue": "2500", "description": "Define the operation timeout" },
+ "queryTimeout": { "kind": "parameter", "displayName": "Query Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "secret": false,
"defaultValue": "2500", "description": "Define the operation timeout in
milliseconds" },
"synchronous": { "kind": "parameter", "displayName": "Synchronous",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"false", "description": "Sets whether synchronous processing should be strictly
used, or Camel is allowed to use asynchronous processing (if supported)." },
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff
Error Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"secret": false, "description": "The number of subsequent error polls (failed
due some error) that should happen before the backoffMultipler should kick-in."
},
"backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff
Idle Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"secret": false, "description": "The number of subsequent idle polls that
should happen before the backoffMultipler should kick-in." },
diff --git
a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
index 7ddc867..4c97728 100644
---
a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
+++
b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
@@ -119,7 +119,7 @@ public class CouchbaseProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
-//
+
Map<String, Object> headers = exchange.getIn().getHeaders();
String id = (headers.containsKey(HEADER_ID)) ?
exchange.getIn().getHeader(HEADER_ID, String.class) : endpoint.getId();
diff --git a/docs/components/modules/ROOT/pages/couchbase-component.adoc
b/docs/components/modules/ROOT/pages/couchbase-component.adoc
index f184af5..6250060 100644
--- a/docs/components/modules/ROOT/pages/couchbase-component.adoc
+++ b/docs/components/modules/ROOT/pages/couchbase-component.adoc
@@ -81,9 +81,9 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *bucket* (common) | The bucket to use | | String
-| *collection* (common) | The collection to use | _default | String
+| *collection* (common) | The collection to use | | String
| *key* (common) | The key to use | | String
-| *scope* (common) | The scope to use | _default | String
+| *scope* (common) | The scope to use | | 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
| *consumerProcessedStrategy* (consumer) | Define the consumer Processed
strategy to use | none | String
| *descending* (consumer) | Define if this operation is descending or not |
false | boolean
@@ -107,7 +107,7 @@ with the following path and query parameters:
| *startingIdForInsertsFrom* (producer) | Define the starting Id where we are
doing an insert operation | | long
| *additionalHosts* (advanced) | The additional hosts | | String
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
-| *queryTimeout* (advanced) | Define the operation timeout | 2500 | long
+| *queryTimeout* (advanced) | Define the operation timeout in milliseconds |
2500 | long
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls
(failed due some error) that should happen before the backoffMultipler should
kick-in. | | int
| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls
that should happen before the backoffMultipler should kick-in. | | int
