Skip to content

Simplify some isEqualTo implementations #2620

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

Merged
bbakerman merged 1 commit into from
Dec 2, 2021
Merged

Simplify some isEqualTo implementations #2620

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
3 changes: 2 additions & 1 deletion src/main/java/graphql/language/FloatValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;

import static graphql.Assert.assertNotNull;
Expand Down Expand Up @@ -77,7 +78,7 @@ public boolean isEqualTo(Node o) {

FloatValue that = (FloatValue) o;

return !(value != null ? !value.equals(that.value) : that.value != null);
return Objects.equals(value, that.value);

}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/graphql/language/IntValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;

import static graphql.Assert.assertNotNull;
Expand Down Expand Up @@ -70,8 +71,7 @@ public boolean isEqualTo(Node o) {

IntValue that = (IntValue) o;

return !(value != null ? !value.equals(that.value) : that.value != null);

return Objects.equals(value, that.value);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/graphql/language/ObjectField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;

import static graphql.Assert.assertNotNull;
Expand Down Expand Up @@ -81,7 +82,7 @@ public boolean isEqualTo(Node o) {

ObjectField that = (ObjectField) o;

return !(name != null ? !name.equals(that.name) : that.name != null);
return Objects.equals(name, that.name);

}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/graphql/language/StringValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;

import static graphql.Assert.assertNotNull;
Expand Down Expand Up @@ -76,7 +77,7 @@ public boolean isEqualTo(Node o) {

StringValue that = (StringValue) o;

return !(value != null ? !value.equals(that.value) : that.value != null);
return Objects.equals(value, that.value);

}

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/graphql/validation/rules/OverlappingFieldsCanBeMerged.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;

import static graphql.collect.ImmutableKit.addToList;
Expand Down Expand Up @@ -374,12 +375,12 @@ public boolean equals(Object o) {

FieldAndType that = (FieldAndType) o;

return field != null ? field.equals(that.field) : that.field == null;
return Objects.equals(field, that.field);
}

@Override
public int hashCode() {
return field != null ? field.hashCode() : 0;
return Objects.hashCode(field);
}
}

Expand Down