query with dynamic arguments (variables)

andimarek · andimarek · commit 2daa0a91841a · 2015-07-11T14:47:40.000+02:00
diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -6,22 +6,32 @@
 import graphql.parser.Parser;
 import graphql.schema.GraphQLSchema;
 
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public class GraphQL {
 
 
-    private GraphQLSchema graphQLSchema;
-    private String requestString;
+    private final GraphQLSchema graphQLSchema;
+    private final String requestString;
+    private final Map<String, Object> arguments = new LinkedHashMap<>();
 
     public GraphQL(GraphQLSchema graphQLSchema, String requestString) {
+        this(graphQLSchema, requestString, Collections.<String, Object>emptyMap());
+    }
+
+    public GraphQL(GraphQLSchema graphQLSchema, String requestString, Map<String, Object> arguments) {
         this.graphQLSchema = graphQLSchema;
         this.requestString = requestString;
+        this.arguments.putAll(arguments);
     }
 
     public Object execute() {
         Parser parser = new Parser();
         Document document = parser.parseDocument(requestString);
         Execution execution = new Execution();
-        return execution.execute(graphQLSchema, null, document, null, null).getResut();
+        return execution.execute(graphQLSchema, null, document, null, arguments).getResut();
     }
 
 
diff --git a/src/main/java/graphql/schema/SchemaUtil.java b/src/main/java/graphql/schema/SchemaUtil.java
@@ -24,6 +24,8 @@ private static void collectTypes(GraphQLType root, Map<String, GraphQLType> resu
             collectTypesForUnions((GraphQLUnionType) root, result);
         } else if (root instanceof GraphQLInputObjectType) {
             result.put(((GraphQLInputObjectType) root).getName(),root);
+        } else if (root instanceof GraphQLTypeReference) {
+
         } else {
             throw new RuntimeException("Unknown type " + root);
         }
diff --git a/src/test/groovy/graphql/StarWarsQueryTest.groovy b/src/test/groovy/graphql/StarWarsQueryTest.groovy
@@ -172,4 +172,28 @@ class StarWarsQueryTest extends Specification {
         result == expected
     }
 
+    def 'Allows us to create a generic query, then use it to fetch Luke Skywalker using his ID'() {
+        given:
+        def query = """
+        query FetchSomeIDQuery(\$someId: String!) {
+            human(id: \$someId) {
+                name
+            }
+        }
+        """
+        def params = [
+                someId: '1000'
+        ]
+        def expected = [
+                human: [
+                        name: 'Luke Skywalker'
+                ]
+        ]
+        when:
+        def result = new GraphQL(StarWarsSchema.starWarsSchema, query, params).execute()
+
+        then:
+        result == expected
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ private static void collectTypes(GraphQLType root, Map<String, GraphQLType> resu`
`24`	`24`	`collectTypesForUnions((GraphQLUnionType) root, result);`
`25`	`25`	`} else if (root instanceof GraphQLInputObjectType) {`
`26`	`26`	`result.put(((GraphQLInputObjectType) root).getName(),root);`
	`27`	`+ } else if (root instanceof GraphQLTypeReference) {`
	`28`	`+`
`27`	`29`	`} else {`
`28`	`30`	`throw new RuntimeException("Unknown type " + root);`
`29`	`31`	`}`