Skip to content

Complete nullability annotations in remaining equals methods #19016

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

Complete nullability annotations in remaining equals methods #19016

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions ...in/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public Map<String, Object> getAttributes() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
Expand Down Expand Up @@ -363,7 +363,7 @@ protected static Map<String, Object> defaultMetadata() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
Expand Down
4 changes: 3 additions & 1 deletion .../org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationConsent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import java.util.Set;
import java.util.function.Consumer;

import org.jspecify.annotations.Nullable;

import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
Expand Down Expand Up @@ -107,7 +109,7 @@ public Set<String> getScopes() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.io.Serial;
import java.io.Serializable;

import org.jspecify.annotations.Nullable;

import org.springframework.util.Assert;

/**
Expand Down Expand Up @@ -64,7 +66,7 @@ public String getValue() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
Expand Down
4 changes: 3 additions & 1 deletion ...amework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.util.Map;
import java.util.Objects;

import org.jspecify.annotations.Nullable;

import org.springframework.security.oauth2.core.ClaimAccessor;
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimNames;
import org.springframework.util.Assert;
Expand Down Expand Up @@ -65,7 +67,7 @@ public String getSubject() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (!(obj instanceof OAuth2TokenExchangeActor other)) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -203,7 +203,7 @@ public TokenSettings getTokenSettings() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/springframework/security/oauth2/server/authorization/settings/AbstractSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public Map<String, Object> getSettings() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
Expand Down
4 changes: 3 additions & 1 deletion .../org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.io.Serial;
import java.io.Serializable;

import org.jspecify.annotations.Nullable;

import org.springframework.util.Assert;

/**
Expand Down Expand Up @@ -65,7 +67,7 @@ public String getValue() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion ...org/springframework/security/web/webauthn/api/ImmutablePublicKeyCredentialUserEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public static PublicKeyCredentialUserEntityBuilder builder() {
}

@Override
public boolean equals(Object obj) {
public boolean equals(@Nullable Object obj) {
if (this == obj) {
Comment on lines 139 to 141
Copy link
Copy Markdown
Contributor Author

@therepanic therepanic Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This module had jspecify support before, I guess I accidentally missed it.

return true;
}
Expand Down
Loading