graphql-java · dondonz · Oct 5, 2022 · Sep 27, 2022 · Sep 27, 2022 · Oct 2, 2022
diff --git a/src/main/java/graphql/execution/instrumentation/Instrumentation.java b/src/main/java/graphql/execution/instrumentation/Instrumentation.java
@@ -468,7 +468,7 @@ default GraphQLSchema instrumentSchema(GraphQLSchema schema, InstrumentationExec
      *
      * @return a non null instrumented ExecutionContext, the default is to return to the same object
      *
-     * @deprecated use {@link #instrumentExecutionContext(ExecutionContext, InstrumentationExecutionParameters)} instead
+     * @deprecated use {@link #instrumentExecutionContext(ExecutionContext, InstrumentationExecutionParameters, InstrumentationState)} instead
      */
     @Deprecated
     @DeprecatedAt("2022-07-26")

diff --git a/src/test/groovy/example/http/ExecutionResultJSONTesting.java b/src/test/groovy/example/http/ExecutionResultJSONTesting.java
@@ -70,7 +70,7 @@ private void testGson(HttpServletResponse response, Object er) throws IOExceptio
     private ExecutionResult createER() {
         List<GraphQLError> errors = new ArrayList<>();
 
-        errors.add(new ValidationError(ValidationErrorType.UnknownType, mkLocations(), "Test ValidationError"));
+        errors.add(new ValidationError(ValidationErrorType.UnknownType, mkLocations(), "Test ValidationError")); // Retain as there is no alternative constructor for ValidationError
         errors.add(new MissingRootTypeException("Mutations are not supported.", null));
         errors.add(new InvalidSyntaxError(mkLocations(), "Not good syntax m'kay"));
         errors.add(new NonNullableFieldWasNullError(new NonNullableFieldWasNullException(mkExecutionInfo(), mkPath())));

diff --git a/src/test/groovy/example/http/HttpMain.java b/src/test/groovy/example/http/HttpMain.java
@@ -18,6 +18,7 @@
 import graphql.schema.idl.TypeDefinitionRegistry;
 import org.dataloader.BatchLoader;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderRegistry;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
@@ -46,7 +47,7 @@
 import static java.util.Arrays.asList;
 
 /**
- * An very simple example of serving a qraphql schema over http.
+ * A very simple example of serving a graphql schema over http.
  * <p>
  * More info can be found here : http://graphql.org/learn/serving-over-http/
  */
@@ -178,7 +179,7 @@ private DataLoaderRegistry buildDataLoaderRegistry() {
                 CompletableFuture.supplyAsync(() ->
                         loadCharactersViaHTTP(keys));
 
-        DataLoader<String, Object> friendsDataLoader = new DataLoader<>(friendsBatchLoader);
+        DataLoader<String, Object> friendsDataLoader = DataLoaderFactory.newDataLoader(friendsBatchLoader);
 
         DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
         //
@@ -275,7 +276,7 @@ private Reader loadSchemaFile(String name) {
     }
 
     // Lots of the data happens to be maps of objects and this allows us to get back into type safety land
-    // with less boiler plate and casts
+    // with less boilerplate and casts
     //
     @SuppressWarnings("TypeParameterUnusedInFormals")
     private <T> T asMapGet(Object mapObj, Object mapKey) {

diff --git a/src/test/groovy/graphql/GarfieldSchema.java b/src/test/groovy/graphql/GarfieldSchema.java
@@ -1,6 +1,7 @@
 package graphql;
 
 
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLInterfaceType;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
@@ -111,23 +112,24 @@ public List<Named> getFriends() {
             .field(newFieldDefinition()
                     .name("name")
                     .type(GraphQLString))
-            .typeResolver(new TypeResolver() {
-                @Override
-                public GraphQLObjectType getType(TypeResolutionEnvironment env) {
-                    if (env.getObject() instanceof Dog) {
-                        return DogType;
-                    }
-                    if (env.getObject() instanceof Person) {
-                        return PersonType;
-                    }
-                    if (env.getObject() instanceof Cat) {
-                        return CatType;
-                    }
-                    return null;
-                }
-            })
             .build();
 
+    public static TypeResolver namedTypeResolver = new TypeResolver() {
+        @Override
+        public GraphQLObjectType getType(TypeResolutionEnvironment env) {
+            if (env.getObject() instanceof Dog) {
+                return DogType;
+            }
+            if (env.getObject() instanceof Person) {
+                return PersonType;
+            }
+            if (env.getObject() instanceof Cat) {
+                return CatType;
+            }
+            return null;
+        }
+    };
+
     public static GraphQLObjectType DogType = newObject()
             .name("Dog")
             .field(newFieldDefinition()
@@ -154,17 +156,18 @@ public GraphQLObjectType getType(TypeResolutionEnvironment env) {
             .name("Pet")
             .possibleType(CatType)
             .possibleType(DogType)
-            .typeResolver(env -> {
-                if (env.getObject() instanceof Cat) {
-                    return CatType;
-                }
-                if (env.getObject() instanceof Dog) {
-                    return DogType;
-                }
-                return null;
-            })
             .build();
 
+    public static TypeResolver petTypeResolver = env -> {
+        if (env.getObject() instanceof Cat) {
+            return CatType;
+        }
+        if (env.getObject() instanceof Dog) {
+            return DogType;
+        }
+        return null;
+    };
+
     public static GraphQLObjectType PersonType = newObject()
             .name("Person")
             .field(newFieldDefinition()
@@ -179,9 +182,14 @@ public GraphQLObjectType getType(TypeResolutionEnvironment env) {
             .withInterface(NamedType)
             .build();
 
+    public static GraphQLCodeRegistry codeRegistry = GraphQLCodeRegistry.newCodeRegistry()
+            .typeResolver("Named", namedTypeResolver)
+            .typeResolver("Pet", petTypeResolver)
+            .build();
+
     public static GraphQLSchema GarfieldSchema = GraphQLSchema.newSchema()
             .query(PersonType)
+            .codeRegistry(codeRegistry)
             .build();
 
-
 }
diff --git a/src/test/groovy/graphql/NestedInputSchema.java b/src/test/groovy/graphql/NestedInputSchema.java
@@ -63,7 +63,7 @@ public static GraphQLObjectType rootType() {
                         .argument(GraphQLArgument.newArgument()
                                 .name("intialValue")
                                 .type(GraphQLInt)
-                                .defaultValue(5))
+                                .defaultValueProgrammatic(5))
                         .argument(GraphQLArgument.newArgument()
                                 .name("filter")
                                 .type(filterType())))

diff --git a/src/test/groovy/graphql/ScalarsQuerySchema.java b/src/test/groovy/graphql/ScalarsQuerySchema.java
@@ -22,7 +22,7 @@ public class ScalarsQuerySchema {
             .field(newFieldDefinition()
                     .name("floatNaN")
                     .type(Scalars.GraphQLFloat)
-                    .staticValue(Double.NaN))
+                    .staticValue(Double.NaN)) // Retain for test coverage
             // Scalars with input of same type, value echoed back
             .field(newFieldDefinition()
                     .name("floatNaNInput")

diff --git a/src/test/groovy/graphql/StarWarsSchema.java b/src/test/groovy/graphql/StarWarsSchema.java
@@ -55,7 +55,6 @@ public class StarWarsSchema {
                     .name("appearsIn")
                     .description("Which movies they appear in.")
                     .type(list(episodeEnum)))
-            .typeResolver(StarWarsData.getCharacterTypeResolver())
             .comparatorRegistry(BY_NAME_REGISTRY)
             .build();
 
@@ -180,6 +179,7 @@ public class StarWarsSchema {
             .dataFetcher(humanCoordinates, humanDataFetcher)
             .dataFetcher(droidCoordinates, droidDataFetcher)
             .dataFetcher(createHumanCoordinates, createHumanDataFetcher)
+            .typeResolver("Character", StarWarsData.getCharacterTypeResolver())
             .build();
 
     public static GraphQLSchema starWarsSchema = GraphQLSchema.newSchema()

diff --git a/src/test/groovy/graphql/TypeReferenceSchema.java b/src/test/groovy/graphql/TypeReferenceSchema.java
@@ -2,6 +2,7 @@
 
 import graphql.schema.Coercing;
 import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLDirective;
 import graphql.schema.GraphQLEnumType;
 import graphql.schema.GraphQLFieldDefinition;
@@ -148,7 +149,6 @@ public Boolean parseLiteral(Object input) {
                 .name("Pet")
                 .possibleType(GraphQLTypeReference.typeRef(CatType.getName()))
                 .possibleType(GraphQLTypeReference.typeRef(DogType.getName()))
-                .typeResolver(new TypeResolverProxy())
                 .withDirective(unionDirective)
                 .build();
     }
@@ -171,7 +171,6 @@ public Boolean parseLiteral(Object input) {
 
         Addressable = GraphQLInterfaceType.newInterface()
                 .name("Addressable")
-                .typeResolver(new TypeResolverProxy())
                 .field(GraphQLFieldDefinition.newFieldDefinition()
                         .name("address")
                         .type(GraphQLString))
@@ -316,6 +315,12 @@ public Boolean parseLiteral(Object input) {
                     .type(QueryDirectiveInput))
             .build();
 
+    public static GraphQLCodeRegistry codeRegistry = GraphQLCodeRegistry.newCodeRegistry()
+            .typeResolver("Pet", new TypeResolverProxy())
+            .typeResolver("Addressable", new TypeResolverProxy())
+            .typeResolver("Named", GarfieldSchema.namedTypeResolver)
+            .build();
+
     public static GraphQLSchema SchemaWithReferences = GraphQLSchema.newSchema()
             .query(PersonService)
             .additionalTypes(new HashSet<>(Arrays.asList(PersonType, PersonInputType, PetType, CatType, DogType, NamedType, HairStyle, OnOff)))
@@ -330,6 +335,6 @@ public Boolean parseLiteral(Object input) {
             .additionalDirective(enumDirective)
             .additionalDirective(enumValueDirective)
             .additionalDirective(interfaceDirective)
-
+            .codeRegistry(codeRegistry)
             .build();
 }
diff --git a/src/test/groovy/graphql/execution/AsyncExecutionStrategyTest.groovy b/src/test/groovy/graphql/execution/AsyncExecutionStrategyTest.groovy
@@ -4,6 +4,7 @@ import graphql.ErrorType
 import graphql.ExecutionResult
 import graphql.GraphQLContext
 import graphql.execution.instrumentation.ExecutionStrategyInstrumentationContext
+import graphql.execution.instrumentation.InstrumentationState
 import graphql.execution.instrumentation.SimpleInstrumentation
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionStrategyParameters
 import graphql.language.Field
@@ -267,7 +268,7 @@ class AsyncExecutionStrategyTest extends Specification {
                 .locale(Locale.getDefault())
                 .instrumentation(new SimpleInstrumentation() {
                     @Override
-                    ExecutionStrategyInstrumentationContext beginExecutionStrategy(InstrumentationExecutionStrategyParameters parameters) {
+                    ExecutionStrategyInstrumentationContext beginExecutionStrategy(InstrumentationExecutionStrategyParameters parameters, InstrumentationState state) {
                         return new ExecutionStrategyInstrumentationContext() {
 
                             @Override

diff --git a/src/test/groovy/graphql/execution/DataFetcherExceptionHandlerTest.groovy b/src/test/groovy/graphql/execution/DataFetcherExceptionHandlerTest.groovy
@@ -76,11 +76,6 @@ class DataFetcherExceptionHandlerTest extends Specification {
 
     def "integration test to prove an async custom error handle can be made"() {
         DataFetcherExceptionHandler handler = new DataFetcherExceptionHandler() {
-            @Override
-            DataFetcherExceptionHandlerResult onException(DataFetcherExceptionHandlerParameters handlerParameters) {
-                return null
-            }
-
             @Override
             CompletableFuture<DataFetcherExceptionHandlerResult> handleException(DataFetcherExceptionHandlerParameters params) {
                 def msg = "The thing went " + params.getException().getMessage()
@@ -117,11 +112,6 @@ class DataFetcherExceptionHandlerTest extends Specification {
 
     def "if an async exception handler itself throws an exception than that is handled"() {
         DataFetcherExceptionHandler handler = new DataFetcherExceptionHandler() {
-            @Override
-            DataFetcherExceptionHandlerResult onException(DataFetcherExceptionHandlerParameters handlerParameters) {
-                return null
-            }
-
             @Override
             CompletableFuture<DataFetcherExceptionHandlerResult> handleException(DataFetcherExceptionHandlerParameters handlerParameters) {
                 throw new RuntimeException("The handler itself went BANG!")
@@ -140,11 +130,6 @@ class DataFetcherExceptionHandlerTest extends Specification {
 
     def "multiple errors can be returned in a handler"() {
         DataFetcherExceptionHandler handler = new DataFetcherExceptionHandler() {
-            @Override
-            DataFetcherExceptionHandlerResult onException(DataFetcherExceptionHandlerParameters handlerParameters) {
-                return null
-            }
-
             @Override
             CompletableFuture<DataFetcherExceptionHandlerResult> handleException(DataFetcherExceptionHandlerParameters params) {
                 def result = DataFetcherExceptionHandlerResult.newResult()

diff --git a/src/test/groovy/graphql/execution/ExecutionStrategyExceptionHandlingEquivalenceTest.groovy b/src/test/groovy/graphql/execution/ExecutionStrategyExceptionHandlingEquivalenceTest.groovy
@@ -4,6 +4,7 @@ import graphql.ExecutionInput
 import graphql.GraphQL
 import graphql.StarWarsSchema
 import graphql.execution.instrumentation.InstrumentationContext
+import graphql.execution.instrumentation.InstrumentationState
 import graphql.execution.instrumentation.SimpleInstrumentation
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters
 import graphql.validation.ValidationError
@@ -16,8 +17,8 @@ class ExecutionStrategyExceptionHandlingEquivalenceTest extends Specification {
     class TestInstrumentation extends SimpleInstrumentation {
 
         @Override
-        InstrumentationContext<Object> beginFieldFetch(InstrumentationFieldFetchParameters parameters) {
-            throw new AbortExecutionException([new ValidationError(ValidationErrorType.UnknownType)])
+        InstrumentationContext<Object> beginFieldFetch(InstrumentationFieldFetchParameters parameters, InstrumentationState state) {
+            throw new AbortExecutionException([new ValidationError(ValidationErrorType.UnknownType)]) // Retain as there is no alternative constructor for ValidationError
         }
     }
 

diff --git a/src/test/groovy/graphql/execution/ExecutionTest.groovy b/src/test/groovy/graphql/execution/ExecutionTest.groovy
@@ -115,7 +115,8 @@ class ExecutionTest extends Specification {
 
 			@Override
             ExecutionContext instrumentExecutionContext(ExecutionContext executionContext,
-                                                        InstrumentationExecutionParameters parameters) {
+                                                        InstrumentationExecutionParameters parameters,
+                                                        InstrumentationState state) {
 
 					return ExecutionContextBuilder.newExecutionContextBuilder(executionContext)
 					.queryStrategy(queryStrategyUpdatedToDuringExecutionContextInstrument)

diff --git a/src/test/groovy/graphql/execution/instrumentation/dataloader/BatchCompareDataFetchers.java b/src/test/groovy/graphql/execution/instrumentation/dataloader/BatchCompareDataFetchers.java
@@ -6,6 +6,7 @@
 import graphql.schema.DataFetcher;
 import org.dataloader.BatchLoader;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -99,7 +100,7 @@ private static List<List<Department>> getDepartmentsForShops(List<Shop> shops) {
         return completedFuture(getDepartmentsForShops(shopList));
     });
 
-    public DataLoader<String, List<Department>> departmentsForShopDataLoader = new DataLoader<>(departmentsForShopsBatchLoader);
+    public DataLoader<String, List<Department>> departmentsForShopDataLoader = DataLoaderFactory.newDataLoader(departmentsForShopsBatchLoader);
 
     public DataFetcher<CompletableFuture<List<Department>>> departmentsForShopDataLoaderDataFetcher = environment -> {
         Shop shop = environment.getSource();
@@ -136,7 +137,7 @@ private static List<List<Product>> getProductsForDepartments(List<Department> de
         return completedFuture(getProductsForDepartments(d));
     });
 
-    public DataLoader<String, List<Product>> productsForDepartmentDataLoader = new DataLoader<>(productsForDepartmentsBatchLoader);
+    public DataLoader<String, List<Product>> productsForDepartmentDataLoader = DataLoaderFactory.newDataLoader(productsForDepartmentsBatchLoader);
 
     public DataFetcher<CompletableFuture<List<Product>>> productsForDepartmentDataLoaderDataFetcher = environment -> {
         Department department = environment.getSource();

diff --git a/.../groovy/graphql/execution/instrumentation/dataloader/DataLoaderCompanyProductBackend.java b/.../groovy/graphql/execution/instrumentation/dataloader/DataLoaderCompanyProductBackend.java
@@ -3,9 +3,8 @@
 
 import com.google.common.collect.ImmutableList;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -27,7 +26,7 @@ public DataLoaderCompanyProductBackend(int companyCount, int projectCount) {
             mkCompany(projectCount);
         }
 
-        projectsLoader = new DataLoader<>(keys -> getProjectsForCompanies(keys).thenApply(projects -> keys
+        projectsLoader = DataLoaderFactory.newDataLoader(keys -> getProjectsForCompanies(keys).thenApply(projects -> keys
                 .stream()
                 .map(companyId -> projects.stream()
                         .filter(project -> project.getCompanyId().equals(companyId))

diff --git a/...aphql/execution/instrumentation/dataloader/DataLoaderDispatcherInstrumentationTest.groovy b/...aphql/execution/instrumentation/dataloader/DataLoaderDispatcherInstrumentationTest.groovy
@@ -10,6 +10,7 @@ import graphql.execution.ExecutionContext
 import graphql.execution.ExecutionStrategyParameters
 import graphql.execution.instrumentation.ChainedInstrumentation
 import graphql.execution.instrumentation.Instrumentation
+import graphql.execution.instrumentation.InstrumentationState
 import graphql.execution.instrumentation.SimpleInstrumentation
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters
 import graphql.schema.DataFetcher
@@ -132,7 +133,7 @@ class DataLoaderDispatcherInstrumentationTest extends Specification {
         def dlInstrumentation = new DataLoaderDispatcherInstrumentation()
         def enhancingInstrumentation = new SimpleInstrumentation() {
             @Override
-            ExecutionInput instrumentExecutionInput(ExecutionInput executionInput, InstrumentationExecutionParameters parameters) {
+            ExecutionInput instrumentExecutionInput(ExecutionInput executionInput, InstrumentationExecutionParameters parameters, InstrumentationState state) {
                 assert executionInput.getDataLoaderRegistry() == startingDataLoaderRegistry
                 return executionInput.transform({ builder -> builder.dataLoaderRegistry(enhancedDataLoaderRegistry) })
             }