kingdevnl
diff --git a/‎src/main/java/nl/kingdev/graphqlclient/Client.java‎
Lines changed: 14 additions & 3 deletions b/‎src/main/java/nl/kingdev/graphqlclient/Client.java‎
Lines changed: 14 additions & 3 deletions
diff --git a/‎src/main/java/nl/kingdev/graphqlclient/query/Query.java‎
Lines changed: 5 additions & 0 deletions b/‎src/main/java/nl/kingdev/graphqlclient/query/Query.java‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/test/java/nl/kingdev/graphqlclient/ClientTest.java‎
Lines changed: 14 additions & 0 deletions b/‎src/test/java/nl/kingdev/graphqlclient/ClientTest.java‎
Lines changed: 14 additions & 0 deletions
@@ -17,11 +17,13 @@ public class Client {
 
     private String uri;
     private Map<String, String> headers;
+    private Map<String, String> globalVariables;
     private static Gson gson = new GsonBuilder().create();
 
     public Client(String uri) {
         this.uri = uri;
         this.headers = new HashMap<>();
+        this.globalVariables = new HashMap<>();
     }
 
 
@@ -39,6 +41,7 @@ private JsonObject makeQueryJson(Query query) {
     public <T> T first(Query query, String name, Class<T> type) {
 
         try {
+            query.getVariables().putAll(globalVariables);
             JsonObject request = makeQueryJson(query);
             JsonObject result = gson.fromJson(HttpUtil.post(this.uri, request.toString(), headers), JsonObject.class);
             return gson.fromJson(result.get("data").getAsJsonObject().get(name), type);
@@ -50,13 +53,12 @@ public <T> T first(Query query, String name, Class<T> type) {
     }
 
     public <T> List<T> query(Query query, String name) {
-
         try {
+            query.getVariables().putAll(globalVariables);
             JsonObject request = makeQueryJson(query);
             JsonObject result = gson.fromJson(HttpUtil.post(this.uri, request.toString(), headers), JsonObject.class);
             JsonArray array = result.get("data").getAsJsonObject().get(name).getAsJsonArray();
-            return gson.fromJson(array, new TypeToken<T>() {
-            }.getType());
+            return gson.fromJson(array, new TypeToken<T>() {}.getType());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -76,5 +78,14 @@ public String getHeader(String name) {
     public void setHeader(String name, String value) {
         this.headers.put(name, value);
     }
+    public void setGlobalVariable(String name, String value) {
+        this.globalVariables.put(name, value);
+    }
 
+    public void removeHeader(String name) {
+        this.headers.remove(name);
+    }
+    public void removeGlobalVariable(String name) {
+        this.globalVariables.remove(name);
+    }
 }
@@ -24,6 +24,11 @@ public Query setVariable(String name, Object value) {
         this.variables.put(name, value);
         return this;
     }
+    
+    public Query removeVariable(String name) {
+        this.variables.remove(name);
+        return this;
+    }
 
     @Override
     public String toString() {
 
@@ -40,6 +40,20 @@ public void queryOne() {
         assertEquals("[email protected]", user.getEmail());
 
     }
+    @Test
+    public void testGlobalVariable() {
+        Client client = makeClient();
+        client.setGlobalVariable("id", "1");
+        User user = client.first(
+                new Query("query user($id: ID!) { user(id: $id) { id, name, email } }"),
+                "user",
+                User.class
+        );
+        assertNotNull("User is null", user);
+        assertEquals("1", user.getId());
+        assertEquals("Leanne Graham", user.getName());
+        assertEquals("[email protected]", user.getEmail());
+    }
 
     private class Todo {
         String id, description;