make DFE more nullable aware

andimarek · andimarek · commit d562ba89c16e · 2025-06-06T13:53:43.000+10:00
diff --git a/src/main/java/graphql/schema/DataFetchingEnvironment.java b/src/main/java/graphql/schema/DataFetchingEnvironment.java
@@ -14,7 +14,7 @@
 import graphql.language.OperationDefinition;
 import org.dataloader.DataLoader;
 import org.dataloader.DataLoaderRegistry;
-import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.List;
@@ -28,6 +28,7 @@
  */
 @SuppressWarnings("TypeParameterUnusedInFormals")
 @PublicApi
+@NullMarked
 public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnvironment {
 
     /**
@@ -92,6 +93,7 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro
      * @deprecated - use {@link #getGraphQlContext()} instead
      */
     @Deprecated(since = "2021-07-05")
+    @Nullable
     <T> T getContext();
 
     /**
@@ -102,7 +104,6 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro
      *
      * @return can NOT be null
      */
-    @NonNull
     GraphQLContext getGraphQlContext();
 
     /**
@@ -130,6 +131,7 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro
      *
      * @return can be null
      */
+    @Nullable
     <T> T getRoot();
 
     /**
diff --git a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java
@@ -21,7 +21,7 @@
 import graphql.language.OperationDefinition;
 import org.dataloader.DataLoader;
 import org.dataloader.DataLoaderRegistry;
-import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.List;
@@ -31,6 +31,7 @@
 
 @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
 @Internal
+@NullMarked
 public class DataFetchingEnvironmentImpl implements DataFetchingEnvironment {
     private final Object source;
     private final Supplier<Map<String, Object>> arguments;
@@ -112,6 +113,7 @@ public static Builder newDataFetchingEnvironment(ExecutionContext executionConte
     }
 
     @Override
+    @Nullable
     public <T> T getSource() {
         return (T) source;
     }
@@ -127,7 +129,7 @@ public boolean containsArgument(String name) {
     }
 
     @Override
-    public <T> T getArgument(String name) {
+    public @Nullable <T> T getArgument(String name) {
         return (T) arguments.get().get(name);
     }
 
@@ -137,12 +139,12 @@ public <T> T getArgumentOrDefault(String name, T defaultValue) {
     }
 
     @Override
-    public <T> T getContext() {
+    public @Nullable <T> T getContext() {
         return (T) context;
     }
 
     @Override
-    public @NonNull GraphQLContext getGraphQlContext() {
+    public GraphQLContext getGraphQlContext() {
         return graphQLContext;
     }
 
@@ -152,7 +154,7 @@ public <T> T getContext() {
     }
 
     @Override
-    public <T> T getRoot() {
+    public @Nullable <T> T getRoot() {
         return (T) root;
     }
 
@@ -333,13 +335,13 @@ public Builder arguments(Supplier<Map<String, Object>> arguments) {
         }
 
         @Deprecated(since = "2021-07-05")
-        public Builder context(Object context) {
+        public Builder context(@Nullable Object context) {
             this.context = context;
             return this;
         }
 
         public Builder graphQLContext(GraphQLContext context) {
-            this.graphQLContext = context;
+            this.graphQLContext = Assert.assertNotNull(context, "GraphQLContext cannot be null");
             return this;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`import graphql.language.OperationDefinition;`
`22`	`22`	`import org.dataloader.DataLoader;`
`23`	`23`	`import org.dataloader.DataLoaderRegistry;`
`24`		`-import org.jspecify.annotations.NonNull;`
	`24`	`+import org.jspecify.annotations.NullMarked;`
`25`	`25`	`import org.jspecify.annotations.Nullable;`
`26`	`26`
`27`	`27`	`import java.util.List;`
`@@ -31,6 +31,7 @@`
`31`	`31`
`32`	`32`	`@SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})`
`33`	`33`	`@Internal`
	`34`	`+@NullMarked`
`34`	`35`	`public class DataFetchingEnvironmentImpl implements DataFetchingEnvironment {`
`35`	`36`	`private final Object source;`
`36`	`37`	`private final Supplier<Map<String, Object>> arguments;`
`@@ -112,6 +113,7 @@ public static Builder newDataFetchingEnvironment(ExecutionContext executionConte`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`@Override`
	`116`	`+ @Nullable`
`115`	`117`	`public <T> T getSource() {`
`116`	`118`	`return (T) source;`
`117`	`119`	`}`
`@@ -127,7 +129,7 @@ public boolean containsArgument(String name) {`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`@Override`
`130`		`- public <T> T getArgument(String name) {`
	`132`	`+ public @Nullable <T> T getArgument(String name) {`
`131`	`133`	`return (T) arguments.get().get(name);`
`132`	`134`	`}`
`133`	`135`
`@@ -137,12 +139,12 @@ public <T> T getArgumentOrDefault(String name, T defaultValue) {`
`137`	`139`	`}`
`138`	`140`
`139`	`141`	`@Override`
`140`		`- public <T> T getContext() {`
	`142`	`+ public @Nullable <T> T getContext() {`
`141`	`143`	`return (T) context;`
`142`	`144`	`}`
`143`	`145`
`144`	`146`	`@Override`
`145`		`- public @NonNull GraphQLContext getGraphQlContext() {`
	`147`	`+ public GraphQLContext getGraphQlContext() {`
`146`	`148`	`return graphQLContext;`
`147`	`149`	`}`
`148`	`150`
`@@ -152,7 +154,7 @@ public <T> T getContext() {`
`152`	`154`	`}`
`153`	`155`
`154`	`156`	`@Override`
`155`		`- public <T> T getRoot() {`
	`157`	`+ public @Nullable <T> T getRoot() {`
`156`	`158`	`return (T) root;`
`157`	`159`	`}`
`158`	`160`
`@@ -333,13 +335,13 @@ public Builder arguments(Supplier<Map<String, Object>> arguments) {`
`333`	`335`	`}`
`334`	`336`
`335`	`337`	`@Deprecated(since = "2021-07-05")`
`336`		`- public Builder context(Object context) {`
	`338`	`+ public Builder context(@Nullable Object context) {`
`337`	`339`	`this.context = context;`
`338`	`340`	`return this;`
`339`	`341`	`}`
`340`	`342`
`341`	`343`	`public Builder graphQLContext(GraphQLContext context) {`
`342`		`- this.graphQLContext = context;`
	`344`	`+ this.graphQLContext = Assert.assertNotNull(context, "GraphQLContext cannot be null");`
`343`	`345`	`return this;`
`344`	`346`	`}`
`345`	`347`