This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 2857fec Regen
2857fec is described below
commit 2857fece1de5a8e4ed24135af9aee5e46e3c0f1d
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Aug 26 07:27:22 2021 +0200
Regen
---
.../camel/springboot/catalog/components/google-pubsub.json | 6 ++++--
.../src/main/docs/google-pubsub-starter.adoc | 3 ++-
.../springboot/GooglePubsubComponentConfiguration.java | 13 +++++++++++++
docs/modules/ROOT/pages/google-pubsub-starter.adoc | 3 ++-
4 files changed, 21 insertions(+), 4 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
index 4253266..9685767 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
@@ -22,8 +22,9 @@
"lenientProperties": false
},
"componentProperties": {
+ "authenticate": { "kind": "property", "displayName": "Authenticate",
"group": "common", "label": "common", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Use Credentials when interacting
with PubSub service (no authentication is required when using emulator)." },
"endpoint": { "kind": "property", "displayName": "Endpoint", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Endpoint to use with local Pub\/Sub emulator." },
- "serviceAccountKey": { "kind": "property", "displayName": "Service Account
Key", "group": "common", "label": "common", "required": true, "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 s [...]
+ "serviceAccountKey": { "kind": "property", "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 [...]
"bridgeErrorHandler": { "kind": "property", "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 me [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
"publisherCacheSize": { "kind": "property", "displayName": "Publisher
Cache Size", "group": "producer", "label": "producer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "description": "Maximum number of producers to cache. This
could be increased if you have producers for lots of different topics." },
@@ -35,10 +36,11 @@
"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" },
+ "authenticate": { "kind": "parameter", "displayName": "Authenticate",
"group": "common", "label": "common", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Use Credentials when interacting
with PubSub service (no authentication is required when using emulator)." },
"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": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "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 r [...]
+ "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-starter/camel-google-pubsub-starter/src/main/docs/google-pubsub-starter.adoc
b/components-starter/camel-google-pubsub-starter/src/main/docs/google-pubsub-starter.adoc
index 96c93ba..f499dc9 100644
---
a/components-starter/camel-google-pubsub-starter/src/main/docs/google-pubsub-starter.adoc
+++
b/components-starter/camel-google-pubsub-starter/src/main/docs/google-pubsub-starter.adoc
@@ -17,13 +17,14 @@ When using google-pubsub with Spring Boot make sure to use
the following Maven d
----
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.google-pubsub.authenticate* | Use Credentials when
interacting with PubSub service (no authentication is required when using
emulator). | true | Boolean
| *camel.component.google-pubsub.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
| *camel.component.google-pubsub.bridge-error-handler* | 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
| *camel.component.google-pubsub.enabled* | Whether to enable auto
configuration of the google-pubsub component. This is enabled by default. | |
Boolean
diff --git
a/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentConfiguration.java
b/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentConfiguration.java
index 3572e9c..e4ced05 100644
---
a/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentConfiguration.java
+++
b/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentConfiguration.java
@@ -37,6 +37,11 @@ public class GooglePubsubComponentConfiguration
*/
private Boolean enabled;
/**
+ * Use Credentials when interacting with PubSub service (no authentication
+ * is required when using emulator).
+ */
+ private Boolean authenticate = true;
+ /**
* Endpoint to use with local Pub/Sub emulator.
*/
private String endpoint;
@@ -90,6 +95,14 @@ public class GooglePubsubComponentConfiguration
*/
private Integer publisherTerminationTimeout;
+ public Boolean getAuthenticate() {
+ return authenticate;
+ }
+
+ public void setAuthenticate(Boolean authenticate) {
+ this.authenticate = authenticate;
+ }
+
public String getEndpoint() {
return endpoint;
}
diff --git a/docs/modules/ROOT/pages/google-pubsub-starter.adoc
b/docs/modules/ROOT/pages/google-pubsub-starter.adoc
index 96c93ba..f499dc9 100644
--- a/docs/modules/ROOT/pages/google-pubsub-starter.adoc
+++ b/docs/modules/ROOT/pages/google-pubsub-starter.adoc
@@ -17,13 +17,14 @@ When using google-pubsub with Spring Boot make sure to use
the following Maven d
----
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.google-pubsub.authenticate* | Use Credentials when
interacting with PubSub service (no authentication is required when using
emulator). | true | Boolean
| *camel.component.google-pubsub.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
| *camel.component.google-pubsub.bridge-error-handler* | 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
| *camel.component.google-pubsub.enabled* | Whether to enable auto
configuration of the google-pubsub component. This is enabled by default. | |
Boolean
