Skip to content

Fix NullAway 0.13.1 compatibility #4338

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

Closed
andimarek wants to merge 1 commit into from
+8 −6
Closed

Fix NullAway 0.13.1 compatibility #4338

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
8 changes: 6 additions & 2 deletions src/main/java/graphql/execution/MergedField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -428,7 +428,11 @@ public MergedField build() {
if (this.singleField != null && this.fields == null) {
return new MergedField(singleField, deferredExecutions);
}
ImmutableList<Field> fields = assertNotNull(this.fields, "You MUST add at least one field via the builder").build();
ImmutableList.Builder<Field> fieldsBuilder = this.fields;
if (fieldsBuilder == null) {
throw new AssertionError("You MUST add at least one field via the builder");
}
ImmutableList<Field> fields = fieldsBuilder.build();
assertNotEmpty(fields);
return new MultiMergedField(fields, deferredExecutions);
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/graphql/language/ArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ public String toString() {

@Override
public ArrayValue deepCopy() {
List<Value> copiedValues = assertNotNull(deepCopy(values));
return new ArrayValue(copiedValues, getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
return new ArrayValue(assertNotNull(deepCopy(values)), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/graphql/language/ObjectValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ public boolean isEqualTo(@Nullable Node o) {

@Override
public ObjectValue deepCopy() {
List<ObjectField> copiedFields = assertNotNull(deepCopy(objectFields));
return new ObjectValue(copiedFields, getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
return new ObjectValue(assertNotNull(deepCopy(objectFields)), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
}


Expand Down
Loading