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/10 20:27:01 UTC
[6/7] camel git commit: CAMEL-11529: Fixed wrong syntax in couchbase
component.
CAMEL-11529: Fixed wrong syntax in couchbase component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a136cd4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a136cd4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a136cd4
Branch: refs/heads/camel-2.19.x
Commit: 9a136cd4f1d933b7cd0c70a7b009cb4be4ff9531
Parents: 3ec3286
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 10 22:21:52 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 10 22:26:39 2017 +0200
----------------------------------------------------------------------
.../camel-couchbase/src/main/docs/couchbase-component.adoc | 8 ++++----
.../apache/camel/component/couchbase/CouchbaseComponent.java | 2 --
.../apache/camel/component/couchbase/CouchbaseEndpoint.java | 5 +++--
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9a136cd4/components/camel-couchbase/src/main/docs/couchbase-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-couchbase/src/main/docs/couchbase-component.adoc b/components/camel-couchbase/src/main/docs/couchbase-component.adoc
index 01d9825..7f3b4b0 100644
--- a/components/camel-couchbase/src/main/docs/couchbase-component.adoc
+++ b/components/camel-couchbase/src/main/docs/couchbase-component.adoc
@@ -35,27 +35,27 @@ The Couchbase component has no options.
// endpoint options: START
The Couchbase endpoint is configured using URI syntax:
- couchbase:url
+ couchbase:protocol:hostname:port
with the following path and query parameters:
-#### Path Parameters (2 parameters):
+#### Path Parameters (3 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
| Name | Description | Default | Type
| **protocol** | *Required* The protocol to use | | String
| **hostname** | *Required* The hostname to use | | String
+| **port** | The port number to use | 8091 | int
|=======================================================================
-#### Query Parameters (48 parameters):
+#### Query Parameters (47 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
| Name | Description | Default | Type
| **bucket** (common) | The bucket to use | | String
| **key** (common) | The key to use | | String
-| **port** (common) | The port number to use | 8091 | int
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/9a136cd4/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseComponent.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseComponent.java
index 74f02c1..a47c6f9 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseComponent.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseComponent.java
@@ -24,11 +24,9 @@ import org.apache.camel.impl.DefaultComponent;
/**
* Couchbase component.
*/
-
public class CouchbaseComponent extends DefaultComponent {
public CouchbaseComponent() {
-
}
public CouchbaseComponent(CamelContext context) {
http://git-wip-us.apache.org/repos/asf/camel/blob/9a136cd4/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
index b03a208..563c405 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
@@ -57,7 +57,7 @@ import static org.apache.camel.component.couchbase.CouchbaseConstants.DEFAULT_VI
* Represents a Couchbase endpoint that can query Views with a Poll strategy
* and/or produce various type of operations.
*/
-@UriEndpoint(firstVersion = "2.19.0", scheme = "couchbase", title = "Couchbase", syntax = "couchbase:url", consumerClass = CouchbaseConsumer.class, label = "database,nosql")
+@UriEndpoint(firstVersion = "2.19.0", scheme = "couchbase", title = "Couchbase", syntax = "couchbase:protocol:hostname:port", consumerClass = CouchbaseConsumer.class, label = "database,nosql")
public class CouchbaseEndpoint extends ScheduledPollEndpoint {
@UriPath
@@ -66,8 +66,9 @@ public class CouchbaseEndpoint extends ScheduledPollEndpoint {
@UriPath
@Metadata(required = "true")
private String hostname;
- @UriParam(defaultValue = "8091")
+ @UriPath(defaultValue = "8091")
private int port;
+
@UriParam
private String bucket;