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 396d716fa0f Regen 396d716fa0f is described below commit 396d716fa0f1bb35e3cf3bdd5b8afd86f98b2677 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Dec 14 12:48:58 2023 +0100 Regen --- .../springboot/catalog/components/azure-cosmosdb.json | 4 ++-- .../springboot/catalog/components/azure-eventhubs.json | 14 ++++++++------ .../org/apache/camel/springboot/catalog/others.properties | 1 + .../apache/camel/springboot/catalog/others/groovy-dsl.json | 2 +- .../catalog/others/{groovy-dsl.json => kotlin-dsl.json} | 8 ++++---- .../springboot/CosmosDbComponentConfiguration.java | 2 +- .../src/main/docs/azure-eventhubs.json | 6 ++++++ .../springboot/EventHubsComponentConfiguration.java | 13 +++++++++++++ tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++ 9 files changed, 41 insertions(+), 14 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 0e993ad001e..12e92e48bf7 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 [...] - "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 [...] + "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": "SHARED_ACCOUNT_KEY", "configurationClass": "org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration", "configuratio [...] }, "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 [...] - "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 [...] + "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": "SHARED_ACCOUNT_KEY", "configurationClass": "org.apache.camel.component.azure.cosmosdb.CosmosDbConfiguration", "configurati [...] } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-eventhubs.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-eventhubs.json index 87735c3c825..376d3b88649 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-eventhubs.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-eventhubs.json @@ -42,9 +42,10 @@ "producerAsyncClient": { "index": 17, "kind": "property", "displayName": "Producer Async Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.azure.messaging.eventhubs.EventHubProducerAsyncClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "Sets the Eve [...] "autowiredEnabled": { "index": 18, "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 [...] "connectionString": { "index": 19, "kind": "property", "displayName": "Connection String", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "Instead of supplying namespace, sharedAccessKey, sharedAccessName ... etc, you can [...] - "sharedAccessKey": { "index": 20, "kind": "property", "displayName": "Shared 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.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "The generated value for the SharedAccessName." }, - "sharedAccessName": { "index": 21, "kind": "property", "displayName": "Shared Access Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "The name you chose for your EventHubs SAS keys." }, - "tokenCredential": { "index": 22, "kind": "property", "displayName": "Token Credential", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "com.azure.core.credential.TokenCredential", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "Still another way of authentication (beside supplying namesp [...] + "credentialType": { "index": 20, "kind": "property", "displayName": "Credential Type", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.component.azure.eventhubs.CredentialType", "enum": [ "AZURE_IDENTITY", "CONNECTION_STRING", "TOKEN_CREDENTIAL" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CONNECTION_STRING", "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfigur [...] + "sharedAccessKey": { "index": 21, "kind": "property", "displayName": "Shared 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.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "The generated value for the SharedAccessName." }, + "sharedAccessName": { "index": 22, "kind": "property", "displayName": "Shared Access Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "The name you chose for your EventHubs SAS keys." }, + "tokenCredential": { "index": 23, "kind": "property", "displayName": "Token Credential", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "com.azure.core.credential.TokenCredential", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "Still another way of authentication (beside supplying namesp [...] }, "headers": { "CamelAzureEventHubsPartitionKey": { "index": 0, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "(producer) Overrides the hashing key to be provided for the batch of events, which instructs the Event Hubs service to map this key to a specific partition. (consumer) It sets the partition hashing key if it was set when originally [...] @@ -79,8 +80,9 @@ "producerAsyncClient": { "index": 19, "kind": "parameter", "displayName": "Producer Async Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.azure.messaging.eventhubs.EventHubProducerAsyncClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "Sets the Ev [...] "lazyStartProducer": { "index": 20, "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 [...] "connectionString": { "index": 21, "kind": "parameter", "displayName": "Connection String", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "Instead of supplying namespace, sharedAccessKey, sharedAccessName ... etc, you can [...] - "sharedAccessKey": { "index": 22, "kind": "parameter", "displayName": "Shared 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.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "The generated value for the SharedAccessName." }, - "sharedAccessName": { "index": 23, "kind": "parameter", "displayName": "Shared Access Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "The name you chose for your EventHubs SAS keys." }, - "tokenCredential": { "index": 24, "kind": "parameter", "displayName": "Token Credential", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "com.azure.core.credential.TokenCredential", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "Still another way of authentication (beside supplying names [...] + "credentialType": { "index": 22, "kind": "parameter", "displayName": "Credential Type", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.component.azure.eventhubs.CredentialType", "enum": [ "AZURE_IDENTITY", "CONNECTION_STRING", "TOKEN_CREDENTIAL" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CONNECTION_STRING", "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfigu [...] + "sharedAccessKey": { "index": 23, "kind": "parameter", "displayName": "Shared 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.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "The generated value for the SharedAccessName." }, + "sharedAccessName": { "index": 24, "kind": "parameter", "displayName": "Shared Access Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "The name you chose for your EventHubs SAS keys." }, + "tokenCredential": { "index": 25, "kind": "parameter", "displayName": "Token Credential", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "com.azure.core.credential.TokenCredential", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration", "configurationField": "configuration", "description": "Still another way of authentication (beside supplying names [...] } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties index 240ffc8defe..7e33c529ea6 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties @@ -15,6 +15,7 @@ java-joor-dsl jfr js-dsl jsh-dsl +kotlin-dsl leveldb lra mail-microsoft-oauth diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/groovy-dsl.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/groovy-dsl.json index 19be56aaed2..ebfb9e6279a 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/groovy-dsl.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/groovy-dsl.json @@ -2,7 +2,7 @@ "other": { "kind": "other", "name": "groovy-dsl", - "title": "Groovy Dsl", + "title": "Groovy DSL", "description": "Camel DSL with Groovy", "deprecated": false, "firstVersion": "3.9.0", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/groovy-dsl.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-dsl.json similarity index 61% copy from catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/groovy-dsl.json copy to catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-dsl.json index 19be56aaed2..dc25e863fbc 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/groovy-dsl.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-dsl.json @@ -1,15 +1,15 @@ { "other": { "kind": "other", - "name": "groovy-dsl", - "title": "Groovy Dsl", - "description": "Camel DSL with Groovy", + "name": "kotlin-dsl", + "title": "Kotlin DSL", + "description": "Camel DSL with Kotlin", "deprecated": false, "firstVersion": "3.9.0", "label": "dsl", "supportLevel": "Experimental", "groupId": "org.apache.camel.springboot", - "artifactId": "camel-groovy-dsl-starter", + "artifactId": "camel-kotlin-dsl-starter", "version": "4.3.0-SNAPSHOT" } } 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 99366d5cc75..37dc6719f39 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 @@ -263,7 +263,7 @@ public class CosmosDbComponentConfiguration /** * Determines the credential strategy to adopt */ - private CredentialType credentialType = CredentialType.AZURE_IDENTITY; + private CredentialType credentialType = CredentialType.SHARED_ACCOUNT_KEY; public Boolean getClientTelemetryEnabled() { return clientTelemetryEnabled; diff --git a/components-starter/camel-azure-eventhubs-starter/src/main/docs/azure-eventhubs.json b/components-starter/camel-azure-eventhubs-starter/src/main/docs/azure-eventhubs.json index b92d68318e4..f314dc0e27e 100644 --- a/components-starter/camel-azure-eventhubs-starter/src/main/docs/azure-eventhubs.json +++ b/components-starter/camel-azure-eventhubs-starter/src/main/docs/azure-eventhubs.json @@ -102,6 +102,12 @@ "sourceType": "org.apache.camel.component.azure.eventhubs.springboot.EventHubsComponentConfiguration", "defaultValue": "$Default" }, + { + "name": "camel.component.azure-eventhubs.credential-type", + "type": "org.apache.camel.component.azure.eventhubs.CredentialType", + "description": "Determines the credential strategy to adopt", + "sourceType": "org.apache.camel.component.azure.eventhubs.springboot.EventHubsComponentConfiguration" + }, { "name": "camel.component.azure-eventhubs.customizer.enabled", "type": "java.lang.Boolean", diff --git a/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentConfiguration.java b/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentConfiguration.java index e5b38801f19..aa1abf49ab2 100644 --- a/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentConfiguration.java +++ b/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentConfiguration.java @@ -24,6 +24,7 @@ import com.azure.messaging.eventhubs.CheckpointStore; import com.azure.messaging.eventhubs.EventHubProducerAsyncClient; import com.azure.messaging.eventhubs.models.EventPosition; import com.azure.storage.common.StorageSharedKeyCredential; +import org.apache.camel.component.azure.eventhubs.CredentialType; import org.apache.camel.component.azure.eventhubs.EventHubsComponent; import org.apache.camel.component.azure.eventhubs.EventHubsConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; @@ -197,6 +198,10 @@ public class EventHubsComponentConfiguration * https://docs.microsoft.com/en-us/azure/event-hubs/event-hubs-get-connection-string */ private String connectionString; + /** + * Determines the credential strategy to adopt + */ + private CredentialType credentialType = CredentialType.CONNECTION_STRING; /** * The generated value for the SharedAccessName. */ @@ -376,6 +381,14 @@ public class EventHubsComponentConfiguration this.connectionString = connectionString; } + public CredentialType getCredentialType() { + return credentialType; + } + + public void setCredentialType(CredentialType credentialType) { + this.credentialType = credentialType; + } + public String getSharedAccessKey() { return sharedAccessKey; } diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 5af2d3bc79b..f977d6ee431 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -3214,6 +3214,11 @@ <artifactId>camel-knative-http</artifactId> <version>4.3.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-kotlin-dsl</artifactId> + <version>4.3.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-kubernetes</artifactId>