modify package name from btoc to b2c (#13126)

Azure · Jul 14, 2020 · b0e44ba · b0e44ba
1 parent 0d1a718
commit b0e44ba
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 26 deletions.
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
@@ -485,6 +485,9 @@
   <!-- Checkstyle suppressions for resource manager package -->
   <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck" files="com.azure.resourcemanager.*"/>
 
+  <!-- Checkstyle suppressions for azure-spring AADB2C package name-->
+  <suppress checks="PackageName" files="com.microsoft.azure.spring.autoconfigure.*|com.azure.spring.*"/>
+
   <!-- Checkstyle suppressions for azure-spring-data-cosmos package -->
   <suppress checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck|ExternalDependencyExposedCheck|ThrowFromClientLoggerCheck" files="com.azure.spring.data.cosmos.*\.java"/>
   <suppress checks="MethodName|MemberName|ParameterName|VisibilityModifier" files="com.azure.spring.data.cosmos.domain|repository|config.*\.java"/>

diff --git a/...btoc/AzureADB2COIDCSampleApplication.java → .../b2c/AzureADB2COIDCSampleApplication.java b/...btoc/AzureADB2COIDCSampleApplication.java → .../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/...re/aad/btoc/controller/WebController.java → ...ure/aad/b2c/controller/WebController.java b/...re/aad/btoc/controller/WebController.java → ...ure/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/...oc/security/WebSecurityConfiguration.java → ...2c/security/WebSecurityConfiguration.java b/...oc/security/WebSecurityConfiguration.java → ...2c/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/...c/AADB2CAuthorizationRequestResolver.java → ...c/AADB2CAuthorizationRequestResolver.java b/...c/AADB2CAuthorizationRequestResolver.java → ...c/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/...nfigure/btoc/AADB2CAutoConfiguration.java → ...onfigure/b2c/AADB2CAutoConfiguration.java b/...nfigure/btoc/AADB2CAutoConfiguration.java → ...onfigure/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/...re/btoc/AADB2CConfigurationException.java → ...ure/b2c/AADB2CConfigurationException.java b/...re/btoc/AADB2CConfigurationException.java → ...ure/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/...gure/btoc/AADB2CLogoutSuccessHandler.java → ...igure/b2c/AADB2CLogoutSuccessHandler.java b/...gure/btoc/AADB2CLogoutSuccessHandler.java → ...igure/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/...igure/btoc/AADB2COidcLoginConfigurer.java → ...figure/b2c/AADB2COidcLoginConfigurer.java b/...igure/btoc/AADB2COidcLoginConfigurer.java → ...figure/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/.../autoconfigure/btoc/AADB2CProperties.java → ...g/autoconfigure/b2c/AADB2CProperties.java b/.../autoconfigure/btoc/AADB2CProperties.java → ...g/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/.../spring/autoconfigure/btoc/AADB2CURL.java → ...e/spring/autoconfigure/b2c/AADB2CURL.java b/.../spring/autoconfigure/btoc/AADB2CURL.java → ...e/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
@@ -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/...ing/btoc/AADB2COidcLoginConfigSample.java → ...ring/b2c/AADB2COidcLoginConfigSample.java b/...ing/btoc/AADB2COidcLoginConfigSample.java → ...ring/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/...zure/spring/btoc/AADB2CWebController.java → ...azure/spring/b2c/AADB2CWebController.java b/...zure/spring/btoc/AADB2CWebController.java → ...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/...DB2CAuthorizationRequestResolverTest.java → ...DB2CAuthorizationRequestResolverTest.java b/...DB2CAuthorizationRequestResolverTest.java → ...DB2CAuthorizationRequestResolverTest.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/...ure/btoc/AADB2CAutoConfigurationTest.java → ...gure/b2c/AADB2CAutoConfigurationTest.java b/...ure/btoc/AADB2CAutoConfigurationTest.java → ...gure/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/...g/autoconfigure/btoc/AADB2CConstants.java → ...ng/autoconfigure/b2c/AADB2CConstants.java b/...g/autoconfigure/btoc/AADB2CConstants.java → ...ng/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/.../btoc/AADB2CLogoutSuccessHandlerTest.java → ...e/b2c/AADB2CLogoutSuccessHandlerTest.java b/.../btoc/AADB2CLogoutSuccessHandlerTest.java → ...e/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/...ing/autoconfigure/btoc/AADB2CURLTest.java → ...ring/autoconfigure/b2c/AADB2CURLTest.java b/...ing/autoconfigure/btoc/AADB2CURLTest.java → ...ring/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;