From 00b01ee5245a4450ad159c069cf1b5611adab897 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 26 Apr 2021 21:59:41 +0100 Subject: [PATCH] Rename package for GraphQLTester --- .../io/spring/sample/graphql/QueryTests.java | 2 +- .../sample/graphql/SubscriptionTests.java | 2 +- .../graphql/project/MockMvcGraphQLTests.java | 2 +- .../DefaultGraphQLTester.java | 2 +- .../test/{query => tester}/GraphQLTester.java | 2 +- .../TestExecutionResult.java | 2 +- .../{query => tester}/TestGraphQLError.java | 2 +- .../{query => tester}/TypeRefAdapter.java | 2 +- .../graphql/test/tester/package-info.java | 21 +++++++++++++++++++ .../{query => tester}/GraphQLTesterTests.java | 2 +- .../{query => tester}/MovieCharacter.java | 2 +- 11 files changed, 31 insertions(+), 10 deletions(-) rename spring-graphql-test/src/main/java/org/springframework/graphql/test/{query => tester}/DefaultGraphQLTester.java (99%) rename spring-graphql-test/src/main/java/org/springframework/graphql/test/{query => tester}/GraphQLTester.java (99%) rename spring-graphql-test/src/main/java/org/springframework/graphql/test/{query => tester}/TestExecutionResult.java (97%) rename spring-graphql-test/src/main/java/org/springframework/graphql/test/{query => tester}/TestGraphQLError.java (98%) rename spring-graphql-test/src/main/java/org/springframework/graphql/test/{query => tester}/TypeRefAdapter.java (96%) create mode 100644 spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/package-info.java rename spring-graphql-test/src/test/java/org/springframework/graphql/test/{query => tester}/GraphQLTesterTests.java (99%) rename spring-graphql-test/src/test/java/org/springframework/graphql/test/{query => tester}/MovieCharacter.java (96%) diff --git a/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/QueryTests.java b/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/QueryTests.java index d753a18b..a39277a2 100644 --- a/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/QueryTests.java +++ b/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/QueryTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.graphql.web.WebGraphQLService; -import org.springframework.graphql.test.query.GraphQLTester; +import org.springframework.graphql.test.tester.GraphQLTester; /** * GraphQL query tests directly via {@link GraphQL}. diff --git a/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/SubscriptionTests.java b/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/SubscriptionTests.java index d10ac232..aa3e196d 100644 --- a/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/SubscriptionTests.java +++ b/samples/webflux-websocket/src/test/java/io/spring/sample/graphql/SubscriptionTests.java @@ -24,7 +24,7 @@ import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.graphql.web.WebGraphQLService; -import org.springframework.graphql.test.query.GraphQLTester; +import org.springframework.graphql.test.tester.GraphQLTester; /** * GraphQL subscription tests directly via {@link GraphQL}. diff --git a/samples/webmvc-http/src/test/java/io/spring/sample/graphql/project/MockMvcGraphQLTests.java b/samples/webmvc-http/src/test/java/io/spring/sample/graphql/project/MockMvcGraphQLTests.java index bdc2d1fe..3bd54a22 100644 --- a/samples/webmvc-http/src/test/java/io/spring/sample/graphql/project/MockMvcGraphQLTests.java +++ b/samples/webmvc-http/src/test/java/io/spring/sample/graphql/project/MockMvcGraphQLTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.graphql.test.query.GraphQLTester; +import org.springframework.graphql.test.tester.GraphQLTester; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.client.MockMvcWebTestClient; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/DefaultGraphQLTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQLTester.java similarity index 99% rename from spring-graphql-test/src/main/java/org/springframework/graphql/test/query/DefaultGraphQLTester.java rename to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQLTester.java index 066986bf..717d39ad 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/DefaultGraphQLTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQLTester.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.test.query; +package org.springframework.graphql.test.tester; import java.net.URI; import java.nio.charset.StandardCharsets; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/GraphQLTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQLTester.java similarity index 99% rename from spring-graphql-test/src/main/java/org/springframework/graphql/test/query/GraphQLTester.java rename to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQLTester.java index ea9250c6..5ae25630 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/GraphQLTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQLTester.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.test.query; +package org.springframework.graphql.test.tester; import java.util.List; import java.util.Map; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TestExecutionResult.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestExecutionResult.java similarity index 97% rename from spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TestExecutionResult.java rename to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestExecutionResult.java index fd0a0675..c5347a07 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TestExecutionResult.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestExecutionResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.test.query; +package org.springframework.graphql.test.tester; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TestGraphQLError.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestGraphQLError.java similarity index 98% rename from spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TestGraphQLError.java rename to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestGraphQLError.java index 33af2b31..02ef5d4a 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TestGraphQLError.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestGraphQLError.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.test.query; +package org.springframework.graphql.test.tester; import java.util.List; import java.util.Map; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TypeRefAdapter.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TypeRefAdapter.java similarity index 96% rename from spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TypeRefAdapter.java rename to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TypeRefAdapter.java index 34610bc6..c5ae70db 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/query/TypeRefAdapter.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TypeRefAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.test.query; +package org.springframework.graphql.test.tester; import java.lang.reflect.Type; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/package-info.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/package-info.java new file mode 100644 index 00000000..4e60f5d1 --- /dev/null +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/package-info.java @@ -0,0 +1,21 @@ +/* + * Copyright 2020-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@NonNullApi +@NonNullFields +package org.springframework.graphql.test.tester; + +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-graphql-test/src/test/java/org/springframework/graphql/test/query/GraphQLTesterTests.java b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQLTesterTests.java similarity index 99% rename from spring-graphql-test/src/test/java/org/springframework/graphql/test/query/GraphQLTesterTests.java rename to spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQLTesterTests.java index 618ca192..330c15f0 100644 --- a/spring-graphql-test/src/test/java/org/springframework/graphql/test/query/GraphQLTesterTests.java +++ b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQLTesterTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.test.query; +package org.springframework.graphql.test.tester; import java.util.Arrays; import java.util.Collections; diff --git a/spring-graphql-test/src/test/java/org/springframework/graphql/test/query/MovieCharacter.java b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/MovieCharacter.java similarity index 96% rename from spring-graphql-test/src/test/java/org/springframework/graphql/test/query/MovieCharacter.java rename to spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/MovieCharacter.java index 188eb326..17114709 100644 --- a/spring-graphql-test/src/test/java/org/springframework/graphql/test/query/MovieCharacter.java +++ b/spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/MovieCharacter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.test.query; +package org.springframework.graphql.test.tester; import org.springframework.lang.Nullable;