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 bcd0fd61425 Regen
bcd0fd61425 is described below
commit bcd0fd6142563883a54ab91f9fa65149ba583a3e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed May 18 07:16:41 2022 +0200
Regen
---
.../catalog/components/azure-storage-blob.json | 6 ++++--
.../src/main/docs/azure-storage-blob.json | 8 +++++++-
.../blob/springboot/BlobComponentConfiguration.java | 17 +++++++++++++++--
3 files changed, 26 insertions(+), 5 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 a319000d8d6..9a10c4cb72d 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
@@ -22,12 +22,13 @@
"lenientProperties": false
},
"componentProperties": {
- "blobName": { "kind": "property", "displayName": "Blob Name", "group":
"common", "label": "common", "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": "The blob name, to
consume specific blob from a container. However on producer, is only required
for the operations on [...]
+ "blobName": { "kind": "property", "displayName": "Blob Name", "group":
"common", "label": "common", "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": "The blob name, to
consume specific blob from a container. However, on producer it is only
required for the operations [...]
"blobOffset": { "kind": "property", "displayName": "Blob Offset", "group":
"common", "label": "common", "required": false, "type": "integer", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 0, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Set the blob offset for
the upload or download operations, default is 0" },
"blobType": { "kind": "property", "displayName": "Blob Type", "group":
"common", "label": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.component.azure.storage.blob.BlobType", "enum": [
"blockblob", "appendblob", "pageblob" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "blockblob", "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": [...]
"closeStreamAfterRead": { "kind": "property", "displayName": "Close Stream
After Read", "group": "common", "label": "", "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
read or keep it open, default is true" },
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description": "The
component configurations" },
"credentials": { "kind": "property", "displayName": "Credentials",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.azure.storage.common.StorageSharedKeyCredential",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description":
"StorageSharedKeyCredential can be injected to create the azure client, this
holds t [...]
+ "credentialType": { "kind": "property", "displayName": "Credential Type",
"group": "common", "label": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.component.azure.storage.blob.CredentialType",
"enum": [ "SHARED_ACCOUNT_KEY", "SHARED_KEY_CREDENTIAL", "AZURE_IDENTITY" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"AZURE_IDENTITY", "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration", "conf [...]
"dataCount": { "kind": "property", "displayName": "Data Count", "group":
"common", "label": "common", "required": false, "type": "integer", "javaType":
"java.lang.Long", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "How many bytes to
include in the range. Must be greater than or equal to 0 if specified." },
"fileDir": { "kind": "property", "displayName": "File Dir", "group":
"common", "label": "common", "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": "The file directory where
the downloaded blobs will be saved to, this can be used in both, producer and
consumer" },
"maxResultsPerPage": { "kind": "property", "displayName": "Max Results Per
Page", "group": "common", "label": "common", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Specifies the maximum
number of blobs to return, including all BlobPrefix elements. If the requ [...]
@@ -121,12 +122,13 @@
"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" },
"containerName": { "kind": "path", "displayName": "Container 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": "The blob container name"
},
- "blobName": { "kind": "parameter", "displayName": "Blob Name", "group":
"common", "label": "common", "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": "The blob name, to
consume specific blob from a container. However on producer, is only required
for the operations o [...]
+ "blobName": { "kind": "parameter", "displayName": "Blob Name", "group":
"common", "label": "common", "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": "The blob name, to
consume specific blob from a container. However, on producer it is only
required for the operation [...]
"blobOffset": { "kind": "parameter", "displayName": "Blob Offset",
"group": "common", "label": "common", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 0, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Set the blob offset for
the upload or download operations, default is 0" },
"blobServiceClient": { "kind": "parameter", "displayName": "Blob Service
Client", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.azure.storage.blob.BlobServiceClient", "deprecated": false,
"autowired": false, "secret": false, "description": "Client to a storage
account. This client does not hold any state about a particular storage account
but is instead a convenient way of sending off appropriate requests to the
resource on the service. It may [...]
"blobType": { "kind": "parameter", "displayName": "Blob Type", "group":
"common", "label": "common", "required": false, "type": "object", "javaType":
"org.apache.camel.component.azure.storage.blob.BlobType", "enum": [
"blockblob", "appendblob", "pageblob" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "blockblob", "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": [...]
"closeStreamAfterRead": { "kind": "parameter", "displayName": "Close
Stream After Read", "group": "common", "label": "", "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
read or keep it open, default is true" },
"credentials": { "kind": "parameter", "displayName": "Credentials",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.azure.storage.common.StorageSharedKeyCredential",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description":
"StorageSharedKeyCredential can be injected to create the azure client, this
holds [...]
+ "credentialType": { "kind": "parameter", "displayName": "Credential Type",
"group": "common", "label": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.component.azure.storage.blob.CredentialType",
"enum": [ "SHARED_ACCOUNT_KEY", "SHARED_KEY_CREDENTIAL", "AZURE_IDENTITY" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"AZURE_IDENTITY", "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration", "con [...]
"dataCount": { "kind": "parameter", "displayName": "Data Count", "group":
"common", "label": "common", "required": false, "type": "integer", "javaType":
"java.lang.Long", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "How many bytes to
include in the range. Must be greater than or equal to 0 if specified." },
"fileDir": { "kind": "parameter", "displayName": "File Dir", "group":
"common", "label": "common", "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": "The file directory where
the downloaded blobs will be saved to, this can be used in both, producer and
consumer" },
"maxResultsPerPage": { "kind": "parameter", "displayName": "Max Results
Per Page", "group": "common", "label": "common", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.storage.blob.BlobConfiguration",
"configurationField": "configuration", "description": "Specifies the maximum
number of blobs to return, including all BlobPrefix elements. If the req [...]
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 35c4f0124d5..5f3ee573d99 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
@@ -29,7 +29,7 @@
{
"name": "camel.component.azure-storage-blob.blob-name",
"type": "java.lang.String",
- "description": "The blob name, to consume specific blob from a
container. However on producer, is only required for the operations on the blob
level",
+ "description": "The blob name, to consume specific blob from a
container. However, on producer it is only required for the operations on the
blob level",
"sourceType":
"org.apache.camel.component.azure.storage.blob.springboot.BlobComponentConfiguration"
},
{
@@ -124,6 +124,12 @@
"sourceType":
"org.apache.camel.component.azure.storage.blob.springboot.BlobComponentConfiguration",
"defaultValue": true
},
+ {
+ "name": "camel.component.azure-storage-blob.credential-type",
+ "type": "org.apache.camel.component.azure.storage.blob.CredentialType",
+ "description": "Determines the credential strategy to adopt",
+ "sourceType":
"org.apache.camel.component.azure.storage.blob.springboot.BlobComponentConfiguration"
+ },
{
"name": "camel.component.azure-storage-blob.credentials",
"type": "com.azure.storage.common.StorageSharedKeyCredential",
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 33872b584a8..5a4132cde58 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
@@ -27,6 +27,7 @@ import
org.apache.camel.component.azure.storage.blob.BlobComponent;
import org.apache.camel.component.azure.storage.blob.BlobConfiguration;
import org.apache.camel.component.azure.storage.blob.BlobOperationsDefinition;
import org.apache.camel.component.azure.storage.blob.BlobType;
+import org.apache.camel.component.azure.storage.blob.CredentialType;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -47,8 +48,8 @@ public class BlobComponentConfiguration
*/
private Boolean enabled;
/**
- * The blob name, to consume specific blob from a container. However on
- * producer, is only required for the operations on the blob level
+ * The blob name, to consume specific blob from a container. However, on
+ * producer it is only required for the operations on the blob level
*/
private String blobName;
/**
@@ -75,6 +76,10 @@ public class BlobComponentConfiguration
* com.azure.storage.common.StorageSharedKeyCredential type.
*/
private StorageSharedKeyCredential credentials;
+ /**
+ * Determines the credential strategy to adopt
+ */
+ private CredentialType credentialType = CredentialType.AZURE_IDENTITY;
/**
* How many bytes to include in the range. Must be greater than or equal to
* 0 if specified.
@@ -278,6 +283,14 @@ public class BlobComponentConfiguration
this.credentials = credentials;
}
+ public CredentialType getCredentialType() {
+ return credentialType;
+ }
+
+ public void setCredentialType(CredentialType credentialType) {
+ this.credentialType = credentialType;
+ }
+
public Long getDataCount() {
return dataCount;
}
