Skip to content

Use Objects.equals instead of hand-rolled String == comparison (CodeQL java/reference-equality-on-strings) #230

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
vharseko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use Objects.equals instead of hand-rolled String == comparison (CodeQL java/reference-equality-on-strings) #230

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
13 changes: 2 additions & 11 deletions commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Responses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015 ForgeRock AS.
* Portions Copyrighted 2026 3A Systems, LLC
*/

package org.forgerock.json.resource;
Expand Down Expand Up @@ -250,22 +251,12 @@ public boolean equals(final Object obj) {
return true;
} else if (obj instanceof ResourceResponseImpl) {
final ResourceResponseImpl that = (ResourceResponseImpl) obj;
return isEqual(id, that.id) && isEqual(revision, that.revision);
return Objects.equals(id, that.id) && Objects.equals(revision, that.revision);
} else {
return false;
}
}

private boolean isEqual(final String s1, final String s2) {
if (s1 == s2) {
return true;
} else if (s1 == null || s2 == null) {
return false;
} else {
return s1.equals(s2);
}
}

@Override
public int hashCode() {
final int hash = id != null ? id.hashCode() : 17;
Expand Down
Loading