diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java index d202d181..35f7147f 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java @@ -109,7 +109,7 @@ class DefaultGraphQlTester implements GraphQlTester { } @Override - public DefaultRequestSpec variable(String name, Object value) { + public DefaultRequestSpec variable(String name, @Nullable Object value) { addVariable(name, value); return this; } diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java index 25978090..333a565c 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java @@ -119,7 +119,7 @@ class DefaultWebGraphQlTester implements WebGraphQlTester { } @Override - public WebRequestSpec variable(String name, Object value) { + public WebRequestSpec variable(String name, @Nullable Object value) { addVariable(name, value); return this; } diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTester.java index 484d66ac..9b04c378 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTester.java @@ -173,7 +173,7 @@ public interface GraphQlTester { * @param value the variable value * @return this request spec */ - T variable(String name, Object value); + T variable(String name, @Nullable Object value); /** * Set the locale to associate with the request. diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTesterRequestSpecSupport.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTesterRequestSpecSupport.java index 283f8c03..2a90cee8 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTesterRequestSpecSupport.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTesterRequestSpecSupport.java @@ -53,7 +53,7 @@ class GraphQlTesterRequestSpecSupport { this.operationName = name; } - protected void addVariable(String name, Object value) { + protected void addVariable(String name, @Nullable Object value) { this.variables.put(name, value); } diff --git a/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterTests.java b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterTests.java index 7df947bb..f9df0295 100644 --- a/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterTests.java +++ b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterTests.java @@ -179,6 +179,7 @@ public class GraphQlTesterTests { .operationName("HeroNameAndFriends") .variable("episode", "JEDI") .variable("foo", "bar") + .variable("optional", null) .execute(); spec.path("hero").entity(MovieCharacter.class).isEqualTo(MovieCharacter.create("R2-D2")); @@ -186,9 +187,10 @@ public class GraphQlTesterTests { RequestInput input = this.inputCaptor.getValue(); assertThat(input.getQuery()).contains(query); assertThat(input.getOperationName()).isEqualTo("HeroNameAndFriends"); - assertThat(input.getVariables()).hasSize(2); + assertThat(input.getVariables()).hasSize(3); assertThat(input.getVariables()).containsEntry("episode", "JEDI"); assertThat(input.getVariables()).containsEntry("foo", "bar"); + assertThat(input.getVariables()).containsEntry("optional", null); } @Test