Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use RequestInput as the input for GraphQlService

Browse Source
This commit is contained in:
Rossen Stoyanchev
2021-07-02 21:20:09 +01:00
parent 5b444d0ef1
commit 04d6a72eec
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java
View File

@@ -32,7 +32,6 @@ import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.PathNotFoundException;
import com.jayway.jsonpath.TypeRef;
import graphql.ExecutionInput;
import graphql.ExecutionResult;
import graphql.GraphQLError;
import org.reactivestreams.Publisher;
@@ -217,8 +216,7 @@ class DefaultGraphQlTester implements GraphQlTester {
}
protected ExecutionResult executeInternal(RequestInput input) {
ExecutionInput executionInput = input.toExecutionInput();
ExecutionResult result = this.graphQlService.execute(executionInput).block(responseTimeout());
ExecutionResult result = this.graphQlService.execute(input).block(responseTimeout());
Assert.notNull(result, "Expected ExecutionResult");
return result;
}

6
spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterTests.java
View File

@@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicReference;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import graphql.ExecutionInput;
import graphql.ExecutionResult;
import graphql.ExecutionResultImpl;
import graphql.GraphQLError;
@@ -36,6 +35,7 @@ import reactor.core.publisher.Mono;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.graphql.GraphQlService;
import org.springframework.graphql.RequestInput;
import org.springframework.lang.Nullable;
import org.springframework.util.CollectionUtils;
@@ -62,7 +62,7 @@ public class GraphQlTesterTests {
private final GraphQlTester graphQlTester = GraphQlTester.create(this.service);
private final ArgumentCaptor<ExecutionInput> inputCaptor = ArgumentCaptor.forClass(ExecutionInput.class);
private final ArgumentCaptor<RequestInput> inputCaptor = ArgumentCaptor.forClass(RequestInput.class);
@Test
@@ -185,7 +185,7 @@ public class GraphQlTesterTests {
spec.path("hero").entity(MovieCharacter.class).isEqualTo(MovieCharacter.create("R2-D2"));
ExecutionInput input = this.inputCaptor.getValue();
RequestInput input = this.inputCaptor.getValue();
assertThat(input.getQuery()).contains(query);
assertThat(input.getOperationName()).isEqualTo("HeroNameAndFriends");
assertThat(input.getVariables()).hasSize(2);