Merge pull request #4141 from graphql-java/datafetcher-result

andimarek · web-flow · commit 71e6199af4a1 · 2025-11-06T09:25:14.000+10:00
make DataFetcherResult jspecify better
diff --git a/src/main/java/graphql/execution/DataFetcherResult.java b/src/main/java/graphql/execution/DataFetcherResult.java
@@ -44,7 +44,7 @@
  */
 @PublicApi
 @NullMarked
-public class DataFetcherResult<T> {
+public class DataFetcherResult<T extends @Nullable Object> {
 
     private final @Nullable T data;
     private final List<GraphQLError> errors;
@@ -144,9 +144,9 @@ public boolean equals(Object o) {
 
         DataFetcherResult<?> that = (DataFetcherResult<?>) o;
         return Objects.equals(data, that.data)
-                && errors.equals(that.errors)
-                && Objects.equals(localContext, that.localContext)
-                && Objects.equals(extensions, that.extensions);
+               && errors.equals(that.errors)
+               && Objects.equals(localContext, that.localContext)
+               && Objects.equals(extensions, that.extensions);
     }
 
     @Override
@@ -157,11 +157,11 @@ public int hashCode() {
     @Override
     public String toString() {
         return "DataFetcherResult{" +
-                "data=" + data +
-                ", errors=" + errors +
-                ", localContext=" + localContext +
-                ", extensions=" + extensions +
-                '}';
+               "data=" + data +
+               ", errors=" + errors +
+               ", localContext=" + localContext +
+               ", extensions=" + extensions +
+               '}';
     }
 
     /**
@@ -175,7 +175,7 @@ public static <T> Builder<T> newResult() {
         return new Builder<>();
     }
 
-    public static class Builder<T> {
+    public static class Builder<T extends @Nullable Object> {
         private @Nullable T data;
         private @Nullable Object localContext;
         private final List<GraphQLError> errors = new ArrayList<>();
