Rename ~.web package to ~.server

Now that RSocket is included, it's more obvious it's not just web.

See gh-339

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

@@ -21,7 +21,7 @@ import java.net.URI;
 import java.util.Arrays;
 import java.util.function.Consumer;
 
-import org.springframework.graphql.web.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlHandler;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.codec.ClientCodecConfigurer;
 import org.springframework.http.codec.CodecConfigurer;

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

@@ -24,8 +24,8 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.graphql.ExecutionGraphQlRequest;
 import org.springframework.graphql.ExecutionGraphQlResponse;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlRequest;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.codec.CodecConfigurer;
 import org.springframework.lang.Nullable;

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

@@ -19,7 +19,7 @@ package org.springframework.graphql.test.tester;
 import java.net.URI;
 import java.util.function.Consumer;
 
-import org.springframework.graphql.web.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlHandler;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.codec.CodecConfigurer;
 

spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/WebGraphQlTesterBuilderTests.java

@@ -37,13 +37,13 @@ import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.graphql.ExecutionGraphQlResponse;
 import org.springframework.graphql.support.DefaultExecutionGraphQlResponse;
 import org.springframework.graphql.support.DocumentSource;
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.TestWebSocketClient;
-import org.springframework.graphql.web.TestWebSocketConnection;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlInterceptor;
-import org.springframework.graphql.web.webflux.GraphQlHttpHandler;
-import org.springframework.graphql.web.webflux.GraphQlWebSocketHandler;
+import org.springframework.graphql.server.WebGraphQlRequest;
+import org.springframework.graphql.server.TestWebSocketClient;
+import org.springframework.graphql.server.TestWebSocketConnection;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlInterceptor;
+import org.springframework.graphql.server.webflux.GraphQlHttpHandler;
+import org.springframework.graphql.server.webflux.GraphQlWebSocketHandler;
 import org.springframework.http.codec.ClientCodecConfigurer;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.lang.Nullable;

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

@@ -23,7 +23,7 @@ import org.springframework.core.codec.Decoder;
 import org.springframework.core.codec.Encoder;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.graphql.web.support.GraphQlMessage;
+import org.springframework.graphql.server.support.GraphQlMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.ClientCodecConfigurer;
 import org.springframework.http.codec.CodecConfigurer;

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

@@ -33,8 +33,8 @@ import reactor.core.publisher.Sinks;
 import org.springframework.graphql.GraphQlRequest;
 import org.springframework.graphql.GraphQlResponse;
 import org.springframework.graphql.ResponseError;
-import org.springframework.graphql.web.support.GraphQlMessage;
-import org.springframework.graphql.web.support.GraphQlMessageType;
+import org.springframework.graphql.server.support.GraphQlMessage;
+import org.springframework.graphql.server.support.GraphQlMessageType;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.codec.CodecConfigurer;
 import org.springframework.lang.Nullable;

spring-graphql/src/main/java/org/springframework/graphql/execution/ThreadLocalAccessor.java

