Shorten GraphQlResponse[Field|Error] and rename GraphQlService

Rename GraphQlService to ExecutionGraphQlService following the renaming
of the request and response to ExecutionGraphQl[Request|Response].

See gh-332

Author: rstoyanchev

spring-graphql-docs/src/docs/asciidoc/client.adoc

@@ -183,7 +183,7 @@ response and the field:
 			.onErrorResume(FieldAccessException.class, ex -> {
 				ClientGraphQlResponse response = ex.getResponse();
 				// ...
-				GraphQlResponseField field = ex.getField();
+				ResponseField field = ex.getField();
 				// ...
 			});
 ----

spring-graphql-docs/src/docs/asciidoc/index.adoc

@@ -118,8 +118,8 @@ The Spring for GraphQL repository contains a WebFlux
 
 <<web-http>> and <<web-websocket>> transport handlers delegate to a common Web
 interception chain for request execution. The chain consists of a sequence of
-`WebInterceptor` components, followed by a `GraphQlService` that invokes the GraphQL
-Java engine.
+`WebInterceptor` components, followed by a `ExecutionGraphQlService` that invokes
+GraphQL Java.
 
 `WebInterceptor` is as a common contract to use in both Spring MVC and WebFlux
 applications. Use it to intercept requests, inspect HTTP request headers, or to register a
@@ -170,13 +170,12 @@ it contains, for the actual config.
 [[execution]]
 == Request Execution
 
-`GraphQlService` is the main Spring abstraction to call GraphQL Java to execute
-requests. Underlying transports, such as the <<web-transports>>, delegate to `GraphQlService` to
-handle requests.
+`ExecutionGraphQlService` is the main Spring abstraction to call GraphQL Java to execute
+requests. Underlying transports, such as the <<web-transports>>, delegate to
+`ExecutionGraphQlService` to handle requests.
 
-The main implementation, `ExecutionGraphQlService`, is a thin facade around the
-invocation of `graphql.GraphQL`. It is configured with a `GraphQlSource` for access to
-the `graphql.GraphQL` instance.
+The main implementation, `DefaultExecutionGraphQlService`, is configured with a
+`GraphQlSource` for access to the `graphql.GraphQL` instance to invoke.
 
 
 
@@ -413,10 +412,10 @@ transport layer, such as from a WebFlux request handling, see
 [[execution-context]]
 === Context Propagation
 
-Spring for GraphQL provides support to transparently propagate context from the <<web-transports>>,
-through the GraphQL engine, and to `DataFetcher` and other components it invokes.
-This includes both `ThreadLocal` context from the Spring MVC request handling thread and
-Reactor `Context` from the WebFlux processing pipeline.
+Spring for GraphQL provides support to transparently propagate context from the
+<<web-transports>>, through GraphQL Java, and to `DataFetcher` and other components it
+invokes. This includes both `ThreadLocal` context from the Spring MVC request handling
+thread and Reactor `Context` from the WebFlux processing pipeline.
 
 
 [[execution-context-webmvc]]
@@ -427,7 +426,7 @@ the same thread as the Spring MVC handler, for example if an asynchronous
 <<web-interception, `WebInterceptor`>> or `DataFetcher` switches to a different thread.
 
 Spring for GraphQL supports propagating `ThreadLocal` values from the Servlet container
-thread to the thread a `DataFetcher` and other components invoked by the GraphQL engine
+thread to the thread a `DataFetcher` and other components invoked by GraphQL Java to
 execute on. To do this, an application needs to create a `ThreadLocalAccessor` to extract
 `ThreadLocal` values of interest:
 
