Fixed the Service Bus sub-client builders overwriting configuration already set on the underlying ServiceBusClientBuilder#49777
Open
moarychan wants to merge 23 commits into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request addresses #49742 by ensuring Service Bus processor (and other sub-client) creation can preserve ServiceBusClientBuilder configuration applied via AzureServiceClientBuilderCustomizer (notably ClientOptions/TracingOptions) instead of having it overwritten during sub-client builder configuration.
Changes:
- Introduces a new
inherit-configurationproperty (nullable, treated astrueby default) and propagates it through Service Bus namespace/producer/consumer/processor property models and mergers. - Updates Service Bus sub-client builder factory behavior to optionally skip re-applying property-derived configuration to the underlying
ServiceBusClientBuilder, preventing customizer configuration from being overwritten. - Aligns listener container factory bean name constants/usages and adds unit tests for the new inheritance behavior.
Reviewed changes
Copilot reviewed 22 out of 22 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpoint.java | Fixes minor grammar in interface JavaDoc. |
| sdk/spring/spring-messaging-azure-servicebus/src/test/java/com/azure/spring/messaging/servicebus/implementation/properties/merger/ProcessorPropertiesParentMergerTests.java | Adds coverage for inheritConfiguration precedence (parent vs child). |
| sdk/spring/spring-messaging-azure-servicebus/src/test/java/com/azure/spring/messaging/servicebus/implementation/properties/merger/ConsumerPropertiesParentMergerTests.java | Adds coverage for inheritConfiguration precedence (parent vs child). |
| sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/properties/merger/SenderPropertiesParentMerger.java | Propagates inheritConfiguration from parent/child into merged producer properties. |
| sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/properties/merger/ProcessorPropertiesParentMerger.java | Propagates inheritConfiguration from namespace parent into processor properties. |
| sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/properties/merger/ProcessorPropertiesMerger.java | Includes inheritConfiguration in processor property copying logic. |
| sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/properties/merger/ConsumerPropertiesParentMerger.java | Propagates inheritConfiguration into merged consumer properties and copy helper. |
| sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/annotation/ServiceBusListenerAnnotationBeanPostProcessor.java | Exposes default container factory bean name constant publicly for reuse. |
| sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/annotation/ServiceBusListener.java | Fixes documented default container factory bean name to match actual default. |
| sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/properties/CommonProperties.java | Adds inheritConfiguration property to common Service Bus properties. |
| sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/annotation/EventHubsListenerAnnotationBeanPostProcessor.java | Exposes default container factory bean name constant publicly for reuse. |
| sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/annotation/EventHubsListener.java | Fixes documented default container factory bean name to match actual default. |
| sdk/spring/spring-cloud-azure-service/src/test/java/com/azure/spring/cloud/service/implementation/servicebus/properties/ServiceBusClientCommonTestProperties.java | Adds inheritConfiguration to test properties used by factory tests. |
| sdk/spring/spring-cloud-azure-service/src/test/java/com/azure/spring/cloud/service/implementation/servicebus/factory/AbstractServiceBusSubClientBuilderFactoryTests.java | Adds tests ensuring inheritConfiguration=false prevents overwriting shared builder config. |
| sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/servicebus/properties/ServiceBusClientCommonProperties.java | Adds new getInheritConfiguration() contract and documents null-as-true behavior. |
| sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/servicebus/lifecycle/ServiceBusProcessorClientLifecycleManager.java | Fixes a minor grammar issue in class JavaDoc. |
| sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/servicebus/factory/AbstractServiceBusSubClientBuilderFactory.java | Implements inheritance gating to prevent property-derived overwrites of ServiceBusClientBuilder config. |
| sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusPropertiesTest.java | Adds tests for default null and inheritance/override behavior in autoconfig properties. |
| sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java | Propagates inheritConfiguration into built producer/consumer/processor property objects. |
| sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusCommonProperties.java | Adds namespace-level inheritConfiguration property to autoconfig model. |
| sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/messaging/AzureMessagingListenerAutoConfiguration.java | Reuses exposed constants for container factory bean naming to avoid string duplication. |
| sdk/spring/CHANGELOG.md | Documents the new inherit-configuration property and its intended effect. |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: moarychan <19926623+moarychan@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes #49742
All SDK Contribution checklist:
General Guidelines and Best Practices
Testing Guidelines