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 3091668 Regen 3091668 is described below commit 309166846dfdcff4f3f6f89ec5665f653a057638 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sat Nov 13 15:45:03 2021 +0100 Regen --- .../springboot/catalog/components/azure-servicebus.json | 2 +- .../springboot/catalog/components/google-pubsub.json | 1 + .../camel/springboot/catalog/components/hwcloud-dms.json | 2 +- .../catalog/components/hwcloud-imagerecognition.json | 2 +- .../camel/springboot/catalog/components/hwcloud-obs.json | 2 +- .../camel/springboot/catalog/components/json-patch.json | 2 +- .../camel/springboot/catalog/components/quickfix.json | 4 ++-- .../src/main/docs/google-pubsub.json | 6 ++++++ .../springboot/GooglePubsubComponentConfiguration.java | 15 +++++++++++++++ .../modules/spring-boot/examples/json/google-pubsub.json | 6 ++++++ 10 files changed, 35 insertions(+), 7 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json index 0e84749..c1f2c08 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json @@ -8,7 +8,7 @@ "firstVersion": "3.12.0", "label": "cloud,messaging", "javaType": "org.apache.camel.component.azure.servicebus.ServiceBusComponent", - "supportLevel": "Preview", + "supportLevel": "Stable", "groupId": "org.apache.camel.springboot", "artifactId": "camel-azure-servicebus-starter", "version": "3.14.0-SNAPSHOT", 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 f80bc6c..60cbbc1 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 @@ -26,6 +26,7 @@ "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": 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 [...] + "synchronousPullRetryableCodes": { "kind": "property", "displayName": "Synchronous Pull Retryable Codes", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Comma-separated list of additional retryable error codes for synchronous pull. By default the PubSub client library retries ABORTED, UNAVAILABLE, UNKNOWN" }, "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." }, "publisherCacheTimeout": { "kind": "property", "displayName": "Publisher Cache Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "How many milliseconds should each producer stay alive in the cache." }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-dms.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-dms.json index aa55576..5446516 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-dms.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-dms.json @@ -8,7 +8,7 @@ "firstVersion": "3.12.0", "label": "cloud", "javaType": "org.apache.camel.component.huaweicloud.dms.DMSComponent", - "supportLevel": "Preview", + "supportLevel": "Stable", "groupId": "org.apache.camel.springboot", "artifactId": "camel-huaweicloud-dms-starter", "version": "3.14.0-SNAPSHOT", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-imagerecognition.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-imagerecognition.json index 2dd37b5..6b37092 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-imagerecognition.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-imagerecognition.json @@ -8,7 +8,7 @@ "firstVersion": "3.12.0", "label": "cloud,messaging", "javaType": "org.apache.camel.component.huaweicloud.image.ImageRecognitionComponent", - "supportLevel": "Preview", + "supportLevel": "Stable", "groupId": "org.apache.camel.springboot", "artifactId": "camel-huaweicloud-imagerecognition-starter", "version": "3.14.0-SNAPSHOT", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-obs.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-obs.json index 8b67ac2..5c33381 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-obs.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hwcloud-obs.json @@ -8,7 +8,7 @@ "firstVersion": "3.12.0", "label": "cloud", "javaType": "org.apache.camel.component.huaweicloud.obs.OBSComponent", - "supportLevel": "Preview", + "supportLevel": "Stable", "groupId": "org.apache.camel.springboot", "artifactId": "camel-huaweicloud-obs-starter", "version": "3.14.0-SNAPSHOT", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/json-patch.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/json-patch.json index 6b2849f..5280152 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/json-patch.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/json-patch.json @@ -8,7 +8,7 @@ "firstVersion": "3.12.0", "label": "transformation", "javaType": "org.apache.camel.component.jsonpatch.JsonPatchComponent", - "supportLevel": "Preview", + "supportLevel": "Stable", "groupId": "org.apache.camel.springboot", "artifactId": "camel-json-patch-starter", "version": "3.14.0-SNAPSHOT", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quickfix.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quickfix.json index 5b07f8e..9cb5912 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quickfix.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quickfix.json @@ -32,8 +32,8 @@ }, "properties": { "configurationName": { "kind": "path", "displayName": "Configuration Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Path to the quickfix configuration file. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the configuration file using these protocols (classpath is default). ref will lookup [...] - "lazyCreateEngine": { "kind": "parameter", "displayName": "Lazy Create Engine", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option allows to create QuickFIX\/J engine on demand. Value true means the engine is started when first message is send or there's consumer configured in route definition. When false value is used, the engine is s [...] - "sessionID": { "kind": "parameter", "displayName": "Session ID", "group": "common", "label": "", "required": false, "type": "object", "javaType": "quickfix.SessionID", "deprecated": false, "autowired": false, "secret": false, "description": "The optional sessionID identifies a specific FIX session. The format of the sessionID is: (BeginString):(SenderCompID)\/(SenderSubID)\/(SenderLocationID)-(TargetCompID)\/(TargetSubID)\/(TargetLocationID)" }, + "lazyCreateEngine": { "kind": "parameter", "displayName": "Lazy Create Engine", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option allows creating QuickFIX\/J engine on demand. Value true means the engine is started when first message is send or there's consumer configured in route definition. When false value is used, the engine is st [...] + "sessionID": { "kind": "parameter", "displayName": "Session ID", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The optional sessionID identifies a specific FIX session. The format of the sessionID is: (BeginString):(SenderCompID)\/(SenderSubID)\/(SenderLocationID)-(TargetCompID)\/(TargetSubID)\/(TargetLocationID)" }, "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 [...] "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." }, diff --git a/components-starter/camel-google-pubsub-starter/src/main/docs/google-pubsub.json b/components-starter/camel-google-pubsub-starter/src/main/docs/google-pubsub.json index 9234aa6..9363f4c 100644 --- a/components-starter/camel-google-pubsub-starter/src/main/docs/google-pubsub.json +++ b/components-starter/camel-google-pubsub-starter/src/main/docs/google-pubsub.json @@ -81,6 +81,12 @@ "type": "java.lang.String", "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.", "sourceType": "org.apache.camel.component.google.pubsub.springboot.GooglePubsubComponentConfiguration" + }, + { + "name": "camel.component.google-pubsub.synchronous-pull-retryable-codes", + "type": "java.lang.String", + "description": "Comma-separated list of additional retryable error codes for synchronous pull. By default the PubSub client library retries ABORTED, UNAVAILABLE, UNKNOWN", + "sourceType": "org.apache.camel.component.google.pubsub.springboot.GooglePubsubComponentConfiguration" } ], "hints": [] 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 e4ced05..9fb814d 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 @@ -62,6 +62,12 @@ public class GooglePubsubComponentConfiguration */ private Boolean bridgeErrorHandler = false; /** + * Comma-separated list of additional retryable error codes for synchronous + * pull. By default the PubSub client library retries ABORTED, UNAVAILABLE, + * UNKNOWN + */ + private String synchronousPullRetryableCodes; + /** * 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 starting @@ -127,6 +133,15 @@ public class GooglePubsubComponentConfiguration this.bridgeErrorHandler = bridgeErrorHandler; } + public String getSynchronousPullRetryableCodes() { + return synchronousPullRetryableCodes; + } + + public void setSynchronousPullRetryableCodes( + String synchronousPullRetryableCodes) { + this.synchronousPullRetryableCodes = synchronousPullRetryableCodes; + } + public Boolean getLazyStartProducer() { return lazyStartProducer; } diff --git a/docs/components/modules/spring-boot/examples/json/google-pubsub.json b/docs/components/modules/spring-boot/examples/json/google-pubsub.json index 9234aa6..9363f4c 100644 --- a/docs/components/modules/spring-boot/examples/json/google-pubsub.json +++ b/docs/components/modules/spring-boot/examples/json/google-pubsub.json @@ -81,6 +81,12 @@ "type": "java.lang.String", "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.", "sourceType": "org.apache.camel.component.google.pubsub.springboot.GooglePubsubComponentConfiguration" + }, + { + "name": "camel.component.google-pubsub.synchronous-pull-retryable-codes", + "type": "java.lang.String", + "description": "Comma-separated list of additional retryable error codes for synchronous pull. By default the PubSub client library retries ABORTED, UNAVAILABLE, UNKNOWN", + "sourceType": "org.apache.camel.component.google.pubsub.springboot.GooglePubsubComponentConfiguration" } ], "hints": []