diff --git a/src/main/java/graphql/execution/MergedField.java b/src/main/java/graphql/execution/MergedField.java index e15404262a..77478ae547 100644 --- a/src/main/java/graphql/execution/MergedField.java +++ b/src/main/java/graphql/execution/MergedField.java @@ -16,7 +16,7 @@ import java.util.function.Consumer; import static graphql.Assert.assertNotEmpty; -import static graphql.Assert.assertNotNull; + /** * This represents all Fields in a query which overlap and are merged into one. @@ -428,7 +428,11 @@ public MergedField build() { if (this.singleField != null && this.fields == null) { return new MergedField(singleField, deferredExecutions); } - ImmutableList fields = assertNotNull(this.fields, "You MUST add at least one field via the builder").build(); + ImmutableList.Builder fieldsBuilder = this.fields; + if (fieldsBuilder == null) { + throw new AssertionError("You MUST add at least one field via the builder"); + } + ImmutableList fields = fieldsBuilder.build(); assertNotEmpty(fields); return new MultiMergedField(fields, deferredExecutions); } diff --git a/src/main/java/graphql/language/ArrayValue.java b/src/main/java/graphql/language/ArrayValue.java index 2d5ae6c100..2c5b7cb765 100644 --- a/src/main/java/graphql/language/ArrayValue.java +++ b/src/main/java/graphql/language/ArrayValue.java @@ -91,8 +91,7 @@ public String toString() { @Override public ArrayValue deepCopy() { - List copiedValues = assertNotNull(deepCopy(values)); - return new ArrayValue(copiedValues, getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData()); + return new ArrayValue(assertNotNull(deepCopy(values)), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData()); } @Override diff --git a/src/main/java/graphql/language/ObjectValue.java b/src/main/java/graphql/language/ObjectValue.java index 7a40d0a4c9..ac2cd266b1 100644 --- a/src/main/java/graphql/language/ObjectValue.java +++ b/src/main/java/graphql/language/ObjectValue.java @@ -81,8 +81,7 @@ public boolean isEqualTo(@Nullable Node o) { @Override public ObjectValue deepCopy() { - List copiedFields = assertNotNull(deepCopy(objectFields)); - return new ObjectValue(copiedFields, getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData()); + return new ObjectValue(assertNotNull(deepCopy(objectFields)), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData()); }