Move oidc package in oauth2-core and oauth2-client

Fixes gh-4710

config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java

@@ -40,8 +40,8 @@ import org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationF
 import org.springframework.security.oauth2.core.AccessToken;
 import org.springframework.security.oauth2.core.endpoint.AuthorizationRequestUriBuilder;
 import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.security.oauth2.oidc.client.authentication.OidcAuthorizationCodeAuthenticationProvider;
-import org.springframework.security.oauth2.oidc.client.userinfo.OidcUserService;
+import org.springframework.security.oauth2.client.oidc.authentication.OidcAuthorizationCodeAuthenticationProvider;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
 import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;

config/src/main/java/org/springframework/security/config/oauth2/client/CommonOAuth2Provider.java

@@ -19,7 +19,7 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio
 import org.springframework.security.oauth2.client.registration.ClientRegistration.Builder;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
-import org.springframework.security.oauth2.oidc.core.IdTokenClaim;
+import org.springframework.security.oauth2.core.oidc.IdTokenClaim;
 
 /**
  * Common OAuth2 Providers that can be used to create

config/src/test/java/org/springframework/security/config/oauth2/client/CommonOAuth2ProviderTests.java

@@ -20,7 +20,7 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio
 import org.springframework.security.oauth2.client.registration.ClientRegistration.ProviderDetails;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
-import org.springframework.security.oauth2.oidc.core.IdTokenClaim;
+import org.springframework.security.oauth2.core.oidc.IdTokenClaim;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/OidcAuthorizedClient.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.client;
+package org.springframework.security.oauth2.client.oidc;
 
 import org.springframework.security.oauth2.client.AuthorizedClient;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.core.AccessToken;
-import org.springframework.security.oauth2.oidc.core.IdToken;
+import org.springframework.security.oauth2.core.oidc.IdToken;
 import org.springframework.util.Assert;
 
 /**

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.client.authentication;
+package org.springframework.security.oauth2.client.oidc.authentication;
 
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.core.Authentication;
@@ -22,25 +22,25 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
 import org.springframework.security.oauth2.client.authentication.AuthorizationCodeAuthenticationToken;
 import org.springframework.security.oauth2.client.authentication.AuthorizationGrantTokenExchanger;
-import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.client.authentication.jwt.JwtDecoderRegistry;
-import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
+import org.springframework.security.oauth2.client.oidc.OidcAuthorizedClient;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
 import org.springframework.security.oauth2.core.AccessToken;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.core.OAuth2Error;
 import org.springframework.security.oauth2.core.endpoint.AuthorizationRequest;
 import org.springframework.security.oauth2.core.endpoint.AuthorizationResponse;
 import org.springframework.security.oauth2.core.endpoint.TokenResponse;
+import org.springframework.security.oauth2.core.oidc.IdToken;
+import org.springframework.security.oauth2.core.oidc.OidcScope;
+import org.springframework.security.oauth2.core.oidc.endpoint.OidcParameter;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
-import org.springframework.security.oauth2.oidc.client.OidcAuthorizedClient;
-import org.springframework.security.oauth2.oidc.client.userinfo.OidcUserService;
-import org.springframework.security.oauth2.oidc.core.IdToken;
-import org.springframework.security.oauth2.oidc.core.OidcScope;
-import org.springframework.security.oauth2.oidc.core.endpoint.OidcParameter;
-import org.springframework.security.oauth2.oidc.core.user.OidcUser;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java

@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.client.userinfo;
+package org.springframework.security.oauth2.client.oidc.userinfo;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.client.AuthorizedClient;
-import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.client.oidc.OidcAuthorizedClient;
 import org.springframework.security.oauth2.client.userinfo.NimbusUserInfoRetriever;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
 import org.springframework.security.oauth2.client.userinfo.UserInfoRetriever;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.core.OAuth2Error;
+import org.springframework.security.oauth2.core.oidc.OidcScope;
+import org.springframework.security.oauth2.core.oidc.UserInfo;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority;
 import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.security.oauth2.oidc.client.OidcAuthorizedClient;
-import org.springframework.security.oauth2.oidc.core.OidcScope;
-import org.springframework.security.oauth2.oidc.core.UserInfo;
-import org.springframework.security.oauth2.oidc.core.user.DefaultOidcUser;
-import org.springframework.security.oauth2.oidc.core.user.OidcUserAuthority;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java

@@ -17,7 +17,7 @@ package org.springframework.security.oauth2.client.registration;
 
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
-import org.springframework.security.oauth2.oidc.core.OidcScope;
+import org.springframework.security.oauth2.core.oidc.OidcScope;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/Address.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 /**
  * The Address Claim represents a physical mailing address defined by the <i>OpenID Connect Core 1.0</i> specification

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddress.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 import java.util.Map;
 

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdToken.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 import org.springframework.security.oauth2.core.AbstractOAuth2Token;
 import org.springframework.util.Assert;

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdTokenClaim.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 /**
  * The &quot;Claims&quot; defined by the <i>OpenID Connect Core 1.0</i> specification

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/IdTokenClaimAccessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 import org.springframework.security.oauth2.core.ClaimAccessor;
 

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcScope.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 import org.springframework.security.oauth2.core.AccessToken;
 

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/StandardClaim.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 /**
  * The &quot;Standard Claims&quot; defined by the <i>OpenID Connect Core 1.0</i> specification

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/StandardClaimAccessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 import org.springframework.security.oauth2.core.ClaimAccessor;
 import org.springframework.util.CollectionUtils;

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/UserInfo.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;
 
 import org.springframework.util.Assert;
 

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/endpoint/OidcParameter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core.endpoint;
+package org.springframework.security.oauth2.core.oidc.endpoint;
 
 /**
  * Standard parameters defined in the OAuth Parameters Registry

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/package-info.java

@@ -16,4 +16,4 @@
 /**
  * Core classes and interfaces providing support for <i>OpenID Connect Core 1.0</i>.
  */
