From 4bfe85e6b3a27ca052c5806082a0e5953031bbc3 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 31 Aug 2021 14:58:13 +0100 Subject: [PATCH] Fix package cycle --- .../graphql/boot/GraphQlWebFluxAutoConfiguration.java | 2 +- .../graphql/boot/GraphQlWebMvcAutoConfiguration.java | 2 +- .../{ => annotation/support}/AnnotatedDataFetcher.java | 6 +++++- .../support}/AnnotatedDataFetcherConfigurer.java | 9 ++++----- .../support}/AnnotatedDataFetcherConfigurerTests.java | 2 +- .../support}/AnnotatedDataFetcherInvocationTests.java | 3 ++- 6 files changed, 14 insertions(+), 10 deletions(-) rename spring-graphql/src/main/java/org/springframework/graphql/data/method/{ => annotation/support}/AnnotatedDataFetcher.java (87%) rename spring-graphql/src/main/java/org/springframework/graphql/data/method/{ => annotation/support}/AnnotatedDataFetcherConfigurer.java (96%) rename spring-graphql/src/test/java/org/springframework/graphql/data/method/{ => annotation/support}/AnnotatedDataFetcherConfigurerTests.java (98%) rename spring-graphql/src/test/java/org/springframework/graphql/data/method/{ => annotation/support}/AnnotatedDataFetcherInvocationTests.java (97%) diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfiguration.java index 955b8cd5..a74123ec 100644 --- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfiguration.java +++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebFluxAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; import org.springframework.graphql.GraphQlService; -import org.springframework.graphql.data.method.AnnotatedDataFetcherConfigurer; +import org.springframework.graphql.data.method.annotation.support.AnnotatedDataFetcherConfigurer; import org.springframework.graphql.execution.GraphQlSource; import org.springframework.graphql.web.WebGraphQlHandler; import org.springframework.graphql.web.WebInterceptor; diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfiguration.java index 0c211fd2..b3e53bad 100644 --- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfiguration.java +++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQlWebMvcAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; import org.springframework.graphql.GraphQlService; -import org.springframework.graphql.data.method.AnnotatedDataFetcherConfigurer; +import org.springframework.graphql.data.method.annotation.support.AnnotatedDataFetcherConfigurer; import org.springframework.graphql.execution.GraphQlSource; import org.springframework.graphql.execution.ThreadLocalAccessor; import org.springframework.graphql.web.WebGraphQlHandler; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/AnnotatedDataFetcher.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcher.java similarity index 87% rename from spring-graphql/src/main/java/org/springframework/graphql/data/method/AnnotatedDataFetcher.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcher.java index cf64905c..e48b74d3 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/method/AnnotatedDataFetcher.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcher.java @@ -13,12 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.data.method; +package org.springframework.graphql.data.method.annotation.support; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import graphql.schema.FieldCoordinates; +import org.springframework.graphql.data.method.HandlerMethod; +import org.springframework.graphql.data.method.HandlerMethodArgumentResolverComposite; +import org.springframework.graphql.data.method.InvocableHandlerMethod; + /** * {@link DataFetcher} that wrap and invokes a {@link HandlerMethod}. * diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/AnnotatedDataFetcherConfigurer.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherConfigurer.java similarity index 96% rename from spring-graphql/src/main/java/org/springframework/graphql/data/method/AnnotatedDataFetcherConfigurer.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherConfigurer.java index 2db5542e..69d52e0d 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/method/AnnotatedDataFetcherConfigurer.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherConfigurer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.data.method; +package org.springframework.graphql.data.method.annotation.support; import java.lang.reflect.Method; import java.util.Arrays; @@ -41,14 +41,13 @@ import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.codec.Decoder; import org.springframework.core.codec.Encoder; +import org.springframework.graphql.data.method.HandlerMethod; +import org.springframework.graphql.data.method.HandlerMethodArgumentResolver; +import org.springframework.graphql.data.method.HandlerMethodArgumentResolverComposite; import org.springframework.graphql.data.method.annotation.MutationMapping; import org.springframework.graphql.data.method.annotation.QueryMapping; import org.springframework.graphql.data.method.annotation.SchemaMapping; import org.springframework.graphql.data.method.annotation.SubscriptionMapping; -import org.springframework.graphql.data.method.annotation.support.ArgumentMapMethodArgumentResolver; -import org.springframework.graphql.data.method.annotation.support.DataFetchingEnvironmentMethodArgumentResolver; -import org.springframework.graphql.data.method.annotation.support.ArgumentMethodArgumentResolver; -import org.springframework.graphql.data.method.annotation.support.SourceMethodArgumentResolver; import org.springframework.graphql.execution.RuntimeWiringConfigurer; import org.springframework.http.MediaType; import org.springframework.http.codec.DecoderHttpMessageReader; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/method/AnnotatedDataFetcherConfigurerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherConfigurerTests.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/data/method/AnnotatedDataFetcherConfigurerTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherConfigurerTests.java index 0b7bc2be..54a6e94c 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/method/AnnotatedDataFetcherConfigurerTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherConfigurerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.data.method; +package org.springframework.graphql.data.method.annotation.support; import java.util.Map; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/method/AnnotatedDataFetcherInvocationTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherInvocationTests.java similarity index 97% rename from spring-graphql/src/test/java/org/springframework/graphql/data/method/AnnotatedDataFetcherInvocationTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherInvocationTests.java index fb209cb4..d725f175 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/method/AnnotatedDataFetcherInvocationTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AnnotatedDataFetcherInvocationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.data.method; +package org.springframework.graphql.data.method.annotation.support; import java.util.List; import java.util.Map; @@ -39,6 +39,7 @@ import org.springframework.graphql.data.method.annotation.MutationMapping; import org.springframework.graphql.data.method.annotation.QueryMapping; import org.springframework.graphql.data.method.annotation.SchemaMapping; import org.springframework.graphql.data.method.annotation.SubscriptionMapping; +import org.springframework.graphql.data.method.annotation.support.AnnotatedDataFetcherConfigurer; import org.springframework.graphql.execution.GraphQlSource; import org.springframework.http.codec.ServerCodecConfigurer; import org.springframework.stereotype.Controller;