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 b20227afa2c Regen
b20227afa2c is described below
commit b20227afa2c33de4938be03c62aab2cdf00d6b34
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Dec 13 13:23:47 2023 +0100
Regen
---
.../springboot/catalog/components/azure-cosmosdb.json | 4 ++--
.../src/main/docs/azure-cosmosdb.json | 13 ++++++-------
.../springboot/CosmosDbComponentConfiguration.java | 14 +++++++-------
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-cosmosdb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-cosmosdb.json
index 9daa183e894..0e993ad001e 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-cosmosdb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-cosmosdb.json
@@ -52,7 +52,7 @@
"indexingPolicy": { "index": 27, "kind": "property", "displayName":
"Indexing Policy", "group": " advanced", "label": "common, advanced",
"required": false, "type": "object", "javaType":
"com.azure.cosmos.models.IndexingPolicy", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "The CosmosDB Indexing
Policy that will be set in case of [...]
"autowiredEnabled": { "index": 28, "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 [...]
"accountKey": { "index": 29, "kind": "property", "displayName": "Account
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": true,
"configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets either a master or
readonly key used to perform authentication for ac [...]
- "useDefaultIdentity": { "index": 30, "kind": "property", "displayName":
"Use Default Identity", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Indicates whether to use
the default iden [...]
+ "credentialType": { "index": 30, "kind": "property", "displayName":
"Credential Type", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.azure.cosmosdb.CredentialType", "enum": [
"SHARED_ACCOUNT_KEY", "AZURE_IDENTITY" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "AZURE_IDENTITY", "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationFie [...]
},
"properties": {
"databaseName": { "index": 0, "kind": "path", "displayName": "Database
Name", "group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "The name of the Cosmos
database that component should connect to. In case you are producing data and
have c [...]
@@ -87,6 +87,6 @@
"lazyStartProducer": { "index": 29, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a produ [...]
"indexingPolicy": { "index": 30, "kind": "parameter", "displayName":
"Indexing Policy", "group": " advanced", "label": "common, advanced",
"required": false, "type": "object", "javaType":
"com.azure.cosmos.models.IndexingPolicy", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "The CosmosDB Indexing
Policy that will be set in case of [...]
"accountKey": { "index": 31, "kind": "parameter", "displayName": "Account
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": true,
"configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Sets either a master or
readonly key used to perform authentication for a [...]
- "useDefaultIdentity": { "index": 32, "kind": "parameter", "displayName":
"Use Default Identity", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationField": "configuration", "description": "Indicates whether to use
the default ide [...]
+ "credentialType": { "index": 32, "kind": "parameter", "displayName":
"Credential Type", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.azure.cosmosdb.CredentialType", "enum": [
"SHARED_ACCOUNT_KEY", "AZURE_IDENTITY" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "AZURE_IDENTITY", "configurationClass":
"org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration",
"configurationFi [...]
}
}
diff --git
a/components-starter/camel-azure-cosmosdb-starter/src/main/docs/azure-cosmosdb.json
b/components-starter/camel-azure-cosmosdb-starter/src/main/docs/azure-cosmosdb.json
index a338ce6ba17..c99869c9689 100644
---
a/components-starter/camel-azure-cosmosdb-starter/src/main/docs/azure-cosmosdb.json
+++
b/components-starter/camel-azure-cosmosdb-starter/src/main/docs/azure-cosmosdb.json
@@ -112,6 +112,12 @@
"sourceType":
"org.apache.camel.component.azure.cosmosdb.springboot.CosmosDbComponentConfiguration",
"defaultValue": false
},
+ {
+ "name": "camel.component.azure-cosmosdb.credential-type",
+ "type": "org.apache.camel.component.azure.cosmosdb.CredentialType",
+ "description": "Determines the credential strategy to adopt",
+ "sourceType":
"org.apache.camel.component.azure.cosmosdb.springboot.CosmosDbComponentConfiguration"
+ },
{
"name": "camel.component.azure-cosmosdb.customizer.enabled",
"type": "java.lang.Boolean",
@@ -216,13 +222,6 @@
"type": "com.azure.cosmos.models.ThroughputProperties",
"description": "Sets throughput of the resources in the Azure Cosmos DB
service. The option is a com.azure.cosmos.models.ThroughputProperties type.",
"sourceType":
"org.apache.camel.component.azure.cosmosdb.springboot.CosmosDbComponentConfiguration"
- },
- {
- "name": "camel.component.azure-cosmosdb.use-default-identity",
- "type": "java.lang.Boolean",
- "description": "Indicates whether to use the default identity mechanism
instead of the access key.",
- "sourceType":
"org.apache.camel.component.azure.cosmosdb.springboot.CosmosDbComponentConfiguration",
- "defaultValue": false
}
],
"hints": []
diff --git
a/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConfiguration.java
b/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConfiguration.java
index 66c30aded8e..99366d5cc75 100644
---
a/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConfiguration.java
+++
b/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentConfiguration.java
@@ -25,6 +25,7 @@ import com.azure.cosmos.models.ThroughputProperties;
import org.apache.camel.component.azure.cosmosdb.CosmosDbComponent;
import org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration;
import org.apache.camel.component.azure.cosmosdb.CosmosDbOperationsDefinition;
+import org.apache.camel.component.azure.cosmosdb.CredentialType;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -260,10 +261,9 @@ public class CosmosDbComponentConfiguration
*/
private String accountKey;
/**
- * Indicates whether to use the default identity mechanism instead of the
- * access key.
+ * Determines the credential strategy to adopt
*/
- private Boolean useDefaultIdentity = false;
+ private CredentialType credentialType = CredentialType.AZURE_IDENTITY;
public Boolean getClientTelemetryEnabled() {
return clientTelemetryEnabled;
@@ -514,11 +514,11 @@ public class CosmosDbComponentConfiguration
this.accountKey = accountKey;
}
- public Boolean getUseDefaultIdentity() {
- return useDefaultIdentity;
+ public CredentialType getCredentialType() {
+ return credentialType;
}
- public void setUseDefaultIdentity(Boolean useDefaultIdentity) {
- this.useDefaultIdentity = useDefaultIdentity;
+ public void setCredentialType(CredentialType credentialType) {
+ this.credentialType = credentialType;
}
}
\ No newline at end of file
