Skip to content

Fix Service Bus autoconfiguration for dedicated producer/consumer/processor connection details #49257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rujche merged 5 commits into from
May 26, 2026
Merged

Fix Service Bus autoconfiguration for dedicated producer/consumer/processor connection details #49257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e057a0
Initial plan
Copilot May 26, 2026
e519306
Fix Service Bus autoconfiguration for dedicated sub-client connection…
Copilot May 26, 2026
17431c4
test: add dedicated service bus connection coverage for consumer and …
Copilot May 26, 2026
6fadb59
Split consumer and processor tests into connection-string-only and na…
Copilot May 26, 2026
ee9e30b
docs(spring): add changelog entry for service bus dedicated connectio…
Copilot May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sdk/spring/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ This section includes changes in `spring-cloud-azure-autoconfigure` module.
#### Bugs Fixed

- Fixed JDBC/Azure Database and Redis passwordless connection scope defaulting using the wrong `azure.scopes` value for Azure China and Azure US Government when `spring.cloud.azure.profile.cloud-type` is set to `azure_china` or `azure_us_government`. The scopes are now correctly derived from the merged cloud type. ([#47096](https://github.com/Azure/azure-sdk-for-java/issues/47096))
- Fixed Service Bus autoconfiguration for dedicated producer, consumer, and processor connection details so applications can initialize with only sub-level Service Bus `namespace` or `connection-string` settings and no top-level Service Bus connection configuration. ([#49257](https://github.com/Azure/azure-sdk-for-java/pull/49257))

### Spring Cloud Azure Stream Binder Service Bus
This section includes changes in `spring-cloud-azure-stream-binder-servicebus` module.
Expand Down
10 changes: 9 additions & 1 deletion ...ud/autoconfigure/implementation/servicebus/AzureServiceBusClientBuilderConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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();
}
Comment thread
rujche marked this conversation as resolved.
return factory.build();
}

Expand Down
6 changes: 5 additions & 1 deletion ...igure/implementation/servicebus/properties/ConfigurationWithoutConnectionDetailsBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
97 changes: 97 additions & 0 deletions .../cloud/autoconfigure/implementation/servicebus/AzureServiceBusAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

import com.azure.core.amqp.AmqpTransportType;
import com.azure.messaging.servicebus.ServiceBusClientBuilder;
import com.azure.messaging.servicebus.ServiceBusProcessorClient;
import com.azure.messaging.servicebus.ServiceBusReceiverClient;
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;
Expand Down Expand Up @@ -158,6 +161,100 @@ void configureRetryShouldApply() {
});
}

@Test
void producerDedicatedConnectionStringShouldConfigureWithoutTopLevelConnectionInfo() {
this.contextRunner
.withPropertyValues(
"spring.cloud.azure.servicebus.producer.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "producer-namespace"),
Comment thread
rujche marked this conversation as resolved.
"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 producerDedicatedNamespaceShouldConfigureWithoutTopLevelConnectionInfo() {
this.contextRunner
.withPropertyValues(
"spring.cloud.azure.servicebus.producer.namespace=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 consumerDedicatedConnectionStringShouldConfigureWithoutTopLevelConnectionInfo() {
this.contextRunner
.withPropertyValues(
"spring.cloud.azure.servicebus.consumer.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "consumer-namespace"),
"spring.cloud.azure.servicebus.consumer.entity-name=test-queue",
"spring.cloud.azure.servicebus.consumer.entity-type=queue"
)
.withBean(AzureGlobalProperties.class, AzureGlobalProperties::new)
.run(context -> {
assertThat(context).hasSingleBean(AzureServiceBusProperties.class);
assertThat(context).hasSingleBean(ServiceBusReceiverClient.class);
});
}

@Test
void consumerDedicatedNamespaceShouldConfigureWithoutTopLevelConnectionInfo() {
this.contextRunner
.withPropertyValues(
"spring.cloud.azure.servicebus.consumer.namespace=consumer-namespace",
"spring.cloud.azure.servicebus.consumer.entity-name=test-queue",
"spring.cloud.azure.servicebus.consumer.entity-type=queue"
Comment thread
rujche marked this conversation as resolved.
)
.withBean(AzureGlobalProperties.class, AzureGlobalProperties::new)
.run(context -> {
assertThat(context).hasSingleBean(AzureServiceBusProperties.class);
assertThat(context).hasSingleBean(ServiceBusReceiverClient.class);
});
}

@Test
void processorDedicatedConnectionStringShouldConfigureWithoutTopLevelConnectionInfo() {
this.contextRunner
.withPropertyValues(
"spring.cloud.azure.servicebus.processor.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "processor-namespace"),
"spring.cloud.azure.servicebus.processor.entity-name=test-queue",
"spring.cloud.azure.servicebus.processor.entity-type=queue"
)
.withBean(AzureGlobalProperties.class, AzureGlobalProperties::new)
.withBean(ServiceBusRecordMessageListener.class, () -> messageContext -> { })
.withBean(ServiceBusErrorHandler.class, () -> errorContext -> { })
.run(context -> {
assertThat(context).hasSingleBean(AzureServiceBusProperties.class);
assertThat(context).hasSingleBean(ServiceBusProcessorClient.class);
});
}

@Test
void processorDedicatedNamespaceShouldConfigureWithoutTopLevelConnectionInfo() {
this.contextRunner
.withPropertyValues(
"spring.cloud.azure.servicebus.processor.namespace=processor-namespace",
"spring.cloud.azure.servicebus.processor.entity-name=test-queue",
"spring.cloud.azure.servicebus.processor.entity-type=queue"
Comment thread
rujche marked this conversation as resolved.
)
.withBean(AzureGlobalProperties.class, AzureGlobalProperties::new)
.withBean(ServiceBusRecordMessageListener.class, () -> messageContext -> { })
.withBean(ServiceBusErrorHandler.class, () -> errorContext -> { })
.run(context -> {
assertThat(context).hasSingleBean(AzureServiceBusProperties.class);
assertThat(context).hasSingleBean(ServiceBusProcessorClient.class);
});
}

@Test
void configurationPropertiesShouldBind() {
String connectionString = String.format(CONNECTION_STRING_FORMAT, "fake-namespace");
Expand Down
Loading