From 38f9f987e48d24944807c9f14776b8d31ed670ae Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 26 Nov 2021 17:10:59 +0000 Subject: [PATCH] Combine querydsl and querybyexample into one package Following the addition of Query By Example, it makes sense to consolidate the two that mirror each other, are closely related, and can share package private support. See gh-191 --- ...aphQlWebFluxQuerydslAutoConfiguration.java | 2 +- ...raphQlWebMvcQuerydslAutoConfiguration.java | 2 +- .../PropertySelection.java | 6 +- .../QueryByExampleDataFetcher.java | 2 +- .../QuerydslDataFetcher.java | 2 +- .../{querydsl => query}/package-info.java | 10 +- .../data/querybyexample/package-info.java | 29 --- .../data/querydsl/PropertySelection.java | 196 ------------------ .../data/{querydsl => query}/Book.java | 2 +- .../data/{querydsl => query}/QBook.java | 2 +- .../QuerydslDataFetcherTests.java | 2 +- .../{querybyexample => query}/jpa/Author.java | 2 +- .../{querybyexample => query}/jpa/Book.java | 2 +- .../jpa/BookJpaRepository.java | 2 +- .../QueryByExampleDataFetcherJpaTests.java | 4 +- .../mongodb => query/mongo}/Author.java | 2 +- .../mongodb => query/mongo}/Book.java | 2 +- .../mongo}/BookMongoRepository.java | 2 +- .../mongo}/BookReactiveMongoRepository.java | 2 +- ...QueryByExampleDataFetcherMongoDbTests.java | 4 +- ...xampleDataFetcherReactiveMongoDbTests.java | 4 +- 21 files changed, 31 insertions(+), 250 deletions(-) rename spring-graphql/src/main/java/org/springframework/graphql/data/{querybyexample => query}/PropertySelection.java (99%) rename spring-graphql/src/main/java/org/springframework/graphql/data/{querybyexample => query}/QueryByExampleDataFetcher.java (99%) rename spring-graphql/src/main/java/org/springframework/graphql/data/{querydsl => query}/QuerydslDataFetcher.java (99%) rename spring-graphql/src/main/java/org/springframework/graphql/data/{querydsl => query}/package-info.java (71%) delete mode 100644 spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/package-info.java delete mode 100644 spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/PropertySelection.java rename spring-graphql/src/test/java/org/springframework/graphql/data/{querydsl => query}/Book.java (96%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querydsl => query}/QBook.java (96%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querydsl => query}/QuerydslDataFetcherTests.java (99%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample => query}/jpa/Author.java (95%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample => query}/jpa/Book.java (95%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample => query}/jpa/BookJpaRepository.java (77%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample => query}/jpa/QueryByExampleDataFetcherJpaTests.java (98%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample/mongodb => query/mongo}/Author.java (95%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample/mongodb => query/mongo}/Book.java (94%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample/mongodb => query/mongo}/BookMongoRepository.java (77%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample/mongodb => query/mongo}/BookReactiveMongoRepository.java (79%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample/mongodb => query/mongo}/QueryByExampleDataFetcherMongoDbTests.java (98%) rename spring-graphql/src/test/java/org/springframework/graphql/data/{querybyexample/mongodb => query/mongo}/QueryByExampleDataFetcherReactiveMongoDbTests.java (98%) 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 3a904b86..fa050e08 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.querydsl.QuerydslDataFetcher; +import org.springframework.graphql.data.query.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 60c76d8a..9adc2740 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.querydsl.QuerydslDataFetcher; +import org.springframework.graphql.data.query.QuerydslDataFetcher; import org.springframework.graphql.execution.GraphQlSource; /** diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/PropertySelection.java b/spring-graphql/src/main/java/org/springframework/graphql/data/query/PropertySelection.java similarity index 99% rename from spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/PropertySelection.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/query/PropertySelection.java index 383fa271..84872023 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/PropertySelection.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/query/PropertySelection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querybyexample; +package org.springframework.graphql.data.query; import java.util.ArrayList; import java.util.Collections; @@ -111,6 +111,7 @@ class PropertySelection { .collect(Collectors.toList()); } + enum EmptyFieldSelection implements FieldSelection { INSTANCE; @@ -132,6 +133,7 @@ class PropertySelection { } + /** * Hierarchical representation of selected fields. Allows traversing the * object graph with nested fields. @@ -153,6 +155,7 @@ class PropertySelection { } + static class DataFetchingFieldSelection implements FieldSelection { private final List selectedFields; @@ -195,4 +198,5 @@ class PropertySelection { } } + } diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/QueryByExampleDataFetcher.java b/spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java similarity index 99% rename from spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/QueryByExampleDataFetcher.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java index 4ef6c78e..6c005e31 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/QueryByExampleDataFetcher.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querybyexample; +package org.springframework.graphql.data.query; import java.lang.reflect.Type; import java.util.Collection; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcher.java b/spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java similarity index 99% rename from spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcher.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java index 1a5d7db5..ddaa6909 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcher.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querydsl; +package org.springframework.graphql.data.query; import java.lang.reflect.Type; import java.util.Collection; 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/query/package-info.java similarity index 71% rename from spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/package-info.java rename to spring-graphql/src/main/java/org/springframework/graphql/data/query/package-info.java index 512bbbdd..eb77d17b 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/package-info.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/query/package-info.java @@ -15,15 +15,17 @@ */ /** - * {@link graphql.schema.DataFetcher} implementations built on Querydsl, Spring - * Data repositories. + * {@link graphql.schema.DataFetcher} implementations built on Spring Data + * extensions such as Query by Example and Querydsl. * + * @see + * Spring Data Query By Example * @see - * Spring Data Querydsl extension + * Spring Data Querydsl */ @NonNullApi @NonNullFields -package org.springframework.graphql.data.querydsl; +package org.springframework.graphql.data.query; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/package-info.java b/spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/package-info.java deleted file mode 100644 index 869707d3..00000000 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/querybyexample/package-info.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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. - */ - -/** - * {@link graphql.schema.DataFetcher} implementations built on the Spring Data, - * Query by Example support. - * - * @see - * Spring Data Query By Example extension - */ -@NonNullApi -@NonNullFields -package org.springframework.graphql.data.querybyexample; - -import org.springframework.lang.NonNullApi; -import org.springframework.lang.NonNullFields; diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/PropertySelection.java b/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/PropertySelection.java deleted file mode 100644 index 6615d029..00000000 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/querydsl/PropertySelection.java +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Copyright 2002-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 - * - * http://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. - */ - -package org.springframework.graphql.data.querydsl; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.function.Function; -import java.util.stream.Collectors; - -import graphql.schema.DataFetchingFieldSelectionSet; -import graphql.schema.SelectedField; - -import org.springframework.data.mapping.PropertyPath; -import org.springframework.data.util.TypeInformation; - -/** - * Utility to compute {@link PropertyPath property paths} from - * a {@link DataFetchingFieldSelectionSet field selection} considering an underlying - * Java type. - *

