graphql-java · andimarek · Apr 22, 2026 · Jan 25, 2026 · Jan 25, 2026 · Jan 25, 2026
diff --git a/src/main/java/graphql/language/DirectiveLocation.java b/src/main/java/graphql/language/DirectiveLocation.java
@@ -6,6 +6,9 @@
 import graphql.PublicApi;
 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;
 import java.util.List;
@@ -20,11 +23,12 @@
 import static graphql.language.NodeUtil.assertNewChildrenAreEmpty;
 
 @PublicApi
+@NullMarked
 public class DirectiveLocation extends AbstractNode<DirectiveLocation> implements NamedNode<DirectiveLocation> {
     private final String name;
 
     @Internal
-    protected DirectiveLocation(String name, SourceLocation sourceLocation, List<Comment> comments, IgnoredChars ignoredChars, Map<String, String> additionalData) {
+    protected DirectiveLocation(String name, @Nullable SourceLocation sourceLocation, List<Comment> comments, IgnoredChars ignoredChars, Map<String, String> additionalData) {
         super(sourceLocation, comments, ignoredChars, additionalData);
         this.name = name;
     }
@@ -60,7 +64,7 @@ public DirectiveLocation withNewChildren(NodeChildrenContainer newChildren) {
     }
 
     @Override
-    public boolean isEqualTo(Node o) {
+    public boolean isEqualTo(@Nullable Node o) {
         if (this == o) {
             return true;
         }
@@ -100,6 +104,7 @@ public DirectiveLocation transform(Consumer<Builder> builderConsumer) {
         return builder.build();
     }
 
+    @NullUnmarked
     public static final class Builder implements NodeBuilder {
         private SourceLocation sourceLocation;
         private ImmutableList<Comment> comments = emptyList();
@@ -148,7 +153,7 @@ public Builder additionalData(String key, String value) {
         }
 
         public DirectiveLocation build() {
-            return new DirectiveLocation(name, sourceLocation, comments, ignoredChars, additionalData);
+            return new DirectiveLocation(assertNotNull(name), sourceLocation, comments, ignoredChars, additionalData);
         }
     }
 }
diff --git a/src/main/java/graphql/language/DirectivesContainer.java b/src/main/java/graphql/language/DirectivesContainer.java
@@ -2,6 +2,7 @@
 
 
 import graphql.PublicApi;
+import org.jspecify.annotations.NullMarked;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +16,7 @@
  * @see DirectiveDefinition#isRepeatable()
  */
 @PublicApi
+@NullMarked
 public interface DirectivesContainer<T extends DirectivesContainer> extends Node<T> {
 
     /**

diff --git a/src/main/java/graphql/language/Document.java b/src/main/java/graphql/language/Document.java
@@ -8,6 +8,9 @@
 import graphql.collect.ImmutableKit;
 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;
 import java.util.List;
@@ -21,14 +24,15 @@
 import static graphql.language.NodeChildrenContainer.newNodeChildrenContainer;
 
 @PublicApi
+@NullMarked
 public class Document extends AbstractNode<Document> {
 
     private final ImmutableList<Definition> definitions;
 
     public static final String CHILD_DEFINITIONS = "definitions";
 
     @Internal
-    protected Document(List<Definition> definitions, SourceLocation sourceLocation, List<Comment> comments, IgnoredChars ignoredChars, Map<String, String> additionalData) {
+    protected Document(List<Definition> definitions, @Nullable SourceLocation sourceLocation, List<Comment> comments, IgnoredChars ignoredChars, Map<String, String> additionalData) {
         super(sourceLocation, comments, ignoredChars, additionalData);
         this.definitions = ImmutableList.copyOf(definitions);
     }
@@ -114,7 +118,7 @@ public Document withNewChildren(NodeChildrenContainer newChildren) {
     }
 
     @Override
-    public boolean isEqualTo(Node o) {
+    public boolean isEqualTo(@Nullable Node o) {
         if (this == o) {
             return true;
         }
@@ -127,7 +131,7 @@ public boolean isEqualTo(Node o) {
 
     @Override
     public Document deepCopy() {
-        return new Document(deepCopy(definitions), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
+        return new Document(assertNotNull(deepCopy(definitions)), getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
     }
 
     @Override
@@ -152,6 +156,7 @@ public Document transform(Consumer<Builder> builderConsumer) {
         return builder.build();
     }
 
+    @NullUnmarked
     public static final class Builder implements NodeBuilder {
         private ImmutableList<Definition> definitions = emptyList();
         private SourceLocation sourceLocation;

diff --git a/src/main/java/graphql/language/EnumTypeDefinition.java b/src/main/java/graphql/language/EnumTypeDefinition.java
@@ -6,6 +6,9 @@
 import graphql.collect.ImmutableKit;
 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.ArrayList;
 import java.util.LinkedHashMap;
@@ -20,6 +23,7 @@
 import static graphql.language.NodeChildrenContainer.newNodeChildrenContainer;
 
 @PublicApi
+@NullMarked
 public class EnumTypeDefinition extends AbstractDescribedNode<EnumTypeDefinition> implements TypeDefinition<EnumTypeDefinition>, DirectivesContainer<EnumTypeDefinition>, NamedNode<EnumTypeDefinition> {
     private final String name;
     private final ImmutableList<EnumValueDefinition> enumValueDefinitions;
@@ -32,8 +36,8 @@ public class EnumTypeDefinition extends AbstractDescribedNode<EnumTypeDefinition
     protected EnumTypeDefinition(String name,
                                  List<EnumValueDefinition> enumValueDefinitions,
                                  List<Directive> directives,
-                                 Description description,
-                                 SourceLocation sourceLocation,
+                                 @Nullable Description description,
+                                 @Nullable SourceLocation sourceLocation,
                                  List<Comment> comments,
                                  IgnoredChars ignoredChars, Map<String, String> additionalData) {
         super(sourceLocation, comments, ignoredChars, additionalData, description);
@@ -105,7 +109,7 @@ public EnumTypeDefinition withNewChildren(NodeChildrenContainer newChildren) {
     }
 
     @Override
-    public boolean isEqualTo(Node o) {
+    public boolean isEqualTo(@Nullable Node o) {
         if (this == o) {
             return true;
         }
@@ -121,8 +125,8 @@ public boolean isEqualTo(Node o) {
     @Override
     public EnumTypeDefinition deepCopy() {
         return new EnumTypeDefinition(name,
-                deepCopy(enumValueDefinitions),
-                deepCopy(directives.getDirectives()),
+                assertNotNull(deepCopy(enumValueDefinitions)),
+                assertNotNull(deepCopy(directives.getDirectives())),
                 description,
                 getSourceLocation(),
                 getComments(),
@@ -154,6 +158,7 @@ public EnumTypeDefinition transform(Consumer<Builder> builderConsumer) {
         return builder.build();
     }
 
+    @NullUnmarked
     public static final class Builder implements NodeDirectivesBuilder {
         private SourceLocation sourceLocation;
         private ImmutableList<Comment> comments = emptyList();
@@ -236,7 +241,7 @@ public Builder additionalData(String key, String value) {
 
 
         public EnumTypeDefinition build() {
-            return new EnumTypeDefinition(name, enumValueDefinitions, directives, description, sourceLocation, comments, ignoredChars, additionalData);
+            return new EnumTypeDefinition(assertNotNull(name), enumValueDefinitions, directives, description, sourceLocation, comments, ignoredChars, additionalData);
         }
     }
 }
diff --git a/src/main/java/graphql/language/EnumTypeExtensionDefinition.java b/src/main/java/graphql/language/EnumTypeExtensionDefinition.java
@@ -4,6 +4,9 @@
 import graphql.Internal;
 import graphql.PublicApi;
 import graphql.collect.ImmutableKit;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -14,14 +17,15 @@
 import static graphql.collect.ImmutableKit.emptyList;
 
 @PublicApi
+@NullMarked
 public class EnumTypeExtensionDefinition extends EnumTypeDefinition implements SDLExtensionDefinition {
 
     @Internal
     protected EnumTypeExtensionDefinition(String name,
                                           List<EnumValueDefinition> enumValueDefinitions,
                                           List<Directive> directives,
-                                          Description description,
-                                          SourceLocation sourceLocation,
+                                          @Nullable Description description,
+                                          @Nullable SourceLocation sourceLocation,
                                           List<Comment> comments,
                                           IgnoredChars ignoredChars,
                                           Map<String, String> additionalData) {
@@ -32,8 +36,8 @@ protected EnumTypeExtensionDefinition(String name,
     @Override
     public EnumTypeExtensionDefinition deepCopy() {
         return new EnumTypeExtensionDefinition(getName(),
-                deepCopy(getEnumValueDefinitions()),
-                deepCopy(getDirectives()),
+                assertNotNull(deepCopy(getEnumValueDefinitions())),
+                assertNotNull(deepCopy(getDirectives())),
                 getDescription(),
                 getSourceLocation(),
                 getComments(),
@@ -67,6 +71,7 @@ public EnumTypeExtensionDefinition transformExtension(Consumer<Builder> builderC
         return builder.build();
     }
 
+    @NullUnmarked
     public static final class Builder implements NodeDirectivesBuilder {
         private SourceLocation sourceLocation;
         private ImmutableList<Comment> comments = emptyList();
@@ -144,7 +149,7 @@ public Builder additionalData(String key, String value) {
 
 
         public EnumTypeExtensionDefinition build() {
-            return new EnumTypeExtensionDefinition(name,
+            return new EnumTypeExtensionDefinition(assertNotNull(name),
                     enumValueDefinitions,
                     directives,
                     description,

diff --git a/src/main/java/graphql/language/EnumValueDefinition.java b/src/main/java/graphql/language/EnumValueDefinition.java
@@ -7,6 +7,9 @@
 import graphql.collect.ImmutableKit;
 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;
 import java.util.List;
@@ -20,6 +23,7 @@
 import static graphql.language.NodeChildrenContainer.newNodeChildrenContainer;
 
 @PublicApi
+@NullMarked
 public class EnumValueDefinition extends AbstractDescribedNode<EnumValueDefinition> implements DirectivesContainer<EnumValueDefinition>, NamedNode<EnumValueDefinition> {
     private final String name;
     private final NodeUtil.DirectivesHolder directives;
@@ -29,8 +33,8 @@ public class EnumValueDefinition extends AbstractDescribedNode<EnumValueDefiniti
     @Internal
     protected EnumValueDefinition(String name,
                                   List<Directive> directives,
-                                  Description description,
-                                  SourceLocation sourceLocation,
+                                  @Nullable Description description,
+                                  @Nullable SourceLocation sourceLocation,
                                   List<Comment> comments,
                                   IgnoredChars ignoredChars, Map<String, String> additionalData) {
         super(sourceLocation, comments, ignoredChars, additionalData, description);
@@ -102,7 +106,7 @@ public EnumValueDefinition withNewChildren(NodeChildrenContainer newChildren) {
     }
 
     @Override
-    public boolean isEqualTo(Node o) {
+    public boolean isEqualTo(@Nullable Node o) {
         if (this == o) {
             return true;
         }
@@ -118,7 +122,7 @@ public boolean isEqualTo(Node o) {
 
     @Override
     public EnumValueDefinition deepCopy() {
-        return new EnumValueDefinition(name, deepCopy(directives.getDirectives()), description, getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
+        return new EnumValueDefinition(name, assertNotNull(deepCopy(directives.getDirectives())), description, getSourceLocation(), getComments(), getIgnoredChars(), getAdditionalData());
     }
 
     @Override
@@ -144,6 +148,7 @@ public EnumValueDefinition transform(Consumer<Builder> builderConsumer) {
         return builder.build();
     }
 
+    @NullUnmarked
     public static final class Builder implements NodeDirectivesBuilder {
         private SourceLocation sourceLocation;
         private ImmutableList<Comment> comments = emptyList();
@@ -214,7 +219,7 @@ public Builder additionalData(String key, String value) {
 
 
         public EnumValueDefinition build() {
-            return new EnumValueDefinition(name, directives, description, sourceLocation, comments, ignoredChars, additionalData);
+            return new EnumValueDefinition(assertNotNull(name), directives, description, sourceLocation, comments, ignoredChars, additionalData);
         }
     }
 }