Skip to content

Make RegisteredClient.Builder nullable setters #19601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
therepanic wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make RegisteredClient.Builder nullable setters #19601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions ...ava/org/springframework/security/oauth2/server/authorization/client/RegisteredClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
*
* @author Joe Grandja
* @author Anoop Garlapati
* @author Andrey Litvitski
* @since 7.0
* @see <a target="_blank" href="https://tools.ietf.org/html/rfc6749#section-2">Section 2
* Client Registration</a>
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -507,7 +508,7 @@ public Builder scopes(Consumer<Set<String>> 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;
}
Expand All @@ -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;
}
Expand Down
Loading