diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java index 73a3da19..66a6b99d 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java +++ b/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; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerGraphQlTransport.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerGraphQlTransport.java index c3467c25..2a5380ef 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerGraphQlTransport.java +++ b/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; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlTester.java index 4a94d984..e0c837b8 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlTester.java +++ b/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; diff --git a/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/WebGraphQlTesterBuilderTests.java b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/WebGraphQlTesterBuilderTests.java index 610825b4..14b96c47 100644 --- a/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/WebGraphQlTesterBuilderTests.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/client/CodecDelegate.java b/spring-graphql/src/main/java/org/springframework/graphql/client/CodecDelegate.java index cbe52b23..438d29bd 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/client/CodecDelegate.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/client/WebSocketGraphQlTransport.java b/spring-graphql/src/main/java/org/springframework/graphql/client/WebSocketGraphQlTransport.java index d75d84a0..299aa531 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/client/WebSocketGraphQlTransport.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/ThreadLocalAccessor.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/ThreadLocalAccessor.java index 3966f5c9..5482270e 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/execution/ThreadLocalAccessor.java +++ b/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 { diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/DefaultWebGraphQlHandlerBuilder.java b/spring-graphql/src/main/java/org/springframework/graphql/server/DefaultWebGraphQlHandlerBuilder.java similarity index 91% rename from spring-graphql/src/main/java/org/springframework/graphql/web/DefaultWebGraphQlHandlerBuilder.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/DefaultWebGraphQlHandlerBuilder.java index d6e955f6..c7434e77 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/DefaultWebGraphQlHandlerBuilder.java +++ b/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() { diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/GraphQlRSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/GraphQlRSocketHandler.java similarity index 91% rename from spring-graphql/src/main/java/org/springframework/graphql/web/GraphQlRSocketHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/GraphQlRSocketHandler.java index 627752d0..d647df5d 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/GraphQlRSocketHandler.java +++ b/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 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)); } diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlInterceptor.java b/spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlInterceptor.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlInterceptor.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlInterceptor.java index 8aa58225..0ef9d321 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlInterceptor.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlRequest.java b/spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlRequest.java similarity index 97% rename from spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlRequest.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlRequest.java index 36b18d10..9f3034c2 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlRequest.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlResponse.java b/spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlResponse.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlResponse.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/RSocketGraphQlResponse.java index 5f0014f5..8802fbc0 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/RSocketGraphQlResponse.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlHandler.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlHandler.java index dd196bd9..392d2c38 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlInterceptor.java b/spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlInterceptor.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlInterceptor.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlInterceptor.java index c16df150..1a24bb92 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlInterceptor.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlRequest.java b/spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlRequest.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlRequest.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlRequest.java index 2bfd2ffe..e75aa457 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlRequest.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlResponse.java b/spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlResponse.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlResponse.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlResponse.java index a1542f44..92899d9a 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/WebGraphQlResponse.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/WebSocketGraphQlInterceptor.java b/spring-graphql/src/main/java/org/springframework/graphql/server/WebSocketGraphQlInterceptor.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/WebSocketGraphQlInterceptor.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/WebSocketGraphQlInterceptor.java index 0c51acf8..ea84e772 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/WebSocketGraphQlInterceptor.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/package-info.java b/spring-graphql/src/main/java/org/springframework/graphql/server/package-info.java similarity index 60% rename from spring-graphql/src/main/java/org/springframework/graphql/web/package-info.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/package-info.java index f805b153..7a0d285a 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/package-info.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/support/GraphQlMessage.java b/spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlMessage.java similarity index 99% rename from spring-graphql/src/main/java/org/springframework/graphql/web/support/GraphQlMessage.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlMessage.java index b632fb6c..78c08965 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/support/GraphQlMessage.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/support/GraphQlMessageType.java b/spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlMessageType.java similarity index 97% rename from spring-graphql/src/main/java/org/springframework/graphql/web/support/GraphQlMessageType.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/support/GraphQlMessageType.java index c9ca68c8..43fa956b 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/support/GraphQlMessageType.java +++ b/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; /** diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/support/package-info.java b/spring-graphql/src/main/java/org/springframework/graphql/server/support/package-info.java similarity index 93% rename from spring-graphql/src/main/java/org/springframework/graphql/web/support/package-info.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/support/package-info.java index 39fc277e..3537c5a9 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/support/package-info.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/CodecDelegate.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/CodecDelegate.java similarity index 97% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webflux/CodecDelegate.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webflux/CodecDelegate.java index 27659466..0e414398 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/CodecDelegate.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlHttpHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlHttpHandler.java similarity index 94% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlHttpHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlHttpHandler.java index 8fbeff11..ab9e8f9b 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlHttpHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandler.java similarity index 95% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandler.java index c84fd40f..8522768f 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphiQlHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphiQlHandler.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphiQlHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webflux/GraphiQlHandler.java index d9a0a06f..ceec57ea 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphiQlHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/SchemaHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/SchemaHandler.java similarity index 96% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webflux/SchemaHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webflux/SchemaHandler.java index 19377d44..0c8c5c47 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/SchemaHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/package-info.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webflux/package-info.java similarity index 94% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webflux/package-info.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webflux/package-info.java index 7f531738..949f295e 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/package-info.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlHttpHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandler.java similarity index 95% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlHttpHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandler.java index 42399903..9338bac1 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlHttpHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java similarity index 97% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandler.java index ce956c3c..eb40bd17 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphiQlHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphiQlHandler.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphiQlHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/GraphiQlHandler.java index 018e6c15..b59f532c 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphiQlHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/SchemaHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/SchemaHandler.java similarity index 96% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/SchemaHandler.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/SchemaHandler.java index 41ef9972..a0954757 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/SchemaHandler.java +++ b/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; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/package-info.java b/spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/package-info.java similarity index 94% rename from spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/package-info.java rename to spring-graphql/src/main/java/org/springframework/graphql/server/webmvc/package-info.java index 8402884d..46299ab6 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/package-info.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/client/MockGraphQlWebSocketServer.java b/spring-graphql/src/test/java/org/springframework/graphql/client/MockGraphQlWebSocketServer.java index 6bfe0be1..55b2fbd7 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/client/MockGraphQlWebSocketServer.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/client/MockWebSocketGraphQlTransportTests.java b/spring-graphql/src/test/java/org/springframework/graphql/client/MockWebSocketGraphQlTransportTests.java index 7197eced..b466b38a 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/client/MockWebSocketGraphQlTransportTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/client/RSocketGraphQlClientBuilderTests.java b/spring-graphql/src/test/java/org/springframework/graphql/client/RSocketGraphQlClientBuilderTests.java index 82183cd0..b58b447e 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/client/RSocketGraphQlClientBuilderTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/client/WebGraphQlClientBuilderTests.java b/spring-graphql/src/test/java/org/springframework/graphql/client/WebGraphQlClientBuilderTests.java index ac67b377..95a9b302 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/client/WebGraphQlClientBuilderTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java index da01ea48..de2ae71f 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java index 7bccf14e..b71e2a70 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java index d0112701..3812e47b 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java index 89f33ae6..7caa6e82 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/ConsumeOneAndNeverCompleteInterceptor.java b/spring-graphql/src/test/java/org/springframework/graphql/server/ConsumeOneAndNeverCompleteInterceptor.java similarity index 96% rename from spring-graphql/src/test/java/org/springframework/graphql/web/ConsumeOneAndNeverCompleteInterceptor.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/ConsumeOneAndNeverCompleteInterceptor.java index 7bcf4f76..217f8e70 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/ConsumeOneAndNeverCompleteInterceptor.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/WebGraphQlHandlerTests.java similarity index 99% rename from spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlHandlerTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/WebGraphQlHandlerTests.java index 1c2aa466..569b4608 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlHandlerTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlInterceptorTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/WebGraphQlInterceptorTests.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlInterceptorTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/WebGraphQlInterceptorTests.java index 7f7347ba..66c548e6 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/WebGraphQlInterceptorTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/WebSocketHandlerTestSupport.java b/spring-graphql/src/test/java/org/springframework/graphql/server/WebSocketHandlerTestSupport.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/web/WebSocketHandlerTestSupport.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/WebSocketHandlerTestSupport.java index bf356240..f3324f26 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/WebSocketHandlerTestSupport.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphQlHttpHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlHttpHandlerTests.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphQlHttpHandlerTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlHttpHandlerTests.java index 7387dac6..6d43e117 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphQlHttpHandlerTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandlerTests.java similarity index 96% rename from spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandlerTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandlerTests.java index 60308677..bcdd5977 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandlerTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphiQlHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphiQlHandlerTests.java similarity index 99% rename from spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphiQlHandlerTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/webflux/GraphiQlHandlerTests.java index 1e08838e..6e34b6ff 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/GraphiQlHandlerTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/TestWebSocketSession.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webflux/TestWebSocketSession.java similarity index 97% rename from spring-graphql/src/test/java/org/springframework/graphql/web/webflux/TestWebSocketSession.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/webflux/TestWebSocketSession.java index 329cb66f..cead3875 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/webflux/TestWebSocketSession.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphQlHttpHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandlerTests.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphQlHttpHandlerTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlHttpHandlerTests.java index bb6d4e09..a0fb92e0 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphQlHttpHandlerTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandlerTests.java similarity index 96% rename from spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandlerTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandlerTests.java index 56d58e49..6d111ab6 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandlerTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphiQlHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphiQlHandlerTests.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphiQlHandlerTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/GraphiQlHandlerTests.java index 8772b272..d1673a9b 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/GraphiQlHandlerTests.java +++ b/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; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/TestWebSocketSession.java b/spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/TestWebSocketSession.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/TestWebSocketSession.java rename to spring-graphql/src/test/java/org/springframework/graphql/server/webmvc/TestWebSocketSession.java index bfeb2fbc..9d080661 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/web/webmvc/TestWebSocketSession.java +++ b/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; diff --git a/spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlServiceSetup.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlServiceSetup.java index 8a3c027c..41532f81 100644 --- a/spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlServiceSetup.java +++ b/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 */ diff --git a/spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java index a83f5c19..c1724a64 100644 --- a/spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java +++ b/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()); } diff --git a/spring-graphql/src/testFixtures/java/org/springframework/graphql/web/TestWebSocketClient.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/server/TestWebSocketClient.java similarity index 98% rename from spring-graphql/src/testFixtures/java/org/springframework/graphql/web/TestWebSocketClient.java rename to spring-graphql/src/testFixtures/java/org/springframework/graphql/server/TestWebSocketClient.java index 9b4adb67..b6717a69 100644 --- a/spring-graphql/src/testFixtures/java/org/springframework/graphql/web/TestWebSocketClient.java +++ b/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; diff --git a/spring-graphql/src/testFixtures/java/org/springframework/graphql/web/TestWebSocketConnection.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/server/TestWebSocketConnection.java similarity index 99% rename from spring-graphql/src/testFixtures/java/org/springframework/graphql/web/TestWebSocketConnection.java rename to spring-graphql/src/testFixtures/java/org/springframework/graphql/server/TestWebSocketConnection.java index 4ca54749..44ffec84 100644 --- a/spring-graphql/src/testFixtures/java/org/springframework/graphql/web/TestWebSocketConnection.java +++ b/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; diff --git a/spring-graphql/src/testFixtures/java/org/springframework/graphql/web/WebGraphQlSetup.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/server/WebGraphQlSetup.java similarity index 81% rename from spring-graphql/src/testFixtures/java/org/springframework/graphql/web/WebGraphQlSetup.java rename to spring-graphql/src/testFixtures/java/org/springframework/graphql/server/WebGraphQlSetup.java index 3610ecc9..627f574d 100644 --- a/spring-graphql/src/testFixtures/java/org/springframework/graphql/web/WebGraphQlSetup.java +++ b/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(); }