Skip to content

Commit 08b4b01

Browse files
authored
Simplify some isEqualTo implementations (graphql-java#2620)
In particular: - use of null-safe Objects.equals - avoid double negation
1 parent cbf0eb1 commit 08b4b01

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

‎src/main/java/graphql/language/FloatValue.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.LinkedHashMap;
1212
import java.util.List;
1313
import java.util.Map;
14+
import java.util.Objects;
1415
import java.util.function.Consumer;
1516

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

7879
FloatValue that = (FloatValue) o;
7980

80-
return !(value != null ? !value.equals(that.value) : that.value != null);
81+
return Objects.equals(value, that.value);
8182

8283
}
8384

‎src/main/java/graphql/language/IntValue.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.LinkedHashMap;
1212
import java.util.List;
1313
import java.util.Map;
14+
import java.util.Objects;
1415
import java.util.function.Consumer;
1516

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

7172
IntValue that = (IntValue) o;
7273

73-
return !(value != null ? !value.equals(that.value) : that.value != null);
74-
74+
return Objects.equals(value, that.value);
7575
}
7676

7777
@Override

‎src/main/java/graphql/language/ObjectField.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.LinkedHashMap;
1212
import java.util.List;
1313
import java.util.Map;
14+
import java.util.Objects;
1415
import java.util.function.Consumer;
1516

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

8283
ObjectField that = (ObjectField) o;
8384

84-
return !(name != null ? !name.equals(that.name) : that.name != null);
85+
return Objects.equals(name, that.name);
8586

8687
}
8788

‎src/main/java/graphql/language/StringValue.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.LinkedHashMap;
1111
import java.util.List;
1212
import java.util.Map;
13+
import java.util.Objects;
1314
import java.util.function.Consumer;
1415

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

7778
StringValue that = (StringValue) o;
7879

79-
return !(value != null ? !value.equals(that.value) : that.value != null);
80+
return Objects.equals(value, that.value);
8081

8182
}
8283

‎src/main/java/graphql/validation/rules/OverlappingFieldsCanBeMerged.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.LinkedHashSet;
3131
import java.util.List;
3232
import java.util.Map;
33+
import java.util.Objects;
3334
import java.util.Set;
3435

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

375376
FieldAndType that = (FieldAndType) o;
376377

377-
return field != null ? field.equals(that.field) : that.field == null;
378+
return Objects.equals(field, that.field);
378379
}
379380

380381
@Override
381382
public int hashCode() {
382-
return field != null ? field.hashCode() : 0;
383+
return Objects.hashCode(field);
383384
}
384385
}
385386

0 commit comments

Comments
 (0)