From b6f477b1d3e96a4802f98a265b595c1ca369bf11 Mon Sep 17 00:00:00 2001
From: Joe Grandja <jgrandja@vmware.com>
Date: Thu, 5 May 2022 06:05:19 -0400
Subject: [PATCH] Remove OAuth2TokenClaimsContext.Builder.claims()

Issue gh-500

Closes gh-731
---
 .../token/OAuth2AccessTokenGenerator.java           |  3 +--
 .../token/OAuth2TokenClaimsContext.java             | 13 -------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java
index e89d434a..32465719 100644
--- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java
+++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java
@@ -21,7 +21,6 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.function.Consumer;
 
 import org.springframework.lang.Nullable;
 import org.springframework.security.crypto.keygen.Base64StringKeyGenerator;
@@ -119,7 +118,7 @@ public final class OAuth2AccessTokenGenerator implements OAuth2TokenGenerator<OA
 
 	/**
 	 * Sets the {@link OAuth2TokenCustomizer} that customizes the
-	 * {@link OAuth2TokenClaimsContext.Builder#claims(Consumer) claims} for the {@link OAuth2AccessToken}.
+	 * {@link OAuth2TokenClaimsContext#getClaims() claims} for the {@link OAuth2AccessToken}.
 	 *
 	 * @param accessTokenCustomizer the {@link OAuth2TokenCustomizer} that customizes the claims for the {@code OAuth2AccessToken}
 	 */
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsContext.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsContext.java
index d9a3b576..fadfa4e1 100644
--- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsContext.java
+++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenClaimsContext.java
@@ -18,7 +18,6 @@ package org.springframework.security.oauth2.server.authorization.token;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Consumer;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -82,18 +81,6 @@ public final class OAuth2TokenClaimsContext implements OAuth2TokenContext {
 			put(OAuth2TokenClaimsSet.Builder.class, claimsBuilder);
 		}
 
-		/**
-		 * A {@code Consumer} of the {@link OAuth2TokenClaimsSet.Builder claims}
-		 * allowing the ability to add, replace, or remove.
-		 *
-		 * @param claimsConsumer a {@code Consumer} of the {@link OAuth2TokenClaimsSet.Builder claims}
-		 * @return the {@link Builder} for further configuration
-		 */
-		public Builder claims(Consumer<OAuth2TokenClaimsSet.Builder> claimsConsumer) {
-			claimsConsumer.accept(get(OAuth2TokenClaimsSet.Builder.class));
-			return this;
-		}
-
 		/**
 		 * Builds a new {@link OAuth2TokenClaimsContext}.
 		 *