Skip to content

Commit d2850e9

Browse files
Copilotrujche
andcommitted
Fix and test TokenCredential bean name resolution in Stream Binder
Co-authored-by: rujche <[email protected]>
1 parent 20644b6 commit d2850e9

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderConfiguration.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,13 @@ EventHubsMessageChannelBinder eventHubBinder(EventHubsChannelProvisioner channel
119119
@ConditionalOnMissingBean
120120
EventHubsProducerFactoryCustomizer defaultEventHubsProducerFactoryCustomizer(
121121
AzureTokenCredentialResolver azureTokenCredentialResolver,
122-
AzureEventHubsProperties eventHubsProperties,
122+
ObjectProvider<AzureEventHubsProperties> eventHubsProperties,
123123
@Qualifier(DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultAzureCredential,
124124
ObjectProvider<AzureServiceClientBuilderCustomizer<EventHubClientBuilder>> clientBuilderCustomizers) {
125125

126-
TokenCredential tokenCredential = azureTokenCredentialResolver.resolve(eventHubsProperties);
126+
TokenCredential tokenCredential = eventHubsProperties.getIfAvailable() != null
127+
? azureTokenCredentialResolver.resolve(eventHubsProperties.getIfAvailable())
128+
: null;
127129
TokenCredential credential = tokenCredential != null ? tokenCredential : defaultAzureCredential;
128130
return new DefaultProducerFactoryCustomizer(credential, azureTokenCredentialResolver, clientBuilderCustomizers);
129131
}
@@ -132,11 +134,13 @@ EventHubsProducerFactoryCustomizer defaultEventHubsProducerFactoryCustomizer(
132134
@ConditionalOnMissingBean
133135
EventHubsProcessorFactoryCustomizer defaultEventHubsProcessorFactoryCustomizer(
134136
AzureTokenCredentialResolver azureTokenCredentialResolver,
135-
AzureEventHubsProperties eventHubsProperties,
137+
ObjectProvider<AzureEventHubsProperties> eventHubsProperties,
136138
@Qualifier(DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultCredential,
137139
ObjectProvider<AzureServiceClientBuilderCustomizer<EventProcessorClientBuilder>> processorClientBuilderCustomizers) {
138140

139-
TokenCredential tokenCredential = azureTokenCredentialResolver.resolve(eventHubsProperties);
141+
TokenCredential tokenCredential = eventHubsProperties.getIfAvailable() != null
142+
? azureTokenCredentialResolver.resolve(eventHubsProperties.getIfAvailable())
143+
: null;
140144
TokenCredential credential = tokenCredential != null ? tokenCredential : defaultCredential;
141145
return new DefaultProcessorFactoryCustomizer(credential, azureTokenCredentialResolver, processorClientBuilderCustomizers);
142146
}

sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderConfiguration.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,14 @@ ServiceBusMessageChannelBinder serviceBusBinder(ServiceBusChannelProvisioner cha
120120
@ConditionalOnMissingBean
121121
ServiceBusProducerFactoryCustomizer defaultServiceBusProducerFactoryCustomizer(
122122
AzureTokenCredentialResolver azureTokenCredentialResolver,
123-
AzureServiceBusProperties serviceBusProperties,
123+
ObjectProvider<AzureServiceBusProperties> serviceBusProperties,
124124
@Qualifier(DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultAzureCredential,
125125
ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder>> clientBuilderCustomizers,
126126
ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder.ServiceBusSenderClientBuilder>> senderClientBuilderCustomizers) {
127127

128-
TokenCredential tokenCredential = azureTokenCredentialResolver.resolve(serviceBusProperties);
128+
TokenCredential tokenCredential = serviceBusProperties.getIfAvailable() != null
129+
? azureTokenCredentialResolver.resolve(serviceBusProperties.getIfAvailable())
130+
: null;
129131
TokenCredential credential = tokenCredential != null ? tokenCredential : defaultAzureCredential;
130132
return new DefaultProducerFactoryCustomizer(credential, azureTokenCredentialResolver,
131133
clientBuilderCustomizers,
@@ -136,13 +138,15 @@ ServiceBusProducerFactoryCustomizer defaultServiceBusProducerFactoryCustomizer(
136138
@ConditionalOnMissingBean
137139
ServiceBusProcessorFactoryCustomizer defaultServiceBusProcessorFactoryCustomizer(
138140
AzureTokenCredentialResolver azureTokenCredentialResolver,
139-
AzureServiceBusProperties serviceBusProperties,
141+
ObjectProvider<AzureServiceBusProperties> serviceBusProperties,
140142
@Qualifier(DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultAzureCredential,
141143
ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder>> clientBuilderCustomizers,
142144
ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder.ServiceBusProcessorClientBuilder>> processorClientBuilderCustomizers,
143145
ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder.ServiceBusSessionProcessorClientBuilder>> sessionProcessorClientBuilderCustomizers) {
144146

145-
TokenCredential tokenCredential = azureTokenCredentialResolver.resolve(serviceBusProperties);
147+
TokenCredential tokenCredential = serviceBusProperties.getIfAvailable() != null
148+
? azureTokenCredentialResolver.resolve(serviceBusProperties.getIfAvailable())
149+
: null;
146150
TokenCredential credential = tokenCredential != null ? tokenCredential : defaultAzureCredential;
147151
return new DefaultProcessorFactoryCustomizer(credential, azureTokenCredentialResolver,
148152
clientBuilderCustomizers,

0 commit comments

Comments
 (0)