Require array and object value to not be null, use empty list instead

dondonz · dondonz · commit d559d7bb30fd · 2025-08-03T10:29:00.000+10:00
diff --git a/src/main/java/graphql/language/AbstractNode.java b/src/main/java/graphql/language/AbstractNode.java
@@ -59,15 +59,15 @@ public Map<String, String> getAdditionalData() {
     }
 
     @SuppressWarnings("unchecked")
-    protected <V extends @Nullable Node> V deepCopy(V nullableObj) {
+    protected <V extends @Nullable Node> @Nullable V deepCopy(@Nullable V nullableObj) {
         if (nullableObj == null) {
             return null;
         }
         return (V) nullableObj.deepCopy();
     }
 
     @SuppressWarnings("unchecked")
-    protected <V extends Node> @Nullable List<V> deepCopy(@Nullable List<? extends Node> list) {
+    protected <V extends @Nullable Node> @Nullable List<V> deepCopy(@Nullable List<? extends Node> list) {
         if (list == null) {
             return null;
         }
diff --git a/src/main/java/graphql/language/ArrayValue.java b/src/main/java/graphql/language/ArrayValue.java
@@ -91,7 +91,8 @@ public String toString() {
 
     @Override
     public ArrayValue deepCopy() {
-        return new ArrayValue(deepCopy(values), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
+        List<Value> copiedValues = deepCopy(values);
+        return new ArrayValue(copiedValues != null ? copiedValues : emptyList(), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
     }
 
     @Override
diff --git a/src/main/java/graphql/language/ObjectValue.java b/src/main/java/graphql/language/ObjectValue.java
@@ -8,6 +8,7 @@
 import graphql.util.TraversalControl;
 import graphql.util.TraverserContext;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.LinkedHashMap;
@@ -80,7 +81,8 @@ public boolean isEqualTo(@Nullable Node o) {
 
     @Override
     public ObjectValue deepCopy() {
-        return new ObjectValue(deepCopy(objectFields), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
+        List<ObjectField> copiedFields = deepCopy(objectFields);
+        return new ObjectValue(copiedFields != null ? copiedFields : emptyList(), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
     }
 
 
@@ -107,8 +109,9 @@ public ObjectValue transform(Consumer<Builder> builderConsumer) {
         return builder.build();
     }
 
+    @NullUnmarked
     public static final class Builder implements NodeBuilder {
-        private @Nullable SourceLocation sourceLocation;
+        private SourceLocation sourceLocation;
         private ImmutableList<ObjectField> objectFields = emptyList();
         private ImmutableList<Comment> comments = emptyList();
         private IgnoredChars ignoredChars = IgnoredChars.EMPTY;
@@ -124,7 +127,7 @@ private Builder(ObjectValue existing) {
             this.additionalData = new LinkedHashMap<>(existing.getAdditionalData());
         }
 
-        public Builder sourceLocation(@Nullable SourceLocation sourceLocation) {
+        public Builder sourceLocation(SourceLocation sourceLocation) {
             this.sourceLocation = sourceLocation;
             return this;
         }

Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,15 @@ public Map<String, String> getAdditionalData() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@SuppressWarnings("unchecked")`
`62`		`- protected <V extends @Nullable Node> V deepCopy(V nullableObj) {`
	`62`	`+ protected <V extends @Nullable Node> @Nullable V deepCopy(@Nullable V nullableObj) {`
`63`	`63`	`if (nullableObj == null) {`
`64`	`64`	`return null;`
`65`	`65`	`}`
`66`	`66`	`return (V) nullableObj.deepCopy();`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@SuppressWarnings("unchecked")`
`70`		`- protected <V extends Node> @Nullable List<V> deepCopy(@Nullable List<? extends Node> list) {`
	`70`	`+ protected <V extends @Nullable Node> @Nullable List<V> deepCopy(@Nullable List<? extends Node> list) {`
`71`	`71`	`if (list == null) {`
`72`	`72`	`return null;`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,8 @@ public String toString() {`
`91`	`91`
`92`	`92`	`@Override`
`93`	`93`	`public ArrayValue deepCopy() {`
`94`		`- return new ArrayValue(deepCopy(values), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());`
	`94`	`+ List<Value> copiedValues = deepCopy(values);`
	`95`	`+ return new ArrayValue(copiedValues != null ? copiedValues : emptyList(), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`@Override`