Make AzureActiveDirectoryConfiguration and AADOAuth2AutoConfiguration not work at the same time. (Azure#17746)

* Disable AzureActiveDirectoryConfiguration  for now.

Author: Rujun Chen

…t/aad/auth/AuthorizedClientRepoTest.java …ementation/AuthorizedClientRepoTest.javasdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/test/aad/auth/AuthorizedClientRepoTest.java renamed to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/spring/aad/implementation/AuthorizedClientRepoTest.java sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/test/aad/auth/AuthorizedClientRepoTest.java renamed to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/spring/aad/implementation/AuthorizedClientRepoTest.java

@@ -1,15 +1,10 @@
-package com.azure.test.aad.auth;
+package com.azure.spring.aad.implementation;
 
-import java.time.Instant;
-
-import com.azure.spring.aad.implementation.AzureAuthorizedClientRepository;
-import com.azure.spring.aad.implementation.AzureClientRegistrationRepository;
 import com.azure.test.utils.AppRunner;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -22,6 +17,8 @@
 import org.springframework.security.oauth2.core.OAuth2RefreshToken;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 
+import java.time.Instant;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -140,7 +137,7 @@ private boolean isTokenExpired(OAuth2AccessToken token) {
     }
 
     @Configuration
-    @EnableAutoConfiguration
+    @SpringBootApplication
     @EnableWebSecurity
     public static class DumbApp {}
 }

…CodeGrantRequestEntityConverterTest.java …CodeGrantRequestEntityConverterTest.javasdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/test/aad/auth/AuthzCodeGrantRequestEntityConverterTest.java renamed to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/spring/aad/implementation/AuthzCodeGrantRequestEntityConverterTest.java sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/test/aad/auth/AuthzCodeGrantRequestEntityConverterTest.java renamed to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/spring/aad/implementation/AuthzCodeGrantRequestEntityConverterTest.java

@@ -1,13 +1,10 @@
-package com.azure.test.aad.auth;
+package com.azure.spring.aad.implementation;
 
-import com.azure.spring.aad.implementation.AuthzCodeGrantRequestEntityConverter;
-import com.azure.spring.aad.implementation.AzureClientRegistrationRepository;
 import com.azure.test.utils.AppRunner;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.RequestEntity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -20,7 +17,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AuthzCodeGrantRequestEntityConverterTest {
 
@@ -100,7 +96,7 @@ private OAuth2AuthorizationResponse createAuthorizationResponse() {
     }
 
     @Configuration
-    @EnableAutoConfiguration
+    @SpringBootApplication
     @EnableWebSecurity
     public static class DumbApp {}
 }

…ureActiveDirectoryConfigurationTest.java …ureActiveDirectoryConfigurationTest.javasdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/test/aad/auth/AzureActiveDirectoryConfigurationTest.java renamed to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/spring/aad/implementation/AzureActiveDirectoryConfigurationTest.java sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/test/aad/auth/AzureActiveDirectoryConfigurationTest.java renamed to sdk/spring/azure-spring-boot-test-aad/src/test/java/com/azure/spring/aad/implementation/AzureActiveDirectoryConfigurationTest.java

@@ -1,20 +1,16 @@
-package com.azure.test.aad.auth;
+package com.azure.spring.aad.implementation;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.azure.spring.aad.implementation.AzureClientRegistrationRepository;
-import com.azure.spring.aad.implementation.DefaultClient;
-import com.azure.spring.aad.implementation.IdentityEndpoints;
 import com.azure.test.utils.AppRunner;
 import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -182,7 +178,7 @@ private List<ClientRegistration> collectClients(Iterable<ClientRegistration> itr
     }
 
     @Configuration
-    @EnableAutoConfiguration
     @EnableWebSecurity
+    @SpringBootApplication
     public static class DumbApp {}
 }

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/implementation/AzureActiveDirectoryConfiguration.java

@@ -5,7 +5,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -23,7 +22,6 @@
 @Configuration
 @ConditionalOnClass(ClientRegistrationRepository.class)
 @EnableConfigurationProperties(AzureActiveDirectoryProperties.class)
-@ConditionalOnExpression("#{'${azure.active.directory.uri:notExist}' != 'notExist'}")
 public class AzureActiveDirectoryConfiguration {
 
     private static final String DEFAULT_CLIENT = "azure";

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADOAuth2AutoConfiguration.java

@@ -7,7 +7,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -54,7 +53,6 @@
 @ConditionalOnProperty(prefix = "azure.activedirectory", value = { "client-id", "client-secret", "tenant-id" })
 @PropertySource(value = "classpath:service-endpoints.properties")
 @EnableConfigurationProperties({ AADAuthenticationProperties.class, ServiceEndpointsProperties.class })
-@ConditionalOnExpression("#{'${azure.active.directory.uri:notExist}' == 'notExist'}")
 public class AADOAuth2AutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AADOAuth2AutoConfiguration.class);

sdk/spring/azure-spring-boot/src/main/resources/META-INF/spring.factories

@@ -2,7 +2,6 @@ org.springframework.boot.env.EnvironmentPostProcessor=com.azure.spring.cloudfoun
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.azure.spring.autoconfigure.aad.AADAuthenticationFilterAutoConfiguration,\
 com.azure.spring.autoconfigure.aad.AADOAuth2AutoConfiguration, \
-com.azure.spring.aad.implementation.AzureActiveDirectoryConfiguration,\
 com.azure.spring.autoconfigure.b2c.AADB2CAutoConfiguration,\
 com.azure.spring.autoconfigure.cosmos.CosmosAutoConfiguration,\
 com.azure.spring.autoconfigure.cosmos.CosmosHealthConfiguration,\