Fix NullAway 0.13.1 compatibility issues

andimarek · claude · andi · commit dda29af440ec · 2026-03-11T11:33:05.000+10:00
- ArrayValue/ObjectValue: inline assertNotNull(deepCopy(...)) to avoid @nullable local variable being passed where @nonnull is required - MergedField: replace assertNotNull on @nullable Builder field with explicit null check to satisfy stricter NullAway type inference Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
diff --git 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<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);
         }
diff --git 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<Value> 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
@@ -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());
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,7 @@ public String toString() {`
`91`	`91`
`92`	`92`	`@Override`
`93`	`93`	`public ArrayValue deepCopy() {`
`94`		`- List<Value> copiedValues = assertNotNull(deepCopy(values));`
`95`		`- return new ArrayValue(copiedValues, getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());`
	`94`	`+ return new ArrayValue(assertNotNull(deepCopy(values)), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());`
`96`	`95`	`}`
`97`	`96`
`98`	`97`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,7 @@ public boolean isEqualTo(@Nullable Node o) {`
`81`	`81`
`82`	`82`	`@Override`
`83`	`83`	`public ObjectValue deepCopy() {`
`84`		`- List<ObjectField> copiedFields = assertNotNull(deepCopy(objectFields));`
`85`		`- return new ObjectValue(copiedFields, getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());`
	`84`	`+ return new ObjectValue(assertNotNull(deepCopy(objectFields)), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());`
`86`	`85`	`}`
`87`	`86`
`88`	`87`