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 2021/03/02 13:56:30 UTC

[camel] branch camel-3.7.x updated: (Backport) CAMEL-16284: fix incorrect URI for couchbase (#5158)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.7.x by this push:
     new be66c6d  (Backport) CAMEL-16284: fix incorrect URI for couchbase (#5158)
be66c6d is described below

commit be66c6dd28a8af54995261f3912f26bbe795fc51
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Mar 2 14:56:07 2021 +0100

    (Backport) CAMEL-16284: fix incorrect URI for couchbase (#5158)
---
 .../resources/org/apache/camel/catalog/components/couchbase.json  | 4 ++--
 .../org/apache/camel/catalog/docs/couchbase-component.adoc        | 2 +-
 .../camel/component/couchbase/CouchbaseEndpointUriFactory.java    | 2 +-
 .../META-INF/services/org/apache/camel/component.properties       | 2 +-
 .../resources/org/apache/camel/component/couchbase/couchbase.json | 4 ++--
 components/camel-couchbase/src/main/docs/couchbase-component.adoc | 2 +-
 .../org/apache/camel/component/couchbase/CouchbaseEndpoint.java   | 2 +-
 .../builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java     | 8 ++++----
 docs/components/modules/ROOT/pages/couchbase-component.adoc       | 2 +-
 9 files changed, 14 insertions(+), 14 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 c655efe..83d65f6 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
@@ -11,10 +11,10 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-couchbase",
-    "version": "3.7.0-SNAPSHOT",
+    "version": "3.7.3-SNAPSHOT",
     "scheme": "couchbase",
     "extendsScheme": "",
-    "syntax": "couchbase:protocol:hostname:port",
+    "syntax": "couchbase:protocol:\/\/hostname:port",
     "async": false,
     "api": false,
     "consumerOnly": false,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/couchbase-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/couchbase-component.adoc
index d4b2054..6c34670 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/couchbase-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/couchbase-component.adoc
@@ -56,7 +56,7 @@ The Couchbase component supports 3 options, which are listed below.
 The Couchbase endpoint is configured using URI syntax:
 
 ----
-couchbase:protocol:hostname:port
+couchbase:protocol://hostname:port
 ----
 
 with the following path and query parameters:
diff --git a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java
index 5ef1684..447e1e9 100644
--- a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java
+++ b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java
@@ -15,7 +15,7 @@ import org.apache.camel.spi.EndpointUriFactory;
  */
 public class CouchbaseEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
 
-    private static final String BASE = ":protocol:hostname:port";
+    private static final String BASE = ":protocol://hostname:port";
 
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
diff --git a/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index feeab90..dfa09d4 100644
--- a/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=couchbase
 groupId=org.apache.camel
 artifactId=camel-couchbase
-version=3.7.2-SNAPSHOT
+version=3.7.3-SNAPSHOT
 projectName=Camel :: Couchbase
 projectDescription=Camel Couchbase component
diff --git a/components/camel-couchbase/src/generated/resources/org/apache/camel/component/couchbase/couchbase.json b/components/camel-couchbase/src/generated/resources/org/apache/camel/component/couchbase/couchbase.json
index 836a1b4..83d65f6 100644
--- a/components/camel-couchbase/src/generated/resources/org/apache/camel/component/couchbase/couchbase.json
+++ b/components/camel-couchbase/src/generated/resources/org/apache/camel/component/couchbase/couchbase.json
@@ -11,10 +11,10 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-couchbase",
-    "version": "3.7.2-SNAPSHOT",
+    "version": "3.7.3-SNAPSHOT",
     "scheme": "couchbase",
     "extendsScheme": "",
-    "syntax": "couchbase:protocol:hostname:port",
+    "syntax": "couchbase:protocol:\/\/hostname:port",
     "async": false,
     "api": false,
     "consumerOnly": false,
diff --git a/components/camel-couchbase/src/main/docs/couchbase-component.adoc b/components/camel-couchbase/src/main/docs/couchbase-component.adoc
index d4b2054..6c34670 100644
--- a/components/camel-couchbase/src/main/docs/couchbase-component.adoc
+++ b/components/camel-couchbase/src/main/docs/couchbase-component.adoc
@@ -56,7 +56,7 @@ The Couchbase component supports 3 options, which are listed below.
 The Couchbase endpoint is configured using URI syntax:
 
 ----
-couchbase:protocol:hostname:port
+couchbase:protocol://hostname:port
 ----
 
 with the following path and query parameters:
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 893cfd0..cc294a7 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
@@ -55,7 +55,7 @@ import static org.apache.camel.component.couchbase.CouchbaseConstants.DEFAULT_VI
 /**
  * Query Couchbase Views with a poll strategy and/or perform various operations against Couchbase databases.
  */
-@UriEndpoint(firstVersion = "2.19.0", scheme = "couchbase", title = "Couchbase", syntax = "couchbase:protocol:hostname:port",
+@UriEndpoint(firstVersion = "2.19.0", scheme = "couchbase", title = "Couchbase", syntax = "couchbase:protocol://hostname:port",
              category = { Category.DATABASE, Category.NOSQL })
 public class CouchbaseEndpoint extends ScheduledPollEndpoint {
 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
index 2ec1388..f40a675 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
@@ -1831,7 +1831,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * Since: 2.19
          * Maven coordinates: org.apache.camel:camel-couchbase
          * 
-         * Syntax: <code>couchbase:protocol:hostname:port</code>
+         * Syntax: <code>couchbase:protocol://hostname:port</code>
          * 
          * Path parameter: protocol (required)
          * The protocol to use
@@ -1843,7 +1843,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * The port number to use
          * Default value: 8091
          * 
-         * @param path protocol:hostname:port
+         * @param path protocol://hostname:port
          * @return the dsl builder
          */
         default CouchbaseEndpointBuilder couchbase(String path) {
@@ -1858,7 +1858,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * Since: 2.19
          * Maven coordinates: org.apache.camel:camel-couchbase
          * 
-         * Syntax: <code>couchbase:protocol:hostname:port</code>
+         * Syntax: <code>couchbase:protocol://hostname:port</code>
          * 
          * Path parameter: protocol (required)
          * The protocol to use
@@ -1872,7 +1872,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * 
          * @param componentName to use a custom component name for the endpoint
          * instead of the default name
-         * @param path protocol:hostname:port
+         * @param path protocol://hostname:port
          * @return the dsl builder
          */
         default CouchbaseEndpointBuilder couchbase(
diff --git a/docs/components/modules/ROOT/pages/couchbase-component.adoc b/docs/components/modules/ROOT/pages/couchbase-component.adoc
index 43fe3e2..a160c1d 100644
--- a/docs/components/modules/ROOT/pages/couchbase-component.adoc
+++ b/docs/components/modules/ROOT/pages/couchbase-component.adoc
@@ -58,7 +58,7 @@ The Couchbase component supports 3 options, which are listed below.
 The Couchbase endpoint is configured using URI syntax:
 
 ----
-couchbase:protocol:hostname:port
+couchbase:protocol://hostname:port
 ----
 
 with the following path and query parameters: