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/03 17:45:29 UTC
[camel] branch master updated (7507f55 -> c87af09)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7507f55 CAMEL-16298: camel-core - pollEnrich with endpoint-dsl should use EndpointConsumerBuilder
new 3204ce6 Google Pubsub: Added note about authentication in documentation
new b1f1348 Google Pubsub: Regen
new f4fc13e Google Pubsub: Added note about authentication in documentation
new c87af09 Google Pubsub: Regen
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/catalog/docs/google-pubsub-component.adoc | 4 ++--
.../camel/component/google/pubsub/google-pubsub.json | 2 +-
.../src/main/docs/google-pubsub-component.adoc | 4 ++--
.../component/google/pubsub/GooglePubsubEndpoint.java | 2 +-
.../dsl/GooglePubsubEndpointBuilderFactory.java | 18 +++++++++---------
.../modules/ROOT/pages/google-pubsub-component.adoc | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
[camel] 02/04: Google Pubsub: Regen
Posted by ac...@apache.org.
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 b1f13486476a1e6dc6dfd7aa48de9f7d4654d327
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 3 18:42:01 2021 +0100
Google Pubsub: Regen
---
.../org/apache/camel/catalog/docs/google-pubsub-component.adoc | 2 +-
docs/components/modules/ROOT/pages/google-pubsub-component.adoc | 2 +-
2 files changed, 2 insertions(+), 2 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 83d4535..fd0af0a 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
@@ -183,7 +183,7 @@ It is up for the route to convert/unmarshall the contents.
== Authentication Configuration
-The location of the default credentials file is configurable - via GOOGLE_APPLICATION_CREDENTIALS environment variable.
+The location of the default credentials file is configurable via the serviceAccountKey parameter.
== Rollback and Redelivery
diff --git a/docs/components/modules/ROOT/pages/google-pubsub-component.adoc b/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
index ad8f5f3..2c4f619 100644
--- a/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
@@ -185,7 +185,7 @@ It is up for the route to convert/unmarshall the contents.
== Authentication Configuration
-The location of the default credentials file is configurable - via GOOGLE_APPLICATION_CREDENTIALS environment variable.
+The location of the default credentials file is configurable via the serviceAccountKey parameter.
== Rollback and Redelivery
[camel] 01/04: Google Pubsub: Added note about authentication in
documentation
Posted by ac...@apache.org.
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 3204ce68eaf685400301868651fe7600a55a171e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 3 18:39:29 2021 +0100
Google Pubsub: Added note about authentication in documentation
---
.../camel-google-pubsub/src/main/docs/google-pubsub-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 83d4535..fd0af0a 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
@@ -183,7 +183,7 @@ It is up for the route to convert/unmarshall the contents.
== Authentication Configuration
-The location of the default credentials file is configurable - via GOOGLE_APPLICATION_CREDENTIALS environment variable.
+The location of the default credentials file is configurable via the serviceAccountKey parameter.
== Rollback and Redelivery
[camel] 04/04: Google Pubsub: Regen
Posted by ac...@apache.org.
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 c87af09f979387dd8d04c3664fb1b8bdb1a40c41
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 3 18:44:16 2021 +0100
Google Pubsub: Regen
---
.../camel/catalog/docs/google-pubsub-component.adoc | 2 +-
.../camel/component/google/pubsub/google-pubsub.json | 2 +-
.../src/main/docs/google-pubsub-component.adoc | 2 +-
.../dsl/GooglePubsubEndpointBuilderFactory.java | 18 +++++++++---------
.../modules/ROOT/pages/google-pubsub-component.adoc | 2 +-
5 files changed, 13 insertions(+), 13 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 fd0af0a..ebfe967 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
@@ -91,7 +91,7 @@ with the following path and query parameters:
| *concurrentConsumers* (common) | The number of parallel streams consuming from the subscription | 1 | Integer
| *loggerId* (common) | Logger ID to use when a match to the parent route required | | String
| *maxMessagesPerPoll* (common) | The max number of messages to receive from the server in a single API call | 1 | Integer
-| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *synchronousPull* (common) | Synchronously pull batches of messages | false | boolean
| *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
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
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 d17dacf..2d70f20 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
@@ -37,7 +37,7 @@
"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" },
"maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "The max number of messages to receive from the server in a single API call" },
- "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems." },
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different [...]
"synchronousPull": { "kind": "parameter", "displayName": "Synchronous Pull", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Synchronously pull batches of messages" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 m [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
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 fd0af0a..ebfe967 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
@@ -91,7 +91,7 @@ with the following path and query parameters:
| *concurrentConsumers* (common) | The number of parallel streams consuming from the subscription | 1 | Integer
| *loggerId* (common) | Logger ID to use when a match to the parent route required | | String
| *maxMessagesPerPoll* (common) | The max number of messages to receive from the server in a single API call | 1 | Integer
-| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *synchronousPull* (common) | Synchronously pull batches of messages | false | boolean
| *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
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
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 a3a7fac..82882f5 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
@@ -159,9 +159,9 @@ public interface GooglePubsubEndpointBuilderFactory {
}
/**
* The Service account key that can be used as credentials for the
- * Storage client. It can be loaded by default from classpath, but you
- * can prefix with classpath:, file:, or http: to load the resource from
- * different systems.
+ * PubSub publisher/subscriber. It can be loaded by default from
+ * classpath, but you can prefix with classpath:, file:, or http: to
+ * load the resource from different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -463,9 +463,9 @@ public interface GooglePubsubEndpointBuilderFactory {
}
/**
* The Service account key that can be used as credentials for the
- * Storage client. It can be loaded by default from classpath, but you
- * can prefix with classpath:, file:, or http: to load the resource from
- * different systems.
+ * PubSub publisher/subscriber. It can be loaded by default from
+ * classpath, but you can prefix with classpath:, file:, or http: to
+ * load the resource from different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -786,9 +786,9 @@ public interface GooglePubsubEndpointBuilderFactory {
}
/**
* The Service account key that can be used as credentials for the
- * Storage client. It can be loaded by default from classpath, but you
- * can prefix with classpath:, file:, or http: to load the resource from
- * different systems.
+ * PubSub publisher/subscriber. It can be loaded by default from
+ * classpath, but you can prefix with classpath:, file:, or http: to
+ * load the resource from different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
diff --git a/docs/components/modules/ROOT/pages/google-pubsub-component.adoc b/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
index 2c4f619..7df1b0d 100644
--- a/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
@@ -93,7 +93,7 @@ with the following path and query parameters:
| *concurrentConsumers* (common) | The number of parallel streams consuming from the subscription | 1 | Integer
| *loggerId* (common) | Logger ID to use when a match to the parent route required | | String
| *maxMessagesPerPoll* (common) | The max number of messages to receive from the server in a single API call | 1 | Integer
-| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *synchronousPull* (common) | Synchronously pull batches of messages | false | boolean
| *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
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
[camel] 03/04: Google Pubsub: Added note about authentication in
documentation
Posted by ac...@apache.org.
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 f4fc13efeeb79e15e5bb27382621f73bfd662dd0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 3 18:42:56 2021 +0100
Google Pubsub: Added note about authentication in documentation
---
.../org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 b36df5e..4c8b8bd 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
@@ -55,7 +55,7 @@ public class GooglePubsubEndpoint extends DefaultEndpoint {
private String destinationName;
@UriParam(label = "common",
- description = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from "
+ description = "The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from "
+ " classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.")
private String serviceAccountKey;