This is an automated email from the ASF dual-hosted git repository.
acosentino 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 f859ca1 [create-pull-request] automated change
f859ca1 is described below
commit f859ca1bdc66b9725fa8c6e1a86e96c442f20294
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Nov 17 01:02:54 2021 +0000
[create-pull-request] automated change
---
.../catalog/components/azure-storage-blob.json | 6 +-
.../catalog/components/elasticsearch-rest.json | 26 +++---
.../springboot/catalog/components/salesforce.json | 6 +-
.../src/main/docs/azure-storage-blob.json | 6 ++
.../springboot/BlobComponentConfiguration.java | 14 +++
.../ElasticsearchComponentConfiguration.java | 100 ++++++++++-----------
.../src/main/docs/salesforce.json | 9 +-
.../SalesforceComponentConfiguration.java | 14 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 2 +-
9 files changed, 113 insertions(+), 70 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-storage-blob.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-storage-blob.json
index 6ca7801..500bfc5 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-storage-blob.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-storage-blob.json
@@ -51,7 +51,8 @@
"operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.azure.storage.blob.BlobOperationsDefinition",
"enum": [ "listBlobContainers", "createBlobContainer", "deleteBlobContainer",
"listBlobs", "getBlob", "deleteBlob", "downloadBlobToFile", "downloadLink",
"uploadBlockBlob", "stageBlockBlobList", "commitBlobBlockList",
"getBlobBlockList", "createAppendBlob", "c [...]
"pageBlobSize": { "kind": "property", "displayName": "Page Blob Size",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "512", "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Specifies the maximum
size for the page blob, up to 8 TB. The page blob size must [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "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 t [...]
- "accessKey": { "kind": "property", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Access key for the
associated azure account name to be used for authentication with azure blob
services" }
+ "accessKey": { "kind": "property", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Access key for the
associated azure account name to be used for authentication with azure blob
services" },
+ "sourceBlobAccessKey": { "kind": "property", "displayName": "Source Blob
Access Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Source Blob Access Key:
for copyblob operation, sadly, we need to have an accessKey for th [...]
},
"properties": {
"accountName": { "kind": "path", "displayName": "Account Name", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Azure account name to be
used for authentication with azure blob services" },
@@ -102,6 +103,7 @@
"startScheduler": { "kind": "parameter", "displayName": "Start Scheduler",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether the scheduler
should be auto started." },
"timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group":
"scheduler", "label": "consumer,scheduler", "required": false, "type":
"object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS",
"MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"MILLISECONDS", "description": "Time unit for initialDelay and delay options."
},
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Controls if fixed delay
or fixed rate is used. See ScheduledExecutorService in JDK for details." },
- "accessKey": { "kind": "parameter", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Access key for the
associated azure account name to be used for authentication with azure blob
services" }
+ "accessKey": { "kind": "parameter", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Access key for the
associated azure account name to be used for authentication with azure blob
services" },
+ "sourceBlobAccessKey": { "kind": "parameter", "displayName": "Source Blob
Access Key", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Source Blob Access Key:
for copyblob operation, sadly, we need to have an accessKey for t [...]
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest.json
index b697835..e1ec210 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest.json
@@ -22,38 +22,38 @@
"lenientProperties": false
},
"componentProperties": {
+ "connectionTimeout": { "kind": "property", "displayName": "Connection
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms to wait
before connection will timeout." },
+ "hostAddresses": { "kind": "property", "displayName": "Host Addresses",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Comma separated list with ip:port formatted
remote transport addresses to use. The ip and port options must be left blank
for hostAddresses to be considered instead." },
"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 [...]
+ "maxRetryTimeout": { "kind": "property", "displayName": "Max Retry
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms before
retry" },
+ "socketTimeout": { "kind": "property", "displayName": "Socket Timeout",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 30000, "description": "The timeout in ms to wait before the
socket will timeout." },
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "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 t [...]
"client": { "kind": "property", "displayName": "Client", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.elasticsearch.client.RestClient", "deprecated": false,
"autowired": true, "secret": false, "description": "To use an existing
configured Elasticsearch client, instead of creating a client per endpoint.
This allow to customize the client with specific settings." },
- "connectionTimeout": { "kind": "property", "displayName": "Connection
Timeout", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms to wait
before connection will timeout." },
- "enableSniffer": { "kind": "property", "displayName": "Enable Sniffer",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "false", "description": "Enable automatically
discover nodes from a running Elasticsearch cluster" },
- "hostAddresses": { "kind": "property", "displayName": "Host Addresses",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Comma separated list with ip:port formatted
remote transport addresses to use. The ip and port options must be left blank
for hostAddresses to be considered instead." },
- "maxRetryTimeout": { "kind": "property", "displayName": "Max Retry
Timeout", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms before
retry" },
+ "enableSniffer": { "kind": "property", "displayName": "Enable Sniffer",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Enable automatically discover
nodes from a running Elasticsearch cluster" },
"sniffAfterFailureDelay": { "kind": "property", "displayName": "Sniff
After Failure Delay", "group": "advanced", "label": "advanced", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 60000, "description": "The delay of a
sniff execution scheduled after a failure (in milliseconds)" },
"snifferInterval": { "kind": "property", "displayName": "Sniffer
Interval", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 300000, "description": "The interval between
consecutive ordinary sniff executions in milliseconds. Will be honoured when
sniffOnFailure is disabled or when there are no failures between consecutive
sniff executions" },
- "socketTimeout": { "kind": "property", "displayName": "Socket Timeout",
"group": "advanced", "label": "advanced", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 30000, "description": "The timeout in ms to wait before the
socket will timeout." },
- "enableSSL": { "kind": "property", "displayName": "Enable SSL", "group":
"security", "label": "security", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "false", "description": "Enable SSL" },
+ "enableSSL": { "kind": "property", "displayName": "Enable SSL", "group":
"security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Enable SSL" },
"password": { "kind": "property", "displayName": "Password", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "description": "Password for authenticate" },
- "user": { "kind": "property", "displayName": "User", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Basic authenticate user" }
+ "user": { "kind": "property", "displayName": "User", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": true,
"description": "Basic authenticate user" }
},
"properties": {
"clusterName": { "kind": "path", "displayName": "Cluster Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Name of the cluster" },
"connectionTimeout": { "kind": "parameter", "displayName": "Connection
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms to wait
before connection will timeout." },
"disconnect": { "kind": "parameter", "displayName": "Disconnect", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Disconnect after it
finish calling the producer" },
- "enableSniffer": { "kind": "parameter", "displayName": "Enable Sniffer",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable automatically
discover nodes from a running Elasticsearch cluster" },
- "enableSSL": { "kind": "parameter", "displayName": "Enable SSL", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable SSL" },
"from": { "kind": "parameter", "displayName": "From", "group": "producer",
"label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
- "hostAddresses": { "kind": "parameter", "displayName": "Host Addresses",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
+ "hostAddresses": { "kind": "parameter", "displayName": "Host Addresses",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "kind": "parameter", "displayName": "Index Name", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
"lazyStartProducer": { "kind": "parameter", "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 sta [...]
"maxRetryTimeout": { "kind": "parameter", "displayName": "Max Retry
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
"operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.component.elasticsearch.ElasticsearchOperation", "enum": [
"Index", "Update", "Bulk", "BulkIndex", "GetById", "MultiGet", "MultiSearch",
"Delete", "DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.elasticsearch.Elasticse [...]
"scrollKeepAliveMs": { "kind": "parameter", "displayName": "Scroll Keep
Alive Ms", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Time in ms during which
elasticsearch will keep search context alive" },
"size": { "kind": "parameter", "displayName": "Size", "group": "producer",
"label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Size of the response." },
- "sniffAfterFailureDelay": { "kind": "parameter", "displayName": "Sniff
After Failure Delay", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The delay of a sniff
execution scheduled after a failure (in milliseconds)" },
- "snifferInterval": { "kind": "parameter", "displayName": "Sniffer
Interval", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 300000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The interval between
consecutive ordinary sniff executions in milliseconds. Will be honour [...]
"socketTimeout": { "kind": "parameter", "displayName": "Socket Timeout",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 30000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The timeout in ms to
wait before the socket will timeout." },
"useScroll": { "kind": "parameter", "displayName": "Use Scroll", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable scroll usage" },
- "waitForActiveShards": { "kind": "parameter", "displayName": "Wait For
Active Shards", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Index creation waits for
the write consistency number of shards to be available" }
+ "waitForActiveShards": { "kind": "parameter", "displayName": "Wait For
Active Shards", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Index creation waits for
the write consistency number of shards to be available" },
+ "enableSniffer": { "kind": "parameter", "displayName": "Enable Sniffer",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable automatically
discover nodes from a running Elasticsearch cluster" },
+ "sniffAfterFailureDelay": { "kind": "parameter", "displayName": "Sniff
After Failure Delay", "group": "advanced", "label": "advanced", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The delay of a sniff
execution scheduled after a failure (in millis [...]
+ "snifferInterval": { "kind": "parameter", "displayName": "Sniffer
Interval", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 300000, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The interval between
consecutive ordinary sniff executions in milliseconds. Will b [...]
+ "enableSSL": { "kind": "parameter", "displayName": "Enable SSL", "group":
"security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.elasticsearch.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Enable SSL" }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
index 8f7b3e6..6690b46 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
@@ -25,11 +25,12 @@
"componentProperties": {
"apexMethod": { "kind": "property", "displayName": "Apex Method", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "APEX method name" },
"apexQueryParams": { "kind": "property", "displayName": "Apex Query
Params", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Query params for APEX method" },
- "apiVersion": { "kind": "property", "displayName": "Api Version", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "50.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce API version." },
+ "apiVersion": { "kind": "property", "displayName": "Api Version", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "53.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce API version." },
"backoffIncrement": { "kind": "property", "displayName": "Backoff
Increment", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Backoff interval increment for
Streaming connection restart attempts for failures beyond CometD auto- [...]
"batchId": { "kind": "property", "displayName": "Batch Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Bulk API Batch ID" },
"contentType": { "kind": "property", "displayName": "Content Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.api.dto.bulk.ContentType",
"enum": [ "XML", "CSV", "JSON", "ZIP_XML", "ZIP_CSV", "ZIP_JSON" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Bulk API co [...]
"defaultReplayId": { "kind": "property", "displayName": "Default Replay
Id", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "-1", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Default replayId setting if no
value is found in initialReplayIdMap" },
+ "fallBackReplayId": { "kind": "property", "displayName": "Fall Back Replay
Id", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "-1", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "ReplayId to fall back to after
an Invalid Replay Id response" },
"format": { "kind": "property", "displayName": "Format", "group":
"common", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.component.salesforce.internal.PayloadFormat", "enum": [
"JSON", "XML" ], "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Payload format to use for
Salesforce API calls, either JSON or XM [...]
"httpClient": { "kind": "property", "displayName": "Http Client", "group":
"common", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.component.salesforce.SalesforceHttpClient", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Custom Jetty Http Client to use
to connect to Salesforce." },
"httpClientConnectionTimeout": { "kind": "property", "displayName": "Http
Client Connection Timeout", "group": "common", "label": "common", "required":
false, "type": "integer", "javaType": "long", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 60000, "description": "Connection
timeout used by the HttpClient when connecting to the Salesforce server." },
@@ -118,11 +119,12 @@
"topicName": { "kind": "path", "displayName": "Topic Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The name of the topic\/channel to use" },
"apexMethod": { "kind": "parameter", "displayName": "Apex Method",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "APEX method name" },
"apexQueryParams": { "kind": "parameter", "displayName": "Apex Query
Params", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Query params for APEX
method" },
- "apiVersion": { "kind": "parameter", "displayName": "Api Version",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "50.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Salesforce API version."
},
+ "apiVersion": { "kind": "parameter", "displayName": "Api Version",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "53.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Salesforce API version."
},
"backoffIncrement": { "kind": "parameter", "displayName": "Backoff
Increment", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Backoff interval
increment for Streaming connection restart attempts for failures beyond Come
[...]
"batchId": { "kind": "parameter", "displayName": "Batch Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Bulk API Batch ID" },
"contentType": { "kind": "parameter", "displayName": "Content Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.api.dto.bulk.ContentType",
"enum": [ "XML", "CSV", "JSON", "ZIP_XML", "ZIP_CSV", "ZIP_JSON" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Bul [...]
"defaultReplayId": { "kind": "parameter", "displayName": "Default Replay
Id", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "-1", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Default replayId setting
if no value is found in initialReplayIdMap" },
+ "fallBackReplayId": { "kind": "parameter", "displayName": "Fall Back
Replay Id", "group": "common", "label": "", "required": false, "type":
"integer", "javaType": "java.lang.Long", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "-1", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "ReplayId to fall back to
after an Invalid Replay Id response" },
"format": { "kind": "parameter", "displayName": "Format", "group":
"common", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.component.salesforce.internal.PayloadFormat", "enum": [
"JSON", "XML" ], "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Payload format to use
for Salesforce API calls, either JS [...]
"httpClient": { "kind": "parameter", "displayName": "Http Client",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.SalesforceHttpClient",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Custom Jetty Http Client
to use to connect to Salesforce." },
"includeDetails": { "kind": "parameter", "displayName": "Include Details",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Include details in
Salesforce1 Analytics report, defaults to false." },
diff --git
a/components-starter/camel-azure-storage-blob-starter/src/main/docs/azure-storage-blob.json
b/components-starter/camel-azure-storage-blob-starter/src/main/docs/azure-storage-blob.json
index 17c0bfa..35c4f01 100644
---
a/components-starter/camel-azure-storage-blob-starter/src/main/docs/azure-storage-blob.json
+++
b/components-starter/camel-azure-storage-blob-starter/src/main/docs/azure-storage-blob.json
@@ -211,6 +211,12 @@
"sourceType":
"org.apache.camel.component.azure.storage.blob.springboot.BlobComponentConfiguration"
},
{
+ "name": "camel.component.azure-storage-blob.source-blob-access-key",
+ "type": "java.lang.String",
+ "description": "Source Blob Access Key: for copyblob operation, sadly,
we need to have an accessKey for the source blob we want to copy Passing an
accessKey as header, it's unsafe so we could set as key.",
+ "sourceType":
"org.apache.camel.component.azure.storage.blob.springboot.BlobComponentConfiguration"
+ },
+ {
"name": "camel.component.azure-storage-blob.timeout",
"type": "java.time.Duration",
"description": "An optional timeout value beyond which a
RuntimeException will be raised. The option is a java.time.Duration type.",
diff --git
a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConfiguration.java
b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConfiguration.java
index 174f391..582d9f6 100644
---
a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConfiguration.java
+++
b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConfiguration.java
@@ -223,6 +223,12 @@ public class BlobComponentConfiguration
* authentication with azure blob services
*/
private String accessKey;
+ /**
+ * Source Blob Access Key: for copyblob operation, sadly, we need to have
an
+ * accessKey for the source blob we want to copy Passing an accessKey as
+ * header, it's unsafe so we could set as key.
+ */
+ private String sourceBlobAccessKey;
public String getBlobName() {
return blobName;
@@ -463,4 +469,12 @@ public class BlobComponentConfiguration
public void setAccessKey(String accessKey) {
this.accessKey = accessKey;
}
+
+ public String getSourceBlobAccessKey() {
+ return sourceBlobAccessKey;
+ }
+
+ public void setSourceBlobAccessKey(String sourceBlobAccessKey) {
+ this.sourceBlobAccessKey = sourceBlobAccessKey;
+ }
}
\ No newline at end of file
diff --git
a/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConfiguration.java
b/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConfiguration.java
index c4a74e7..04f1d5b 100644
---
a/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConfiguration.java
+++
b/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConfiguration.java
@@ -38,6 +38,16 @@ public class ElasticsearchComponentConfiguration
*/
private Boolean enabled;
/**
+ * The time in ms to wait before connection will timeout.
+ */
+ private Integer connectionTimeout = 30000;
+ /**
+ * Comma separated list with ip:port formatted remote transport addresses
to
+ * use. The ip and port options must be left blank for hostAddresses to be
+ * considered instead.
+ */
+ private String hostAddresses;
+ /**
* 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
@@ -49,6 +59,14 @@ public class ElasticsearchComponentConfiguration
*/
private Boolean lazyStartProducer = false;
/**
+ * The time in ms before retry
+ */
+ private Integer maxRetryTimeout = 30000;
+ /**
+ * The timeout in ms to wait before the socket will timeout.
+ */
+ private Integer socketTimeout = 30000;
+ /**
* 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
@@ -64,24 +82,10 @@ public class ElasticsearchComponentConfiguration
*/
private RestClient client;
/**
- * The time in ms to wait before connection will timeout.
- */
- private Integer connectionTimeout = 30000;
- /**
* Enable automatically discover nodes from a running Elasticsearch cluster
*/
private Boolean enableSniffer = false;
/**
- * Comma separated list with ip:port formatted remote transport addresses
to
- * use. The ip and port options must be left blank for hostAddresses to be
- * considered instead.
- */
- private String hostAddresses;
- /**
- * The time in ms before retry
- */
- private Integer maxRetryTimeout = 30000;
- /**
* The delay of a sniff execution scheduled after a failure (in
* milliseconds)
*/
@@ -93,10 +97,6 @@ public class ElasticsearchComponentConfiguration
*/
private Integer snifferInterval = 300000;
/**
- * The timeout in ms to wait before the socket will timeout.
- */
- private Integer socketTimeout = 30000;
- /**
* Enable SSL
*/
private Boolean enableSSL = false;
@@ -109,6 +109,22 @@ public class ElasticsearchComponentConfiguration
*/
private String user;
+ public Integer getConnectionTimeout() {
+ return connectionTimeout;
+ }
+
+ public void setConnectionTimeout(Integer connectionTimeout) {
+ this.connectionTimeout = connectionTimeout;
+ }
+
+ public String getHostAddresses() {
+ return hostAddresses;
+ }
+
+ public void setHostAddresses(String hostAddresses) {
+ this.hostAddresses = hostAddresses;
+ }
+
public Boolean getLazyStartProducer() {
return lazyStartProducer;
}
@@ -117,6 +133,22 @@ public class ElasticsearchComponentConfiguration
this.lazyStartProducer = lazyStartProducer;
}
+ public Integer getMaxRetryTimeout() {
+ return maxRetryTimeout;
+ }
+
+ public void setMaxRetryTimeout(Integer maxRetryTimeout) {
+ this.maxRetryTimeout = maxRetryTimeout;
+ }
+
+ public Integer getSocketTimeout() {
+ return socketTimeout;
+ }
+
+ public void setSocketTimeout(Integer socketTimeout) {
+ this.socketTimeout = socketTimeout;
+ }
+
public Boolean getAutowiredEnabled() {
return autowiredEnabled;
}
@@ -133,14 +165,6 @@ public class ElasticsearchComponentConfiguration
this.client = client;
}
- public Integer getConnectionTimeout() {
- return connectionTimeout;
- }
-
- public void setConnectionTimeout(Integer connectionTimeout) {
- this.connectionTimeout = connectionTimeout;
- }
-
public Boolean getEnableSniffer() {
return enableSniffer;
}
@@ -149,22 +173,6 @@ public class ElasticsearchComponentConfiguration
this.enableSniffer = enableSniffer;
}
- public String getHostAddresses() {
- return hostAddresses;
- }
-
- public void setHostAddresses(String hostAddresses) {
- this.hostAddresses = hostAddresses;
- }
-
- public Integer getMaxRetryTimeout() {
- return maxRetryTimeout;
- }
-
- public void setMaxRetryTimeout(Integer maxRetryTimeout) {
- this.maxRetryTimeout = maxRetryTimeout;
- }
-
public Integer getSniffAfterFailureDelay() {
return sniffAfterFailureDelay;
}
@@ -181,14 +189,6 @@ public class ElasticsearchComponentConfiguration
this.snifferInterval = snifferInterval;
}
- public Integer getSocketTimeout() {
- return socketTimeout;
- }
-
- public void setSocketTimeout(Integer socketTimeout) {
- this.socketTimeout = socketTimeout;
- }
-
public Boolean getEnableSSL() {
return enableSSL;
}
diff --git
a/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
b/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
index af4d25e..c98bf8a 100644
--- a/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
+++ b/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
@@ -43,7 +43,7 @@
"type": "java.lang.String",
"description": "Salesforce API version.",
"sourceType":
"org.apache.camel.component.salesforce.springboot.SalesforceComponentConfiguration",
- "defaultValue": "50.0"
+ "defaultValue": "53.0"
},
{
"name": "camel.component.salesforce.authentication-type",
@@ -127,6 +127,13 @@
"sourceType":
"org.apache.camel.component.salesforce.springboot.SalesforceComponentConfiguration"
},
{
+ "name": "camel.component.salesforce.fall-back-replay-id",
+ "type": "java.lang.Long",
+ "description": "ReplayId to fall back to after an Invalid Replay Id
response",
+ "sourceType":
"org.apache.camel.component.salesforce.springboot.SalesforceComponentConfiguration",
+ "defaultValue": -1
+ },
+ {
"name": "camel.component.salesforce.format",
"type": "org.apache.camel.component.salesforce.internal.PayloadFormat",
"description": "Payload format to use for Salesforce API calls, either
JSON or XML, defaults to JSON. As of Camel 3.12, this option only applies to
the Raw operation.",
diff --git
a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index 4ceb028..0c2a2f4 100644
---
a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++
b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -63,7 +63,7 @@ public class SalesforceComponentConfiguration
/**
* Salesforce API version.
*/
- private String apiVersion = "50.0";
+ private String apiVersion = "53.0";
/**
* Backoff interval increment for Streaming connection restart attempts for
* failures beyond CometD auto-reconnect. The option is a long type.
@@ -82,6 +82,10 @@ public class SalesforceComponentConfiguration
*/
private Long defaultReplayId = -1L;
/**
+ * ReplayId to fall back to after an Invalid Replay Id response
+ */
+ private Long fallBackReplayId = -1L;
+ /**
* Payload format to use for Salesforce API calls, either JSON or XML,
* defaults to JSON. As of Camel 3.12, this option only applies to the Raw
* operation.
@@ -569,6 +573,14 @@ public class SalesforceComponentConfiguration
this.defaultReplayId = defaultReplayId;
}
+ public Long getFallBackReplayId() {
+ return fallBackReplayId;
+ }
+
+ public void setFallBackReplayId(Long fallBackReplayId) {
+ this.fallBackReplayId = fallBackReplayId;
+ }
+
public PayloadFormat getFormat() {
return format;
}
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 3dee0d0..3441b60 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4531,7 +4531,7 @@
<dependency>
<groupId>org.knowm.xchange</groupId>
<artifactId>xchange-core</artifactId>
- <version>5.0.11</version>
+ <version>5.0.12</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