-package org.springframework.security.oauth2.oidc.core;
+package org.springframework.security.oauth2.core.oidc;

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUser.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.security.oauth2.oidc.core.user;
+package org.springframework.security.oauth2.core.oidc.user;
 
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
-import org.springframework.security.oauth2.oidc.core.IdToken;
-import org.springframework.security.oauth2.oidc.core.IdTokenClaim;
-import org.springframework.security.oauth2.oidc.core.UserInfo;
+import org.springframework.security.oauth2.core.oidc.IdToken;
+import org.springframework.security.oauth2.core.oidc.IdTokenClaim;
+import org.springframework.security.oauth2.core.oidc.UserInfo;
 
 import java.util.Map;
 import java.util.Set;

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUser.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core.user;
+package org.springframework.security.oauth2.core.oidc.user;
 
 import org.springframework.security.core.AuthenticatedPrincipal;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.security.oauth2.oidc.core.IdToken;
-import org.springframework.security.oauth2.oidc.core.IdTokenClaimAccessor;
-import org.springframework.security.oauth2.oidc.core.StandardClaimAccessor;
-import org.springframework.security.oauth2.oidc.core.UserInfo;
+import org.springframework.security.oauth2.core.oidc.IdToken;
+import org.springframework.security.oauth2.core.oidc.IdTokenClaimAccessor;
+import org.springframework.security.oauth2.core.oidc.StandardClaimAccessor;
+import org.springframework.security.oauth2.core.oidc.UserInfo;
 import org.springframework.util.Assert;
 
 import java.util.HashMap;

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUserAuthority.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.security.oauth2.oidc.core.user;
+package org.springframework.security.oauth2.core.oidc.user;
 
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
-import org.springframework.security.oauth2.oidc.core.IdToken;
-import org.springframework.security.oauth2.oidc.core.UserInfo;
+import org.springframework.security.oauth2.core.oidc.IdToken;
+import org.springframework.security.oauth2.core.oidc.UserInfo;
 
 /**
  * A {@link GrantedAuthority} that is associated with an {@link OidcUser}.

oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/package-info.java

@@ -16,4 +16,4 @@
 /**
  * Provides a model for an <i>OpenID Connect Core 1.0</i> representation of a user <code>Principal</code>.
  */
-package org.springframework.security.oauth2.oidc.core.user;
+package org.springframework.security.oauth2.core.oidc.user;

oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUserTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.security.oauth2.oidc.core.user;
+package org.springframework.security.oauth2.core.oidc.user;
 
 import java.time.Instant;
 import java.util.Collections;
@@ -27,10 +27,10 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.oauth2.oidc.core.IdToken;
-import org.springframework.security.oauth2.oidc.core.IdTokenClaim;
-import org.springframework.security.oauth2.oidc.core.StandardClaim;
-import org.springframework.security.oauth2.oidc.core.UserInfo;
+import org.springframework.security.oauth2.core.oidc.IdToken;
+import org.springframework.security.oauth2.core.oidc.IdTokenClaim;
+import org.springframework.security.oauth2.core.oidc.StandardClaim;
+import org.springframework.security.oauth2.core.oidc.UserInfo;
 
 import static org.assertj.core.api.Assertions.assertThat;