Rename ~.web package to ~.server

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

See gh-339

Author: rstoyanchev

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

@@ -21,7 +21,7 @@
 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 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 @@
 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.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.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 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.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 @@
  *
  * @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/web/DefaultWebGraphQlHandlerBuilder.java renamed to 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 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 @@ public WebGraphQlHandler.Builder threadLocalAccessors(List<ThreadLocalAccessor>
 	@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/web/GraphQlRSocketHandler.java renamed to 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 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 @@
  */
 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/web/RSocketGraphQlInterceptor.java renamed to 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;