Apply consistent naming to builder() methods

Issue gh-143 gh-81

Author: jgrandja

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

@@ -62,7 +62,7 @@ public Map<String, Object> getClaims() {
 	 *
 	 * @return the {@link Builder}
 	 */
-	public static Builder withClaims() {
+	public static Builder builder() {
 		return new Builder();
 	}
 

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java

@@ -59,7 +59,7 @@ public Map<String, Object> getClaims() {
 	 *
 	 * @return the {@link Builder}
 	 */
-	public static Builder withClaims() {
+	public static Builder builder() {
 		return new Builder();
 	}
 

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIssuerUtil.java

@@ -48,7 +48,7 @@ static Jwt issueJwtAccessToken(JwtEncoder jwtEncoder, String subject, String aud
 		Instant issuedAt = Instant.now();
 		Instant expiresAt = issuedAt.plus(1, ChronoUnit.HOURS);		// TODO Allow configuration for access token time-to-live
 
-		JwtClaimsSet jwtClaimsSet = JwtClaimsSet.withClaims()
+		JwtClaimsSet jwtClaimsSet = JwtClaimsSet.builder()
 											.issuer(issuer)
 											.subject(subject)
 											.audience(Collections.singletonList(audience))

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

@@ -74,7 +74,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			return;
 		}
 
-		OidcProviderConfiguration providerConfiguration = OidcProviderConfiguration.withClaims()
+		OidcProviderConfiguration providerConfiguration = OidcProviderConfiguration.builder()
 				.issuer(this.providerSettings.issuer())
 				.authorizationEndpoint(asUrl(this.providerSettings.issuer(), this.providerSettings.authorizationEndpoint()))
 				.tokenEndpoint(asUrl(this.providerSettings.issuer(), this.providerSettings.tokenEndpoint()))

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/core/oidc/OidcProviderConfigurationTests.java

@@ -34,7 +34,7 @@
  */
 public class OidcProviderConfigurationTests {
 	private final OidcProviderConfiguration.Builder minimalConfigurationBuilder =
-			OidcProviderConfiguration.withClaims()
+			OidcProviderConfiguration.builder()
 					.issuer("https://example.com/issuer1")
 					.authorizationEndpoint("https://example.com/issuer1/oauth2/authorize")
 					.tokenEndpoint("https://example.com/issuer1/oauth2/token")
@@ -45,7 +45,7 @@ public class OidcProviderConfigurationTests {
 
 	@Test
 	public void buildWhenAllRequiredClaimsAndAdditionalClaimsThenCreated() {
-		OidcProviderConfiguration providerConfiguration = OidcProviderConfiguration.withClaims()
+		OidcProviderConfiguration providerConfiguration = OidcProviderConfiguration.builder()
 				.issuer("https://example.com/issuer1")
 				.authorizationEndpoint("https://example.com/issuer1/oauth2/authorize")
 				.tokenEndpoint("https://example.com/issuer1/oauth2/token")
@@ -73,7 +73,7 @@ public void buildWhenAllRequiredClaimsAndAdditionalClaimsThenCreated() {
 
 	@Test
 	public void buildWhenOnlyRequiredClaimsThenCreated() {
-		OidcProviderConfiguration providerConfiguration = OidcProviderConfiguration.withClaims()
+		OidcProviderConfiguration providerConfiguration = OidcProviderConfiguration.builder()
 				.issuer("https://example.com/issuer1")
 				.authorizationEndpoint("https://example.com/issuer1/oauth2/authorize")
 				.tokenEndpoint("https://example.com/issuer1/oauth2/token")
@@ -409,14 +409,14 @@ public void tokenEndpointAuthenticationMethodsWhenAddingOrRemovingThenCorrectVal
 
 	@Test
 	public void claimWhenNameIsNullThenThrowIllegalArgumentException() {
-		assertThatThrownBy(() -> OidcProviderConfiguration.withClaims().claim(null, "value"))
+		assertThatThrownBy(() -> OidcProviderConfiguration.builder().claim(null, "value"))
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessage("name cannot be empty");
 	}
 
 	@Test
 	public void claimWhenValueIsNullThenThrowIllegalArgumentException() {
-		assertThatThrownBy(() -> OidcProviderConfiguration.withClaims().claim("claim-name", null))
+		assertThatThrownBy(() -> OidcProviderConfiguration.builder().claim("claim-name", null))
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessage("value cannot be null");
 	}

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/core/oidc/http/converter/OidcProviderConfigurationHttpMessageConverterTests.java

@@ -145,7 +145,7 @@ public void readInternalWhenInvalidProviderConfigurationThenThrowException() {
 	@Test
 	public void writeInternalWhenProviderConfigurationThenSuccess() {
 		OidcProviderConfiguration providerConfiguration =
-				OidcProviderConfiguration.withClaims()
+				OidcProviderConfiguration.builder()
 						.issuer("https://example.com/issuer1")
 						.authorizationEndpoint("https://example.com/issuer1/oauth2/authorize")
 						.tokenEndpoint("https://example.com/issuer1/oauth2/token")
@@ -187,7 +187,7 @@ public void writeInternalWhenWriteFailsThenThrowsException() {
 		this.messageConverter.setProviderConfigurationParametersConverter(failingConverter);
 
 		OidcProviderConfiguration providerConfiguration =
-				OidcProviderConfiguration.withClaims()
+				OidcProviderConfiguration.builder()
 						.issuer("https://example.com/issuer1")
 						.authorizationEndpoint("https://example.com/issuer1/oauth2/authorize")
 						.tokenEndpoint("https://example.com/issuer1/oauth2/token")

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java

@@ -29,7 +29,7 @@ public class JwtClaimsSetTests {
 
 	@Test
 	public void buildWhenClaimsEmptyThenThrowIllegalArgumentException() {
-		assertThatThrownBy(() -> JwtClaimsSet.withClaims().build())
+		assertThatThrownBy(() -> JwtClaimsSet.builder().build())
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessage("claims cannot be empty");
 	}
@@ -38,7 +38,7 @@ public void buildWhenClaimsEmptyThenThrowIllegalArgumentException() {
 	public void buildWhenAllClaimsProvidedThenAllClaimsAreSet() {
 		JwtClaimsSet expectedJwtClaimsSet = TestJwtClaimsSets.jwtClaimsSet().build();
 
-		JwtClaimsSet jwtClaimsSet = JwtClaimsSet.withClaims()
+		JwtClaimsSet jwtClaimsSet = JwtClaimsSet.builder()
 				.issuer(expectedJwtClaimsSet.getIssuer().toExternalForm())
 				.subject(expectedJwtClaimsSet.getSubject())
 				.audience(expectedJwtClaimsSet.getAudience())
@@ -76,14 +76,14 @@ public void fromWhenClaimsProvidedThenCopied() {
 
 	@Test
 	public void claimWhenNameNullThenThrowIllegalArgumentException() {
-		assertThatThrownBy(() -> JwtClaimsSet.withClaims().claim(null, "value"))
+		assertThatThrownBy(() -> JwtClaimsSet.builder().claim(null, "value"))
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessage("name cannot be empty");
 	}
 
 	@Test
 	public void claimWhenValueNullThenThrowIllegalArgumentException() {
-		assertThatThrownBy(() -> JwtClaimsSet.withClaims().claim("name", null))
+		assertThatThrownBy(() -> JwtClaimsSet.builder().claim("name", null))
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessage("value cannot be null");
 	}

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java

@@ -30,7 +30,7 @@ public static JwtClaimsSet.Builder jwtClaimsSet() {
 		Instant issuedAt = Instant.now();
 		Instant expiresAt = issuedAt.plus(1, ChronoUnit.HOURS);
 
-		return JwtClaimsSet.withClaims()
+		return JwtClaimsSet.builder()
 				.issuer(issuer)
 				.subject("subject")
 				.audience(Collections.singletonList("client-1"))