Move WebInterceptorChain into WebInterceptor

Shorter name on method declaration within the interceptor, also for
consistency with GraphQlClientInterceptor.

Author: rstoyanchev

spring-graphql/src/main/java/org/springframework/graphql/client/GraphQlClientInterceptor.java

@@ -84,7 +84,7 @@ interface Chain {
 
 		/**
 		 * Delegate to the rest of the chain to perform the request.
-		 * @param request the request to perform.
+		 * @param request the request to perform
 		 * @return {@code Mono} with the response
 		 * @see GraphQlClient.RequestSpec#execute()
 		 */

spring-graphql/src/main/java/org/springframework/graphql/web/DefaultWebGraphQlHandlerBuilder.java

@@ -88,12 +88,12 @@ public WebGraphQlHandler.Builder threadLocalAccessors(List<ThreadLocalAccessor>
 	@Override
 	public WebGraphQlHandler build() {
 
-		WebInterceptorChain endOfChain =
+		WebInterceptor.Chain endOfChain =
 				request -> this.service.execute(request).map(WebGraphQlResponse::new);
 
-		WebInterceptorChain chain = this.interceptors.stream()
+		WebInterceptor.Chain chain = this.interceptors.stream()
 				.reduce(WebInterceptor::andThen)
-				.map(interceptor -> (WebInterceptorChain) (request) -> interceptor.intercept(request, endOfChain))
+				.map(interceptor -> (WebInterceptor.Chain) (request) -> interceptor.intercept(request, endOfChain))
 				.orElse(endOfChain);
 
 		return new WebGraphQlHandler() {

spring-graphql/src/main/java/org/springframework/graphql/web/WebInterceptor.java

@@ -25,10 +25,10 @@
 import org.springframework.util.Assert;
 
 /**
- * Interceptor for the handling of GraphQL over HTTP or GraphQL over WebSocket
- * requests. Exposes the details of the underlying HTTP request or WebSocket
- * handshake, the decoded GraphQL request, and allows customization of the
- * {@link ExecutionInput} and the resulting {@link ExecutionResult}.
+ * Interceptor for server handling of GraphQL over HTTP or WebSocket requests,
+ * providing access info about the underlying HTTP request or WebSocket
+ * handshake, and allowing customization of the {@link ExecutionInput} and
+ * the {@link ExecutionResult}.
  *
  * <p>Interceptors are typically declared as beans in Spring configuration and
  * ordered as defined in {@link ObjectProvider#orderedStream()}.
@@ -42,16 +42,13 @@
 public interface WebInterceptor {
 
 	/**
-	 * Intercept a request and delegate to the rest of the chain that consists
-	 * of other interceptors followed by a
-	 * {@link ExecutionGraphQlService} that executes the
-	 * request through the GraphQL Java.
-	 * @param request provides access to GraphQL request and allows customization
-	 * of the {@link ExecutionInput} for {@link graphql.GraphQL}.
-	 * @param chain the rest of the chain to handle the request
+	 * Intercept a request and delegate to the rest of the chain including other
+	 * interceptors and a {@link ExecutionGraphQlService}.
+	 * @param request the request to execute
+	 * @param chain the rest of the chain to execute the request
 	 * @return a {@link Mono} with the response
 	 */
-	Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, WebInterceptorChain chain);
+	Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, Chain chain);
 
 	/**
 	 * Return a new {@link WebInterceptor} that invokes the current interceptor
@@ -62,9 +59,24 @@ public interface WebInterceptor {
 	default WebInterceptor andThen(WebInterceptor interceptor) {
 		Assert.notNull(interceptor, "WebInterceptor is required");
 		return (request, chain) -> {
-			WebInterceptorChain nextChain = nextRequest -> interceptor.intercept(nextRequest, chain);
+			Chain nextChain = nextRequest -> interceptor.intercept(nextRequest, chain);
 			return intercept(request, nextChain);
 		};
 	}
 
+
+	/**
+	 * Contract for delegation to the rest of the chain.
+	 */
+	interface Chain {
+
+		/**
+		 * Delegate to the rest of the chain to execute the request.
+		 * @param request the request to execute
+		 * the {@link ExecutionInput} for {@link graphql.GraphQL}.
+		 * @return {@code Mono} with the response
+		 */
+		Mono<WebGraphQlResponse> next(WebGraphQlRequest request);
+
+	}
 }

spring-graphql/src/main/java/org/springframework/graphql/web/WebInterceptorChain.java

@@ -31,7 +31,7 @@
 public interface WebSocketInterceptor extends WebInterceptor {
 
 	@Override
-	default Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, WebInterceptorChain chain) {
+	default Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, Chain chain) {
 		return chain.next(request);
 	}
 

spring-graphql/src/main/java/org/springframework/graphql/web/WebSocketInterceptor.java

@@ -23,7 +23,7 @@
 public class ConsumeOneAndNeverCompleteInterceptor implements WebInterceptor {
 
 	@Override
-	public Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, WebInterceptorChain chain) {
+	public Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, Chain chain) {
 		return chain.next(request).map(response -> response.transform(builder -> {
 			Object originalData = response.getData();
 			if (originalData instanceof Publisher) {

spring-graphql/src/test/java/org/springframework/graphql/web/ConsumeOneAndNeverCompleteInterceptor.java

@@ -110,7 +110,7 @@ private static class OrderInterceptor implements WebInterceptor {
 		}
 
 		@Override
-		public Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, WebInterceptorChain chain) {
+		public Mono<WebGraphQlResponse> intercept(WebGraphQlRequest request, Chain chain) {
 			this.sb.append(":pre").append(this.order);
 			return chain.next(request)
 					.map((response) -> {