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 2021/08/06 04:47:45 UTC
[camel-spring-boot] branch main updated (b89f6d0 -> 6b85989)
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-spring-boot.git.
from b89f6d0 [create-pull-request] automated change
new d3c4e67 Regen
new 6b85989 Regen
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:
.../catalog/components/azure-storage-blob.json | 6 ++
.../springboot/catalog/components/salesforce.json | 1 +
.../springboot/catalog/others/csimple-joor.json | 1 +
.../camel/springboot/catalog/others/lra.json | 1 +
.../src/main/docs/azure-storage-blob-starter.adoc | 5 +-
.../springboot/BlobComponentConfiguration.java | 50 ++++++++++++++++
.../blob/springboot/BlobComponentConverter.java | 4 ++
.../src/main/docs/salesforce-starter.adoc | 3 +-
.../SalesforceComponentConfiguration.java | 13 +++++
.../ROOT/pages/azure-storage-blob-starter.adoc | 5 +-
docs/modules/ROOT/pages/salesforce-starter.adoc | 3 +-
tooling/camel-spring-boot-dependencies/pom.xml | 66 +++++++++++-----------
12 files changed, 121 insertions(+), 37 deletions(-)
[camel-spring-boot] 02/02: Regen
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-spring-boot.git
commit 6b8598955ae376aea5b6625baf305a43e458056f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Aug 6 06:47:30 2021 +0200
Regen
---
.../catalog/components/azure-storage-blob.json | 6 +++
.../springboot/catalog/components/salesforce.json | 1 +
.../src/main/docs/azure-storage-blob-starter.adoc | 5 ++-
.../springboot/BlobComponentConfiguration.java | 50 ++++++++++++++++++++++
.../blob/springboot/BlobComponentConverter.java | 4 ++
.../src/main/docs/salesforce-starter.adoc | 3 +-
.../SalesforceComponentConfiguration.java | 13 ++++++
.../ROOT/pages/azure-storage-blob-starter.adoc | 5 ++-
docs/modules/ROOT/pages/salesforce-starter.adoc | 3 +-
9 files changed, 86 insertions(+), 4 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 78c5be1..1a9f34a 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
@@ -39,6 +39,9 @@
"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 [...]
"blobSequenceNumber": { "kind": "property", "displayName": "Blob Sequence Number", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "A user-controlled value that you can use to track requests. The value of [...]
"blockListType": { "kind": "property", "displayName": "Block List Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.azure.storage.blob.models.BlockListType", "enum": [ "committed", "uncommitted", "all" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "COMMITTED", "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": [...]
+ "changeFeedContext": { "kind": "property", "displayName": "Change Feed Context", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.azure.core.util.Context", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When using getChangeFeed producer operation, this gives additional context that is [...]
+ "changeFeedEndTime": { "kind": "property", "displayName": "Change Feed End Time", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.time.OffsetDateTime", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When using getChangeFeed producer operation, this filters the results to return event [...]
+ "changeFeedStartTime": { "kind": "property", "displayName": "Change Feed Start Time", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.time.OffsetDateTime", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When using getChangeFeed producer operation, this filters the results to return e [...]
"closeStreamAfterWrite": { "kind": "property", "displayName": "Close Stream After Write", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "Close the stream after write or keep it open, default is true" },
"commitBlockListLater": { "kind": "property", "displayName": "Commit Block List Later", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When is set to true, the staged blocks will not be committed directly." },
"createAppendBlob": { "kind": "property", "displayName": "Create Append Blob", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When is set to true, the append blocks will be created when committing append blocks." },
@@ -74,6 +77,9 @@
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation [...]
"blobSequenceNumber": { "kind": "parameter", "displayName": "Blob Sequence Number", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "A user-controlled value that you can use to track requests. The value o [...]
"blockListType": { "kind": "parameter", "displayName": "Block List Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.azure.storage.blob.models.BlockListType", "enum": [ "committed", "uncommitted", "all" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "COMMITTED", "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": [...]
+ "changeFeedContext": { "kind": "parameter", "displayName": "Change Feed Context", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.azure.core.util.Context", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When using getChangeFeed producer operation, this gives additional context that is [...]
+ "changeFeedEndTime": { "kind": "parameter", "displayName": "Change Feed End Time", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.time.OffsetDateTime", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When using getChangeFeed producer operation, this filters the results to return even [...]
+ "changeFeedStartTime": { "kind": "parameter", "displayName": "Change Feed Start Time", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.time.OffsetDateTime", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When using getChangeFeed producer operation, this filters the results to return [...]
"closeStreamAfterWrite": { "kind": "parameter", "displayName": "Close Stream After Write", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "Close the stream after write or keep it open, default is true" },
"commitBlockListLater": { "kind": "parameter", "displayName": "Commit Block List Later", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When is set to true, the staged blocks will not be committed directly." },
"createAppendBlob": { "kind": "parameter", "displayName": "Create Append Blob", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.azure.storage.blob.BlobConfiguration", "configurationField": "configuration", "description": "When is set to true, the append blocks will be created when committing append blo [...]
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 27ada11..ad58271 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
@@ -98,6 +98,7 @@
"httpProxyUseDigestAuth": { "kind": "property", "displayName": "Http Proxy Use Digest Auth", "group": "security", "label": "common,proxy,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true Digest authentication will be used when authenticating to the HTTP proxy, otherwise Basic authorization method will be used" },
"httpProxyUsername": { "kind": "property", "displayName": "Http Proxy Username", "group": "security", "label": "common,proxy,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Username to use to authenticate against the HTTP proxy server." },
"instanceUrl": { "kind": "property", "displayName": "Instance Url", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "URL of the Salesforce instance used after authentication, by default received from Salesforce on successful authentication" },
+ "jwtAudience": { "kind": "property", "displayName": "Jwt Audience", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Value to use for the Audience claim (aud) when using OAuth JWT flow. If not set, the login URL will be used, which is appropriate in most cases." },
"keystore": { "kind": "property", "displayName": "Keystore", "group": "security", "label": "common,security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.KeyStoreParameters", "deprecated": false, "autowired": false, "secret": true, "description": "KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only one entry with private key and certificate. Salesforce does not verify the certificate chain, so this can easily be a selfsig [...]
"lazyLogin": { "kind": "property", "displayName": "Lazy Login", "group": "security", "label": "common,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true prevents the component from authenticating to Salesforce with the start of the component. You would generally set this to the (default) false and authenticate early and be immediately aware of any authe [...]
"loginConfig": { "kind": "property", "displayName": "Login Config", "group": "security", "label": "common,security", "required": false, "type": "object", "javaType": "org.apache.camel.component.salesforce.SalesforceLoginConfig", "deprecated": false, "autowired": false, "secret": false, "description": "All authentication configuration in one nested bean, all properties set there can be set directly on the component as well" },
diff --git a/components-starter/camel-azure-storage-blob-starter/src/main/docs/azure-storage-blob-starter.adoc b/components-starter/camel-azure-storage-blob-starter/src/main/docs/azure-storage-blob-starter.adoc
index aba93d7..224bd9f 100644
--- a/components-starter/camel-azure-storage-blob-starter/src/main/docs/azure-storage-blob-starter.adoc
+++ b/components-starter/camel-azure-storage-blob-starter/src/main/docs/azure-storage-blob-starter.adoc
@@ -17,7 +17,7 @@ When using azure-storage-blob with Spring Boot make sure to use the following Ma
----
-The component supports 28 options, which are listed below.
+The component supports 31 options, which are listed below.
@@ -32,6 +32,9 @@ The component supports 28 options, which are listed below.
| *camel.component.azure-storage-blob.blob-type* | The blob type in order to initiate the appropriate settings for each blob type | | BlobType
| *camel.component.azure-storage-blob.block-list-type* | Specifies which type of blocks to return. | | BlockListType
| *camel.component.azure-storage-blob.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
+| *camel.component.azure-storage-blob.change-feed-context* | When using getChangeFeed producer operation, this gives additional context that is passed through the Http pipeline during the service call. The option is a com.azure.core.util.Context type. | | Context
+| *camel.component.azure-storage-blob.change-feed-end-time* | When using getChangeFeed producer operation, this filters the results to return events approximately before the end time. Note: A few events belonging to the next hour can also be returned. A few events belonging to this hour can be missing; to ensure all events from the hour are returned, round the end time up by an hour. The option is a java.time.OffsetDateTime type. | | OffsetDateTime
+| *camel.component.azure-storage-blob.change-feed-start-time* | When using getChangeFeed producer operation, this filters the results to return events approximately after the start time. Note: A few events belonging to the previous hour can also be returned. A few events belonging to this hour can be missing; to ensure all events from the hour are returned, round the start time down by an hour. The option is a java.time.OffsetDateTime type. | | OffsetDateTime
| *camel.component.azure-storage-blob.close-stream-after-read* | Close the stream after read or keep it open, default is true | true | Boolean
| *camel.component.azure-storage-blob.close-stream-after-write* | Close the stream after write or keep it open, default is true | true | Boolean
| *camel.component.azure-storage-blob.commit-block-list-later* | When is set to true, the staged blocks will not be committed directly. | true | Boolean
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 05e32da..174f391 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
@@ -17,7 +17,9 @@
package org.apache.camel.component.azure.storage.blob.springboot;
import java.time.Duration;
+import java.time.OffsetDateTime;
import javax.annotation.Generated;
+import com.azure.core.util.Context;
import com.azure.storage.blob.BlobServiceClient;
import com.azure.storage.blob.models.BlockListType;
import com.azure.storage.common.StorageSharedKeyCredential;
@@ -142,6 +144,30 @@ public class BlobComponentConfiguration
*/
private BlockListType blockListType = BlockListType.COMMITTED;
/**
+ * When using getChangeFeed producer operation, this gives additional
+ * context that is passed through the Http pipeline during the service call.
+ * The option is a com.azure.core.util.Context type.
+ */
+ private Context changeFeedContext;
+ /**
+ * When using getChangeFeed producer operation, this filters the results to
+ * return events approximately before the end time. Note: A few events
+ * belonging to the next hour can also be returned. A few events belonging
+ * to this hour can be missing; to ensure all events from the hour are
+ * returned, round the end time up by an hour. The option is a
+ * java.time.OffsetDateTime type.
+ */
+ private OffsetDateTime changeFeedEndTime;
+ /**
+ * When using getChangeFeed producer operation, this filters the results to
+ * return events approximately after the start time. Note: A few events
+ * belonging to the previous hour can also be returned. A few events
+ * belonging to this hour can be missing; to ensure all events from the hour
+ * are returned, round the start time down by an hour. The option is a
+ * java.time.OffsetDateTime type.
+ */
+ private OffsetDateTime changeFeedStartTime;
+ /**
* Close the stream after write or keep it open, default is true
*/
private Boolean closeStreamAfterWrite = true;
@@ -334,6 +360,30 @@ public class BlobComponentConfiguration
this.blockListType = blockListType;
}
+ public Context getChangeFeedContext() {
+ return changeFeedContext;
+ }
+
+ public void setChangeFeedContext(Context changeFeedContext) {
+ this.changeFeedContext = changeFeedContext;
+ }
+
+ public OffsetDateTime getChangeFeedEndTime() {
+ return changeFeedEndTime;
+ }
+
+ public void setChangeFeedEndTime(OffsetDateTime changeFeedEndTime) {
+ this.changeFeedEndTime = changeFeedEndTime;
+ }
+
+ public OffsetDateTime getChangeFeedStartTime() {
+ return changeFeedStartTime;
+ }
+
+ public void setChangeFeedStartTime(OffsetDateTime changeFeedStartTime) {
+ this.changeFeedStartTime = changeFeedStartTime;
+ }
+
public Boolean getCloseStreamAfterWrite() {
return closeStreamAfterWrite;
}
diff --git a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConverter.java b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConverter.java
index d8ae596..92a7a0c 100644
--- a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConverter.java
+++ b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConverter.java
@@ -45,6 +45,8 @@ public class BlobComponentConverter implements GenericConverter {
answer.add(new ConvertiblePair(String.class, com.azure.storage.common.StorageSharedKeyCredential.class));
answer.add(new ConvertiblePair(String.class, com.azure.storage.blob.BlobServiceClient.class));
answer.add(new ConvertiblePair(String.class, java.time.Duration.class));
+ answer.add(new ConvertiblePair(String.class, com.azure.core.util.Context.class));
+ answer.add(new ConvertiblePair(String.class, java.time.OffsetDateTime.class));
return answer;
}
@@ -65,6 +67,8 @@ public class BlobComponentConverter implements GenericConverter {
case "com.azure.storage.common.StorageSharedKeyCredential": return applicationContext.getBean(ref, com.azure.storage.common.StorageSharedKeyCredential.class);
case "com.azure.storage.blob.BlobServiceClient": return applicationContext.getBean(ref, com.azure.storage.blob.BlobServiceClient.class);
case "java.time.Duration": return applicationContext.getBean(ref, java.time.Duration.class);
+ case "com.azure.core.util.Context": return applicationContext.getBean(ref, com.azure.core.util.Context.class);
+ case "java.time.OffsetDateTime": return applicationContext.getBean(ref, java.time.OffsetDateTime.class);
}
return null;
}
diff --git a/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc b/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc
index c14122a..d164fe3 100644
--- a/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc
+++ b/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc
@@ -17,7 +17,7 @@ When using salesforce with Spring Boot make sure to use the following Maven depe
----
-The component supports 85 options, which are listed below.
+The component supports 86 options, which are listed below.
@@ -64,6 +64,7 @@ The component supports 85 options, which are listed below.
| *camel.component.salesforce.instance-id* | Salesforce1 Analytics report execution instance ID | | String
| *camel.component.salesforce.instance-url* | URL of the Salesforce instance used after authentication, by default received from Salesforce on successful authentication | | String
| *camel.component.salesforce.job-id* | Bulk API Job ID | | String
+| *camel.component.salesforce.jwt-audience* | Value to use for the Audience claim (aud) when using OAuth JWT flow. If not set, the login URL will be used, which is appropriate in most cases. | | String
| *camel.component.salesforce.keystore* | KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only one entry with private key and certificate. Salesforce does not verify the certificate chain, so this can easily be a selfsigned certificate. Make sure that you upload the certificate to the corresponding connected app. The option is a org.apache.camel.support.jsse.KeyStoreParameters type. | | KeyStoreParameters
| *camel.component.salesforce.lazy-login* | If set to true prevents the component from authenticating to Salesforce with the start of the component. You would generally set this to the (default) false and authenticate early and be immediately aware of any authentication issues. | false | Boolean
| *camel.component.salesforce.lazy-start-producer* | 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 and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...]
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 4d8c3dd..6f8439e 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
@@ -424,6 +424,11 @@ public class SalesforceComponentConfiguration
*/
private String instanceUrl;
/**
+ * Value to use for the Audience claim (aud) when using OAuth JWT flow. If
+ * not set, the login URL will be used, which is appropriate in most cases.
+ */
+ private String jwtAudience;
+ /**
* KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain
* only one entry with private key and certificate. Salesforce does not
* verify the certificate chain, so this can easily be a selfsigned
@@ -1089,6 +1094,14 @@ public class SalesforceComponentConfiguration
this.instanceUrl = instanceUrl;
}
+ public String getJwtAudience() {
+ return jwtAudience;
+ }
+
+ public void setJwtAudience(String jwtAudience) {
+ this.jwtAudience = jwtAudience;
+ }
+
public KeyStoreParameters getKeystore() {
return keystore;
}
diff --git a/docs/modules/ROOT/pages/azure-storage-blob-starter.adoc b/docs/modules/ROOT/pages/azure-storage-blob-starter.adoc
index aba93d7..224bd9f 100644
--- a/docs/modules/ROOT/pages/azure-storage-blob-starter.adoc
+++ b/docs/modules/ROOT/pages/azure-storage-blob-starter.adoc
@@ -17,7 +17,7 @@ When using azure-storage-blob with Spring Boot make sure to use the following Ma
----
-The component supports 28 options, which are listed below.
+The component supports 31 options, which are listed below.
@@ -32,6 +32,9 @@ The component supports 28 options, which are listed below.
| *camel.component.azure-storage-blob.blob-type* | The blob type in order to initiate the appropriate settings for each blob type | | BlobType
| *camel.component.azure-storage-blob.block-list-type* | Specifies which type of blocks to return. | | BlockListType
| *camel.component.azure-storage-blob.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
+| *camel.component.azure-storage-blob.change-feed-context* | When using getChangeFeed producer operation, this gives additional context that is passed through the Http pipeline during the service call. The option is a com.azure.core.util.Context type. | | Context
+| *camel.component.azure-storage-blob.change-feed-end-time* | When using getChangeFeed producer operation, this filters the results to return events approximately before the end time. Note: A few events belonging to the next hour can also be returned. A few events belonging to this hour can be missing; to ensure all events from the hour are returned, round the end time up by an hour. The option is a java.time.OffsetDateTime type. | | OffsetDateTime
+| *camel.component.azure-storage-blob.change-feed-start-time* | When using getChangeFeed producer operation, this filters the results to return events approximately after the start time. Note: A few events belonging to the previous hour can also be returned. A few events belonging to this hour can be missing; to ensure all events from the hour are returned, round the start time down by an hour. The option is a java.time.OffsetDateTime type. | | OffsetDateTime
| *camel.component.azure-storage-blob.close-stream-after-read* | Close the stream after read or keep it open, default is true | true | Boolean
| *camel.component.azure-storage-blob.close-stream-after-write* | Close the stream after write or keep it open, default is true | true | Boolean
| *camel.component.azure-storage-blob.commit-block-list-later* | When is set to true, the staged blocks will not be committed directly. | true | Boolean
diff --git a/docs/modules/ROOT/pages/salesforce-starter.adoc b/docs/modules/ROOT/pages/salesforce-starter.adoc
index c14122a..d164fe3 100644
--- a/docs/modules/ROOT/pages/salesforce-starter.adoc
+++ b/docs/modules/ROOT/pages/salesforce-starter.adoc
@@ -17,7 +17,7 @@ When using salesforce with Spring Boot make sure to use the following Maven depe
----
-The component supports 85 options, which are listed below.
+The component supports 86 options, which are listed below.
@@ -64,6 +64,7 @@ The component supports 85 options, which are listed below.
| *camel.component.salesforce.instance-id* | Salesforce1 Analytics report execution instance ID | | String
| *camel.component.salesforce.instance-url* | URL of the Salesforce instance used after authentication, by default received from Salesforce on successful authentication | | String
| *camel.component.salesforce.job-id* | Bulk API Job ID | | String
+| *camel.component.salesforce.jwt-audience* | Value to use for the Audience claim (aud) when using OAuth JWT flow. If not set, the login URL will be used, which is appropriate in most cases. | | String
| *camel.component.salesforce.keystore* | KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only one entry with private key and certificate. Salesforce does not verify the certificate chain, so this can easily be a selfsigned certificate. Make sure that you upload the certificate to the corresponding connected app. The option is a org.apache.camel.support.jsse.KeyStoreParameters type. | | KeyStoreParameters
| *camel.component.salesforce.lazy-login* | If set to true prevents the component from authenticating to Salesforce with the start of the component. You would generally set this to the (default) false and authenticate early and be immediately aware of any authentication issues. | false | Boolean
| *camel.component.salesforce.lazy-start-producer* | 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 and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...]
[camel-spring-boot] 01/02: Regen
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-spring-boot.git
commit d3c4e67e19ec16cbd114152b9744be3c76d482d5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Aug 6 06:38:33 2021 +0200
Regen
---
.../springboot/catalog/others/csimple-joor.json | 1 +
.../camel/springboot/catalog/others/lra.json | 1 +
tooling/camel-spring-boot-dependencies/pom.xml | 66 +++++++++++-----------
3 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/csimple-joor.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/csimple-joor.json
index cdfb1a3..d70cba9 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/csimple-joor.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/csimple-joor.json
@@ -6,6 +6,7 @@
"description": "jOOR compiler for csimple language",
"deprecated": false,
"firstVersion": "3.7.0",
+ "label": "dlanguage,java",
"supportLevel": "Stable",
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-csimple-joor-starter",
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/lra.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/lra.json
index 1025a38..4642f4c 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/lra.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/lra.json
@@ -6,6 +6,7 @@
"description": "Camel saga binding for Long-Running-Action framework",
"deprecated": false,
"firstVersion": "2.21.0",
+ "label": "database, microservice",
"supportLevel": "Preview",
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-lra-starter",
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 6e53d59..92fa32e 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4741,177 +4741,177 @@
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-distribution</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-docs</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-examples</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-common</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-common</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jackson</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jackson</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jaxb</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jaxb</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jpa</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jpa</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jsonb</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jsonb</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-xstream</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-xstream</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-benchmark</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-benchmark-deployment</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-deployment</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-integration-test</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-deployment</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-integration-test</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-spring-boot-autoconfigure</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-spring-boot-starter</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-test</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-test</artifactId>
- <version>8.9.0.Final</version>
+ <version>8.9.1.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>