Bugfixes/multi ds and new property

eng/code-quality-reports/src/main/resources/revapi/revapi.json

@@ -405,6 +405,11 @@
           "new": "method void com.mysql.cj.protocol.ServerSession::setOldStatusFlags(int)",
           "justification": "Method was added to an interface."
         },
+        {
+          "code": "java.method.addedToInterface",
+          "new": "method java.lang.String com.azure.spring.cloud.core.provider.authentication.TokenCredentialOptionsProvider.TokenCredentialOptions::getTokenCredentialBeanName()",
+          "justification": "Support to configure token credential bean name."
+        },
         {
           "code": "java.annotation.added",
           "old": "method com.azure.cosmos.CosmosDiagnosticsContext com.azure.cosmos.CosmosDiagnostics::getDiagnosticsContext()",

sdk/spring/CHANGELOG.md

@@ -7,6 +7,13 @@ Upgrade Spring Boot dependencies version to 3.3.5 and Spring Cloud dependencies
 ### Spring Cloud Azure Autoconfigure
 This section includes changes in `spring-cloud-azure-autoconfigure` module.
 
+#### Features Added
+- Support to configure token credential bean name. [#41977](https://github.com/Azure/azure-sdk-for-java/issues/41977).
+
+#### Bugs Fixed
+- Fix primitive type prop (isManagedIdentityEnabled) copy issue. [#41977](https://github.com/Azure/azure-sdk-for-java/issues/41977).
+- Fix to support multiple JDBC datasource prop passwordless. [#41977](https://github.com/Azure/azure-sdk-for-java/issues/41977).
+
 #### Breaking Changes
 - Change the default Service Bus JMS connection factory to `JmsPoolConnectionFactory` from `CachingConnectionFactory`. Set `spring.jms.cache.enabled=true` to continue using `CachingConnectionFactory` [#42306](https://github.com/Azure/azure-sdk-for-java/pull/42306).
 

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureContextUtils.java

@@ -93,4 +93,10 @@ private AzureContextUtils() {
      */
     public static final String PASSWORDLESS_KAFKA_PROPERTIES_BEAN_POST_PROCESSOR_BEAN_NAME =
         "azurePasswordlessKafkaPropertiesBeanPostProcessor";
+
+    /**
+     * Bean name of the SpringTokenCredentialProviderContextProvider for the passwordless token credential acquisition.
+     */
+    public static final String SPRING_TOKEN_CREDENTIAL_PROVIDER_CONTEXT_BEAN_NAME =
+        "springTokenCredentialProviderContextProvider";
 }

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalPropertiesAutoConfiguration.java

@@ -5,6 +5,7 @@
 
 import com.azure.spring.cloud.autoconfigure.implementation.context.properties.AzureGlobalProperties;
 import org.springframework.beans.factory.aot.BeanRegistrationExcludeFilter;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -14,8 +15,10 @@
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.util.ClassUtils;
 
 import static com.azure.spring.cloud.autoconfigure.implementation.context.AzureContextUtils.AZURE_GLOBAL_PROPERTY_BEAN_NAME;
+import static com.azure.spring.cloud.autoconfigure.implementation.context.AzureContextUtils.SPRING_TOKEN_CREDENTIAL_PROVIDER_CONTEXT_BEAN_NAME;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
 
 /**
@@ -29,6 +32,9 @@ public class AzureGlobalPropertiesAutoConfiguration {
     static class Registrar implements EnvironmentAware, ImportBeanDefinitionRegistrar {
         private Environment environment;
 
+        private static final String AZURE_AUTHENTICATION_TEMPLATE_CLASS_NAME =
+            "com.azure.identity.extensions.implementation.template.AzureAuthenticationTemplate";
+
         @Override
         public void setEnvironment(Environment environment) {
             this.environment = environment;
@@ -38,12 +44,14 @@ public void setEnvironment(Environment environment) {
         public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
                                             BeanDefinitionRegistry registry) {
             if (!registry.containsBeanDefinition(AZURE_GLOBAL_PROPERTY_BEAN_NAME)) {
-                registry.registerBeanDefinition(AZURE_GLOBAL_PROPERTY_BEAN_NAME,
-                                                genericBeanDefinition(AzureGlobalProperties.class,
-                                                                      () -> Binder.get(this.environment)
-                                                                                  .bindOrCreate(AzureGlobalProperties.PREFIX,
-                                                                                                AzureGlobalProperties.class))
-                                                    .getBeanDefinition());
+                BeanDefinitionBuilder definitionBuilder = genericBeanDefinition(AzureGlobalProperties.class,
+                    () -> Binder.get(this.environment)
+                                .bindOrCreate(AzureGlobalProperties.PREFIX,
+                                    AzureGlobalProperties.class));
+                if (ClassUtils.isPresent(AZURE_AUTHENTICATION_TEMPLATE_CLASS_NAME, null)) {
+                    definitionBuilder.addDependsOn(SPRING_TOKEN_CREDENTIAL_PROVIDER_CONTEXT_BEAN_NAME);
+                }
+                registry.registerBeanDefinition(AZURE_GLOBAL_PROPERTY_BEAN_NAME, definitionBuilder.getBeanDefinition());
             }
         }
 

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureTokenCredentialAutoConfiguration.java

@@ -37,6 +37,7 @@
 import org.springframework.boot.task.TaskExecutorBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.StringUtils;
@@ -55,10 +56,12 @@
 public class AzureTokenCredentialAutoConfiguration extends AzureServiceConfigurationBase {
     private static final Logger LOGGER = LoggerFactory.getLogger(AzureTokenCredentialAutoConfiguration.class);
 
+    private final GenericApplicationContext applicationContext;
     private final IdentityClientProperties identityClientProperties;
 
-    AzureTokenCredentialAutoConfiguration(AzureGlobalProperties azureGlobalProperties) {
+    AzureTokenCredentialAutoConfiguration(GenericApplicationContext applicationContext, AzureGlobalProperties azureGlobalProperties) {
         super(azureGlobalProperties);
+        this.applicationContext = applicationContext;
         this.identityClientProperties = loadProperties(azureGlobalProperties, new IdentityClientProperties());
     }
 
@@ -101,6 +104,11 @@ AzureTokenCredentialResolver azureTokenCredentialResolver(
                 return null;
             }
 
+            String tokenCredentialBeanName = azureProperties.getCredential().getTokenCredentialBeanName();
+            if (StringUtils.hasText(tokenCredentialBeanName)) {
+                return this.applicationContext.getBean(tokenCredentialBeanName, TokenCredential.class);
+            }
+
             final TokenCredentialOptionsProvider.TokenCredentialOptions properties = azureProperties.getCredential();
             final String tenantId = azureProperties.getProfile().getTenantId();
             final String clientId = properties.getClientId();

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/SpringTokenCredentialProviderContextProviderAutoConfiguration.java

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.cloud.autoconfigure.implementation.context;
+
+import com.azure.identity.extensions.implementation.template.AzureAuthenticationTemplate;
+import com.azure.spring.cloud.autoconfigure.implementation.jdbc.SpringTokenCredentialProviderContextProvider;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static com.azure.spring.cloud.autoconfigure.implementation.context.AzureContextUtils.SPRING_TOKEN_CREDENTIAL_PROVIDER_CONTEXT_BEAN_NAME;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} for Spring Cloud Azure {@link SpringTokenCredentialProviderContextProvider}.
+ *
+ * @since 5.17.0
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(AzureAuthenticationTemplate.class)
+class SpringTokenCredentialProviderContextProviderAutoConfiguration {
+
+    @Bean(name = SPRING_TOKEN_CREDENTIAL_PROVIDER_CONTEXT_BEAN_NAME)
+    @ConditionalOnMissingBean
+    SpringTokenCredentialProviderContextProvider springTokenCredentialProviderContextProvider() {
+        return new SpringTokenCredentialProviderContextProvider();
+    }
+}

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java

@@ -4,8 +4,8 @@
 package com.azure.spring.cloud.autoconfigure.implementation.data.redis;
 
 import com.azure.spring.cloud.autoconfigure.implementation.context.properties.AzureGlobalProperties;
-import com.azure.spring.cloud.autoconfigure.implementation.passwordless.properties.AzureRedisPasswordlessProperties;
 import com.azure.spring.cloud.autoconfigure.implementation.data.redis.lettuce.AzureRedisCredentials;
+import com.azure.spring.cloud.autoconfigure.implementation.passwordless.properties.AzureRedisPasswordlessProperties;
 import com.azure.spring.cloud.core.implementation.util.AzurePasswordlessPropertiesUtils;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisCredentials;
@@ -54,8 +54,8 @@ AzureRedisPasswordlessProperties redisPasswordlessProperties() {
     AzureRedisCredentials azureRedisCredentials(RedisProperties redisProperties,
                                                 AzureRedisPasswordlessProperties azureRedisPasswordlessProperties,
                                                 AzureGlobalProperties azureGlobalProperties) {
-        return new AzureRedisCredentials(redisProperties.getUsername(),
-            mergeAzureProperties(azureGlobalProperties, azureRedisPasswordlessProperties));
+        AzureRedisPasswordlessProperties redisPasswordlessProperties = mergeAzureProperties(azureGlobalProperties, azureRedisPasswordlessProperties);
+        return new AzureRedisCredentials(redisProperties.getUsername(), redisPasswordlessProperties);
     }
 
     @Bean(name = "azureLettuceClientConfigurationBuilderCustomizer")
@@ -81,5 +81,4 @@ private AzureRedisPasswordlessProperties mergeAzureProperties(AzureGlobalPropert
         AzurePasswordlessPropertiesUtils.mergeAzureCommonProperties(azureGlobalProperties, azurePasswordlessProperties, mergedProperties);
         return mergedProperties;
     }
-
 }

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/lettuce/AzureRedisCredentials.java

@@ -14,6 +14,9 @@
 import org.springframework.util.StringUtils;
 
 import java.util.Objects;
+import java.util.Properties;
+
+import static com.azure.spring.cloud.autoconfigure.implementation.util.SpringPasswordlessPropertiesUtils.enhancePasswordlessProperties;
 
 public class AzureRedisCredentials implements RedisCredentials {
 
@@ -25,9 +28,11 @@ public class AzureRedisCredentials implements RedisCredentials {
      * Create instance of Azure Redis Credentials
      */
     public AzureRedisCredentials(String username, PasswordlessProperties passwordlessProperties) {
-        Objects.requireNonNull(passwordlessProperties, "PasswordlessProperties is required");
+        Objects.requireNonNull(passwordlessProperties, "PasswordlessProperties is required.");
         azureAuthenticationTemplate = new AzureAuthenticationTemplate();
-        azureAuthenticationTemplate.init(passwordlessProperties.toPasswordlessProperties());
+        Properties properties = passwordlessProperties.toPasswordlessProperties();
+        enhancePasswordlessProperties("spring.data.redis.azure", passwordlessProperties, properties);
+        azureAuthenticationTemplate.init(properties);
         this.username = resolveUsername(azureAuthenticationTemplate, username);
     }
 

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java

@@ -12,7 +12,6 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 
 
 /**
@@ -29,15 +28,7 @@ public class AzureJdbcAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
-    @DependsOn("springTokenCredentialProviderContextProvider")
     JdbcPropertiesBeanPostProcessor jdbcConfigurationPropertiesBeanPostProcessor() {
         return new JdbcPropertiesBeanPostProcessor();
     }
-
-    @Bean
-    @ConditionalOnMissingBean
-    SpringTokenCredentialProviderContextProvider springTokenCredentialProviderContextProvider() {
-        return new SpringTokenCredentialProviderContextProvider();
-    }
-
 }