From 03930a9f14f4d0b4a84cc8b3be82a565a83ac840 Mon Sep 17 00:00:00 2001 From: Andrey Litvitski Date: Wed, 26 Aug 2026 02:09:25 +0300 Subject: [PATCH] Make RegisteredClient.Builder nullable setters Closes: gh-19597 Signed-off-by: Andrey Litvitski --- .../authorization/client/RegisteredClient.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java index 5367cd1abba..8fcb660b042 100644 --- a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java +++ b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java @@ -42,6 +42,7 @@ * * @author Joe Grandja * @author Anoop Garlapati + * @author Andrey Litvitski * @since 7.0 * @see Section 2 * Client Registration @@ -331,7 +332,7 @@ protected Builder(RegisteredClient registeredClient) { * @param id the identifier for the registration * @return the {@link Builder} */ - public Builder id(String id) { + public Builder id(@Nullable String id) { this.id = id; return this; } @@ -341,7 +342,7 @@ public Builder id(String id) { * @param clientId the client identifier * @return the {@link Builder} */ - public Builder clientId(String clientId) { + public Builder clientId(@Nullable String clientId) { this.clientId = clientId; return this; } @@ -351,7 +352,7 @@ public Builder clientId(String clientId) { * @param clientIdIssuedAt the time at which the client identifier was issued * @return the {@link Builder} */ - public Builder clientIdIssuedAt(Instant clientIdIssuedAt) { + public Builder clientIdIssuedAt(@Nullable Instant clientIdIssuedAt) { this.clientIdIssuedAt = clientIdIssuedAt; return this; } @@ -361,7 +362,7 @@ public Builder clientIdIssuedAt(Instant clientIdIssuedAt) { * @param clientSecret the client secret * @return the {@link Builder} */ - public Builder clientSecret(String clientSecret) { + public Builder clientSecret(@Nullable String clientSecret) { this.clientSecret = clientSecret; return this; } @@ -373,7 +374,7 @@ public Builder clientSecret(String clientSecret) { * {@code null} if it does not expire * @return the {@link Builder} */ - public Builder clientSecretExpiresAt(Instant clientSecretExpiresAt) { + public Builder clientSecretExpiresAt(@Nullable Instant clientSecretExpiresAt) { this.clientSecretExpiresAt = clientSecretExpiresAt; return this; } @@ -383,7 +384,7 @@ public Builder clientSecretExpiresAt(Instant clientSecretExpiresAt) { * @param clientName the client name * @return the {@link Builder} */ - public Builder clientName(String clientName) { + public Builder clientName(@Nullable String clientName) { this.clientName = clientName; return this; } @@ -507,7 +508,7 @@ public Builder scopes(Consumer> scopesConsumer) { * @param clientSettings the client configuration settings * @return the {@link Builder} */ - public Builder clientSettings(ClientSettings clientSettings) { + public Builder clientSettings(@Nullable ClientSettings clientSettings) { this.clientSettings = clientSettings; return this; } @@ -517,7 +518,7 @@ public Builder clientSettings(ClientSettings clientSettings) { * @param tokenSettings the token configuration settings * @return the {@link Builder} */ - public Builder tokenSettings(TokenSettings tokenSettings) { + public Builder tokenSettings(@Nullable TokenSettings tokenSettings) { this.tokenSettings = tokenSettings; return this; }