@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.graphql.server.WebGraphQlHandler;
 
 /**
  * Interface to be implemented to assist with the extraction of ThreadLocal
@@ -37,7 +38,7 @@ import org.springframework.beans.factory.ObjectProvider;
  *
  * @author Rossen Stoyanchev
  * @since 1.0.0
- * @see org.springframework.graphql.web.WebGraphQlHandler.Builder#threadLocalAccessor(ThreadLocalAccessor...)
+ * @see WebGraphQlHandler.Builder#threadLocalAccessor(ThreadLocalAccessor...)
  */
 public interface ThreadLocalAccessor {
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +25,6 @@ import reactor.core.publisher.Mono;
 import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.graphql.execution.ReactorContextManager;
 import org.springframework.graphql.execution.ThreadLocalAccessor;
-import org.springframework.graphql.web.WebGraphQlInterceptor.Chain;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -89,11 +88,11 @@ class DefaultWebGraphQlHandlerBuilder implements WebGraphQlHandler.Builder {
 	@Override
 	public WebGraphQlHandler build() {
 
-		Chain endOfChain = request -> this.service.execute(request).map(WebGraphQlResponse::new);
+		WebGraphQlInterceptor.Chain endOfChain = request -> this.service.execute(request).map(WebGraphQlResponse::new);
 
-		Chain chain = this.interceptors.stream()
+		WebGraphQlInterceptor.Chain chain = this.interceptors.stream()
 				.reduce(WebGraphQlInterceptor::andThen)
-				.map(interceptor -> (Chain) (request) -> interceptor.intercept(request, endOfChain))
+				.map(interceptor -> (WebGraphQlInterceptor.Chain) (request) -> interceptor.intercept(request, endOfChain))
 				.orElse(endOfChain);
 
 		return new WebGraphQlHandler() {

spring-graphql/src/main/java/org/springframework/graphql/server/GraphQlRSocketHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 
 import java.util.List;
@@ -28,7 +28,6 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.graphql.ExecutionGraphQlResponse;
 import org.springframework.graphql.ExecutionGraphQlService;
-import org.springframework.graphql.web.RSocketGraphQlInterceptor.Chain;
 import org.springframework.util.AlternativeJdkIdGenerator;
 import org.springframework.util.IdGenerator;
 
@@ -68,7 +67,7 @@ import org.springframework.util.IdGenerator;
  */
 public class GraphQlRSocketHandler {
 
-	private final Chain executionChain;
+	private final RSocketGraphQlInterceptor.Chain executionChain;
 
 	private final IdGenerator idGenerator = new AlternativeJdkIdGenerator();
 
@@ -80,12 +79,12 @@ public class GraphQlRSocketHandler {
 	public GraphQlRSocketHandler(
 			ExecutionGraphQlService service, List<RSocketGraphQlInterceptor> interceptors) {
 
-		Chain endOfChain = request -> service.execute(request).map(RSocketGraphQlResponse::new);
+		RSocketGraphQlInterceptor.Chain endOfChain = request -> service.execute(request).map(RSocketGraphQlResponse::new);
 
 		this.executionChain = (interceptors.isEmpty() ? endOfChain :
 				interceptors.stream()
 						.reduce(RSocketGraphQlInterceptor::andThen)
-						.map(interceptor -> (Chain) request -> interceptor.intercept(request, endOfChain))
+						.map(interceptor -> (RSocketGraphQlInterceptor.Chain) request -> interceptor.intercept(request, endOfChain))
 						.orElse(endOfChain));
 	}
 

spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;

spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlRequest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.util.Locale;
 import java.util.Map;

spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlResponse.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.util.function.Consumer;
 

spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.util.List;
 

spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;

spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlRequest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.net.URI;
 import java.util.Locale;

spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlResponse.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.util.function.Consumer;
 

spring-graphql/src/main/java/org/springframework/graphql/server/WebSocketGraphQlInterceptor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.util.Map;
 

spring-graphql/src/main/java/org/springframework/graphql/server/package-info.java

@@ -15,16 +15,11 @@
  */
 
 /**
- * Support for executing GraphQL requests over the Web, including handlers for HTTP and
- * WebSocket. Handlers are provided for use in ether
- * {@link org.springframework.graphql.web.webmvc Spring WebMvc} or
- * {@link org.springframework.graphql.web.webflux Spring WebFlux} with a common
- * {@link org.springframework.graphql.web.WebGraphQlInterceptor interception}
- * model that allows applications to customize the request and response.
+ * Server transports handling GraphQL requests over the HTTP, WebSocket, and RSocket.
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.support;
+package org.springframework.graphql.server.support;
 
 import java.util.Collections;
 import java.util.List;

spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlMessageType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.support;
+package org.springframework.graphql.server.support;
 
 
 /**

spring-graphql/src/main/java/org/springframework/graphql/server/support/package-info.java

@@ -19,7 +19,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.graphql.web.support;
+package org.springframework.graphql.server.support;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-graphql/src/main/java/org/springframework/graphql/server/webflux/CodecDelegate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import java.util.Map;
 
@@ -25,7 +25,7 @@ import org.springframework.core.codec.Decoder;
 import org.springframework.core.codec.Encoder;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.graphql.web.support.GraphQlMessage;
+import org.springframework.graphql.server.support.GraphQlMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.CodecConfigurer;
 import org.springframework.http.codec.DecoderHttpMessageReader;

spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlHttpHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import java.util.Map;
 
@@ -23,8 +23,8 @@ import org.apache.commons.logging.LogFactory;
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlRequest;
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;

spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -32,11 +32,11 @@ import org.reactivestreams.Subscription;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlResponse;
-import org.springframework.graphql.web.WebSocketGraphQlInterceptor;
-import org.springframework.graphql.web.support.GraphQlMessage;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlRequest;
+import org.springframework.graphql.server.WebGraphQlResponse;
+import org.springframework.graphql.server.WebSocketGraphQlInterceptor;
+import org.springframework.graphql.server.support.GraphQlMessage;
 import org.springframework.http.codec.CodecConfigurer;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;

spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphiQlHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import java.net.URI;
 

spring-graphql/src/main/java/org/springframework/graphql/server/webflux/SchemaHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import graphql.schema.idl.SchemaPrinter;
 import reactor.core.publisher.Mono;

spring-graphql/src/main/java/org/springframework/graphql/server/webflux/package-info.java

@@ -19,7 +19,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 import java.io.IOException;
 import java.util.Map;
@@ -27,8 +27,8 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlRequest;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlRequest;
 import org.springframework.util.AlternativeJdkIdGenerator;
 import org.springframework.util.Assert;
 import org.springframework.util.IdGenerator;

spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -43,11 +43,11 @@ import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.WebGraphQlResponse;
-import org.springframework.graphql.web.WebSocketGraphQlInterceptor;
-import org.springframework.graphql.web.support.GraphQlMessage;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlRequest;
+import org.springframework.graphql.server.WebGraphQlResponse;
+import org.springframework.graphql.server.WebSocketGraphQlInterceptor;
+import org.springframework.graphql.server.support.GraphQlMessage;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;

spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphiQlHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 import java.net.URI;
 

spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/SchemaHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 import graphql.schema.idl.SchemaPrinter;
 

spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/package-info.java

@@ -19,7 +19,7 @@
  */
 @NonNullApi
 @NonNullFields
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-graphql/src/test/java/org/springframework/graphql/client/MockGraphQlWebSocketServer.java

@@ -30,7 +30,7 @@ import reactor.core.publisher.Mono;
 import org.springframework.graphql.GraphQlRequest;
 import org.springframework.graphql.GraphQlResponse;
 import org.springframework.graphql.support.DefaultGraphQlRequest;
-import org.springframework.graphql.web.support.GraphQlMessage;
+import org.springframework.graphql.server.support.GraphQlMessage;
 import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.socket.WebSocketHandler;
 import org.springframework.web.reactive.socket.WebSocketSession;

spring-graphql/src/test/java/org/springframework/graphql/client/MockWebSocketGraphQlTransportTests.java

@@ -35,10 +35,10 @@ import org.springframework.graphql.GraphQlRequest;
 import org.springframework.graphql.GraphQlResponse;
 import org.springframework.graphql.ResponseError;
 import org.springframework.graphql.support.DefaultGraphQlRequest;
-import org.springframework.graphql.web.TestWebSocketClient;
-import org.springframework.graphql.web.TestWebSocketConnection;
-import org.springframework.graphql.web.support.GraphQlMessage;
-import org.springframework.graphql.web.support.GraphQlMessageType;
+import org.springframework.graphql.server.TestWebSocketClient;
+import org.springframework.graphql.server.TestWebSocketConnection;
+import org.springframework.graphql.server.support.GraphQlMessage;
+import org.springframework.graphql.server.support.GraphQlMessageType;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.codec.ClientCodecConfigurer;
 import org.springframework.web.reactive.socket.CloseStatus;

spring-graphql/src/test/java/org/springframework/graphql/client/RSocketGraphQlClientBuilderTests.java

@@ -36,7 +36,7 @@ import org.springframework.graphql.ExecutionGraphQlResponse;
 import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.graphql.GraphQlRequest;
 import org.springframework.graphql.support.DefaultExecutionGraphQlResponse;
-import org.springframework.graphql.web.GraphQlRSocketHandler;
+import org.springframework.graphql.server.GraphQlRSocketHandler;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.messaging.handler.annotation.MessageMapping;

spring-graphql/src/test/java/org/springframework/graphql/client/WebGraphQlClientBuilderTests.java

@@ -37,13 +37,13 @@ import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.graphql.ExecutionGraphQlResponse;
 import org.springframework.graphql.support.DefaultExecutionGraphQlResponse;
 import org.springframework.graphql.support.DocumentSource;
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.TestWebSocketClient;
-import org.springframework.graphql.web.TestWebSocketConnection;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlInterceptor;
-import org.springframework.graphql.web.webflux.GraphQlHttpHandler;
-import org.springframework.graphql.web.webflux.GraphQlWebSocketHandler;
+import org.springframework.graphql.server.WebGraphQlRequest;
+import org.springframework.graphql.server.TestWebSocketClient;
+import org.springframework.graphql.server.TestWebSocketConnection;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlInterceptor;
+import org.springframework.graphql.server.webflux.GraphQlHttpHandler;
+import org.springframework.graphql.server.webflux.GraphQlWebSocketHandler;
 import org.springframework.http.codec.ClientCodecConfigurer;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.http.server.reactive.HttpHandler;

spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java

@@ -47,9 +47,9 @@ import org.springframework.graphql.GraphQlSetup;
 import org.springframework.graphql.ResponseHelper;
 import org.springframework.graphql.data.GraphQlRepository;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlResponse;
+import org.springframework.graphql.server.WebGraphQlRequest;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlResponse;
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 

spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java

@@ -44,9 +44,9 @@ import org.springframework.graphql.GraphQlSetup;
 import org.springframework.graphql.ResponseHelper;
 import org.springframework.graphql.data.query.QueryByExampleDataFetcher;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlResponse;
+import org.springframework.graphql.server.WebGraphQlRequest;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlResponse;
 import org.springframework.http.HttpHeaders;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.lang.Nullable;

spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java

@@ -46,9 +46,9 @@ import org.springframework.graphql.ResponseHelper;
 import org.springframework.graphql.GraphQlSetup;
 import org.springframework.graphql.data.query.QueryByExampleDataFetcher;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.WebGraphQlResponse;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlRequest;
+import org.springframework.graphql.server.WebGraphQlResponse;
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.test.context.ContextConfiguration;

spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java

@@ -45,9 +45,9 @@ import org.springframework.graphql.GraphQlSetup;
 import org.springframework.graphql.ResponseHelper;
 import org.springframework.graphql.data.query.QueryByExampleDataFetcher;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-import org.springframework.graphql.web.WebGraphQlRequest;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlResponse;
+import org.springframework.graphql.server.WebGraphQlRequest;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlResponse;
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.test.context.ContextConfiguration;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;

spring-graphql/src/test/java/org/springframework/graphql/server/WebGraphQlHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.net.URI;
 import java.time.Duration;

spring-graphql/src/test/java/org/springframework/graphql/server/WebGraphQlInterceptorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.net.URI;
 import java.util.Arrays;

spring-graphql/src/test/java/org/springframework/graphql/server/WebSocketHandlerTestSupport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import reactor.core.publisher.Flux;
 

spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlHttpHandlerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import java.util.Collections;
 import java.util.List;

spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -37,13 +37,13 @@ import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.graphql.GraphQlSetup;
-import org.springframework.graphql.web.ConsumeOneAndNeverCompleteInterceptor;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlInterceptor;
-import org.springframework.graphql.web.WebSocketHandlerTestSupport;
-import org.springframework.graphql.web.WebSocketGraphQlInterceptor;
-import org.springframework.graphql.web.support.GraphQlMessage;
-import org.springframework.graphql.web.support.GraphQlMessageType;
+import org.springframework.graphql.server.ConsumeOneAndNeverCompleteInterceptor;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlInterceptor;
+import org.springframework.graphql.server.WebSocketHandlerTestSupport;
+import org.springframework.graphql.server.WebSocketGraphQlInterceptor;
+import org.springframework.graphql.server.support.GraphQlMessage;
+import org.springframework.graphql.server.support.GraphQlMessageType;
 import org.springframework.http.codec.ServerCodecConfigurer;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.web.reactive.socket.CloseStatus;

spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphiQlHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;

spring-graphql/src/test/java/org/springframework/graphql/server/webflux/TestWebSocketSession.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webflux;
+package org.springframework.graphql.server.webflux;
 
 import java.net.URI;
 

spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandlerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -35,13 +35,13 @@ import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import org.springframework.graphql.GraphQlSetup;
-import org.springframework.graphql.web.ConsumeOneAndNeverCompleteInterceptor;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlInterceptor;
-import org.springframework.graphql.web.WebSocketHandlerTestSupport;
-import org.springframework.graphql.web.WebSocketGraphQlInterceptor;
-import org.springframework.graphql.web.support.GraphQlMessage;
-import org.springframework.graphql.web.support.GraphQlMessageType;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlInterceptor;
+import org.springframework.graphql.server.WebSocketGraphQlInterceptor;
+import org.springframework.graphql.server.support.GraphQlMessage;
+import org.springframework.graphql.server.support.GraphQlMessageType;
+import org.springframework.graphql.server.ConsumeOneAndNeverCompleteInterceptor;
+import org.springframework.graphql.server.WebSocketHandlerTestSupport;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.converter.GenericHttpMessageConverter;

spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphiQlHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 
 import java.io.IOException;

spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/TestWebSocketSession.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web.webmvc;
+package org.springframework.graphql.server.webmvc;
 
 import java.net.InetSocketAddress;
 import java.net.URI;

spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlServiceSetup.java

@@ -16,11 +16,12 @@
 package org.springframework.graphql;
 
 import org.springframework.graphql.execution.DataLoaderRegistrar;
-import org.springframework.graphql.web.WebGraphQlSetup;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlSetup;
 
 /**
  * Workflow that results in the creation of a {@link ExecutionGraphQlService} or a
- * {@link org.springframework.graphql.web.WebGraphQlHandler}.
+ * {@link WebGraphQlHandler}.
  *
  * @author Rossen Stoyanchev
  */

spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java

@@ -35,9 +35,10 @@ import org.springframework.graphql.execution.DefaultExecutionGraphQlService;
 import org.springframework.graphql.execution.GraphQlSource;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 import org.springframework.graphql.execution.ThreadLocalAccessor;
-import org.springframework.graphql.web.WebGraphQlHandler;
-import org.springframework.graphql.web.WebGraphQlSetup;
-import org.springframework.graphql.web.WebGraphQlInterceptor;
+import org.springframework.graphql.server.webflux.GraphQlHttpHandler;
+import org.springframework.graphql.server.WebGraphQlHandler;
+import org.springframework.graphql.server.WebGraphQlSetup;
+import org.springframework.graphql.server.WebGraphQlInterceptor;
 
 /**
  * Workflow for GraphQL tests setup that starts with {@link GraphQlSource.Builder}
@@ -154,13 +155,13 @@ public class GraphQlSetup implements GraphQlServiceSetup {
 	}
 
 	@Override
-	public org.springframework.graphql.web.webmvc.GraphQlHttpHandler toHttpHandler() {
-		return new org.springframework.graphql.web.webmvc.GraphQlHttpHandler(toWebGraphQlHandler());
+	public org.springframework.graphql.server.webmvc.GraphQlHttpHandler toHttpHandler() {
+		return new org.springframework.graphql.server.webmvc.GraphQlHttpHandler(toWebGraphQlHandler());
 	}
 
 	@Override
-	public org.springframework.graphql.web.webflux.GraphQlHttpHandler toHttpHandlerWebFlux() {
-		return new org.springframework.graphql.web.webflux.GraphQlHttpHandler(toWebGraphQlHandler());
+	public GraphQlHttpHandler toHttpHandlerWebFlux() {
+		return new GraphQlHttpHandler(toWebGraphQlHandler());
 	}
 
 

spring-graphql/src/testFixtures/java/org/springframework/graphql/server/TestWebSocketClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.net.URI;
 import java.util.List;

spring-graphql/src/testFixtures/java/org/springframework/graphql/server/TestWebSocketConnection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import java.net.URI;
 import java.util.ArrayList;

spring-graphql/src/testFixtures/java/org/springframework/graphql/server/WebGraphQlSetup.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql.web;
+package org.springframework.graphql.server;
 
 import org.springframework.graphql.execution.ThreadLocalAccessor;
+import org.springframework.graphql.server.webflux.GraphQlHttpHandler;
 
 /**
  * Workflow that results in the creation of a {@link WebGraphQlHandler} or
@@ -31,8 +32,8 @@ public interface WebGraphQlSetup {
 
 	WebGraphQlHandler toWebGraphQlHandler();
 
-	org.springframework.graphql.web.webmvc.GraphQlHttpHandler toHttpHandler();
+	org.springframework.graphql.server.webmvc.GraphQlHttpHandler toHttpHandler();
 
-	org.springframework.graphql.web.webflux.GraphQlHttpHandler toHttpHandlerWebFlux();
+	GraphQlHttpHandler toHttpHandlerWebFlux();
 
 }