@@ -558,7 +557,7 @@ public class MyConfig {
 The Spring Boot starter declares a `BatchLoaderRegistry` bean that you can inject into
 your configuration, as shown above, or into any component such as a controller in order
 register batch loading functions. In turn the `BatchLoaderRegistry` is injected into
-`ExecutionGraphQlService` where it ensures `DataLoader` registrations per request.
+`DefaultExecutionGraphQlService` where it ensures `DataLoader` registrations per request.
 
 By default, the `DataLoader` name is based on the class name of the target entity.
 This allows an `@SchemaMapping` method to declare a
@@ -1202,7 +1201,7 @@ If needed, you can customize the name through the annotation, e.g. `@Argument("b
 
 TIP: The `@Argument` annotation does not have a "required" flag, nor the option to
 specify a default value. Both of these can be specified at the GraphQL schema level and
-are enforced by the GraphQL Engine.
+are enforced by GraphQL Java.
 
 You can use `@Argument` on a `Map<String, Object>` argument, to obtain all argument
 values. The name attribute on `@Argument` must not be set.

spring-graphql-docs/src/docs/asciidoc/testing.adoc

@@ -179,7 +179,7 @@ connection closed, e.g. after a test runs.
 
 Many times it's enough to test GraphQL requests on the server side, without the use of a
 client to send requests over a transport protocol. To test directly against a
-`GraphQlService`, use the `GraphQlServiceTester` extension:
+`ExecutionGraphQlService`, use the `GraphQlServiceTester` extension:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
@@ -197,7 +197,7 @@ a client. However, in some cases it's useful to involve server side transport
 handling with given mock transport input.
 
 The `WebGraphQlHandlerTester` extension lets you processes request through the
-`WebInterceptor` chain before handing off to `GraphQlService` for request execution:
+`WebInterceptor` chain before handing off to `ExecutionGraphQlService` for request execution:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractDirectTransport.java

@@ -27,7 +27,7 @@
 import org.springframework.graphql.ExecutionGraphQlResponse;
 import org.springframework.graphql.GraphQlRequest;
 import org.springframework.graphql.GraphQlResponse;
-import org.springframework.graphql.GraphQlResponseError;
+import org.springframework.graphql.ResponseError;
 import org.springframework.graphql.support.DefaultExecutionGraphQlRequest;
 import org.springframework.graphql.support.DefaultExecutionGraphQlResponse;
 import org.springframework.graphql.client.GraphQlTransport;
@@ -61,7 +61,7 @@ public Flux<GraphQlResponse> executeSubscription(GraphQlRequest request) {
 				Object data = response.getData();
 				AssertionErrors.assertTrue("Not a Publisher: " + data, data instanceof Publisher);
 
-				List<GraphQlResponseError> errors = response.getErrors();
+				List<ResponseError> errors = response.getErrors();
 				AssertionErrors.assertTrue("Subscription errors: " + errors, CollectionUtils.isEmpty(errors));
 
 				return Flux.from((Publisher<ExecutionResult>) data).map(executionResult ->

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractGraphQlTesterBuilder.java

@@ -25,7 +25,7 @@
 import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
-import org.springframework.graphql.GraphQlResponseError;
+import org.springframework.graphql.ResponseError;
 import org.springframework.graphql.client.AbstractGraphQlClientBuilder;
 import org.springframework.graphql.client.GraphQlTransport;
 import org.springframework.graphql.support.CachingDocumentSource;
@@ -57,7 +57,7 @@ public abstract class AbstractGraphQlTesterBuilder<B extends AbstractGraphQlTest
 
 
 	@Nullable
-	private Predicate<GraphQlResponseError> errorFilter;
+	private Predicate<ResponseError> errorFilter;
 
 	private DocumentSource documentSource = new CachingDocumentSource(new ResourceDocumentSource());
 
@@ -67,7 +67,7 @@ public abstract class AbstractGraphQlTesterBuilder<B extends AbstractGraphQlTest
 
 
 	@Override
-	public B errorFilter(Predicate<GraphQlResponseError> predicate) {
+	public B errorFilter(Predicate<ResponseError> predicate) {
 		this.errorFilter = (this.errorFilter != null ? errorFilter.and(predicate) : predicate);
 		return self();
 	}

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlServiceTester.java

@@ -19,12 +19,12 @@
 
 import java.util.function.Consumer;
 
-import org.springframework.graphql.GraphQlService;
+import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.util.Assert;
 
 
 /**
- * Default {@link GraphQlServiceTester} that uses a {@link GraphQlService} for
+ * Default {@link GraphQlServiceTester} that uses a {@link ExecutionGraphQlService} for
  * request execution.
  *
  * @author Rossen Stoyanchev
@@ -64,9 +64,9 @@ public Builder<?> mutate() {
 	static class Builder<B extends Builder<B>> extends AbstractGraphQlTesterBuilder<B>
 			implements GraphQlServiceTester.Builder<B> {
 
-		private final GraphQlService service;
+		private final ExecutionGraphQlService service;
 
-		Builder(GraphQlService service) {
+		Builder(ExecutionGraphQlService service) {
 			Assert.notNull(service, "GraphQlService is required");
 			this.service = service;
 		}

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

@@ -37,7 +37,7 @@
 import org.springframework.graphql.support.DefaultGraphQlRequest;
 import org.springframework.graphql.GraphQlRequest;
 import org.springframework.graphql.GraphQlResponse;
-import org.springframework.graphql.GraphQlResponseError;
+import org.springframework.graphql.ResponseError;
 import org.springframework.graphql.client.GraphQlTransport;
 import org.springframework.graphql.support.DocumentSource;
 import org.springframework.lang.Nullable;
@@ -62,7 +62,7 @@ final class DefaultGraphQlTester implements GraphQlTester {
 	private final GraphQlTransport transport;
 
 	@Nullable
-	private final Predicate<GraphQlResponseError> errorFilter;
+	private final Predicate<ResponseError> errorFilter;
 
 	private final Configuration jsonPathConfig;
 
@@ -77,7 +77,7 @@ final class DefaultGraphQlTester implements GraphQlTester {
 	 * Package private constructor for use from {@link AbstractGraphQlTesterBuilder}.
 	 */
 	DefaultGraphQlTester(
-			GraphQlTransport transport, @Nullable Predicate<GraphQlResponseError> errorFilter,
+			GraphQlTransport transport, @Nullable Predicate<ResponseError> errorFilter,
 			Configuration jsonPathConfig, DocumentSource documentSource, Duration timeout,
 			Consumer<AbstractGraphQlTesterBuilder<?>> builderInitializer) {
 
@@ -210,15 +210,15 @@ private final static class ResponseDelegate {
 
 		private final Supplier<String> jsonContent;
 
-		private final List<GraphQlResponseError> errors;
+		private final List<ResponseError> errors;
 
-		private final List<GraphQlResponseError> unexpectedErrors;
+		private final List<ResponseError> unexpectedErrors;
 
 		private final Consumer<Runnable> assertDecorator;
 
 
 		private ResponseDelegate(
-				GraphQlResponse response, @Nullable Predicate<GraphQlResponseError> errorFilter,
+				GraphQlResponse response, @Nullable Predicate<ResponseError> errorFilter,
 				Consumer<Runnable> assertDecorator, Configuration jsonPathConfig) {
 
 			this.jsonDoc = JsonPath.parse(response.toMap(), jsonPathConfig);
@@ -254,9 +254,9 @@ void doAssert(Runnable task) {
 			this.assertDecorator.accept(task);
 		}
 
-		boolean filterErrors(Predicate<GraphQlResponseError> predicate) {
+		boolean filterErrors(Predicate<ResponseError> predicate) {
 			boolean filtered = false;
-			for (GraphQlResponseError error : this.errors) {
+			for (ResponseError error : this.errors) {
 				if (predicate.test(error)) {
 					this.unexpectedErrors.remove(error);
 					filtered = true;
@@ -265,12 +265,12 @@ boolean filterErrors(Predicate<GraphQlResponseError> predicate) {
 			return filtered;
 		}
 
-		void expectErrors(Predicate<GraphQlResponseError> predicate) {
+		void expectErrors(Predicate<ResponseError> predicate) {
 			boolean filtered = filterErrors(predicate);
 			this.assertDecorator.accept(() -> AssertionErrors.assertTrue("No matching errors.", filtered));
 		}
 
-		void consumeErrors(Consumer<List<GraphQlResponseError>> consumer) {
+		void consumeErrors(Consumer<List<ResponseError>> consumer) {
 			filterErrors(error -> true);
 			consumer.accept(this.errors);
 		}
@@ -294,7 +294,7 @@ private static final class DefaultResponse implements Response, Errors {
 		private final ResponseDelegate delegate;
 
 		private DefaultResponse(
-				GraphQlResponse response, @Nullable Predicate<GraphQlResponseError> errorFilter,
+				GraphQlResponse response, @Nullable Predicate<ResponseError> errorFilter,
 				Consumer<Runnable> assertDecorator, Configuration jsonPathConfig) {
 
 			this.delegate = new ResponseDelegate(response, errorFilter, assertDecorator, jsonPathConfig);
@@ -312,13 +312,13 @@ public Errors errors() {
 		}
 
 		@Override
-		public Errors filter(Predicate<GraphQlResponseError> predicate) {
+		public Errors filter(Predicate<ResponseError> predicate) {
 			this.delegate.filterErrors(predicate);
 			return this;
 		}
 
 		@Override
-		public Errors expect(Predicate<GraphQlResponseError> predicate) {
+		public Errors expect(Predicate<ResponseError> predicate) {
 			this.delegate.expectErrors(predicate);
 			return this;
 		}
@@ -330,7 +330,7 @@ public Traversable verify() {
 		}
 
 		@Override
-		public Traversable satisfy(Consumer<List<GraphQlResponseError>> consumer) {
+		public Traversable satisfy(Consumer<List<ResponseError>> consumer) {
 			this.delegate.consumeErrors(consumer);
 			return this;
 		}

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlServiceTester.java

@@ -16,10 +16,10 @@
 
 package org.springframework.graphql.test.tester;
 
-import org.springframework.graphql.GraphQlService;
+import org.springframework.graphql.ExecutionGraphQlService;
 
 /**
- * {@link GraphQlTester} that executes requests through a {@link GraphQlService}
+ * {@link GraphQlTester} that executes requests through a {@link ExecutionGraphQlService}
  * Use it for server-side tests, without a client.
  *
  * @author Rossen Stoyanchev
@@ -35,14 +35,14 @@ public interface GraphQlServiceTester extends GraphQlTester {
 	/**
 	 * Create a {@link GraphQlServiceTester} instance.
 	 */
-	static GraphQlServiceTester create(GraphQlService service) {
+	static GraphQlServiceTester create(ExecutionGraphQlService service) {
 		return builder(service).build();
 	}
 
 	/**
 	 * Return a builder for {@link GraphQlServiceTester}.
 	 */
-	static GraphQlServiceTester.Builder<?> builder(GraphQlService service) {
+	static GraphQlServiceTester.Builder<?> builder(ExecutionGraphQlService service) {
 		return new DefaultGraphQlServiceTester.Builder<>(service);
 	}
 

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlServiceTransport.java

@@ -21,28 +21,28 @@
 
 import org.springframework.graphql.ExecutionGraphQlRequest;
 import org.springframework.graphql.ExecutionGraphQlResponse;
-import org.springframework.graphql.GraphQlService;
+import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.util.Assert;
 
 
 /**
- * {@code GraphQlTransport} that calls directly a {@link GraphQlService}.
+ * {@code GraphQlTransport} that calls directly a {@link ExecutionGraphQlService}.
  *
  * @author Rossen Stoyanchev
  * @since 1.0.0
  */
 final class GraphQlServiceTransport extends AbstractDirectTransport {
 
-	private final GraphQlService graphQlService;
+	private final ExecutionGraphQlService graphQlService;
 
 
-	GraphQlServiceTransport(GraphQlService graphQlService) {
+	GraphQlServiceTransport(ExecutionGraphQlService graphQlService) {
 		Assert.notNull(graphQlService, "GraphQlService is required");
 		this.graphQlService = graphQlService;
 	}
 
 
-	public GraphQlService getGraphQlService() {
+	public ExecutionGraphQlService getGraphQlService() {
 		return this.graphQlService;
 	}
 

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTester.java

@@ -24,7 +24,7 @@
 import reactor.core.publisher.Flux;
 
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.graphql.GraphQlResponseError;
+import org.springframework.graphql.ResponseError;
 import org.springframework.graphql.client.GraphQlTransport;
 import org.springframework.graphql.support.DocumentSource;
 import org.springframework.graphql.support.ResourceDocumentSource;
@@ -103,7 +103,7 @@ interface Builder<B extends Builder<B>> {
 		 * @param predicate the error filter to add
 		 * @return the same builder instance
 		 */
-		B errorFilter(Predicate<GraphQlResponseError> predicate);
+		B errorFilter(Predicate<ResponseError> predicate);
 
 		/**
 		 * Configure a {@link DocumentSource} for use with
@@ -448,7 +448,7 @@ interface Errors {
 		 * @param errorPredicate the error filter to add
 		 * @return the same spec to add more filters before {@link #verify()}
 		 */
-		Errors filter(Predicate<GraphQlResponseError> errorPredicate);
+		Errors filter(Predicate<ResponseError> errorPredicate);
 
 		/**
 		 * Use this to declare errors that are expected.
@@ -461,7 +461,7 @@ interface Errors {
 		 * @param errorPredicate the predicate for the expected error
 		 * @return the same spec to add more filters or expected errors
 		 */
-		Errors expect(Predicate<GraphQlResponseError> errorPredicate);
+		Errors expect(Predicate<ResponseError> errorPredicate);
 
 		/**
 		 * Verify there are either no errors or that there no unexpected errors that have
@@ -477,7 +477,7 @@ interface Errors {
 		 * @param errorsConsumer to inspect errors with
 		 * @return a spec to switch to a data path
 		 */
-		Traversable satisfy(Consumer<List<GraphQlResponseError>> errorsConsumer);
+		Traversable satisfy(Consumer<List<ResponseError>> errorsConsumer);
 
 	}