From f296619100a6c77f30f2f0851fcd9ace295a0def Mon Sep 17 00:00:00 2001 From: Yi Liu Date: Tue, 14 Jul 2020 13:02:33 +0800 Subject: [PATCH] modify package name from btoc to b2c --- .../main/resources/checkstyle/checkstyle-suppressions.xml | 3 +++ .../aad/{btoc => b2c}/AzureADB2COIDCSampleApplication.java | 2 +- .../azure/aad/{btoc => b2c}/controller/WebController.java | 2 +- .../{btoc => b2c}/security/WebSecurityConfiguration.java | 4 ++-- .../{btoc => b2c}/AADB2CAuthorizationRequestResolver.java | 2 +- .../{btoc => b2c}/AADB2CAutoConfiguration.java | 6 +++--- .../{btoc => b2c}/AADB2CConfigurationException.java | 2 +- .../{btoc => b2c}/AADB2CLogoutSuccessHandler.java | 2 +- .../{btoc => b2c}/AADB2COidcLoginConfigurer.java | 2 +- .../autoconfigure/{btoc => b2c}/AADB2CProperties.java | 2 +- .../azure/spring/autoconfigure/{btoc => b2c}/AADB2CURL.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../spring/{btoc => b2c}/AADB2COidcLoginConfigSample.java | 4 ++-- .../com/azure/spring/{btoc => b2c}/AADB2CWebController.java | 2 +- .../AADB2CAuthorizationRequestResolverTest.java | 4 ++-- .../{btoc => b2c}/AADB2CAutoConfigurationTest.java | 4 ++-- .../spring/autoconfigure/{btoc => b2c}/AADB2CConstants.java | 6 +++--- .../{btoc => b2c}/AADB2CLogoutSuccessHandlerTest.java | 2 +- .../spring/autoconfigure/{btoc => b2c}/AADB2CURLTest.java | 2 +- 19 files changed, 29 insertions(+), 26 deletions(-) rename sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/{btoc => b2c}/AzureADB2COIDCSampleApplication.java (91%) rename sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/{btoc => b2c}/controller/WebController.java (96%) rename sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/{btoc => b2c}/security/WebSecurityConfiguration.java (87%) rename sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CAuthorizationRequestResolver.java (98%) rename sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CAutoConfiguration.java (96%) rename sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CConfigurationException.java (88%) rename sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CLogoutSuccessHandler.java (96%) rename sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2COidcLoginConfigurer.java (95%) rename sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CProperties.java (99%) rename sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CURL.java (97%) rename sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/{btoc => b2c}/AADB2COidcLoginConfigSample.java (91%) rename sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/{btoc => b2c}/AADB2CWebController.java (98%) rename sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CAuthorizationRequestResolverTest.java (95%) rename sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CAutoConfigurationTest.java (95%) rename sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CConstants.java (82%) rename sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CLogoutSuccessHandlerTest.java (96%) rename sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/{btoc => b2c}/AADB2CURLTest.java (97%) diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml index 1a88861759f3..e5bbe9ac1a68 100755 --- a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml +++ b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml @@ -485,6 +485,9 @@ + + + diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/AzureADB2COIDCSampleApplication.java b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/AzureADB2COIDCSampleApplication.java similarity index 91% rename from sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/AzureADB2COIDCSampleApplication.java rename to sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/AzureADB2COIDCSampleApplication.java index 2a9ba33644b1..15d40cddcbd8 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/AzureADB2COIDCSampleApplication.java +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/AzureADB2COIDCSampleApplication.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.aad.btoc; +package com.microsoft.azure.aad.b2c; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/controller/WebController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/controller/WebController.java similarity index 96% rename from sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/controller/WebController.java rename to sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/controller/WebController.java index dcd7810e546d..ad38e4965aef 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/controller/WebController.java +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/controller/WebController.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.aad.btoc.controller; +package com.microsoft.azure.aad.b2c.controller; import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken; import org.springframework.security.oauth2.core.user.OAuth2User; diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/security/WebSecurityConfiguration.java b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/security/WebSecurityConfiguration.java similarity index 87% rename from sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/security/WebSecurityConfiguration.java rename to sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/security/WebSecurityConfiguration.java index 4c1fd4ae3d40..c2096ee6420c 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/btoc/security/WebSecurityConfiguration.java +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/microsoft/azure/aad/b2c/security/WebSecurityConfiguration.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.aad.btoc.security; +package com.microsoft.azure.aad.b2c.security; -import com.microsoft.azure.spring.autoconfigure.btoc.AADB2COidcLoginConfigurer; +import com.microsoft.azure.spring.autoconfigure.b2c.AADB2COidcLoginConfigurer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAuthorizationRequestResolver.java b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAuthorizationRequestResolver.java similarity index 98% rename from sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAuthorizationRequestResolver.java rename to sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAuthorizationRequestResolver.java index c7e10953e45d..9ab1f38de882 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAuthorizationRequestResolver.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAuthorizationRequestResolver.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAutoConfiguration.java b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAutoConfiguration.java similarity index 96% rename from sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAutoConfiguration.java rename to sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAutoConfiguration.java index 37ad3ec63e4b..abd155695108 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAutoConfiguration.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAutoConfiguration.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import com.microsoft.azure.telemetry.TelemetrySender; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import static com.microsoft.azure.spring.autoconfigure.btoc.AADB2CProperties.PREFIX; -import static com.microsoft.azure.spring.autoconfigure.btoc.AADB2CProperties.USER_FLOW_SIGN_UP_OR_SIGN_IN; +import static com.microsoft.azure.spring.autoconfigure.b2c.AADB2CProperties.PREFIX; +import static com.microsoft.azure.spring.autoconfigure.b2c.AADB2CProperties.USER_FLOW_SIGN_UP_OR_SIGN_IN; import static com.microsoft.azure.telemetry.TelemetryData.SERVICE_NAME; import static com.microsoft.azure.telemetry.TelemetryData.TENANT_NAME; import static com.microsoft.azure.telemetry.TelemetryData.getClassPackageSimpleName; diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CConfigurationException.java b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CConfigurationException.java similarity index 88% rename from sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CConfigurationException.java rename to sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CConfigurationException.java index 274d83843b25..df2e2f035fbd 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CConfigurationException.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CConfigurationException.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; /** * Throw runtime exception for configuration. diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CLogoutSuccessHandler.java b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CLogoutSuccessHandler.java similarity index 96% rename from sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CLogoutSuccessHandler.java rename to sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CLogoutSuccessHandler.java index c2ded434692a..4b5a811b5b70 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CLogoutSuccessHandler.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CLogoutSuccessHandler.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.springframework.lang.NonNull; import org.springframework.security.core.Authentication; diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2COidcLoginConfigurer.java b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2COidcLoginConfigurer.java similarity index 95% rename from sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2COidcLoginConfigurer.java rename to sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2COidcLoginConfigurer.java index d07bebfba0a6..3053474c8f57 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2COidcLoginConfigurer.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2COidcLoginConfigurer.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CProperties.java b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CProperties.java similarity index 99% rename from sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CProperties.java rename to sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CProperties.java index ba51aa078570..730ecbf71dd2 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CProperties.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CProperties.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.hibernate.validator.constraints.URL; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CURL.java b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CURL.java similarity index 97% rename from sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CURL.java rename to sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CURL.java index 84b075de97d8..f98c8fc375af 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CURL.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CURL.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.springframework.util.Assert; diff --git a/sdk/spring/azure-spring-boot/src/main/resources/META-INF/spring.factories b/sdk/spring/azure-spring-boot/src/main/resources/META-INF/spring.factories index 77ad8951f70a..5f88a537624a 100644 --- a/sdk/spring/azure-spring-boot/src/main/resources/META-INF/spring.factories +++ b/sdk/spring/azure-spring-boot/src/main/resources/META-INF/spring.factories @@ -7,6 +7,6 @@ com.microsoft.azure.spring.autoconfigure.gremlin.GremlinAutoConfiguration,\ com.microsoft.azure.spring.autoconfigure.gremlin.GremlinRepositoriesAutoConfiguration,\ com.microsoft.azure.spring.autoconfigure.aad.AADAuthenticationFilterAutoConfiguration,\ com.microsoft.azure.spring.autoconfigure.aad.AADOAuth2AutoConfiguration,\ -com.microsoft.azure.spring.autoconfigure.btoc.AADB2CAutoConfiguration,\ +com.microsoft.azure.spring.autoconfigure.b2c.AADB2CAutoConfiguration,\ com.microsoft.azure.spring.autoconfigure.metrics.AzureMonitorMetricsExportAutoConfiguration,\ com.microsoft.azure.spring.autoconfigure.jms.ServiceBusJMSAutoConfiguration diff --git a/sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/btoc/AADB2COidcLoginConfigSample.java b/sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/b2c/AADB2COidcLoginConfigSample.java similarity index 91% rename from sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/btoc/AADB2COidcLoginConfigSample.java rename to sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/b2c/AADB2COidcLoginConfigSample.java index 23ed8f070cfb..115830b10809 100644 --- a/sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/btoc/AADB2COidcLoginConfigSample.java +++ b/sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/b2c/AADB2COidcLoginConfigSample.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.btoc; +package com.azure.spring.b2c; -import com.microsoft.azure.spring.autoconfigure.btoc.AADB2COidcLoginConfigurer; +import com.microsoft.azure.spring.autoconfigure.b2c.AADB2COidcLoginConfigurer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; diff --git a/sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/btoc/AADB2CWebController.java b/sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/b2c/AADB2CWebController.java similarity index 98% rename from sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/btoc/AADB2CWebController.java rename to sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/b2c/AADB2CWebController.java index c06ee37b0da8..b3864861c0d7 100644 --- a/sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/btoc/AADB2CWebController.java +++ b/sdk/spring/azure-spring-boot/src/samples/java/com/azure/spring/b2c/AADB2CWebController.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.btoc; +package com.azure.spring.b2c; import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken; import org.springframework.security.oauth2.core.user.OAuth2User; diff --git a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAuthorizationRequestResolverTest.java b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAuthorizationRequestResolverTest.java similarity index 95% rename from sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAuthorizationRequestResolverTest.java rename to sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAuthorizationRequestResolverTest.java index 367c69e719ca..3a11618adc9d 100644 --- a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAuthorizationRequestResolverTest.java +++ b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAuthorizationRequestResolverTest.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.junit.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest; -import static com.microsoft.azure.spring.autoconfigure.btoc.AADB2CConstants.*; +import static com.microsoft.azure.spring.autoconfigure.b2c.AADB2CConstants.*; import static org.assertj.core.api.Java6Assertions.assertThat; public class AADB2CAuthorizationRequestResolverTest { diff --git a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAutoConfigurationTest.java b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAutoConfigurationTest.java similarity index 95% rename from sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAutoConfigurationTest.java rename to sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAutoConfigurationTest.java index 60114aad61bf..386cf665c56e 100644 --- a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CAutoConfigurationTest.java +++ b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CAutoConfigurationTest.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.junit.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; -import static com.microsoft.azure.spring.autoconfigure.btoc.AADB2CConstants.*; +import static com.microsoft.azure.spring.autoconfigure.b2c.AADB2CConstants.*; import static org.assertj.core.api.Java6Assertions.assertThat; public class AADB2CAutoConfigurationTest { diff --git a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CConstants.java b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CConstants.java similarity index 82% rename from sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CConstants.java rename to sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CConstants.java index c68f2449aaa0..8a296c767fe0 100644 --- a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CConstants.java +++ b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CConstants.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; -import static com.microsoft.azure.spring.autoconfigure.btoc.AADB2CProperties.PREFIX; -import static com.microsoft.azure.spring.autoconfigure.btoc.AADB2CProperties.USER_FLOW_SIGN_UP_OR_SIGN_IN; +import static com.microsoft.azure.spring.autoconfigure.b2c.AADB2CProperties.PREFIX; +import static com.microsoft.azure.spring.autoconfigure.b2c.AADB2CProperties.USER_FLOW_SIGN_UP_OR_SIGN_IN; public class AADB2CConstants { diff --git a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CLogoutSuccessHandlerTest.java b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CLogoutSuccessHandlerTest.java similarity index 96% rename from sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CLogoutSuccessHandlerTest.java rename to sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CLogoutSuccessHandlerTest.java index 0262f0ced51e..3901d098cf3c 100644 --- a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CLogoutSuccessHandlerTest.java +++ b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CLogoutSuccessHandlerTest.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.junit.Before; import org.junit.Test; diff --git a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CURLTest.java b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CURLTest.java similarity index 97% rename from sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CURLTest.java rename to sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CURLTest.java index 7d55ffa859c3..17180eb7e7a6 100644 --- a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/btoc/AADB2CURLTest.java +++ b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/b2c/AADB2CURLTest.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.azure.spring.autoconfigure.btoc; +package com.microsoft.azure.spring.autoconfigure.b2c; import org.junit.Test;