- * Property paths are created for each selected field that corresponds with a property - * on the underlying type. Nested properties are represented with nested paths - * if the nesting can be resolved to a concrete type, otherwise the nested path - * is considered to be a composite property without further inspection. - * - * @author Mark Paluch - * @since 1.0.0 - */ -class PropertySelection { - - private final List propertyPaths; - - private PropertySelection(List propertyPaths) { - this.propertyPaths = propertyPaths; - } - - /** - * Create a property selection for the given {@link TypeInformation type} and - * {@link DataFetchingFieldSelectionSet}. - * - * @param typeInformation the type to inspect - * @param selectionSet the field selection to apply - * @return a property selection holding all selectable property paths. - */ - public static PropertySelection create(TypeInformation typeInformation, - DataFetchingFieldSelectionSet selectionSet) { - return create(typeInformation, new DataFetchingFieldSelection(selectionSet)); - } - - private static PropertySelection create(TypeInformation typeInformation, FieldSelection selection) { - List propertyPaths = collectPropertyPaths(typeInformation, - selection, - path -> PropertyPath.from(path, typeInformation)); - return new PropertySelection(propertyPaths); - } - - private static List collectPropertyPaths(TypeInformation typeInformation, - FieldSelection selection, Function propertyPathFactory) { - List propertyPaths = new ArrayList<>(); - - for (SelectedField selectedField : selection) { - - String propertyName = selectedField.getName(); - TypeInformation property = typeInformation.getProperty(propertyName); - - if (property == null) { - continue; - } - - PropertyPath propertyPath = propertyPathFactory.apply(propertyName); - FieldSelection nestedSelection = selection.select(selectedField); - - List pathsToAdd = Collections.singletonList(propertyPath); - - if (!nestedSelection.isEmpty() && property.getActualType() != null) { - List nestedPaths = collectPropertyPaths(property.getRequiredActualType(), - nestedSelection, propertyPath::nested); - - if (!nestedPaths.isEmpty()) { - pathsToAdd = nestedPaths; - } - } - - propertyPaths.addAll(pathsToAdd); - } - - return propertyPaths; - } - - /** - * @return the property paths as list. - */ - public List toList() { - return this.propertyPaths.stream().map(PropertyPath::toDotPath) - .collect(Collectors.toList()); - } - - /** - * Hierarchical representation of selected fields. Allows traversing the - * object graph with nested fields. - */ - interface FieldSelection extends Iterable { - - /** - * @return {@code true} if the field selection is empty - */ - boolean isEmpty(); - - /** - * Obtain the field selection (nested fields) for a given {@code field}. - * @param field the field for which nested fields should be obtained - * @return the field selection. Can be empty. - */ - FieldSelection select(SelectedField field); - - } - - static class DataFetchingFieldSelection implements FieldSelection { - - private final List selectedFields; - private final List allFields; - - DataFetchingFieldSelection(DataFetchingFieldSelectionSet selectionSet) { - this.selectedFields = selectionSet.getImmediateFields(); - this.allFields = selectionSet.getFields(); - } - - private DataFetchingFieldSelection(List selectedFields, - List allFields) { - this.selectedFields = selectedFields; - this.allFields = allFields; - } - - @Override - public boolean isEmpty() { - return selectedFields.isEmpty(); - } - - @Override - public FieldSelection select(SelectedField field) { - List selectedFields = new ArrayList<>(); - - for (SelectedField selectedField : allFields) { - if (field.equals(selectedField.getParentField())) { - selectedFields.add(selectedField); - } - } - - return (selectedFields.isEmpty() ? EmptyFieldSelection.INSTANCE - : new DataFetchingFieldSelection(selectedFields, allFields)); - } - - @Override - public Iterator iterator() { - return this.selectedFields.iterator(); - } - - } - - enum EmptyFieldSelection implements FieldSelection { - - INSTANCE; - - @Override - public boolean isEmpty() { - return true; - } - - @Override - public FieldSelection select(SelectedField field) { - return INSTANCE; - } - - @Override - public Iterator iterator() { - return Collections.emptyIterator(); - } - - } -} diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/Book.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/Book.java similarity index 96% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/Book.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/Book.java index f7ad96bf..3a7c1c15 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/Book.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/Book.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querydsl; +package org.springframework.graphql.data.query; import org.springframework.data.annotation.Id; import org.springframework.graphql.Author; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QBook.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/QBook.java similarity index 96% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QBook.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/QBook.java index c808f091..84248332 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QBook.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/QBook.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querydsl; +package org.springframework.graphql.data.query; import com.querydsl.core.types.Path; import com.querydsl.core.types.PathMetadata; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcherTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java similarity index 99% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcherTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java index f9adc35a..04d95788 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querydsl/QuerydslDataFetcherTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querydsl; +package org.springframework.graphql.data.query; import java.net.URI; import java.util.Arrays; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/Author.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/Author.java similarity index 95% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/Author.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/Author.java index c6aa372a..36f62030 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/Author.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/Author.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.data.querybyexample.jpa; +package org.springframework.graphql.data.query.jpa; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/Book.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/Book.java similarity index 95% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/Book.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/Book.java index 8592e8b4..c549d3d1 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/Book.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/Book.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querybyexample.jpa; +package org.springframework.graphql.data.query.jpa; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/BookJpaRepository.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/BookJpaRepository.java similarity index 77% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/BookJpaRepository.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/BookJpaRepository.java index 9fbb8576..2fd6c8df 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/BookJpaRepository.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/BookJpaRepository.java @@ -1,4 +1,4 @@ -package org.springframework.graphql.data.querybyexample.jpa; +package org.springframework.graphql.data.query.jpa; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.graphql.data.GraphQlRepository; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/QueryByExampleDataFetcherJpaTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/QueryByExampleDataFetcherJpaTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java index bacf0048..941ba955 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/jpa/QueryByExampleDataFetcherJpaTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querybyexample.jpa; +package org.springframework.graphql.data.query.jpa; import java.net.URI; import java.util.Arrays; @@ -43,7 +43,7 @@ import org.springframework.data.repository.query.QueryByExampleExecutor; import org.springframework.graphql.BookSource; import org.springframework.graphql.GraphQlResponse; import org.springframework.graphql.GraphQlSetup; -import org.springframework.graphql.data.querybyexample.QueryByExampleDataFetcher; +import org.springframework.graphql.data.query.QueryByExampleDataFetcher; import org.springframework.graphql.web.WebGraphQlHandler; import org.springframework.graphql.web.WebInput; import org.springframework.graphql.web.WebOutput; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/Author.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/Author.java similarity index 95% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/Author.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/Author.java index fb53cf7c..afa15c16 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/Author.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/Author.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.graphql.data.querybyexample.mongodb; +package org.springframework.graphql.data.query.mongo; import org.springframework.data.annotation.Id; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/Book.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/Book.java similarity index 94% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/Book.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/Book.java index 92351380..0a006b28 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/Book.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/Book.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querybyexample.mongodb; +package org.springframework.graphql.data.query.mongo; import org.springframework.data.annotation.Id; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/BookMongoRepository.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/BookMongoRepository.java similarity index 77% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/BookMongoRepository.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/BookMongoRepository.java index a987b91b..be8a1f96 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/BookMongoRepository.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/BookMongoRepository.java @@ -1,4 +1,4 @@ -package org.springframework.graphql.data.querybyexample.mongodb; +package org.springframework.graphql.data.query.mongo; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.graphql.data.GraphQlRepository; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/BookReactiveMongoRepository.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/BookReactiveMongoRepository.java similarity index 79% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/BookReactiveMongoRepository.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/BookReactiveMongoRepository.java index f4d8fc12..bd36dc49 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/BookReactiveMongoRepository.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/BookReactiveMongoRepository.java @@ -1,4 +1,4 @@ -package org.springframework.graphql.data.querybyexample.mongodb; +package org.springframework.graphql.data.query.mongo; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.graphql.data.GraphQlRepository; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/QueryByExampleDataFetcherMongoDbTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/QueryByExampleDataFetcherMongoDbTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java index 00ee0d33..ceeb1ef6 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/QueryByExampleDataFetcherMongoDbTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querybyexample.mongodb; +package org.springframework.graphql.data.query.mongo; import java.net.URI; import java.util.Arrays; @@ -45,7 +45,7 @@ import org.springframework.data.repository.query.QueryByExampleExecutor; import org.springframework.graphql.BookSource; import org.springframework.graphql.GraphQlResponse; import org.springframework.graphql.GraphQlSetup; -import org.springframework.graphql.data.querybyexample.QueryByExampleDataFetcher; +import org.springframework.graphql.data.query.QueryByExampleDataFetcher; import org.springframework.graphql.web.WebGraphQlHandler; import org.springframework.graphql.web.WebInput; import org.springframework.graphql.web.WebOutput; diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/QueryByExampleDataFetcherReactiveMongoDbTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java similarity index 98% rename from spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/QueryByExampleDataFetcherReactiveMongoDbTests.java rename to spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java index c575d00e..7744d0f6 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/querybyexample/mongodb/QueryByExampleDataFetcherReactiveMongoDbTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.graphql.data.querybyexample.mongodb; +package org.springframework.graphql.data.query.mongo; import java.net.URI; import java.util.Collections; @@ -44,7 +44,7 @@ import org.springframework.data.repository.query.ReactiveQueryByExampleExecutor; import org.springframework.graphql.BookSource; import org.springframework.graphql.GraphQlResponse; import org.springframework.graphql.GraphQlSetup; -import org.springframework.graphql.data.querybyexample.QueryByExampleDataFetcher; +import org.springframework.graphql.data.query.QueryByExampleDataFetcher; import org.springframework.graphql.web.WebGraphQlHandler; import org.springframework.graphql.web.WebInput; import org.springframework.graphql.web.WebOutput;