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 5d932771b3e Regen
5d932771b3e is described below
commit 5d932771b3e08cf8e1cdf8f7b836d9e766b58458
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Dec 15 06:38:03 2023 +0100
Regen
---
.../springboot/catalog/components/azure-servicebus.json | 10 ++++++----
.../src/main/docs/azure-servicebus.json | 6 ++++++
.../springboot/ServiceBusComponentConfiguration.java | 13 +++++++++++++
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json
index 3580d8f564e..932cadcbc3a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json
@@ -46,8 +46,9 @@
"serviceBusTransactionContext": { "index": 21, "kind": "property",
"displayName": "Service Bus Transaction Context", "group": "producer", "label":
"producer", "required": false, "type": "object", "javaType":
"com.azure.messaging.servicebus.ServiceBusTransactionContext", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Represents [...]
"autowiredEnabled": { "index": 22, "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": 23, "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.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Sets the connection
string for a Service Bus namespace or a specific Service Bus [...]
- "fullyQualifiedNamespace": { "index": 24, "kind": "property",
"displayName": "Fully Qualified Namespace", "group": "security", "label":
"security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Fully Qualified
Namespace of the service bus" },
- "tokenCredential": { "index": 25, "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.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "A TokenCredential for
Azure AD authentication." }
+ "credentialType": { "index": 24, "kind": "property", "displayName":
"Credential Type", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.azure.servicebus.CredentialType", "enum": [
"AZURE_IDENTITY", "CONNECTION_STRING", "TOKEN_CREDENTIAL" ], "deprecated":
false, "autowired": false, "secret": false, "defaultValue":
"CONNECTION_STRING", "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfi [...]
+ "fullyQualifiedNamespace": { "index": 25, "kind": "property",
"displayName": "Fully Qualified Namespace", "group": "security", "label":
"security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Fully Qualified
Namespace of the service bus" },
+ "tokenCredential": { "index": 26, "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.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "A TokenCredential for
Azure AD authentication." }
},
"headers": {
"CamelAzureServiceBusApplicationProperties": { "index": 0, "kind":
"header", "displayName": "", "group": "common", "label": "common", "required":
false, "javaType": "Map<String, Object>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
application properties (also known as custom properties) on messages sent and
received by the producer and consumer, respectively.", "constantName":
"org.apache.camel.component.azure.servicebus.Servi [...]
@@ -102,7 +103,8 @@
"serviceBusTransactionContext": { "index": 22, "kind": "parameter",
"displayName": "Service Bus Transaction Context", "group": "producer", "label":
"producer", "required": false, "type": "object", "javaType":
"com.azure.messaging.servicebus.ServiceBusTransactionContext", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Represents [...]
"lazyStartProducer": { "index": 23, "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": 24, "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.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Sets the connection
string for a Service Bus namespace or a specific Service Bus [...]
- "fullyQualifiedNamespace": { "index": 25, "kind": "parameter",
"displayName": "Fully Qualified Namespace", "group": "security", "label":
"security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Fully Qualified
Namespace of the service bus" },
- "tokenCredential": { "index": 26, "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.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "A TokenCredential for
Azure AD authentication." }
+ "credentialType": { "index": 25, "kind": "parameter", "displayName":
"Credential Type", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.azure.servicebus.CredentialType", "enum": [
"AZURE_IDENTITY", "CONNECTION_STRING", "TOKEN_CREDENTIAL" ], "deprecated":
false, "autowired": false, "secret": false, "defaultValue":
"CONNECTION_STRING", "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConf [...]
+ "fullyQualifiedNamespace": { "index": 26, "kind": "parameter",
"displayName": "Fully Qualified Namespace", "group": "security", "label":
"security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Fully Qualified
Namespace of the service bus" },
+ "tokenCredential": { "index": 27, "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.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "A TokenCredential for
Azure AD authentication." }
}
}
diff --git
a/components-starter/camel-azure-servicebus-starter/src/main/docs/azure-servicebus.json
b/components-starter/camel-azure-servicebus-starter/src/main/docs/azure-servicebus.json
index 7be373e3f66..69af7c76318 100644
---
a/components-starter/camel-azure-servicebus-starter/src/main/docs/azure-servicebus.json
+++
b/components-starter/camel-azure-servicebus-starter/src/main/docs/azure-servicebus.json
@@ -70,6 +70,12 @@
"description": "Sets the desired operation to be used in the consumer",
"sourceType":
"org.apache.camel.component.azure.servicebus.springboot.ServiceBusComponentConfiguration"
},
+ {
+ "name": "camel.component.azure-servicebus.credential-type",
+ "type": "org.apache.camel.component.azure.servicebus.CredentialType",
+ "description": "Determines the credential strategy to adopt",
+ "sourceType":
"org.apache.camel.component.azure.servicebus.springboot.ServiceBusComponentConfiguration"
+ },
{
"name": "camel.component.azure-servicebus.customizer.enabled",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-azure-servicebus-starter/src/main/java/org/apache/camel/component/azure/servicebus/springboot/ServiceBusComponentConfiguration.java
b/components-starter/camel-azure-servicebus-starter/src/main/java/org/apache/camel/component/azure/servicebus/springboot/ServiceBusComponentConfiguration.java
index a867d9382eb..963329d30ac 100644
---
a/components-starter/camel-azure-servicebus-starter/src/main/java/org/apache/camel/component/azure/servicebus/springboot/ServiceBusComponentConfiguration.java
+++
b/components-starter/camel-azure-servicebus-starter/src/main/java/org/apache/camel/component/azure/servicebus/springboot/ServiceBusComponentConfiguration.java
@@ -28,6 +28,7 @@ import
com.azure.messaging.servicebus.ServiceBusSenderAsyncClient;
import com.azure.messaging.servicebus.ServiceBusTransactionContext;
import com.azure.messaging.servicebus.models.ServiceBusReceiveMode;
import com.azure.messaging.servicebus.models.SubQueue;
+import org.apache.camel.component.azure.servicebus.CredentialType;
import org.apache.camel.component.azure.servicebus.ServiceBusComponent;
import org.apache.camel.component.azure.servicebus.ServiceBusConfiguration;
import
org.apache.camel.component.azure.servicebus.ServiceBusConsumerOperationDefinition;
@@ -200,6 +201,10 @@ public class ServiceBusComponentConfiguration
* Service Bus resource.
*/
private String connectionString;
+ /**
+ * Determines the credential strategy to adopt
+ */
+ private CredentialType credentialType = CredentialType.CONNECTION_STRING;
/**
* Fully Qualified Namespace of the service bus
*/
@@ -408,6 +413,14 @@ public class ServiceBusComponentConfiguration
this.connectionString = connectionString;
}
+ public CredentialType getCredentialType() {
+ return credentialType;
+ }
+
+ public void setCredentialType(CredentialType credentialType) {
+ this.credentialType = credentialType;
+ }
+
public String getFullyQualifiedNamespace() {
return fullyQualifiedNamespace;
}
