You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/04 06:33:31 UTC
[camel] 02/03: CAMEL-16273 - Camel-google-* cloud components: Make
the serviceAccountKey explicitly configurable - Camel-google-pubsub -
Improved endpoint options description
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
commit d502b9ee1645f2cd5da0074b4fd8431fe5358850
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 4 07:24:07 2021 +0100
CAMEL-16273 - Camel-google-* cloud components: Make the serviceAccountKey explicitly configurable - Camel-google-pubsub - Improved endpoint options description
---
.../org/apache/camel/catalog/docs/google-pubsub-component.adoc | 4 ++--
.../apache/camel/component/google/pubsub/google-pubsub.json | 4 ++--
.../src/main/docs/google-pubsub-component.adoc | 4 ++--
.../camel/component/google/pubsub/GooglePubsubEndpoint.java | 3 ++-
.../apache/camel/builder/endpoint/StaticEndpointBuilders.java | 10 ++++++----
.../endpoint/dsl/GooglePubsubEndpointBuilderFactory.java | 10 ++++++----
.../components/modules/ROOT/pages/google-pubsub-component.adoc | 4 ++--
7 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-pubsub-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-pubsub-component.adoc
index 51a99a1..2d81f33 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-pubsub-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-pubsub-component.adoc
@@ -76,8 +76,8 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *projectId* | *Required* Project Id | | String
-| *destinationName* | *Required* Destination Name | | String
+| *projectId* | *Required* The Google Cloud PubSub Project Id | | String
+| *destinationName* | *Required* The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name. | | String
|===
diff --git a/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json b/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
index 822febb..c731e37 100644
--- a/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
+++ b/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
@@ -31,8 +31,8 @@
"publisherTerminationTimeout": { "kind": "property", "displayName": "Publisher Termination Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "How many milliseconds should a producer be allowed to terminate." }
},
"properties": {
- "projectId": { "kind": "path", "displayName": "Project Id", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Project Id" },
- "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Destination Name" },
+ "projectId": { "kind": "path", "displayName": "Project Id", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The Google Cloud PubSub Project Id" },
+ "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name." },
"ackMode": { "kind": "parameter", "displayName": "Ack Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.pubsub.GooglePubsubConstants.AckMode", "enum": [ "AUTO", "NONE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO", "description": "AUTO = exchange gets ack'ed\/nack'ed on completion. NONE = downstream process has to ack\/nack explicitly" },
"concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "The number of parallel streams consuming from the subscription" },
"loggerId": { "kind": "parameter", "displayName": "Logger Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Logger ID to use when a match to the parent route required" },
diff --git a/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc b/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
index 51a99a1..2d81f33 100644
--- a/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
+++ b/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
@@ -76,8 +76,8 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *projectId* | *Required* Project Id | | String
-| *destinationName* | *Required* Destination Name | | String
+| *projectId* | *Required* The Google Cloud PubSub Project Id | | String
+| *destinationName* | *Required* The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name. | | String
|===
diff --git a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index e4e0fa3..3e8fd7b 100644
--- a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++ b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -50,7 +50,8 @@ public class GooglePubsubEndpoint extends DefaultEndpoint {
@Metadata(required = true)
private String projectId;
- @UriPath(label = "common", description = "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.")
+ @UriPath(label = "common",
+ description = "The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name.")
@Metadata(required = true)
private String destinationName;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 6356271..951b970 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -5657,10 +5657,11 @@ public class StaticEndpointBuilders {
* Syntax: <code>google-pubsub:projectId:destinationName</code>
*
* Path parameter: projectId (required)
- * Project Id
+ * The Google Cloud PubSub Project Id
*
* Path parameter: destinationName (required)
- * Destination Name
+ * The Destination Name. For the consumer this will be the subscription
+ * name, while for the producer this will be the topic name.
*
* @param path projectId:destinationName
* @return the dsl builder
@@ -5680,10 +5681,11 @@ public class StaticEndpointBuilders {
* Syntax: <code>google-pubsub:projectId:destinationName</code>
*
* Path parameter: projectId (required)
- * Project Id
+ * The Google Cloud PubSub Project Id
*
* Path parameter: destinationName (required)
- * Destination Name
+ * The Destination Name. For the consumer this will be the subscription
+ * name, while for the producer this will be the topic name.
*
* @param componentName to use a custom component name for the endpoint
* instead of the default name
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index d42733f..fd0dacf 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -874,10 +874,11 @@ public interface GooglePubsubEndpointBuilderFactory {
* Syntax: <code>google-pubsub:projectId:destinationName</code>
*
* Path parameter: projectId (required)
- * Project Id
+ * The Google Cloud PubSub Project Id
*
* Path parameter: destinationName (required)
- * Destination Name
+ * The Destination Name. For the consumer this will be the subscription
+ * name, while for the producer this will be the topic name.
*
* @param path projectId:destinationName
* @return the dsl builder
@@ -897,10 +898,11 @@ public interface GooglePubsubEndpointBuilderFactory {
* Syntax: <code>google-pubsub:projectId:destinationName</code>
*
* Path parameter: projectId (required)
- * Project Id
+ * The Google Cloud PubSub Project Id
*
* Path parameter: destinationName (required)
- * Destination Name
+ * The Destination Name. For the consumer this will be the subscription
+ * name, while for the producer this will be the topic name.
*
* @param componentName to use a custom component name for the endpoint
* instead of the default name
diff --git a/docs/components/modules/ROOT/pages/google-pubsub-component.adoc b/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
index e180625..7164c2c 100644
--- a/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
@@ -78,8 +78,8 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *projectId* | *Required* Project Id | | String
-| *destinationName* | *Required* Destination Name | | String
+| *projectId* | *Required* The Google Cloud PubSub Project Id | | String
+| *destinationName* | *Required* The Destination Name. For the consumer this will be the subscription name, while for the producer this will be the topic name. | | String
|===