Typos, renames, etc

Author: Kehrlann

oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java

@@ -82,7 +82,7 @@ public final class OAuth2AuthorizationServerConfigurer<B extends HttpSecurityBui
 			OAuth2TokenRevocationEndpointFilter.DEFAULT_TOKEN_REVOCATION_ENDPOINT_URI, HttpMethod.POST.name());
 	private final RequestMatcher jwkSetEndpointMatcher = new AntPathRequestMatcher(
 			JwkSetEndpointFilter.DEFAULT_JWK_SET_ENDPOINT_URI, HttpMethod.GET.name());
-	private final RequestMatcher oidcProviderMetadataEndpointMatcher = new AntPathRequestMatcher(
+	private final RequestMatcher oidcProviderConfigurationEndpointMatcher = new AntPathRequestMatcher(
 			OidcProviderConfigurationEndpointFilter.DEFAULT_OIDC_PROVIDER_CONFIGURATION_ENDPOINT_URI, HttpMethod.GET.name());
 
 	/**
@@ -141,7 +141,7 @@ public OAuth2AuthorizationServerConfigurer<B> providerSettings(ProviderSettings
 	public List<RequestMatcher> getEndpointMatchers() {
 		// TODO: use ProviderSettings instead
 		return Arrays.asList(this.authorizationEndpointMatcher, this.tokenEndpointMatcher,
-				this.tokenRevocationEndpointMatcher, this.jwkSetEndpointMatcher, this.oidcProviderMetadataEndpointMatcher);
+				this.tokenRevocationEndpointMatcher, this.jwkSetEndpointMatcher, this.oidcProviderConfigurationEndpointMatcher);
 	}
 
 	@Override

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/oidc/OidcProviderConfiguration.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.security.oauth2.core.oidc;
 
+import org.springframework.security.oauth2.server.authorization.Version;
 import org.springframework.util.Assert;
 
 import java.io.Serializable;
@@ -39,6 +40,8 @@
  * @see <a target="_blank" href="https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfigurationResponse">4.2. OpenID Provider Configuration Response</a>
  */
 public class OidcProviderConfiguration implements OidcProviderMetadataClaimAccessor, Serializable {
+	private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
+
 	private final Map<String, Object> claims;
 
 	private OidcProviderConfiguration(Map<String, Object> claims) {

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/oidc/OidcProviderMetadataClaimNames.java

@@ -21,7 +21,7 @@
  *
  * @author Daniel Garnier-Moiroux
  * @since 0.1.0
- * @see <a target="_blank" href="https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata">URL the OpenID Provider asserts as its Issuer identifier</a>
+ * @see <a target="_blank" href="https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata">3. OpenID Provider Metadata</a>
  */
 public interface OidcProviderMetadataClaimNames {
 

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OidcProviderConfigurationEndpointFilter.java

@@ -75,10 +75,10 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 		}
 
 		OidcProviderConfiguration providerConfiguration = OidcProviderConfiguration.withClaims()
-				.issuer(providerSettings.issuer())
-				.authorizationEndpoint(asUrl(providerSettings.issuer(), providerSettings.authorizationEndpoint()))
-				.tokenEndpoint(asUrl(providerSettings.issuer(), providerSettings.tokenEndpoint()))
-				.jwksUri(asUrl(providerSettings.issuer(), providerSettings.jwkSetEndpoint()))
+				.issuer(this.providerSettings.issuer())
+				.authorizationEndpoint(asUrl(this.providerSettings.issuer(), this.providerSettings.authorizationEndpoint()))
+				.tokenEndpoint(asUrl(this.providerSettings.issuer(), this.providerSettings.tokenEndpoint()))
+				.jwksUri(asUrl(this.providerSettings.issuer(), this.providerSettings.jwkSetEndpoint()))
 				.subjectType("public")
 				.responseType(OAuth2AuthorizationResponseType.CODE.getValue())
 				.scope(OidcScopes.OPENID)