Fix Service Bus autoconfiguration for dedicated sub-client connection details

Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/46f525ea-fb3b-4a1a-a68b-1699ceb5be19

Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Author: Copilot

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusClientBuilderConfiguration.java

@@ -21,6 +21,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.util.StringUtils;
 
 @Configuration(proxyBeanMethods = false)
 @Import(AzureServiceBusPropertiesConfiguration.class)
@@ -50,7 +51,14 @@ ServiceBusClientBuilderFactory serviceBusClientBuilderFactory(
 
     @Bean
     @ConditionalOnMissingBean
-    ServiceBusClientBuilder serviceBusClientBuilder(ServiceBusClientBuilderFactory factory) {
+    ServiceBusClientBuilder serviceBusClientBuilder(
+        ServiceBusClientBuilderFactory factory,
+        ObjectProvider<ServiceConnectionStringProvider<AzureServiceType.ServiceBus>> connectionStringProviders) {
+        if (!StringUtils.hasText(this.serviceBusProperties.getConnectionString())
+            && !StringUtils.hasText(this.serviceBusProperties.getNamespace())
+            && connectionStringProviders.orderedStream().findFirst().isEmpty()) {
+            return new ServiceBusClientBuilder();
+        }
         return factory.build();
     }
 

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/ConfigurationWithoutConnectionDetailsBean.java

@@ -13,7 +13,11 @@
 
 @ConditionalOnMissingBean(type = "com.azure.spring.cloud.autoconfigure.implementation.servicebus.properties.AzureServiceBusConnectionDetails")
 @ConditionalOnProperty(value = "spring.cloud.azure.servicebus.enabled", havingValue = "true", matchIfMissing = true)
-@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.servicebus", name = {"connection-string", "namespace"})
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.servicebus",
+    name = {"connection-string", "namespace",
+        "producer.connection-string", "producer.namespace",
+        "consumer.connection-string", "consumer.namespace",
+        "processor.connection-string", "processor.namespace"})
 class ConfigurationWithoutConnectionDetailsBean {
 
     private final AzureGlobalProperties azureGlobalProperties;

sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusAutoConfigurationTests.java

@@ -5,6 +5,7 @@
 
 import com.azure.core.amqp.AmqpTransportType;
 import com.azure.messaging.servicebus.ServiceBusClientBuilder;
+import com.azure.messaging.servicebus.ServiceBusSenderClient;
 import com.azure.messaging.servicebus.models.ServiceBusReceiveMode;
 import com.azure.spring.cloud.autoconfigure.implementation.AbstractAzureServiceConfigurationTests;
 import com.azure.spring.cloud.autoconfigure.implementation.context.properties.AzureGlobalProperties;
@@ -158,6 +159,21 @@ void configureRetryShouldApply() {
             });
     }
 
+    @Test
+    void producerDedicatedConnectionStringShouldConfigureWithoutTopLevelConnectionInfo() {
+        this.contextRunner
+            .withPropertyValues(
+                "spring.cloud.azure.servicebus.producer.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "producer-namespace"),
+                "spring.cloud.azure.servicebus.producer.entity-name=test-queue",
+                "spring.cloud.azure.servicebus.producer.entity-type=queue"
+            )
+            .withBean(AzureGlobalProperties.class, AzureGlobalProperties::new)
+            .run(context -> {
+                assertThat(context).hasSingleBean(AzureServiceBusProperties.class);
+                assertThat(context).hasSingleBean(ServiceBusSenderClient.class);
+            });
+    }
+
     @Test
     void configurationPropertiesShouldBind() {
         String connectionString = String.format(CONNECTION_STRING_FORMAT, "fake-namespace");