GQL 4.2 : argumnents map does not contain null arguments

Author: Thomas Draier

src/main/java/graphql/annotations/ExtensionDataFetcherWrapper.java

@@ -37,9 +37,9 @@ public ExtensionDataFetcherWrapper(Class declaringClass, DataFetcher<T> dataFetc
     public T get(DataFetchingEnvironment environment) {
         Object source = environment.getSource();
         if (source != null && (!declaringClass.isInstance(source)) && !(source instanceof Map)) {
-            environment = new DataFetchingEnvironmentImpl(newInstance(declaringClass, source), environment.getArguments(),
-                    environment.getContext(), environment.getFields(), environment.getFieldType(), environment.getParentType(),
-                    environment.getGraphQLSchema(), environment.getFragmentsByName(), environment.getExecutionId(), environment.getSelectionSet());
+            environment = new DataFetchingEnvironmentImpl(newInstance(declaringClass, source), environment.getArguments(), environment.getContext(),
+                    environment.getRoot(), environment.getFieldDefinition(), environment.getFields(), environment.getFieldType(), environment.getParentType(), environment.getGraphQLSchema(),
+                    environment.getFragmentsByName(), environment.getExecutionId(), environment.getSelectionSet(), environment.getFieldTypeInfo());
         }
 
         return dataFetcher.get(environment);

src/main/java/graphql/annotations/MethodDataFetcher.java

@@ -18,6 +18,11 @@
 import graphql.schema.GraphQLType;
 
 import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
 import java.util.*;
 
 import static graphql.annotations.ReflectionKit.constructNewInstance;
@@ -63,17 +68,28 @@ public Object get(DataFetchingEnvironment environment) {
 
     private Object[] invocationArgs(DataFetchingEnvironment environment) {
         List<Object> result = new ArrayList<>();
-        Iterator envArgs = environment.getArguments().values().iterator();
+        Map<String,Object> envArgs = environment.getArguments();
         for (Parameter p : method.getParameters()) {
+            String parameterName;
+            GraphQLName name = p.getAnnotation(GraphQLName.class);
+            if (name != null) {
+                parameterName = toGraphqlName(name.value());
+            } else {
+                parameterName = toGraphqlName(p.getName());
+            }
+
             Class<?> paramType = p.getType();
             if (DataFetchingEnvironment.class.isAssignableFrom(paramType)) {
                 result.add(environment);
                 continue;
             }
 
             graphql.schema.GraphQLType graphQLType = typeFunction.buildType(true, paramType, p.getAnnotatedType());
-            Object arg = envArgs.next();
-            result.add(buildArg(p.getParameterizedType(), graphQLType, arg));
+            if (envArgs.containsKey(parameterName)) {
+                result.add(buildArg(p.getParameterizedType(), graphQLType, envArgs.get(parameterName)));
+            } else {
+                result.add(null);
+            }
         }
         return result.toArray();
     }

src/test/java/graphql/annotations/GraphQLConnectionTest.java

@@ -112,8 +112,8 @@ public List<Obj> getNonNullObjs() {
         }
 
         @GraphQLField
-        @GraphQLConnection(name = "null")
-        public List<Obj> getNull() {
+        @GraphQLConnection(name = "nullObj")
+        public List<Obj> getNullObj() {
             return null;
         }
 
@@ -197,14 +197,14 @@ public void methodNull() {
         GraphQLSchema schema = newSchema().query(object).build();
 
         GraphQL graphQL = GraphQL.newGraphQL(schema).build();
-        ExecutionResult result = graphQL.execute("{ null(first: 1) { edges { cursor node { id, val } } } }",
+        ExecutionResult result = graphQL.execute("{ nullObj(first: 1) { edges { cursor node { id, val } } } }",
                 new TestConnections(Arrays.asList(new Obj("1", "test"), new Obj("2", "hello"), new Obj("3", "world"))));
 
         assertTrue(result.getErrors().isEmpty());
 
         Map<String, Map<String, List<Map<String, Map<String, Object>>>>> data = result.getData();
 
-        assertEquals(data.get("null"), null);
+        assertEquals(data.get("nullObj"), null);
     }
 
     @Test