Refactor credential resolution to eliminate code duplication

Co-authored-by: rujche <[email protected]>

Author: Copilot

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

@@ -123,10 +123,7 @@ EventHubsProducerFactoryCustomizer defaultEventHubsProducerFactoryCustomizer(
         @Qualifier(DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultAzureCredential,
         ObjectProvider<AzureServiceClientBuilderCustomizer<EventHubClientBuilder>> clientBuilderCustomizers) {
 
-        TokenCredential tokenCredential = eventHubsProperties.getIfAvailable() != null
-            ? azureTokenCredentialResolver.resolve(eventHubsProperties.getIfAvailable())
-            : null;
-        TokenCredential credential = tokenCredential != null ? tokenCredential : defaultAzureCredential;
+        TokenCredential credential = resolveTokenCredential(azureTokenCredentialResolver, eventHubsProperties, defaultAzureCredential);
         return new DefaultProducerFactoryCustomizer(credential, azureTokenCredentialResolver, clientBuilderCustomizers);
     }
 
@@ -138,13 +135,25 @@ EventHubsProcessorFactoryCustomizer defaultEventHubsProcessorFactoryCustomizer(
         @Qualifier(DEFAULT_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultCredential,
         ObjectProvider<AzureServiceClientBuilderCustomizer<EventProcessorClientBuilder>> processorClientBuilderCustomizers) {
 
-        TokenCredential tokenCredential = eventHubsProperties.getIfAvailable() != null
-            ? azureTokenCredentialResolver.resolve(eventHubsProperties.getIfAvailable())
-            : null;
-        TokenCredential credential = tokenCredential != null ? tokenCredential : defaultCredential;
+        TokenCredential credential = resolveTokenCredential(azureTokenCredentialResolver, eventHubsProperties, defaultCredential);
         return new DefaultProcessorFactoryCustomizer(credential, azureTokenCredentialResolver, processorClientBuilderCustomizers);
     }
 
+    private static TokenCredential resolveTokenCredential(
+        AzureTokenCredentialResolver azureTokenCredentialResolver,
+        ObjectProvider<AzureEventHubsProperties> eventHubsProperties,
+        TokenCredential defaultCredential) {
+
+        AzureEventHubsProperties properties = eventHubsProperties.getIfAvailable();
+        if (properties != null) {
+            TokenCredential resolvedCredential = azureTokenCredentialResolver.resolve(properties);
+            if (resolvedCredential != null) {
+                return resolvedCredential;
+            }
+        }
+        return defaultCredential;
+    }
+
     /**
      * The default {@link EventHubsProducerFactoryCustomizer} to configure the credential related properties and client builder customizers.
      */

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

@@ -125,10 +125,7 @@ ServiceBusProducerFactoryCustomizer defaultServiceBusProducerFactoryCustomizer(
         ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder>> clientBuilderCustomizers,
         ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder.ServiceBusSenderClientBuilder>> senderClientBuilderCustomizers) {
 
-        TokenCredential tokenCredential = serviceBusProperties.getIfAvailable() != null
-            ? azureTokenCredentialResolver.resolve(serviceBusProperties.getIfAvailable())
-            : null;
-        TokenCredential credential = tokenCredential != null ? tokenCredential : defaultAzureCredential;
+        TokenCredential credential = resolveTokenCredential(azureTokenCredentialResolver, serviceBusProperties, defaultAzureCredential);
         return new DefaultProducerFactoryCustomizer(credential, azureTokenCredentialResolver,
             clientBuilderCustomizers,
             senderClientBuilderCustomizers);
@@ -144,16 +141,28 @@ ServiceBusProcessorFactoryCustomizer defaultServiceBusProcessorFactoryCustomizer
         ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder.ServiceBusProcessorClientBuilder>> processorClientBuilderCustomizers,
         ObjectProvider<AzureServiceClientBuilderCustomizer<ServiceBusClientBuilder.ServiceBusSessionProcessorClientBuilder>> sessionProcessorClientBuilderCustomizers) {
 
-        TokenCredential tokenCredential = serviceBusProperties.getIfAvailable() != null
-            ? azureTokenCredentialResolver.resolve(serviceBusProperties.getIfAvailable())
-            : null;
-        TokenCredential credential = tokenCredential != null ? tokenCredential : defaultAzureCredential;
+        TokenCredential credential = resolveTokenCredential(azureTokenCredentialResolver, serviceBusProperties, defaultAzureCredential);
         return new DefaultProcessorFactoryCustomizer(credential, azureTokenCredentialResolver,
             clientBuilderCustomizers,
             processorClientBuilderCustomizers,
             sessionProcessorClientBuilderCustomizers);
     }
 
+    private static TokenCredential resolveTokenCredential(
+        AzureTokenCredentialResolver azureTokenCredentialResolver,
+        ObjectProvider<AzureServiceBusProperties> serviceBusProperties,
+        TokenCredential defaultCredential) {
+
+        AzureServiceBusProperties properties = serviceBusProperties.getIfAvailable();
+        if (properties != null) {
+            TokenCredential resolvedCredential = azureTokenCredentialResolver.resolve(properties);
+            if (resolvedCredential != null) {
+                return resolvedCredential;
+            }
+        }
+        return defaultCredential;
+    }
+
     /**
      * The default {@link ServiceBusProducerFactory} to configure the credential related properties and client builder customizers.
      */