diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/data/GraphQlWebFluxQuerydslAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/data/GraphQlWebFluxQuerydslAutoConfiguration.java index 0c6de53b..3a904b86 100644 --- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/data/GraphQlWebFluxQuerydslAutoConfiguration.java +++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/data/GraphQlWebFluxQuerydslAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.data.querydsl.QuerydslPredicateExecutor; import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor; import org.springframework.graphql.boot.GraphQlAutoConfiguration; import org.springframework.graphql.boot.GraphQlSourceBuilderCustomizer; -import org.springframework.graphql.data.QuerydslDataFetcher; +import org.springframework.graphql.data.querydsl.QuerydslDataFetcher; import org.springframework.graphql.execution.GraphQlSource; /** diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/data/GraphQlWebMvcQuerydslAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/data/GraphQlWebMvcQuerydslAutoConfiguration.java index 92d37cdb..60c76d8a 100644 --- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/data/GraphQlWebMvcQuerydslAutoConfiguration.java +++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/data/GraphQlWebMvcQuerydslAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.data.querydsl.QuerydslPredicateExecutor; import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor; import org.springframework.graphql.boot.GraphQlAutoConfiguration; import org.springframework.graphql.boot.GraphQlSourceBuilderCustomizer; -import org.springframework.graphql.data.QuerydslDataFetcher; +import org.springframework.graphql.data.querydsl.QuerydslDataFetcher; import org.springframework.graphql.execution.GraphQlSource; /** diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/package-info.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/package-info.java index 28b8c0b6..4e0ee83c 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/method/package-info.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/method/package-info.java @@ -1,7 +1,24 @@ -/** - * Support for DataFetcher's based on methods in a handler class. +/* + * Copyright 2020-2021 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. */ +/** + * Support for DataFetcher's based on handler methods typically annotated with + * {@link org.springframework.graphql.data.method.annotation.SchemaMapping} + * annotations. + */ @NonNullApi @NonNullFields package org.springframework.graphql.data.method; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/package-info.java b/spring-graphql/src/main/java/org/springframework/graphql/data/package-info.java index b2897197..e4de0a1a 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/package-info.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/package-info.java @@ -15,8 +15,7 @@ */ /** - * Spring Data support for GraphQL, including built-in Querydsl - * {@link graphql.schema.DataFetcher} implementations. + * Support for various ways to implement {@link graphql.schema.DataFetcher}s. */ @NonNullApi @NonNullFields diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/DtoInstantiatingConverter.java b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/DtoInstantiatingConverter.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/data/DtoInstantiatingConverter.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/DtoInstantiatingConverter.java index c99df8b1..ef977bef 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/DtoInstantiatingConverter.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/DtoInstantiatingConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data; +package org.springframework.graphql.data.querydsl; import org.springframework.core.convert.converter.Converter; import org.springframework.data.mapping.PersistentEntity; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/DtoMappingContext.java b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/DtoMappingContext.java similarity index 98% rename from spring-graphql/src/main/java/org/springframework/graphql/data/DtoMappingContext.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/DtoMappingContext.java index 41d30187..b9885596 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/DtoMappingContext.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/DtoMappingContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data; +package org.springframework.graphql.data.querydsl; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.PersistentEntity; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/QuerydslDataFetcher.java b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcher.java similarity index 99% rename from spring-graphql/src/main/java/org/springframework/graphql/data/QuerydslDataFetcher.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcher.java index ac683e41..5eb9d0b3 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/QuerydslDataFetcher.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data; +package org.springframework.graphql.data.querydsl; import java.lang.reflect.Type; import java.util.Collections; @@ -63,6 +63,7 @@ import org.springframework.data.repository.core.support.DefaultRepositoryMetadat import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.Streamable; import org.springframework.data.util.TypeInformation; +import org.springframework.graphql.data.GraphQlRepository; import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/package-info.java b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/package-info.java new file mode 100644 index 00000000..40193a5c --- /dev/null +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/package-info.java @@ -0,0 +1,26 @@ +/* + * Copyright 2020-2021 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. + */ + +/** + * Support for {@link graphql.schema.DataFetcher}s backed by Querydsl based + * Spring Data repositories. + */ +@NonNullApi +@NonNullFields +package org.springframework.graphql.data.querydsl; + +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/Book.java b/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/Book.java similarity index 95% rename from spring-graphql/src/test/java/org/springframework/graphql/data/Book.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/Book.java index 6be2d6a9..2ff2c140 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/Book.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/Book.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data; +package org.springframework.graphql.data.querydsl; public class Book { diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/QBook.java b/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QBook.java similarity index 96% rename from spring-graphql/src/test/java/org/springframework/graphql/data/QBook.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QBook.java index cccf1f51..c808f091 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/QBook.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QBook.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data; +package org.springframework.graphql.data.querydsl; import com.querydsl.core.types.Path; import com.querydsl.core.types.PathMetadata; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/QuerydslDataFetcherTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcherTests.java similarity index 99% rename from spring-graphql/src/test/java/org/springframework/graphql/data/QuerydslDataFetcherTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcherTests.java index 9aa91534..b20fd82f 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/QuerydslDataFetcherTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcherTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data; +package org.springframework.graphql.data.querydsl; import java.net.URI; import java.util.Arrays; @@ -37,6 +37,7 @@ import org.springframework.data.querydsl.QuerydslPredicateExecutor; import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor; import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer; import org.springframework.data.repository.Repository; +import org.springframework.graphql.data.GraphQlRepository; import org.springframework.graphql.execution.ExecutionGraphQlService; import org.springframework.graphql.execution.GraphQlSource; import org.springframework.graphql.web.WebGraphQlHandler;