Problem: non-null types for variables don't get processed

These variables are still converted to maps

Solution: handle NonNullTypes

Author: yrashk

src/main/java/graphql/servlet/GraphQLVariables.java

@@ -17,9 +17,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.annotations.GraphQLObjectTypeWrapper;
-import graphql.language.OperationDefinition;
-import graphql.language.TypeName;
-import graphql.language.VariableDefinition;
+import graphql.language.*;
 import graphql.parser.Parser;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLType;
@@ -46,7 +44,16 @@ public GraphQLVariables(GraphQLSchema schema, String query, Map<String, Object>
                     .forEach(new Consumer<VariableDefinition>() {
                         @SneakyThrows
                         @Override public void accept(VariableDefinition d) {
-                            GraphQLType type = schema.getType(((TypeName) (d.getType())).getName());
+                            GraphQLType type;
+                            Type t = d.getType();
+                            if (t instanceof TypeName) {
+                                type = schema.getType(((TypeName) t).getName());
+                            } else if (t instanceof NonNullType) {
+                                accept(new VariableDefinition(d.getName(), ((NonNullType) t).getType()));
+                                return;
+                            } else {
+                                type = null;
+                            }
                             if (type instanceof GraphQLObjectTypeWrapper) {
                                 String value = objectMapper.writeValueAsString(variables.get(d.getName()));
                                 Object val = objectMapper.readValue(value, ((GraphQLObjectTypeWrapper) type).getObjectClass());

src/test/java/graphql/servlet/GraphQLVariablesTest.java

@@ -79,4 +79,26 @@ public void variableTyping() {
         assertEquals(((ComplexQueryProvider.Data)d).getField1(), "1");
         assertEquals(((ComplexQueryProvider.Data)d).getField2(), "2");
     }
+
+    private static final String NON_NULL_QUERY = "query Q($d: Data!) { data { echo(data: $d) { field1 field2 } } }";
+
+    @Test
+    public void nonNullvariableTyping() {
+        GraphQLServlet servlet = new GraphQLServlet();
+        ComplexQueryProvider queryProvider = new ComplexQueryProvider();
+        servlet.bindQueryProvider(queryProvider);
+        GraphQLSchema schema = servlet.getSchema();
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("field1", "1");
+        data.put("field2", "2");
+        HashMap<String, Object> vars = new HashMap<>();
+        vars.put("d", data);
+        GraphQLVariables variables = new GraphQLVariables(schema, NON_NULL_QUERY, vars);
+        Object d = variables.get("d");
+        System.out.println("d = " + d);
+        assertTrue(d instanceof ComplexQueryProvider.Data);
+        assertEquals(((ComplexQueryProvider.Data)d).getField1(), "1");
+        assertEquals(((ComplexQueryProvider.Data)d).getField2(), "2");
+    }
+
 }