Upgrade to v4.2

Author: Thomas Draier

build.gradle

@@ -68,7 +68,7 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:3.0.0'
+    compile 'com.graphql-java:graphql-java:4.2'
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'

src/main/java/graphql/annotations/EnhancedExecutionStrategy.java

@@ -843,8 +843,8 @@ public Object get(DataFetchingEnvironment environment) {
             HashMap<String, Object> arguments = new HashMap<>(environment.getArguments());
             arguments.keySet().removeAll(Arrays.asList("first", "last", "before", "after"));
             DataFetchingEnvironment env = new DataFetchingEnvironmentImpl(environment.getSource(), arguments, environment.getContext(),
-                    environment.getFields(), environment.getFieldType(), environment.getParentType(), environment.getGraphQLSchema(),
-                    environment.getFragmentsByName(), environment.getExecutionId(), environment.getSelectionSet());
+                    environment.getRoot(), environment.getFieldDefinition(), environment.getFields(), environment.getFieldType(), environment.getParentType(), environment.getGraphQLSchema(),
+                    environment.getFragmentsByName(), environment.getExecutionId(), environment.getSelectionSet(), environment.getFieldTypeInfo());
             Object data = actualDataFetcher.get(env);
             if (data != null) {
                 Connection conn = constructNewInstance(constructor, data);

src/main/java/graphql/annotations/GraphQLAnnotations.java

@@ -657,7 +657,7 @@ public void queryOptional() {
         GraphQLObjectType object = GraphQLAnnotations.object(OptionalTest.class);
         GraphQLSchema schema = newSchema().query(object).build();
 
-        GraphQL graphQL = GraphQL.newGraphQL(schema).queryExecutionStrategy(new EnhancedExecutionStrategy()).build();
+        GraphQL graphQL = GraphQL.newGraphQL(schema).build();
         ExecutionResult result = graphQL.execute("{empty, nonempty}", new OptionalTest());
         assertTrue(result.getErrors().isEmpty());
         Map<String, Object> v = (Map<String, Object>) result.getData();
@@ -676,7 +676,7 @@ public void optionalInput() {
         }).build()).build();
         GraphQLSchema schema = newSchema().query(object).mutation(mutation).build();
 
-        GraphQL graphQL = GraphQL.newGraphQL(schema).queryExecutionStrategy(new EnhancedExecutionStrategy()).build();
+        GraphQL graphQL = GraphQL.newGraphQL(schema).build();
         ExecutionResult result = graphQL.execute("mutation {test(input: {empty: \"test\"}) { empty nonempty } }", new OptionalTest());
         assertTrue(result.getErrors().isEmpty());
         Map<String, Object> v = (Map<String, Object>) ((Map<String, Object>) result.getData()).get("test");
@@ -707,7 +707,7 @@ public String toString() {
     public void queryEnum() {
         GraphQLObjectType object = GraphQLAnnotations.object(EnumTest.class);
         GraphQLSchema schema = newSchema().query(object).build();
-        GraphQL graphQL = GraphQL.newGraphQL(schema).queryExecutionStrategy(new EnhancedExecutionStrategy()).build();
+        GraphQL graphQL = GraphQL.newGraphQL(schema).build();
 
         ExecutionResult result = graphQL.execute("{e}", new EnumTest(EnumTest.E.B));
         assertTrue(result.getErrors().isEmpty());

src/main/java/graphql/execution/TypeInfoWorkaround.java

@@ -40,7 +40,7 @@ public String method() throws TestException {
     public void exceptionRethrowing() {
         try {
             MethodDataFetcher methodDataFetcher = new MethodDataFetcher(getClass().getMethod("method"));
-            methodDataFetcher.get(new DataFetchingEnvironmentImpl(this, new HashMap<>(), null, new ArrayList<>(), null, null, null, null, null, null));
+            methodDataFetcher.get(new DataFetchingEnvironmentImpl(this, new HashMap<String,Object>(), null, null, null, new ArrayList<>(), null, null, null, null, null, null, null));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }