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 2025/06/12 05:47:16 UTC
(camel) branch main updated (cd034099216 -> 2f3a24fcb15)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from cd034099216 Upgrade Q
new 9d77df417d1 camel-google-pubsub: Fix test
new 2f3a24fcb15 Polished
The 2 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/components/google-pubsub.json | 32 +-
.../component/google/pubsub/google-pubsub.json | 32 +-
.../google/pubsub/GooglePubsubEndpoint.java | 45 +--
.../pubsub/integration/AcknowledgementIT.java | 4 -
.../integration/ManualAcknowledgementIT.java | 38 --
.../dsl/GooglePubsubEndpointBuilderFactory.java | 401 +++++++++++----------
6 files changed, 249 insertions(+), 303 deletions(-)
(camel) 02/02: Polished
Posted by da...@apache.org.
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.git
commit 2f3a24fcb157e842f1acae9b64367c590e5bfe75
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 12 07:47:02 2025 +0200
Polished
---
.../camel/catalog/components/google-pubsub.json | 32 +-
.../component/google/pubsub/google-pubsub.json | 32 +-
.../google/pubsub/GooglePubsubEndpoint.java | 45 +--
.../dsl/GooglePubsubEndpointBuilderFactory.java | 401 +++++++++++----------
4 files changed, 249 insertions(+), 261 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
index 1491e3e7c41..3c4b1115578 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
@@ -46,21 +46,21 @@
"properties": {
"projectId": { "index": 0, "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": { "index": 1, "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." },
- "authenticate": { "index": 2, "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)." },
- "loggerId": { "index": 3, "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" },
- "serviceAccountKey": { "index": 4, "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 fr [...]
- "ackMode": { "index": 5, "kind": "parameter", "displayName": "Ack Mode", "group": "consumer", "label": "consumer", "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": { "index": 6, "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "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" },
- "maxAckExtensionPeriod": { "index": 7, "kind": "parameter", "displayName": "Max Ack Extension Period", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 3600, "description": "Set the maximum period a message ack deadline will be extended. Value in seconds" },
- "maxMessagesPerPoll": { "index": 8, "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "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" },
- "synchronousPull": { "index": 9, "kind": "parameter", "displayName": "Synchronous Pull", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Synchronously pull batches of messages" },
- "bridgeErrorHandler": { "index": 10, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "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 (if possible) occurred while the Camel consumer is trying to pickup incoming [...]
- "exceptionHandler": { "index": 11, "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 de [...]
- "exchangePattern": { "index": 12, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
- "lazyStartProducer": { "index": 13, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "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 produ [...]
- "messageOrderingEnabled": { "index": 14, "kind": "parameter", "displayName": "Message Ordering Enabled", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Should message ordering be enabled" },
- "pubsubEndpoint": { "index": 15, "kind": "parameter", "displayName": "Pubsub Endpoint", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Pub\/Sub endpoint to use. Required when using message ordering, and ensures that messages are received in order even when multiple publishers are used" },
- "retry": { "index": 16, "kind": "parameter", "displayName": "Retry", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "com.google.api.gax.retrying.RetrySettings", "deprecated": false, "autowired": false, "secret": false, "description": "A custom RetrySettings to control how the publisher handles retry-able failures" },
- "serializer": { "index": 17, "kind": "parameter", "displayName": "Serializer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.pubsub.serializer.GooglePubsubSerializer", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "description": "A custom GooglePubsubSerializer to use for serializing message payloads in the producer" }
+ "ackMode": { "index": 2, "kind": "parameter", "displayName": "Ack Mode", "group": "consumer", "label": "consumer", "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" },
+ "bridgeErrorHandler": { "index": 3, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "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 (if possible) occurred while the Camel consumer is trying to pickup incoming [...]
+ "concurrentConsumers": { "index": 4, "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "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" },
+ "exceptionHandler": { "index": 5, "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 def [...]
+ "exchangePattern": { "index": 6, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+ "maxAckExtensionPeriod": { "index": 7, "kind": "parameter", "displayName": "Max Ack Extension Period", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 3600, "description": "Set the maximum period a message ack deadline will be extended. Value in seconds" },
+ "maxMessagesPerPoll": { "index": 8, "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer (advanced)", "label": "consumer,advanced", "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" },
+ "synchronousPull": { "index": 9, "kind": "parameter", "displayName": "Synchronous Pull", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Synchronously pull batches of messages" },
+ "lazyStartProducer": { "index": 10, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "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 produ [...]
+ "messageOrderingEnabled": { "index": 11, "kind": "parameter", "displayName": "Message Ordering Enabled", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Should message ordering be enabled" },
+ "pubsubEndpoint": { "index": 12, "kind": "parameter", "displayName": "Pubsub Endpoint", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Pub\/Sub endpoint to use. Required when using message ordering, and ensures that messages are received in order even when multiple publishers are used" },
+ "retry": { "index": 13, "kind": "parameter", "displayName": "Retry", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "com.google.api.gax.retrying.RetrySettings", "deprecated": false, "autowired": false, "secret": false, "description": "A custom RetrySettings to control how the publisher handles retry-able failures" },
+ "serializer": { "index": 14, "kind": "parameter", "displayName": "Serializer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.pubsub.serializer.GooglePubsubSerializer", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "description": "A custom GooglePubsubSerializer to use for serializing message payloads in the producer" },
+ "loggerId": { "index": 15, "kind": "parameter", "displayName": "Logger Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "To use a custom logger name" },
+ "authenticate": { "index": 16, "kind": "parameter", "displayName": "Authenticate", "group": "security", "label": "security", "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)." },
+ "serviceAccountKey": { "index": 17, "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "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 resour [...]
}
}
diff --git a/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/org/apache/camel/component/google/pubsub/google-pubsub.json b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/org/apache/camel/component/google/pubsub/google-pubsub.json
index 1491e3e7c41..3c4b1115578 100644
--- a/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/org/apache/camel/component/google/pubsub/google-pubsub.json
+++ b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/org/apache/camel/component/google/pubsub/google-pubsub.json
@@ -46,21 +46,21 @@
"properties": {
"projectId": { "index": 0, "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": { "index": 1, "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." },
- "authenticate": { "index": 2, "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)." },
- "loggerId": { "index": 3, "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" },
- "serviceAccountKey": { "index": 4, "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 fr [...]
- "ackMode": { "index": 5, "kind": "parameter", "displayName": "Ack Mode", "group": "consumer", "label": "consumer", "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": { "index": 6, "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "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" },
- "maxAckExtensionPeriod": { "index": 7, "kind": "parameter", "displayName": "Max Ack Extension Period", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 3600, "description": "Set the maximum period a message ack deadline will be extended. Value in seconds" },
- "maxMessagesPerPoll": { "index": 8, "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "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" },
- "synchronousPull": { "index": 9, "kind": "parameter", "displayName": "Synchronous Pull", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Synchronously pull batches of messages" },
- "bridgeErrorHandler": { "index": 10, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "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 (if possible) occurred while the Camel consumer is trying to pickup incoming [...]
- "exceptionHandler": { "index": 11, "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 de [...]
- "exchangePattern": { "index": 12, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
- "lazyStartProducer": { "index": 13, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "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 produ [...]
- "messageOrderingEnabled": { "index": 14, "kind": "parameter", "displayName": "Message Ordering Enabled", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Should message ordering be enabled" },
- "pubsubEndpoint": { "index": 15, "kind": "parameter", "displayName": "Pubsub Endpoint", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Pub\/Sub endpoint to use. Required when using message ordering, and ensures that messages are received in order even when multiple publishers are used" },
- "retry": { "index": 16, "kind": "parameter", "displayName": "Retry", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "com.google.api.gax.retrying.RetrySettings", "deprecated": false, "autowired": false, "secret": false, "description": "A custom RetrySettings to control how the publisher handles retry-able failures" },
- "serializer": { "index": 17, "kind": "parameter", "displayName": "Serializer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.pubsub.serializer.GooglePubsubSerializer", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "description": "A custom GooglePubsubSerializer to use for serializing message payloads in the producer" }
+ "ackMode": { "index": 2, "kind": "parameter", "displayName": "Ack Mode", "group": "consumer", "label": "consumer", "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" },
+ "bridgeErrorHandler": { "index": 3, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "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 (if possible) occurred while the Camel consumer is trying to pickup incoming [...]
+ "concurrentConsumers": { "index": 4, "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer (advanced)", "label": "consumer,advanced", "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" },
+ "exceptionHandler": { "index": 5, "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 def [...]
+ "exchangePattern": { "index": 6, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+ "maxAckExtensionPeriod": { "index": 7, "kind": "parameter", "displayName": "Max Ack Extension Period", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 3600, "description": "Set the maximum period a message ack deadline will be extended. Value in seconds" },
+ "maxMessagesPerPoll": { "index": 8, "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer (advanced)", "label": "consumer,advanced", "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" },
+ "synchronousPull": { "index": 9, "kind": "parameter", "displayName": "Synchronous Pull", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Synchronously pull batches of messages" },
+ "lazyStartProducer": { "index": 10, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "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 produ [...]
+ "messageOrderingEnabled": { "index": 11, "kind": "parameter", "displayName": "Message Ordering Enabled", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Should message ordering be enabled" },
+ "pubsubEndpoint": { "index": 12, "kind": "parameter", "displayName": "Pubsub Endpoint", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Pub\/Sub endpoint to use. Required when using message ordering, and ensures that messages are received in order even when multiple publishers are used" },
+ "retry": { "index": 13, "kind": "parameter", "displayName": "Retry", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "com.google.api.gax.retrying.RetrySettings", "deprecated": false, "autowired": false, "secret": false, "description": "A custom RetrySettings to control how the publisher handles retry-able failures" },
+ "serializer": { "index": 14, "kind": "parameter", "displayName": "Serializer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.pubsub.serializer.GooglePubsubSerializer", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "description": "A custom GooglePubsubSerializer to use for serializing message payloads in the producer" },
+ "loggerId": { "index": 15, "kind": "parameter", "displayName": "Logger Id", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "To use a custom logger name" },
+ "authenticate": { "index": 16, "kind": "parameter", "displayName": "Authenticate", "group": "security", "label": "security", "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)." },
+ "serviceAccountKey": { "index": 17, "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "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 resour [...]
}
}
diff --git a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index a7300d8fdb6..0af5829bd23 100644
--- a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++ b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -49,64 +49,49 @@ public class GooglePubsubEndpoint extends DefaultEndpoint implements EndpointSer
@UriPath(label = "common", description = "The Google Cloud PubSub Project Id")
@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.")
@Metadata(required = true)
private String destinationName;
-
- @UriParam(label = "common", name = "authenticate",
+ @UriParam(label = "security",
description = "Use Credentials when interacting with PubSub service (no authentication is required when using emulator).",
defaultValue = "true")
private boolean authenticate = true;
-
- @UriParam(label = "common",
+ @UriParam(label = "security",
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;
-
- @UriParam(name = "loggerId", description = "Logger ID to use when a match to the parent route required")
+ @Deprecated
+ @UriParam(label = "advanced", description = "To use a custom logger name")
private String loggerId;
-
- @UriParam(label = "consumer", name = "concurrentConsumers",
+ @UriParam(label = "consumer,advanced", name = "concurrentConsumers",
description = "The number of parallel streams consuming from the subscription",
defaultValue = "1")
private Integer concurrentConsumers = 1;
-
- @UriParam(label = "consumer", name = "maxMessagesPerPoll",
+ @UriParam(label = "consumer,advanced", name = "maxMessagesPerPoll",
description = "The max number of messages to receive from the server in a single API call", defaultValue = "1")
private Integer maxMessagesPerPoll = 1;
-
- @UriParam(label = "consumer", name = "synchronousPull", description = "Synchronously pull batches of messages",
+ @UriParam(label = "consumer,advanced", name = "synchronousPull", description = "Synchronously pull batches of messages",
defaultValue = "false")
private boolean synchronousPull;
-
@UriParam(label = "consumer", defaultValue = "AUTO", enums = "AUTO,NONE",
description = "AUTO = exchange gets ack'ed/nack'ed on completion. NONE = downstream process has to ack/nack explicitly")
private GooglePubsubConstants.AckMode ackMode = GooglePubsubConstants.AckMode.AUTO;
-
- @UriParam(label = "consumer", name = "maxAckExtensionPeriod",
+ @UriParam(label = "consumer,advanced", name = "maxAckExtensionPeriod",
description = "Set the maximum period a message ack deadline will be extended. Value in seconds",
defaultValue = "3600")
private int maxAckExtensionPeriod = 3600;
-
- @UriParam(defaultValue = "false",
- description = "Should message ordering be enabled",
- label = "producer,advanced")
+ @UriParam(label = "producer,advanced",
+ description = "Should message ordering be enabled")
private boolean messageOrderingEnabled;
-
- @UriParam(description = "Pub/Sub endpoint to use. Required when using message ordering, and ensures that messages are received in order even when multiple publishers are used",
- label = "producer,advanced")
+ @UriParam(label = "producer,advanced",
+ description = "Pub/Sub endpoint to use. Required when using message ordering, and ensures that messages are received in order even when multiple publishers are used")
private String pubsubEndpoint;
-
- @UriParam(name = "serializer",
- description = "A custom GooglePubsubSerializer to use for serializing message payloads in the producer",
- label = "producer,advanced")
+ @UriParam(label = "producer,advanced",
+ description = "A custom GooglePubsubSerializer to use for serializing message payloads in the producer")
@Metadata(autowired = true)
private GooglePubsubSerializer serializer;
-
- @UriParam(description = "A custom RetrySettings to control how the publisher handles retry-able failures",
- label = "producer,advanced")
+ @UriParam(label = "producer,advanced", description = "A custom RetrySettings to control how the publisher handles retry-able failures")
private RetrySettings retry;
public GooglePubsubEndpoint(String uri, Component component) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index 54f1c8e79b6..f72cd982651 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -43,69 +43,6 @@ public interface GooglePubsubEndpointBuilderFactory {
default AdvancedGooglePubsubEndpointConsumerBuilder advanced() {
return (AdvancedGooglePubsubEndpointConsumerBuilder) this;
}
- /**
- * Use Credentials when interacting with PubSub service (no
- * authentication is required when using emulator).
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- *
- * @param authenticate the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder authenticate(boolean authenticate) {
- doSetProperty("authenticate", authenticate);
- return this;
- }
- /**
- * Use Credentials when interacting with PubSub service (no
- * authentication is required when using emulator).
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- *
- * @param authenticate the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder authenticate(String authenticate) {
- doSetProperty("authenticate", authenticate);
- return this;
- }
- /**
- * Logger ID to use when a match to the parent route required.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param loggerId the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder loggerId(String loggerId) {
- doSetProperty("loggerId", loggerId);
- return this;
- }
- /**
- * 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.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param serviceAccountKey the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder serviceAccountKey(String serviceAccountKey) {
- doSetProperty("serviceAccountKey", serviceAccountKey);
- return this;
- }
/**
* AUTO = exchange gets ack'ed/nack'ed on completion. NONE = downstream
* process has to ack/nack explicitly.
@@ -141,129 +78,52 @@ public interface GooglePubsubEndpointBuilderFactory {
return this;
}
/**
- * The number of parallel streams consuming from the subscription.
- *
- * The option is a: <code>java.lang.Integer</code> type.
- *
- * Default: 1
- * Group: consumer
- *
- * @param concurrentConsumers the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder concurrentConsumers(Integer concurrentConsumers) {
- doSetProperty("concurrentConsumers", concurrentConsumers);
- return this;
- }
- /**
- * The number of parallel streams consuming from the subscription.
- *
- * The option will be converted to a <code>java.lang.Integer</code>
- * type.
- *
- * Default: 1
- * Group: consumer
- *
- * @param concurrentConsumers the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder concurrentConsumers(String concurrentConsumers) {
- doSetProperty("concurrentConsumers", concurrentConsumers);
- return this;
- }
- /**
- * Set the maximum period a message ack deadline will be extended. Value
- * in seconds.
- *
- * The option is a: <code>int</code> type.
- *
- * Default: 3600
- * Group: consumer
- *
- * @param maxAckExtensionPeriod the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder maxAckExtensionPeriod(int maxAckExtensionPeriod) {
- doSetProperty("maxAckExtensionPeriod", maxAckExtensionPeriod);
- return this;
- }
- /**
- * Set the maximum period a message ack deadline will be extended. Value
- * in seconds.
- *
- * The option will be converted to a <code>int</code> type.
- *
- * Default: 3600
- * Group: consumer
- *
- * @param maxAckExtensionPeriod the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder maxAckExtensionPeriod(String maxAckExtensionPeriod) {
- doSetProperty("maxAckExtensionPeriod", maxAckExtensionPeriod);
- return this;
- }
- /**
- * The max number of messages to receive from the server in a single API
- * call.
- *
- * The option is a: <code>java.lang.Integer</code> type.
- *
- * Default: 1
- * Group: consumer
- *
- * @param maxMessagesPerPoll the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointConsumerBuilder maxMessagesPerPoll(Integer maxMessagesPerPoll) {
- doSetProperty("maxMessagesPerPoll", maxMessagesPerPoll);
- return this;
- }
- /**
- * The max number of messages to receive from the server in a single API
- * call.
+ * Use Credentials when interacting with PubSub service (no
+ * authentication is required when using emulator).
*
- * The option will be converted to a <code>java.lang.Integer</code>
- * type.
+ * The option is a: <code>boolean</code> type.
*
- * Default: 1
- * Group: consumer
+ * Default: true
+ * Group: security
*
- * @param maxMessagesPerPoll the value to set
+ * @param authenticate the value to set
* @return the dsl builder
*/
- default GooglePubsubEndpointConsumerBuilder maxMessagesPerPoll(String maxMessagesPerPoll) {
- doSetProperty("maxMessagesPerPoll", maxMessagesPerPoll);
+ default GooglePubsubEndpointConsumerBuilder authenticate(boolean authenticate) {
+ doSetProperty("authenticate", authenticate);
return this;
}
/**
- * Synchronously pull batches of messages.
+ * Use Credentials when interacting with PubSub service (no
+ * authentication is required when using emulator).
*
- * The option is a: <code>boolean</code> type.
+ * The option will be converted to a <code>boolean</code> type.
*
- * Default: false
- * Group: consumer
+ * Default: true
+ * Group: security
*
- * @param synchronousPull the value to set
+ * @param authenticate the value to set
* @return the dsl builder
*/
- default GooglePubsubEndpointConsumerBuilder synchronousPull(boolean synchronousPull) {
- doSetProperty("synchronousPull", synchronousPull);
+ default GooglePubsubEndpointConsumerBuilder authenticate(String authenticate) {
+ doSetProperty("authenticate", authenticate);
return this;
}
/**
- * Synchronously pull batches of messages.
+ * 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.
*
- * The option will be converted to a <code>boolean</code> type.
+ * The option is a: <code>java.lang.String</code> type.
*
- * Default: false
- * Group: consumer
+ * Group: security
*
- * @param synchronousPull the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GooglePubsubEndpointConsumerBuilder synchronousPull(String synchronousPull) {
- doSetProperty("synchronousPull", synchronousPull);
+ default GooglePubsubEndpointConsumerBuilder serviceAccountKey(String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
@@ -329,6 +189,37 @@ public interface GooglePubsubEndpointBuilderFactory {
doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
return this;
}
+ /**
+ * The number of parallel streams consuming from the subscription.
+ *
+ * The option is a: <code>java.lang.Integer</code> type.
+ *
+ * Default: 1
+ * Group: consumer (advanced)
+ *
+ * @param concurrentConsumers the value to set
+ * @return the dsl builder
+ */
+ default AdvancedGooglePubsubEndpointConsumerBuilder concurrentConsumers(Integer concurrentConsumers) {
+ doSetProperty("concurrentConsumers", concurrentConsumers);
+ return this;
+ }
+ /**
+ * The number of parallel streams consuming from the subscription.
+ *
+ * The option will be converted to a <code>java.lang.Integer</code>
+ * type.
+ *
+ * Default: 1
+ * Group: consumer (advanced)
+ *
+ * @param concurrentConsumers the value to set
+ * @return the dsl builder
+ */
+ default AdvancedGooglePubsubEndpointConsumerBuilder concurrentConsumers(String concurrentConsumers) {
+ doSetProperty("concurrentConsumers", concurrentConsumers);
+ return this;
+ }
/**
* To let the consumer use a custom ExceptionHandler. Notice if the
* option bridgeErrorHandler is enabled then this option is not in use.
@@ -394,6 +285,116 @@ public interface GooglePubsubEndpointBuilderFactory {
doSetProperty("exchangePattern", exchangePattern);
return this;
}
+ /**
+ * Set the maximum period a message ack deadline will be extended. Value
+ * in seconds.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Default: 3600
+ * Group: consumer (advanced)
+ *
+ * @param maxAckExtensionPeriod the value to set
+ * @return the dsl builder
+ */
+ default AdvancedGooglePubsubEndpointConsumerBuilder maxAckExtensionPeriod(int maxAckExtensionPeriod) {
+ doSetProperty("maxAckExtensionPeriod", maxAckExtensionPeriod);
+ return this;
+ }
+ /**
+ * Set the maximum period a message ack deadline will be extended. Value
+ * in seconds.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Default: 3600
+ * Group: consumer (advanced)
+ *
+ * @param maxAckExtensionPeriod the value to set
+ * @return the dsl builder
+ */
+ default AdvancedGooglePubsubEndpointConsumerBuilder maxAckExtensionPeriod(String maxAckExtensionPeriod) {
+ doSetProperty("maxAckExtensionPeriod", maxAckExtensionPeriod);
+ return this;
+ }
+ /**
+ * The max number of messages to receive from the server in a single API
+ * call.
+ *
+ * The option is a: <code>java.lang.Integer</code> type.
+ *
+ * Default: 1
+ * Group: consumer (advanced)
+ *
+ * @param maxMessagesPerPoll the value to set
+ * @return the dsl builder
+ */
+ default AdvancedGooglePubsubEndpointConsumerBuilder maxMessagesPerPoll(Integer maxMessagesPerPoll) {
+ doSetProperty("maxMessagesPerPoll", maxMessagesPerPoll);
+ return this;
+ }
+ /**
+ * The max number of messages to receive from the server in a single API
+ * call.
+ *
+ * The option will be converted to a <code>java.lang.Integer</code>
+ * type.
+ *
+ * Default: 1
+ * Group: consumer (advanced)
+ *
+ * @param maxMessagesPerPoll the value to set
+ * @return the dsl builder
+ */
+ default AdvancedGooglePubsubEndpointConsumerBuilder maxMessagesPerPoll(String maxMessagesPerPoll) {
+ doSetProperty("maxMessagesPerPoll", maxMessagesPerPoll);
+ return this;
+ }
+ /**
+ * Synchronously pull batches of messages.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: false
+ * Group: consumer (advanced)
+ *
+ * @param synchronousPull the value to set
+ * @return the dsl builder
+ */
+ default AdvancedGooglePubsubEndpointConsumerBuilder synchronousPull(boolean synchronousPull) {
+ doSetProperty("synchronousPull", synchronousPull);
+ return this;
+ }
+ /**
+ * Synchronously pull batches of messages.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Default: false
+ * Group: consumer (advanced)
+ *
+ * @param synchronousPull the value to set
+ * @return the dsl builder
+ */
+ default AdvancedGooglePubsubEndpointConsumerBuilder synchronousPull(String synchronousPull) {
+ doSetProperty("synchronousPull", synchronousPull);
+ return this;
+ }
+ /**
+ * To use a custom logger name.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: advanced
+ *
+ * @param loggerId the value to set
+ * @return the dsl builder
+ */
+ @Deprecated
+ default AdvancedGooglePubsubEndpointConsumerBuilder loggerId(String loggerId) {
+ doSetProperty("loggerId", loggerId);
+ return this;
+ }
}
/**
@@ -413,7 +414,7 @@ public interface GooglePubsubEndpointBuilderFactory {
* The option is a: <code>boolean</code> type.
*
* Default: true
- * Group: common
+ * Group: security
*
* @param authenticate the value to set
* @return the dsl builder
@@ -429,7 +430,7 @@ public interface GooglePubsubEndpointBuilderFactory {
* The option will be converted to a <code>boolean</code> type.
*
* Default: true
- * Group: common
+ * Group: security
*
* @param authenticate the value to set
* @return the dsl builder
@@ -438,20 +439,6 @@ public interface GooglePubsubEndpointBuilderFactory {
doSetProperty("authenticate", authenticate);
return this;
}
- /**
- * Logger ID to use when a match to the parent route required.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param loggerId the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointProducerBuilder loggerId(String loggerId) {
- doSetProperty("loggerId", loggerId);
- return this;
- }
/**
* The Service account key that can be used as credentials for the
* PubSub publisher/subscriber. It can be loaded by default from
@@ -460,7 +447,7 @@ public interface GooglePubsubEndpointBuilderFactory {
*
* The option is a: <code>java.lang.String</code> type.
*
- * Group: common
+ * Group: security
*
* @param serviceAccountKey the value to set
* @return the dsl builder
@@ -635,6 +622,21 @@ public interface GooglePubsubEndpointBuilderFactory {
doSetProperty("serializer", serializer);
return this;
}
+ /**
+ * To use a custom logger name.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: advanced
+ *
+ * @param loggerId the value to set
+ * @return the dsl builder
+ */
+ @Deprecated
+ default AdvancedGooglePubsubEndpointProducerBuilder loggerId(String loggerId) {
+ doSetProperty("loggerId", loggerId);
+ return this;
+ }
}
/**
@@ -655,7 +657,7 @@ public interface GooglePubsubEndpointBuilderFactory {
* The option is a: <code>boolean</code> type.
*
* Default: true
- * Group: common
+ * Group: security
*
* @param authenticate the value to set
* @return the dsl builder
@@ -671,7 +673,7 @@ public interface GooglePubsubEndpointBuilderFactory {
* The option will be converted to a <code>boolean</code> type.
*
* Default: true
- * Group: common
+ * Group: security
*
* @param authenticate the value to set
* @return the dsl builder
@@ -680,20 +682,6 @@ public interface GooglePubsubEndpointBuilderFactory {
doSetProperty("authenticate", authenticate);
return this;
}
- /**
- * Logger ID to use when a match to the parent route required.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- *
- * @param loggerId the value to set
- * @return the dsl builder
- */
- default GooglePubsubEndpointBuilder loggerId(String loggerId) {
- doSetProperty("loggerId", loggerId);
- return this;
- }
/**
* The Service account key that can be used as credentials for the
* PubSub publisher/subscriber. It can be loaded by default from
@@ -702,7 +690,7 @@ public interface GooglePubsubEndpointBuilderFactory {
*
* The option is a: <code>java.lang.String</code> type.
*
- * Group: common
+ * Group: security
*
* @param serviceAccountKey the value to set
* @return the dsl builder
@@ -724,6 +712,21 @@ public interface GooglePubsubEndpointBuilderFactory {
return (GooglePubsubEndpointBuilder) this;
}
+ /**
+ * To use a custom logger name.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: advanced
+ *
+ * @param loggerId the value to set
+ * @return the dsl builder
+ */
+ @Deprecated
+ default AdvancedGooglePubsubEndpointBuilder loggerId(String loggerId) {
+ doSetProperty("loggerId", loggerId);
+ return this;
+ }
}
public interface GooglePubsubBuilders {
(camel) 01/02: camel-google-pubsub: Fix test
Posted by da...@apache.org.
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.git
commit 9d77df417d16c8c88c5707277d486ad431c1ded0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 12 07:39:03 2025 +0200
camel-google-pubsub: Fix test
---
.../pubsub/integration/AcknowledgementIT.java | 4 ---
.../integration/ManualAcknowledgementIT.java | 38 ----------------------
2 files changed, 42 deletions(-)
diff --git a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
index 4f00d6b2862..c87d2b8ed74 100644
--- a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
+++ b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
@@ -67,7 +67,6 @@ public class AcknowledgementIT extends PubsubTestSupport {
@Override
public void process(Exchange exchange) throws Exception {
if (AcknowledgementIT.fail) {
- Thread.sleep(750);
throw new Exception("fail");
}
}
@@ -82,10 +81,7 @@ public class AcknowledgementIT extends PubsubTestSupport {
* body comparison will fail. Check 2 : Failure. As the route throws and exception and the message is NACK'ed. The
* message should remain in the PubSub Subscription for the third check. Check 3 : Success for the second message.
* The message received should match the second message sent.
- *
- * @throws Exception
*/
-
@Test
public void singleMessage() throws Exception {
diff --git a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/ManualAcknowledgementIT.java b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/ManualAcknowledgementIT.java
index 86b0b29f031..4ba5e8a467d 100644
--- a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/ManualAcknowledgementIT.java
+++ b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/ManualAcknowledgementIT.java
@@ -34,12 +34,8 @@ public class ManualAcknowledgementIT extends PubsubTestSupport {
private static final String TOPIC_NAME = "manualAcknowledgeTopic";
private static final String SUBSCRIPTION_NAME = "manualAcknowledgeSubscription";
private static final String SYNC_ROUTE_ID = "receive-from-subscription-sync";
- private static final String ASYNC_ROUTE_ID = "receive-from-subscription-async";
private static Boolean ack = true;
- @EndpointInject("mock:receiveResultAsync")
- private MockEndpoint receiveResultAsync;
-
@EndpointInject("mock:receiveResultSync")
private MockEndpoint receiveResultSync;
@@ -60,23 +56,6 @@ public class ManualAcknowledgementIT extends PubsubTestSupport {
.routeId("send-to-topic")
.to("google-pubsub:{{project.id}}:" + TOPIC_NAME);
- from("google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME + "?ackMode=NONE")
- .autoStartup(false)
- .routeId(ASYNC_ROUTE_ID)
- .to("mock:receiveResultAsync")
- .process(exchange -> {
- GooglePubsubAcknowledge acknowledge
- = exchange.getIn().getHeader(GooglePubsubConstants.GOOGLE_PUBSUB_ACKNOWLEDGE,
- GooglePubsubAcknowledge.class);
-
- if (ManualAcknowledgementIT.ack) {
- acknowledge.ack(exchange);
- } else {
- LOG.debug("Nack!");
- acknowledge.nack(exchange);
- }
- });
-
from("google-pubsub:{{project.id}}:" + SUBSCRIPTION_NAME + "?synchronousPull=true&ackMode=NONE")
.autoStartup(false)
.routeId(SYNC_ROUTE_ID)
@@ -99,14 +78,6 @@ public class ManualAcknowledgementIT extends PubsubTestSupport {
@Test
public void testManualAcknowledgement() throws Exception {
- // 1. Asynchronous consumer with manual acknowledgement.
- // Message should only be received once.
- producer.sendBody("Testing!");
- receiveResultAsync.expectedMessageCount(1);
- context.getRouteController().startRoute(ASYNC_ROUTE_ID);
- receiveResultAsync.assertIsSatisfied(3000);
- context.getRouteController().stopRoute(ASYNC_ROUTE_ID);
-
// 2. Synchronous consumer with manual acknowledgement.
// Message should only be received once.
producer.sendBody("Testing!");
@@ -116,17 +87,8 @@ public class ManualAcknowledgementIT extends PubsubTestSupport {
context.getRouteController().stopRoute(SYNC_ROUTE_ID);
receiveResultSync.reset();
- receiveResultAsync.reset();
ack = false;
- // 3. Asynchronous consumer with manual negative-acknowledgement.
- // Message should be continuously redelivered after being nacked.
- producer.sendBody("Testing!");
- receiveResultAsync.expectedMinimumMessageCount(3);
- context.getRouteController().startRoute(ASYNC_ROUTE_ID);
- receiveResultAsync.assertIsSatisfied(3000);
- context.getRouteController().stopRoute(ASYNC_ROUTE_ID);
-
// 4. Synchronous consumer with manual negative-acknowledgement.
// Message should be continuously redelivered after being nacked.
producer.sendBody("Testing!");